Switch from OLDCARD to NEWCARD on pc98.

9 files changed, 10 insertions, 29 deletions

diff --git a/release/pc98/boot_crunch.conf b/release/pc98/boot_crunch.conf
index 9005b00..b630c88 100644
--- a/release/pc98/boot_crunch.conf
+++ b/release/pc98/boot_crunch.conf
@@ -34,10 +34,8 @@ ln minigzip gzip
 ln minigzip gunzip
 ln minigzip zcat
 
-srcdirs /usr/src/usr.sbin /usr/src/usr.sbin/pccard
+srcdirs /usr/src/usr.sbin
 progs arp
-progs pccardc
-progs pccardd
 progs ppp
 progs sysinstall
 
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 33458fd..e330ee2 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -320,6 +320,8 @@ _arcnet=	arcnet
 _ath_hal=	ath_hal
 _awi=		awi
 _bktr=		bktr
+_cardbus=	cardbus
+_cbb=		cbb
 _coff=		coff
 _cp=		cp
 _cpufreq=	cpufreq
@@ -329,6 +331,7 @@ _ed=		ed
 _elink=		elink
 _em=		em
 _ep=		ep
+_exca=		exca
 _ext2fs=	ext2fs
 _fe=		fe
 _hfa=		hfa
@@ -375,8 +378,6 @@ _arl=		arl
 _arcmsr=	arcmsr
 _asr=		asr
 _bios=		bios
-_cardbus=	cardbus
-_cbb=		cbb
 _ciss=		ciss
 _cm=		cm
 _cs=		cs
@@ -384,7 +385,6 @@ _ctau=		ctau
 _cx=		cx
 _dpt=		dpt
 _ex=		ex
-_exca=		exca
 _hptmv=		hptmv
 _ichwd=		ichwd
 _ida=		ida
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index df07702..950ed0c 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -142,6 +142,12 @@ device		npx
 #device		"snd_sb16"	# Sound Blaster 16
 #device		snd_sbc		# Sound Blaster
 
+# PCCARD (PCMCIA) support
+# PCMCIA and cardbus bridge support
+device		cbb		# cardbus (yenta) bridge
+device		pccard		# PC Card (16-bit) bus
+device		cardbus		# CardBus (32-bit) bus
+
 # Serial (COM) ports
 options 	COM_MULTIPORT
 #options 	COM_ESP		# ESP98
diff --git a/sys/pc98/conf/GENERIC.hints b/sys/pc98/conf/GENERIC.hints
index 1085a5d..1c033da 100644
--- a/sys/pc98/conf/GENERIC.hints
+++ b/sys/pc98/conf/GENERIC.hints
@@ -53,10 +53,6 @@ hint.sc.0.at="isa"
 #hint.pmc.0.at="isa"
 #hint.pmc.0.port="0x8f0"
 
-hint.pcic.0.at="isa"
-hint.pcic.0.irq="6"
-hint.pcic.0.port="0x3e0"
-
 # Microsoft Sound System
 #hint.pcm.0.at="isa"
 #hint.pcm.0.port="0xf40"
diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES
index 2759643..e87e016 100644
--- a/sys/pc98/conf/NOTES
+++ b/sys/pc98/conf/NOTES
@@ -757,9 +757,6 @@ nodevice	cm
 nodevice	cs
 nodevice	ex
 nodevice	fea
-nodevice	cbb
-nodevice	pccard
-nodevice	cardbus
 nodevice	intpm
 nodevice	alpm
 nodevice	ichsmb
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index 68d5ad3..cb18093 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -14,10 +14,6 @@ SRCS=	anonFTP.c cdrom.c command.c config.c devices.c dhcp.c \
 	system.c tape.c tcpip.c termcap.c ttys.c ufs.c usb.c user.c \
 	variable.c ${_wizard} keymap.h
 
-.if ${MACHINE} == "pc98"
-SRCS+=  pccard.c
-.endif
-
 CFLAGS+= -DUSE_GZIP=1
 .if ${MACHINE} == "pc98"
 CFLAGS+= -DPC98
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 657b35f..b5d8022 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -65,10 +65,6 @@
 #define	WITH_LINUX
 #endif
 
-#if defined(PC98)
-#define PCCARD_ARCH 1		        /* Support PCCARD installations */
-#endif
-
 /* device limits */
 #define DEV_NAME_MAX		128	/* The maximum length of a device name	*/
 #define DEV_MAX			100	/* The maximum number of devices we'll deal with */
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index 68d5ad3..cb18093 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -14,10 +14,6 @@ SRCS=	anonFTP.c cdrom.c command.c config.c devices.c dhcp.c \
 	system.c tape.c tcpip.c termcap.c ttys.c ufs.c usb.c user.c \
 	variable.c ${_wizard} keymap.h
 
-.if ${MACHINE} == "pc98"
-SRCS+=  pccard.c
-.endif
-
 CFLAGS+= -DUSE_GZIP=1
 .if ${MACHINE} == "pc98"
 CFLAGS+= -DPC98
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 657b35f..b5d8022 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -65,10 +65,6 @@
 #define	WITH_LINUX
 #endif
 
-#if defined(PC98)
-#define PCCARD_ARCH 1		        /* Support PCCARD installations */
-#endif
-
 /* device limits */
 #define DEV_NAME_MAX		128	/* The maximum length of a device name	*/
 #define DEV_MAX			100	/* The maximum number of devices we'll deal with */