Repair the wcd and atapi code a little, so that it compiles and loads

as an LKM.
I dont have one of these beasts, so I cannot guarantee that I've not
broken it (more).
It does compile with ATAPI_STATIC, and as a LKM.

1 files changed, 6 insertions, 1 deletions

diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c
index 9e67f09..d34bf73 100644
--- a/sys/i386/isa/wcd.c
+++ b/sys/i386/isa/wcd.c
@@ -256,6 +256,11 @@ wcdattach (struct atapi *ata, int unit, struct atapi_params *ap, int debug,
 		printf ("wcd: too many units\n");
 		return (0);
 	}
+	if (!atapi_request_immediate) {
+		printf("wcd: configuration error, ATAPI core code not present!\n");
+		printf("wcd: check `options ATAPI_STATIC' in your kernel config file!\n");
+		return (0);
+	}
 	t = malloc (sizeof (struct wcd), M_TEMP, M_NOWAIT);
 	if (! t) {
 		printf ("wcd: out of memory\n");
@@ -1136,7 +1141,7 @@ int wcd_unload (struct lkm_table *lkmtp, int cmd)
 /*
  * Dispatcher function for the module (load/unload/stat).
  */
-int wcd (struct lkm_table *lkmtp, int cmd, int ver)
+int wcd_mod (struct lkm_table *lkmtp, int cmd, int ver)
 {
 	int err = 0;