From eb0ff1925c0f48f6d92c1a96bcde0acef654e5d1 Mon Sep 17 00:00:00 2001 From: kato Date: Sat, 18 Jan 1997 15:59:46 +0000 Subject: [PATCH] Re-construct PC-98 code of device_infor[] entries. Enabled all devices which was #ifndef PC98'ed. This makes diff small between i386/i386/userconfig.c and pc98/i386/userconfig.c. --- sys/pc98/i386/userconfig.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/sys/pc98/i386/userconfig.c b/sys/pc98/i386/userconfig.c index 0d7b2849a740..3b7822f22383 100644 --- a/sys/pc98/i386/userconfig.c +++ b/sys/pc98/i386/userconfig.c @@ -225,15 +225,7 @@ static DEV_INFO device_info[] = { /*---Name----- ---Description---------------------------------------------- */ #ifdef PC98 {"bs", "PC-9801-55 SCSI Interface", 0, CLS_STORAGE}, -{"ahc", "Adaptec 274x/284x/294x SCSI controller", 0, CLS_STORAGE}, -{"aic", "Adaptec 152x SCSI and compatible sound cards", 0, CLS_STORAGE}, -{"ncr", "NCR/Symbios 53C810/15/25/60/75 SCSI controller",FLG_FIXED,CLS_STORAGE}, -{"wdc", "IDE/ESDI/MFM disk controller", 0, CLS_STORAGE}, -{"fdc", "Floppy disk controller", FLG_FIXED, CLS_STORAGE}, -{"mcd", "Mitsumi CD-ROM", 0, CLS_STORAGE}, -{"scd", "Sony CD-ROM", 0, CLS_STORAGE}, -{"matcdc", "Matsushita/Panasonic/Creative CDROM", 0, CLS_STORAGE}, -#else +#endif {"bt", "Buslogic SCSI controller", 0, CLS_STORAGE}, {"ahc", "Adaptec 274x/284x/294x SCSI controller", 0, CLS_STORAGE}, {"ahb", "Adaptec 174x SCSI controller", 0, CLS_STORAGE}, @@ -250,7 +242,6 @@ static DEV_INFO device_info[] = { {"scd", "Sony CD-ROM", 0, CLS_STORAGE}, {"matcdc", "Matsushita/Panasonic/Creative CDROM", 0, CLS_STORAGE}, {"wt", "Wangtek/Archive QIC-02 Tape drive", 0, CLS_STORAGE}, -#endif {"amd", "Tekram DC-390(T) / AMD 53c974 based PCI SCSI", FLG_FIXED, CLS_STORAGE}, #ifdef PC98 @@ -275,7 +266,6 @@ static DEV_INFO device_info[] = { {"fpa", "DEC DEFPA PCI FDDI adapter", FLG_FIXED, CLS_NETWORK}, {"sio", "8250/16450/16550 Serial port", 0, CLS_COMMS}, -#ifndef PC98 {"cx", "Cronyx/Sigma multiport sync/async adapter",0, CLS_COMMS}, {"rc", "RISCom/8 multiport async adapter", 0, CLS_COMMS}, {"cy", "Cyclades multiport async adapter", 0, CLS_COMMS}, @@ -284,18 +274,11 @@ static DEV_INFO device_info[] = { {"si", "Specialix SI/XIO async adapter", 0, CLS_COMMS}, {"stl", "Stallion EasyIO/Easy Connection 8/32 async adapter",0, CLS_COMMS}, {"stli", "Stallion intelligent async adapter" ,0, CLS_COMMS}, -#endif {"lpt", "Parallel printer port", 0, CLS_COMMS}, -#ifndef PC98 {"gp", "National Instruments AT-GPIB/TNT driver", 0, CLS_COMMS}, -#endif -#ifdef PC98 -{"mse", "Bus Mouse", 0, CLS_INPUT}, -#else {"mse", "Microsoft Bus Mouse", 0, CLS_INPUT}, {"psm", "PS/2 Mouse", 0, CLS_INPUT}, -#endif {"joy", "Joystick", FLG_FIXED, CLS_INPUT}, {"vt", "PCVT console driver", FLG_FIXED, CLS_INPUT}, {"sc", "Syscons console driver", FLG_FIXED, CLS_INPUT},