diff options
| author | phk <phk@FreeBSD.org> | 2002-04-09 11:18:46 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2002-04-09 11:18:46 +0000 |
| commit | 77e3582887133356a4ca5d6ddc54686ccd0e8e7f (patch) | |
| tree | 268a77a1e098a6cee634a0556b2a1c21b4097e68 /sys/i386 | |
| parent | de757425225dabddb761e8af9c23487af54cecd4 (diff) | |
| download | FreeBSD-src-77e3582887133356a4ca5d6ddc54686ccd0e8e7f.zip FreeBSD-src-77e3582887133356a4ca5d6ddc54686ccd0e8e7f.tar.gz | |
GC various bits and pieces of USERCONFIG from all over the place.
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/conf/GENERIC | 2 | ||||
| -rw-r--r-- | sys/i386/conf/NEWCARD | 2 | ||||
| -rw-r--r-- | sys/i386/i386/machdep.c | 6 | ||||
| -rw-r--r-- | sys/i386/include/md_var.h | 1 | ||||
| -rw-r--r-- | sys/i386/isa/isa_device.h | 1 | ||||
| -rw-r--r-- | sys/i386/isa/pcvt/pcvt_drv.c | 4 |
6 files changed, 2 insertions, 14 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 4739922..d24a999 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 99b237b..4fe4c85 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 8c3737b..d54d3d7 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 <sys/param.h> #include <sys/systm.h> @@ -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 b4db430..041362f 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 42fab2b..bb2ed43 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 ffbba2c..90fc98e 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) { |
