d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GC various bits and pieces of USERCONFIG from all over the place.

Browse Source
This commit is contained in:
Poul-Henning Kamp 2002-04-09 11:18:46 +00:00
parent 1aec374128
commit 2ce7d7a033
22 changed files with 6 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/alpha/alpha/machdep.c
View File

@ -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);

6
sys/amd64/amd64/machdep.c
View File

@ -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);

2
sys/amd64/conf/GENERIC
View File

@ -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

1
sys/amd64/include/md_var.h
View File

@ -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_ */

7
sys/conf/NOTES
View File

@ -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.
#

2
sys/dev/atkbdc/atkbd.c
View File

@ -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.
*/

1
sys/dev/eisa/eisaconf.c
View File

@ -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 */

3
sys/dev/fb/vga.c
View File

@ -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.

2
sys/dev/kbd/atkbd.c
View File

@ -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.
*/

2
sys/i386/conf/GENERIC
View File

@ -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

2
sys/i386/conf/NEWCARD
View File

@ -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

6
sys/i386/i386/machdep.c
View File

@ -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);

1
sys/i386/include/md_var.h
View File

@ -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_ */

1
sys/i386/isa/isa_device.h
View File

@ -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 */
};

4
sys/i386/isa/pcvt/pcvt_drv.c
View File

@ -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)
{

12
sys/ia64/ia64/machdep.c
View File

@ -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);

8
sys/isa/pnpreg.h
View File

@ -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

2
sys/pc98/conf/GENERIC
View File

@ -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

6
sys/pc98/i386/machdep.c
View File

@ -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>
@ -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);

6
sys/pc98/pc98/machdep.c
View File

@ -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>
@ -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);

12
sys/powerpc/aim/machdep.c
View File

@ -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);

12
sys/powerpc/powerpc/machdep.c
View File

@ -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);