- fix problems with sockets not initialized (disabling

  hotplug support -> cardmgr handles sockets)
- fix problems with PCMCIA net adapters now using PCI
  modules, by adding PCMCIA base code in `network.img'

2 files changed, 6 insertions, 6 deletions

diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index cedaef119..8eeb8c80c 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -185,7 +185,7 @@ stage1-disk: $(STAGE1OBJS-DISK) $(STAGE1_OWN_LIBS) $(FRONTEND_LINK) $(STAGE1_LIB
 	$(CC) $(LDFLAGS_STAGE1) -o $@ $^
 	$(STRIPCMD) $@
 
-stage1-network: $(STAGE1OBJS-NETWORK) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(STAGE1_LIBC)
+stage1-network: $(STAGE1OBJS-NETWORK) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC)
 	$(CC) $(LDFLAGS_STAGE1) -o $@ $^
 	$(STRIPCMD) $@
 
@@ -208,7 +208,7 @@ $(STAGE1OBJS-DISK): %-DISK.o: %.c
 	$(COMPILE) $(INCLUDES) $(DISK_DEFS) -c $< -o $@
 
 $(STAGE1OBJS-NETWORK): %-NETWORK.o: %.c
-	$(COMPILE) $(INCLUDES) $(NETWORK_DEFS) -c $< -o $@
+	$(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) -c $< -o $@
 
 $(STAGE1OBJS-USB): %-USB.o: %.c
 	$(COMPILE) $(INCLUDES) $(USB_DEFS) -c $< -o $@
diff --git a/mdk-stage1/pcmcia_/cardmgr.c b/mdk-stage1/pcmcia_/cardmgr.c
index 37598015c..1db18b55b 100644
--- a/mdk-stage1/pcmcia_/cardmgr.c
+++ b/mdk-stage1/pcmcia_/cardmgr.c
@@ -339,8 +339,8 @@ static void write_stab(void)
 	fprintf(f, "Socket %d: ", i);
 	if (!(s->state & SOCKET_PRESENT)) {
 	    fprintf(f, "empty\n");
-	} else if (s->state & SOCKET_HOTPLUG) {
-	    fprintf(f, "CardBus hotplug device\n");
+//mdk-stage1// 	} else if (s->state & SOCKET_HOTPLUG) {
+//mdk-stage1// 	    fprintf(f, "CardBus hotplug device\n");
 	} else if (!s->card) {
 	    fprintf(f, "unsupported card\n");
 	} else {
@@ -547,10 +547,10 @@ static card_info_t *lookup_card(int ns)
 	    }
 	} else {
 	    /* this is a 2.4 kernel; hotplug handles these cards */
-	    s->state |= SOCKET_HOTPLUG;
+//mdk-stage1//	    s->state |= SOCKET_HOTPLUG;
 	    log_message("CM: socket %d: CardBus hotplug device", ns);
 	    //beep(BEEP_TIME, BEEP_OK);
-	    return NULL;
+//mdk-stage1//	    return NULL;
 	}
     }