7 files changed, 23 insertions, 37 deletions
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index f6dc252..00c3be2 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -5,7 +5,7 @@ BINDIR=/stand
 NOSHARED=YES
 
 CLEANFILES+=	makedevs.c rtermcap rtermcap.tmp dumpnlist
-CLEANFILES+=	keymap.tmp keymap.h pccard_conf.h
+CLEANFILES+=	keymap.tmp keymap.h
 
 .PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum
 
@@ -15,23 +15,14 @@ SRCS=	anonFTP.c cdrom.c command.c config.c devices.c dhcp.c kget.c \
 	label.c lndir.c main.c makedevs.c media.c menus.c misc.c mouse.c \
 	msg.c network.c nfs.c options.c package.c pccard.c \
 	system.c tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
-	keymap.h pccard_conf.h
+	keymap.h
 
 CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
 CFLAGS+= -I${.CURDIR}/../../sys
 
-PCCARD?= NO
-
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
 LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
 
-pccard_conf.h:
-.if ${PCCARD} == "YES"
-	echo "#define PCCARD 1" > pccard_conf.h
-.else
-	echo "#undef PCCARD" > pccard_conf.h
-.endif
-
 makedevs.c:	Makefile rtermcap keymap.h
 	rm -f makedevs.tmp
 	echo '#include <sys/types.h>' > makedevs.tmp
diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c
index ad454ee..86f6bd3 100644
--- a/usr.sbin/sade/main.c
+++ b/usr.sbin/sade/main.c
@@ -35,7 +35,6 @@
  */
 
 #include "sysinstall.h"
-#include "pccard_conf.h"
 #include <sys/signal.h>
 #include <sys/fcntl.h>
 
@@ -88,10 +87,8 @@ main(int argc, char **argv)
     if (DebugFD)
 	dup2(DebugFD, 2);
 
-#ifdef PCCARD
     /* Initialize PC-card */
     pccardInitialize();
-#endif
 
     /* Probe for all relevant devices on the system */
     deviceGetAll();
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 2a4c618..43eeab0 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -691,6 +691,9 @@ extern int	package_add(char *name);
 extern int	package_extract(Device *dev, char *name, Boolean depended);
 extern Boolean	package_exists(char *name);
 
+/* pccard.c */
+extern void	pccardInitialize(void);
+
 /* system.c */
 extern void	systemInitialize(int argc, char **argv);
 extern void	systemShutdown(int status);
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index f6dc252..00c3be2 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -5,7 +5,7 @@ BINDIR=/stand
 NOSHARED=YES
 
 CLEANFILES+=	makedevs.c rtermcap rtermcap.tmp dumpnlist
-CLEANFILES+=	keymap.tmp keymap.h pccard_conf.h
+CLEANFILES+=	keymap.tmp keymap.h
 
 .PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum
 
@@ -15,23 +15,14 @@ SRCS=	anonFTP.c cdrom.c command.c config.c devices.c dhcp.c kget.c \
 	label.c lndir.c main.c makedevs.c media.c menus.c misc.c mouse.c \
 	msg.c network.c nfs.c options.c package.c pccard.c \
 	system.c tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
-	keymap.h pccard_conf.h
+	keymap.h
 
 CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
 CFLAGS+= -I${.CURDIR}/../../sys
 
-PCCARD?= NO
-
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
 LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
 
-pccard_conf.h:
-.if ${PCCARD} == "YES"
-	echo "#define PCCARD 1" > pccard_conf.h
-.else
-	echo "#undef PCCARD" > pccard_conf.h
-.endif
-
 makedevs.c:	Makefile rtermcap keymap.h
 	rm -f makedevs.tmp
 	echo '#include <sys/types.h>' > makedevs.tmp
diff --git a/usr.sbin/sysinstall/main.c b/usr.sbin/sysinstall/main.c
index ad454ee..86f6bd3 100644
--- a/usr.sbin/sysinstall/main.c
+++ b/usr.sbin/sysinstall/main.c
@@ -35,7 +35,6 @@
  */
 
 #include "sysinstall.h"
-#include "pccard_conf.h"
 #include <sys/signal.h>
 #include <sys/fcntl.h>
 
@@ -88,10 +87,8 @@ main(int argc, char **argv)
     if (DebugFD)
 	dup2(DebugFD, 2);
 
-#ifdef PCCARD
     /* Initialize PC-card */
     pccardInitialize();
-#endif
 
     /* Probe for all relevant devices on the system */
     deviceGetAll();
diff --git a/usr.sbin/sysinstall/pccard.c b/usr.sbin/sysinstall/pccard.c
index db18ab4..8d8c3ea 100644
--- a/usr.sbin/sysinstall/pccard.c
+++ b/usr.sbin/sysinstall/pccard.c
@@ -15,13 +15,10 @@
  */
 
 #include "sysinstall.h"
-#include "pccard_conf.h"
 #include <sys/fcntl.h>
 #include <sys/time.h>
 #include <pccard/cardinfo.h>
 
-#ifdef	PCCARD
-
 int	pccard_mode = 0;
 
 DMenu MenuPCICMem = {
@@ -83,6 +80,19 @@ pccardInitialize(void)
 	return;
     }
 
+    sprintf(card_device, CARD_DEVICE, 0);
+
+    if ((fd = open(card_device, O_RDWR)) < 0) {
+	msgDebug("Can't open PC-card controller %s.\n", 
+		card_device);
+	return;
+    }
+    else if (msgYesNo("Found PC-card slot(s).\n"
+		"Use PC-card device as installation media?\n")) {
+	return;
+    }
+    close(fd);
+
     dmenuOpenSimple(&MenuPCICMem, FALSE);
     spcic_mem = variable_get("_pcicmem");
     dmenuOpenSimple(&MenuCardIRQ, FALSE);
@@ -122,8 +132,6 @@ pccardInitialize(void)
 	break;
     }
 
-    sprintf(card_device, CARD_DEVICE, 0);
-
     w = savescr();
     dialog_clear_norefresh();
     msgConfirm("Now we start initializing PC-card controller and cards.\n"
@@ -163,7 +171,3 @@ pccardInitialize(void)
     vsystem(pccardd_cmd);
     restorescr(w);
 }
-
-#endif	/* PCCARD */
-
-
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 2a4c618..43eeab0 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -691,6 +691,9 @@ extern int	package_add(char *name);
 extern int	package_extract(Device *dev, char *name, Boolean depended);
 extern Boolean	package_exists(char *name);
 
+/* pccard.c */
+extern void	pccardInitialize(void);
+
 /* system.c */
 extern void	systemInitialize(int argc, char **argv);
 extern void	systemShutdown(int status);