Add preliminary support for PCMCIA devices in addition to PCI/cardbus.

if_ndis.c has been split into if_ndis_pci.c and if_ndis_pccard.c.
The ndiscvt(8) utility should be able to parse device info for PCMCIA
devices now. The ndis_alloc_amem() has moved from kern_ndis.c to
if_ndis_pccard.c so that kern_ndis.c no longer depends on pccard.

NOTE: this stuff is not guaranteed to work 100% correctly yet. So
far I have been able to load/init my PCMCIA Cisco Aironet 340 card,
but it crashes in the interrupt handler. The existing support for
PCI/cardbus devices should still work as before.

1 files changed, 5 insertions, 1 deletions

diff --git a/usr.sbin/ndiscvt/ndiscvt.c b/usr.sbin/ndiscvt/ndiscvt.c
index 58068aa..d1a29b3 100644
--- a/usr.sbin/ndiscvt/ndiscvt.c
+++ b/usr.sbin/ndiscvt/ndiscvt.c
@@ -236,8 +236,10 @@ main(int argc, char *argv[])
 	}
 
 	if (inffile == NULL) {
+		fprintf (outfp, "#ifdef NDIS_REGVALS\n");
 		fprintf (outfp, "ndis_cfg ndis_regvals[] = {\n");
         	fprintf (outfp, "\t{ NULL, NULL, { 0 }, 0 }\n");
+		fprintf (outfp, "#endif /* NDIS_REGVALS */\n");
 
 		fprintf (outfp, "};\n\n");
 	} else {
@@ -250,7 +252,8 @@ main(int argc, char *argv[])
 		fclose(fp);
 	}
 
-	fprintf(outfp, "\n\nextern unsigned char drv_data[];\n\n");
+	fprintf(outfp, "\n#ifdef NDIS_IMAGE\n");
+	fprintf(outfp, "\nextern unsigned char drv_data[];\n\n");
 
 	fprintf(outfp, "__asm__(\".data\");\n");
 	fprintf(outfp, "__asm__(\".type   drv_data, @object\");\n");
@@ -278,6 +281,7 @@ main(int argc, char *argv[])
 
 done:
 
+	fprintf(outfp, "#endif /* NDIS_IMAGE */\n");
 	if (fp != NULL)
 		fclose(fp);
 	fclose(outfp);