Module Name: src
Committed By: isaki
Date: Sat Nov 19 12:27:44 UTC 2011
Modified Files:
src/distrib/sets/lists/base: md.x68k
src/distrib/sets/lists/comp: md.x68k
src/distrib/sets/lists/man: mi
src/share/man/man4/man4.x68k: Makefile
src/share/man/man8/man8.x68k: Makefile
src/sys/arch/x68k/conf: GENERIC INSTALL files.x68k majors.x68k
src/sys/arch/x68k/include: Makefile
src/sys/arch/x68k/usr.bin: Makefile
Removed Files:
src/share/man/man4/man4.x68k: pow.4
src/share/man/man8/man8.x68k: rtcalarm.8
src/sys/arch/x68k/dev: pow.c powvar.h
src/sys/arch/x68k/include: powioctl.h
src/sys/arch/x68k/usr.bin/rtcalarm: Makefile rtcalarm.c
Log Message:
Obsolete pow(4) and rtcalarm(8). Discussed in port-x68k@.
Probably the combination of pow(4) ioctl and rtcalarm(8) does
not work for a long time, and nobody uses them.
I'll rewrite a part about power switch handler as a new device.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/base/md.x68k
cvs rdiff -u -r1.58 -r1.59 src/distrib/sets/lists/comp/md.x68k
cvs rdiff -u -r1.1355 -r1.1356 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/man4.x68k/Makefile
cvs rdiff -u -r1.14 -r0 src/share/man/man4/man4.x68k/pow.4
cvs rdiff -u -r1.9 -r1.10 src/share/man/man8/man8.x68k/Makefile
cvs rdiff -u -r1.9 -r0 src/share/man/man8/man8.x68k/rtcalarm.8
cvs rdiff -u -r1.155 -r1.156 src/sys/arch/x68k/conf/GENERIC
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/x68k/conf/INSTALL
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/x68k/conf/files.x68k
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/x68k/conf/majors.x68k
cvs rdiff -u -r1.23 -r0 src/sys/arch/x68k/dev/pow.c
cvs rdiff -u -r1.4 -r0 src/sys/arch/x68k/dev/powvar.h
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/x68k/include/Makefile
cvs rdiff -u -r1.4 -r0 src/sys/arch/x68k/include/powioctl.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/sys/arch/x68k/usr.bin/Makefile
cvs rdiff -u -r1.7 -r0 src/sys/arch/x68k/usr.bin/rtcalarm/Makefile
cvs rdiff -u -r1.11 -r0 src/sys/arch/x68k/usr.bin/rtcalarm/rtcalarm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/md.x68k
diff -u src/distrib/sets/lists/base/md.x68k:1.42 src/distrib/sets/lists/base/md.x68k:1.43
--- src/distrib/sets/lists/base/md.x68k:1.42 Sat Dec 20 13:20:58 2008
+++ src/distrib/sets/lists/base/md.x68k Sat Nov 19 12:27:42 2011
@@ -1,10 +1,11 @@
-# $NetBSD: md.x68k,v 1.42 2008/12/20 13:20:58 isaki Exp $
+# $NetBSD: md.x68k,v 1.43 2011/11/19 12:27:42 isaki Exp $
+./dev/pow0 base-obsolete obsolete
./dev/pow1 base-obsolete obsolete
./usr/bin/bellctrl base-util-bin
./usr/bin/loadfont base-util-bin
./usr/bin/loadkmap base-util-bin
./usr/bin/palette base-util-bin
-./usr/bin/rtcalarm base-util-bin
+./usr/bin/rtcalarm base-obsolete obsolete
./usr/bin/tvctrl base-util-bin
./usr/mdec/boot base-sysutil-bin
./usr/mdec/fdboot_ufs base-sysutil-bin
Index: src/distrib/sets/lists/comp/md.x68k
diff -u src/distrib/sets/lists/comp/md.x68k:1.58 src/distrib/sets/lists/comp/md.x68k:1.59
--- src/distrib/sets/lists/comp/md.x68k:1.58 Sun Jul 17 20:54:32 2011
+++ src/distrib/sets/lists/comp/md.x68k Sat Nov 19 12:27:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.x68k,v 1.58 2011/07/17 20:54:32 joerg Exp $
+# $NetBSD: md.x68k,v 1.59 2011/11/19 12:27:42 isaki Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/x68k comp-c-include
./usr/include/x68k/_G_config.h comp-obsolete obsolete
@@ -46,7 +46,7 @@
./usr/include/x68k/pci_machdep.h comp-obsolete obsolete
./usr/include/x68k/pmap.h comp-c-include
./usr/include/x68k/pmc.h comp-c-include
-./usr/include/x68k/powioctl.h comp-c-include
+./usr/include/x68k/powioctl.h comp-obsolete obsolete
./usr/include/x68k/proc.h comp-c-include
./usr/include/x68k/profile.h comp-c-include
./usr/include/x68k/psl.h comp-c-include
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1355 src/distrib/sets/lists/man/mi:1.1356
--- src/distrib/sets/lists/man/mi:1.1355 Tue Nov 15 16:50:45 2011
+++ src/distrib/sets/lists/man/mi Sat Nov 19 12:27:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1355 2011/11/15 16:50:45 riz Exp $
+# $NetBSD: mi,v 1.1356 2011/11/19 12:27:42 isaki Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1823,7 +1823,7 @@
./usr/share/man/cat4/x68k/intro.0 man-sys-catman .cat
./usr/share/man/cat4/x68k/mfp.0 man-sys-catman .cat
./usr/share/man/cat4/x68k/neptune.0 man-sys-catman .cat
-./usr/share/man/cat4/x68k/pow.0 man-sys-catman .cat
+./usr/share/man/cat4/x68k/pow.0 man-obsolete obsolete
./usr/share/man/cat4/x68k/vs.0 man-sys-catman .cat
./usr/share/man/cat4/x86/amdpcib.0 man-sys-catman .cat
./usr/share/man/cat4/x86/apic.0 man-sys-catman .cat
@@ -2942,7 +2942,7 @@
./usr/share/man/cat8/x68k/memswitch.0 man-sysutil-catman .cat
./usr/share/man/cat8/x68k/newdisk.0 man-sysutil-catman .cat
./usr/share/man/cat8/x68k/poffd.0 man-obsolete obsolete
-./usr/share/man/cat8/x68k/rtcalarm.0 man-sysutil-catman .cat
+./usr/share/man/cat8/x68k/rtcalarm.0 man-obsolete obsolete
./usr/share/man/cat8/x86_64/MAKEDEV.0 man-obsolete obsolete
./usr/share/man/cat8/x86_64/makedev.0 man-obsolete obsolete
./usr/share/man/cat8/xntpd.0 man-obsolete obsolete
@@ -4586,7 +4586,7 @@
./usr/share/man/html4/x68k/intro.html man-sys-htmlman html
./usr/share/man/html4/x68k/mfp.html man-sys-htmlman html
./usr/share/man/html4/x68k/neptune.html man-sys-htmlman html
-./usr/share/man/html4/x68k/pow.html man-sys-htmlman html
+./usr/share/man/html4/x68k/pow.html man-obsolete obsolete
./usr/share/man/html4/x68k/vs.html man-sys-htmlman html
./usr/share/man/html4/x86/amdpcib.html man-sys-htmlman html
./usr/share/man/html4/x86/apic.html man-sys-htmlman html
@@ -5483,7 +5483,7 @@
./usr/share/man/html8/x68k/memswitch.html man-sysutil-htmlman html
./usr/share/man/html8/x68k/newdisk.html man-sysutil-htmlman html
./usr/share/man/html8/x68k/poffd.html man-obsolete obsolete
-./usr/share/man/html8/x68k/rtcalarm.html man-sysutil-htmlman html
+./usr/share/man/html8/x68k/rtcalarm.html man-obsolete obsolete
./usr/share/man/html8/yp.html man-nis-htmlman html
./usr/share/man/html8/ypbind.html man-nis-htmlman yp,html
./usr/share/man/html8/ypinit.html man-nis-htmlman yp,html
@@ -7284,7 +7284,7 @@
./usr/share/man/man4/x68k/intro.4 man-sys-man .man
./usr/share/man/man4/x68k/mfp.4 man-sys-man .man
./usr/share/man/man4/x68k/neptune.4 man-sys-man .man
-./usr/share/man/man4/x68k/pow.4 man-sys-man .man
+./usr/share/man/man4/x68k/pow.4 man-obsolete obsolete
./usr/share/man/man4/x68k/vs.4 man-sys-man .man
./usr/share/man/man4/x86/amdpcib.4 man-sys-man .man
./usr/share/man/man4/x86/apic.4 man-sys-man .man
@@ -8403,7 +8403,7 @@
./usr/share/man/man8/x68k/memswitch.8 man-sysutil-man .man
./usr/share/man/man8/x68k/newdisk.8 man-sysutil-man .man
./usr/share/man/man8/x68k/poffd.8 man-obsolete obsolete
-./usr/share/man/man8/x68k/rtcalarm.8 man-sysutil-man .man
+./usr/share/man/man8/x68k/rtcalarm.8 man-obsolete obsolete
./usr/share/man/man8/x86_64/MAKEDEV.8 man-obsolete obsolete
./usr/share/man/man8/x86_64/makedev.8 man-obsolete obsolete
./usr/share/man/man8/xntpd.8 man-obsolete obsolete
Index: src/share/man/man4/man4.x68k/Makefile
diff -u src/share/man/man4/man4.x68k/Makefile:1.7 src/share/man/man4/man4.x68k/Makefile:1.8
--- src/share/man/man4/man4.x68k/Makefile:1.7 Sun Dec 1 09:14:34 2002
+++ src/share/man/man4/man4.x68k/Makefile Sat Nov 19 12:27:43 2011
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2002/12/01 09:14:34 isaki Exp $
+# $NetBSD: Makefile,v 1.8 2011/11/19 12:27:43 isaki Exp $
-MAN= bmd.4 intio.4 intro.4 mfp.4 neptune.4 pow.4 vs.4
+MAN= bmd.4 intio.4 intro.4 mfp.4 neptune.4 vs.4
MANSUBDIR=/x68k
.include <bsd.man.mk>
Index: src/share/man/man8/man8.x68k/Makefile
diff -u src/share/man/man8/man8.x68k/Makefile:1.9 src/share/man/man8/man8.x68k/Makefile:1.10
--- src/share/man/man8/man8.x68k/Makefile:1.9 Sat Dec 20 13:20:58 2008
+++ src/share/man/man8/man8.x68k/Makefile Sat Nov 19 12:27:43 2011
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2008/12/20 13:20:58 isaki Exp $
+# $NetBSD: Makefile,v 1.10 2011/11/19 12:27:43 isaki Exp $
-MAN= boot.8 loadbsd.8 newdisk.8 rtcalarm.8
+MAN= boot.8 loadbsd.8 newdisk.8
MLINKS+=loadbsd.8 loadbsd.x.8
MANSUBDIR=/x68k
Index: src/sys/arch/x68k/conf/GENERIC
diff -u src/sys/arch/x68k/conf/GENERIC:1.155 src/sys/arch/x68k/conf/GENERIC:1.156
--- src/sys/arch/x68k/conf/GENERIC:1.155 Thu Mar 17 13:26:51 2011
+++ src/sys/arch/x68k/conf/GENERIC Sat Nov 19 12:27:43 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.155 2011/03/17 13:26:51 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.156 2011/11/19 12:27:43 isaki Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/x68k/conf/std.x68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.155 $"
+#ident "GENERIC-$Revision: 1.156 $"
maxusers 8
@@ -252,7 +252,6 @@ kbd0 at mfp0 # standard keyboard
ite0 at grf0 grfaddr 0 # internal terminal emulator
options ITE_KERNEL_ATTR=4 # bold for kernel messages
# see /sys/arch/x68k/dev/itevar.h
-pow0 at mfp0 # software power switch
## floppy disks
fdc0 at intio0 addr 0xe94000 intr 96 dma 0 dmaintr 100 # floppy controller
Index: src/sys/arch/x68k/conf/INSTALL
diff -u src/sys/arch/x68k/conf/INSTALL:1.91 src/sys/arch/x68k/conf/INSTALL:1.92
--- src/sys/arch/x68k/conf/INSTALL:1.91 Sun Mar 6 17:08:33 2011
+++ src/sys/arch/x68k/conf/INSTALL Sat Nov 19 12:27:43 2011
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.91 2011/03/06 17:08:33 bouyer Exp $
+# $NetBSD: INSTALL,v 1.92 2011/11/19 12:27:43 isaki Exp $
#
# INSTALL -- installation kernel.
@@ -8,7 +8,7 @@ include "arch/x68k/conf/std.x68k"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.91 $"
+#ident "INSTALL-$Revision: 1.92 $"
makeoptions COPTS="-Os" # Optimise for space. Implies -O2
@@ -223,7 +223,6 @@ kbd0 at mfp0 # standard keyboard
ite0 at grf0 grfaddr 0 # internal terminal emulator
options ITE_KERNEL_ATTR=4 # bold for kernel messages
# see /sys/arch/x68k/dev/itevar.h
-#pow0 at mfp0 # software power switch
## floppy disks
fdc0 at intio0 addr 0xe94000 intr 96 dma 0 dmaintr 100 # floppy controller
Index: src/sys/arch/x68k/conf/files.x68k
diff -u src/sys/arch/x68k/conf/files.x68k:1.75 src/sys/arch/x68k/conf/files.x68k:1.76
--- src/sys/arch/x68k/conf/files.x68k:1.75 Tue Nov 15 12:23:22 2011
+++ src/sys/arch/x68k/conf/files.x68k Sat Nov 19 12:27:43 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.x68k,v 1.75 2011/11/15 12:23:22 tsutsui Exp $
+# $NetBSD: files.x68k,v 1.76 2011/11/19 12:27:43 isaki Exp $
#
# new style config file for x68k architecture
#
@@ -96,10 +96,6 @@ device kbd: event
attach kbd at mfp
file arch/x68k/dev/kbd.c kbd needs-flag
-device pow: sysmon_power, sysmon_taskq
-attach pow at mfp
-file arch/x68k/dev/pow.c pow
-
device rtc
attach rtc at intio
file arch/x68k/dev/rtclock.c rtc
Index: src/sys/arch/x68k/conf/majors.x68k
diff -u src/sys/arch/x68k/conf/majors.x68k:1.24 src/sys/arch/x68k/conf/majors.x68k:1.25
--- src/sys/arch/x68k/conf/majors.x68k:1.24 Thu Jun 30 20:09:38 2011
+++ src/sys/arch/x68k/conf/majors.x68k Sat Nov 19 12:27:43 2011
@@ -1,4 +1,4 @@
-# $NetBSD: majors.x68k,v 1.24 2011/06/30 20:09:38 wiz Exp $
+# $NetBSD: majors.x68k,v 1.25 2011/11/19 12:27:43 isaki Exp $
#
# Device majors for x68k
#
@@ -29,7 +29,7 @@ device-major bpf char 22 bpfilter
device-major sram char 23 sram
device-major tun char 31 tun
-device-major pow char 32 pow
+#obsolete pow char 32 pow
device-major bell char 33 bell
device-major ccd char 34 block 15 ccd
device-major ss char 35 ss
Index: src/sys/arch/x68k/include/Makefile
diff -u src/sys/arch/x68k/include/Makefile:1.35 src/sys/arch/x68k/include/Makefile:1.36
--- src/sys/arch/x68k/include/Makefile:1.35 Thu Jul 21 11:02:48 2011
+++ src/sys/arch/x68k/include/Makefile Sat Nov 19 12:27:44 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2011/07/21 11:02:48 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2011/11/19 12:27:44 isaki Exp $
INCSDIR= /usr/include/x68k
@@ -16,7 +16,7 @@ INCS= ansi.h aout_machdep.h asm.h \
lock.h limits.h \
math.h mcontext.h mutex.h \
opmbellio.h opmreg.h \
- param.h parioctl.h pcb.h pmap.h pmc.h powioctl.h proc.h \
+ param.h parioctl.h pcb.h pmap.h pmc.h proc.h \
profile.h psl.h pte.h ptrace.h \
reg.h remote-sl.h rwlock.h \
setjmp.h signal.h sram.h \
Index: src/sys/arch/x68k/usr.bin/Makefile
diff -u src/sys/arch/x68k/usr.bin/Makefile:1.1.1.1 src/sys/arch/x68k/usr.bin/Makefile:1.2
--- src/sys/arch/x68k/usr.bin/Makefile:1.1.1.1 Sun May 5 12:17:17 1996
+++ src/sys/arch/x68k/usr.bin/Makefile Sat Nov 19 12:27:44 2011
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1.1.1 1996/05/05 12:17:17 oki Exp $
+# $NetBSD: Makefile,v 1.2 2011/11/19 12:27:44 isaki Exp $
-SUBDIR+= loadfont loadkmap palette rtcalarm tvctrl bellctrl
+SUBDIR+= loadfont loadkmap palette tvctrl bellctrl
.include <bsd.subdir.mk>
