Hi,
could please someone with commit privs review and commit the attached patches.
They will enable (at least) Laptop-users to load the two modules on demand.
At least the aic(4) module (in conjunction with cam(4) ) is verified to 
work when loaded after startup (not preloaded).
The fdc(4) module is only tested preloaded from the bootloader.

Bye!
----
Michael Reifenberger
^.*Plaut.*$, IT, R/3 Basis, GPS
diff -ruP modules.orig/Makefile modules/Makefile
--- modules.orig/Makefile       Tue Oct 17 23:57:27 2000
+++ modules/Makefile    Wed Oct 18 00:41:53 2000
@@ -6,8 +6,8 @@
 _random=       random
 .endif
 
-SUBDIR=        3dfx accf_data accf_http agp aha amr an aue \
-       cam ccd cd9660 coda cue dc ed fdesc fxp if_disc if_ef \
+SUBDIR=        3dfx accf_data accf_http agp aha aic amr an aue \
+       cam ccd cd9660 coda cue dc ed fdc fdesc fxp if_disc if_ef \
        if_ppp if_sl if_tap if_tun ip6fw ipfilter ipfw ispfw joy kernfs kue \
        md mfs mii mlx msdos ncp netgraph nfs ntfs nullfs \
        nwfs pcn portal procfs ${_random} \
diff -ruP modules.orig/aic/Makefile modules/aic/Makefile
--- modules.orig/aic/Makefile   Thu Jan  1 01:00:00 1970
+++ modules/aic/Makefile        Wed Oct 18 00:39:14 2000
@@ -0,0 +1,9 @@
+# $FreeBSD: src/sys/modules/xl/Makefile,v 1.12 2000/05/27 01:14:33 peter Exp $
+
+.PATH: ${.CURDIR}/../../dev/aic
+KMOD   = aic
+SRCS   = aic.c aic_cbus.c aic_isa.c aic_pccard.c 
+SRCS   += opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h
+SRCS   += opt_cam.h opt_scsi.h
+
+.include <bsd.kmod.mk>
diff -ruP modules.orig/fdc/Makefile modules/fdc/Makefile
--- modules.orig/fdc/Makefile   Thu Jan  1 01:00:00 1970
+++ modules/fdc/Makefile        Thu Sep 28 14:52:42 2000
@@ -0,0 +1,12 @@
+# $FreeBSD: src/sys/modules/xl/Makefile,v 1.12 2000/05/27 01:14:33 peter Exp $
+
+.PATH: ${.CURDIR}/../../isa
+KMOD   = fdc
+SRCS   = fd.c
+SRCS   += opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h
+SRCS   += card.h opt_fdc.h
+
+card.h:
+               echo '#define NCARD 1' > card.h
+
+.include <bsd.kmod.mk>
diff -ruP dev/aic.orig/aic_cbus.c dev/aic/aic_cbus.c
--- dev/aic.orig/aic_cbus.c     Wed Oct 18 00:28:38 2000
+++ dev/aic/aic_cbus.c  Wed Oct 18 00:37:29 2000
@@ -278,4 +278,5 @@
 
 extern devclass_t aic_devclass;
 
+MODULE_DEPEND(aic, cam, 1, 1, 1);
 DRIVER_MODULE(aic, isa, aic_isa_driver, aic_devclass, 0, 0);
diff -ruP dev/aic.orig/aic_isa.c dev/aic/aic_isa.c
--- dev/aic.orig/aic_isa.c      Wed Oct 18 00:28:38 2000
+++ dev/aic/aic_isa.c   Wed Oct 18 00:34:56 2000
@@ -224,4 +224,5 @@
 
 extern devclass_t aic_devclass;
 
+MODULE_DEPEND(aic, cam, 1, 1, 1);
 DRIVER_MODULE(aic, isa, aic_isa_driver, aic_devclass, 0, 0);
diff -ruP dev/aic.orig/aic_pccard.c dev/aic/aic_pccard.c
--- dev/aic.orig/aic_pccard.c   Wed Oct 18 00:28:38 2000
+++ dev/aic/aic_pccard.c        Wed Oct 18 00:37:37 2000
@@ -177,4 +177,5 @@
 
 extern devclass_t aic_devclass;
 
+MODULE_DEPEND(aic, cam, 1, 1, 1);
 DRIVER_MODULE(aic, pccard, aic_pccard_driver, aic_devclass, 0, 0);

Reply via email to