From 2ce7d7a0335f8424a2645ec044a0202ebef230d8 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Tue, 9 Apr 2002 11:18:46 +0000 Subject: [PATCH] GC various bits and pieces of USERCONFIG from all over the place. --- sys/alpha/alpha/machdep.c | 12 ------------ sys/amd64/amd64/machdep.c | 6 ------ sys/amd64/conf/GENERIC | 2 -- sys/amd64/include/md_var.h | 1 - sys/conf/NOTES | 7 +------ sys/dev/atkbdc/atkbd.c | 2 +- sys/dev/eisa/eisaconf.c | 1 - sys/dev/fb/vga.c | 3 +-- sys/dev/kbd/atkbd.c | 2 +- sys/i386/conf/GENERIC | 2 -- sys/i386/conf/NEWCARD | 2 -- sys/i386/i386/machdep.c | 6 ------ sys/i386/include/md_var.h | 1 - sys/i386/isa/isa_device.h | 1 - sys/i386/isa/pcvt/pcvt_drv.c | 4 ++-- sys/ia64/ia64/machdep.c | 12 ------------ sys/isa/pnpreg.h | 8 -------- sys/pc98/conf/GENERIC | 2 -- sys/pc98/i386/machdep.c | 6 ------ sys/pc98/pc98/machdep.c | 6 ------ sys/powerpc/aim/machdep.c | 12 ------------ sys/powerpc/powerpc/machdep.c | 12 ------------ 22 files changed, 6 insertions(+), 104 deletions(-) diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c index 59fcbfdcbdc..c2fb8e9fe03 100644 --- a/sys/alpha/alpha/machdep.c +++ b/sys/alpha/alpha/machdep.c @@ -278,18 +278,6 @@ cpu_startup(dummy) vm_ksubmap_init(&kmi); -#if defined(USERCONFIG) -#if defined(USERCONFIG_BOOT) - if (1) -#else - if (boothowto & RB_CONFIG) -#endif - { - userconfig(); - cninit(); /* the preferred console may have changed */ - } -#endif - printf("avail memory = %ld (%ldK bytes)\n", ptoa(cnt.v_free_count), ptoa(cnt.v_free_count) / 1024); diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 8c3737b6345..d54d3d78143 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -50,7 +50,6 @@ #include "opt_npx.h" #include "opt_perfmon.h" #include "opt_kstack_pages.h" -/* #include "opt_userconfig.h" */ #include #include @@ -239,11 +238,6 @@ cpu_startup(dummy) vm_ksubmap_init(&kmi); -#if defined(USERCONFIG) - userconfig(); - cninit(); /* the preferred console may have changed */ -#endif - printf("avail memory = %u (%uK bytes)\n", ptoa(cnt.v_free_count), ptoa(cnt.v_free_count) / 1024); diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 4739922e77f..d24a99984f8 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -44,8 +44,6 @@ options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI -#options USERCONFIG #boot -c editor -#options VISUAL_USERCONFIG #visual boot -c editor options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h index b4db4303e54..041362fbc6a 100644 --- a/sys/amd64/include/md_var.h +++ b/sys/amd64/include/md_var.h @@ -88,7 +88,6 @@ int is_physical_memory(vm_offset_t addr); u_long kvtop(void *addr); void setidt(int idx, alias_for_inthand_t *func, int typ, int dpl, int selec); void swi_vm(void *); -void userconfig(void); int user_dbreg_trap(void); #endif /* !_MACHINE_MD_VAR_H_ */ diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 5c9ad2a9fde..df8fe4b9543 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -259,11 +259,6 @@ options REGRESSION # options COMPILING_LINT - -# XXX - this doesn't belong here either -#options USERCONFIG #boot -c editor -#options INTRO_USERCONFIG #imply -c and show intro screen -#options VISUAL_USERCONFIG #visual boot -c editor ##################################################################### # NETWORKING OPTIONS @@ -1222,7 +1217,7 @@ hint.sio.0.irq="4" # access the device in any normal way. # 0x80 use this port for serial line gdb support in ddb. # -# PnP `flags' (set via userconfig using pnp x flags y) +# PnP `flags' # 0x1 disable probing of this device. Used to prevent your modem # from being attached as a PnP modem. # diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c index d229d0dcf01..d9d7b4aada4 100644 --- a/sys/dev/atkbdc/atkbd.c +++ b/sys/dev/atkbdc/atkbd.c @@ -1245,7 +1245,7 @@ init_keyboard(KBDC kbdc, int *type, int flags) } /* - * Allow us to set the XT_KEYBD flag in UserConfig so that keyboards + * Allow us to set the XT_KEYBD flag so that keyboards * such as those on the IBM ThinkPad laptop computers can be used * with the standard console driver. */ diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c index ef65f4b28f6..d8b5d8e9565 100644 --- a/sys/dev/eisa/eisaconf.c +++ b/sys/dev/eisa/eisaconf.c @@ -81,7 +81,6 @@ struct eisa_device { }; -/* Global variable, so UserConfig can change it. */ #define MAX_COL 79 #ifndef EISA_SLOTS #define EISA_SLOTS 10 /* PCI clashes with higher ones.. fix later */ diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c index 235709a31b3..8fc1fd28733 100644 --- a/sys/dev/fb/vga.c +++ b/sys/dev/fb/vga.c @@ -1049,8 +1049,7 @@ probe_adapters(void) #endif /* - * Ensure a zero start address. This is mainly to recover after - * switching from pcvt using userconfig(). The registers are w/o + * Ensure a zero start address. The registers are w/o * for old hardware so it's too hard to relocate the active screen * memory. * This must be done before vga_save_state() for VGA. diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c index d229d0dcf01..d9d7b4aada4 100644 --- a/sys/dev/kbd/atkbd.c +++ b/sys/dev/kbd/atkbd.c @@ -1245,7 +1245,7 @@ init_keyboard(KBDC kbdc, int *type, int flags) } /* - * Allow us to set the XT_KEYBD flag in UserConfig so that keyboards + * Allow us to set the XT_KEYBD flag so that keyboards * such as those on the IBM ThinkPad laptop computers can be used * with the standard console driver. */ diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 4739922e77f..d24a99984f8 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -44,8 +44,6 @@ options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI -#options USERCONFIG #boot -c editor -#options VISUAL_USERCONFIG #visual boot -c editor options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD index 99b237ba88c..4fe4c859bde 100644 --- a/sys/i386/conf/NEWCARD +++ b/sys/i386/conf/NEWCARD @@ -48,8 +48,6 @@ options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI -#options USERCONFIG #boot -c editor -#options VISUAL_USERCONFIG #visual boot -c editor options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 8c3737b6345..d54d3d78143 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -50,7 +50,6 @@ #include "opt_npx.h" #include "opt_perfmon.h" #include "opt_kstack_pages.h" -/* #include "opt_userconfig.h" */ #include #include @@ -239,11 +238,6 @@ cpu_startup(dummy) vm_ksubmap_init(&kmi); -#if defined(USERCONFIG) - userconfig(); - cninit(); /* the preferred console may have changed */ -#endif - printf("avail memory = %u (%uK bytes)\n", ptoa(cnt.v_free_count), ptoa(cnt.v_free_count) / 1024); diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h index b4db4303e54..041362fbc6a 100644 --- a/sys/i386/include/md_var.h +++ b/sys/i386/include/md_var.h @@ -88,7 +88,6 @@ int is_physical_memory(vm_offset_t addr); u_long kvtop(void *addr); void setidt(int idx, alias_for_inthand_t *func, int typ, int dpl, int selec); void swi_vm(void *); -void userconfig(void); int user_dbreg_trap(void); #endif /* !_MACHINE_MD_VAR_H_ */ diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h index 42fab2b9176..bb2ed43b855 100644 --- a/sys/i386/isa/isa_device.h +++ b/sys/i386/isa/isa_device.h @@ -68,7 +68,6 @@ struct isa_device { int id_unit; /* unit number */ int id_flags; /* flags */ int id_enabled; /* is device enabled */ - struct isa_device *id_next; /* used in isa_devlist in userconfig() */ struct device *id_device; /* new-bus wrapper device */ }; diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c index ffbba2c507e..90fc98eaa3d 100644 --- a/sys/i386/isa/pcvt/pcvt_drv.c +++ b/sys/i386/isa/pcvt/pcvt_drv.c @@ -696,8 +696,8 @@ pcvt_cn_init(struct consdev *cp) #if PCVT_SCANSET == 2 /* - * Turn off scancode translation early so that UserConfig - * and DDB can read the keyboard. + * Turn off scancode translation early so that + * DDB can read the keyboard. */ if (kbd) { diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c index b21b9b554b2..5c734d6b744 100644 --- a/sys/ia64/ia64/machdep.c +++ b/sys/ia64/ia64/machdep.c @@ -206,18 +206,6 @@ cpu_startup(dummy) vm_ksubmap_init(&kmi); -#if defined(USERCONFIG) -#if defined(USERCONFIG_BOOT) - if (1) -#else - if (boothowto & RB_CONFIG) -#endif - { - userconfig(); - cninit(); /* the preferred console may have changed */ - } -#endif - printf("avail memory = %ld (%ldK bytes)\n", ptoa(cnt.v_free_count), ptoa(cnt.v_free_count) / 1024); diff --git a/sys/isa/pnpreg.h b/sys/isa/pnpreg.h index 04d6131000f..2a3b7e061f9 100644 --- a/sys/isa/pnpreg.h +++ b/sys/isa/pnpreg.h @@ -39,14 +39,6 @@ /* Maximum Number of PnP Devices. 8 should be plenty */ #define PNP_MAX_CARDS 8 -#if 0 -/* - * the following is the maximum number of PnP Logical devices that - * userconfig can handle. - */ -#define MAX_PNP_LDN 20 -#endif - /* Static ports to access PnP state machine */ #ifdef PC98 #define _PNP_ADDRESS 0x259 diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 120174bd22a..91af9936b4a 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -50,8 +50,6 @@ options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI options EPSON_BOUNCEDMA #use bounce buufer for 15-16M #options EPSON_MEMWIN #EPSON memory window support #options LINE30 -#options USERCONFIG #boot -c editor -#options VISUAL_USERCONFIG #visual boot -c editor options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index 3cb856a4e68..6c395edf4a8 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -50,7 +50,6 @@ #include "opt_npx.h" #include "opt_perfmon.h" #include "opt_kstack_pages.h" -/* #include "opt_userconfig.h" */ #include #include @@ -259,11 +258,6 @@ cpu_startup(dummy) vm_ksubmap_init(&kmi); -#if defined(USERCONFIG) - userconfig(); - cninit(); /* the preferred console may have changed */ -#endif - printf("avail memory = %u (%uK bytes)\n", ptoa(cnt.v_free_count), ptoa(cnt.v_free_count) / 1024); diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 3cb856a4e68..6c395edf4a8 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -50,7 +50,6 @@ #include "opt_npx.h" #include "opt_perfmon.h" #include "opt_kstack_pages.h" -/* #include "opt_userconfig.h" */ #include #include @@ -259,11 +258,6 @@ cpu_startup(dummy) vm_ksubmap_init(&kmi); -#if defined(USERCONFIG) - userconfig(); - cninit(); /* the preferred console may have changed */ -#endif - printf("avail memory = %u (%uK bytes)\n", ptoa(cnt.v_free_count), ptoa(cnt.v_free_count) / 1024); diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c index 0eb12cabe91..3683b612f99 100644 --- a/sys/powerpc/aim/machdep.c +++ b/sys/powerpc/aim/machdep.c @@ -213,18 +213,6 @@ cpu_startup(void *dummy) vm_ksubmap_init(&kmi); -#if defined(USERCONFIG) -#if defined(USERCONFIG_BOOT) - if (1) -#else - if (boothowto & RB_CONFIG) -#endif - { - userconfig(); - cninit(); /* the preferred console may have changed */ - } -#endif - printf("avail memory = %ld (%ldK bytes)\n", ptoa(cnt.v_free_count), ptoa(cnt.v_free_count) / 1024); diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c index 0eb12cabe91..3683b612f99 100644 --- a/sys/powerpc/powerpc/machdep.c +++ b/sys/powerpc/powerpc/machdep.c @@ -213,18 +213,6 @@ cpu_startup(void *dummy) vm_ksubmap_init(&kmi); -#if defined(USERCONFIG) -#if defined(USERCONFIG_BOOT) - if (1) -#else - if (boothowto & RB_CONFIG) -#endif - { - userconfig(); - cninit(); /* the preferred console may have changed */ - } -#endif - printf("avail memory = %ld (%ldK bytes)\n", ptoa(cnt.v_free_count), ptoa(cnt.v_free_count) / 1024);