summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/pccard.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/sysinstall/pccard.c')
-rw-r--r--usr.sbin/sysinstall/pccard.c22
1 files changed, 13 insertions, 9 deletions
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 */
-
-
OpenPOWER on IntegriCloud