Bannish ATAPI and ATAPI_STATIC #defines to opt_atapi.h.

7 files changed, 35 insertions, 17 deletions

diff --git a/lkm/atapi/Makefile b/lkm/atapi/Makefile
index cdecdbbb51c0..d23244621776 100644
--- a/lkm/atapi/Makefile
+++ b/lkm/atapi/Makefile
@@ -1,12 +1,12 @@
-#	$Id: Makefile,v 1.3 1996/05/07 23:19:28 wosch Exp $
+#	$Id: Makefile,v 1.4 1996/06/23 14:58:08 bde Exp $
 
 .PATH:          ${.CURDIR}/../../sys/i386/isa
 KMOD            = atapi_mod
-SRCS            = atapi.c wdc.h #wcd.h
+SRCS            = atapi.c wdc.h opt_atapi.h #wcd.h 
 NOMAN           =
 BINDIR          = /lkm
-CFLAGS         += -nostdinc -I. -DATAPI -DATAPI_MODULE
-CLEANFILES     += $(KMOD) machine wdc.h wcd.h *.b
+CFLAGS         += -nostdinc -I. -DATAPI_MODULE
+CLEANFILES     += $(KMOD) machine wdc.h wcd.h opt_atapi.h *.b
 LN              = ln -f -s
 EXPORT_SYMS	= _atapi_mod _atapi_debug_ptr _atapi_intr_ptr \
 		  _atapi_request_callback_ptr _atapi_request_immediate_ptr \
@@ -26,6 +26,9 @@ wdc.h:
 wcd.h:
 		echo "#define NWCD 1" > wcd.h
 
+opt_atapi.h:
+		echo "#define ATAPI 1"> opt_atapi.h
+
 .c.o:
 		-@$(LN) /sys/i386/include machine
 		$(CC) $(CFLAGS) -c $<
diff --git a/lkm/wcd/Makefile b/lkm/wcd/Makefile
index 0922cde72720..ec1a07e574f4 100644
--- a/lkm/wcd/Makefile
+++ b/lkm/wcd/Makefile
@@ -1,12 +1,12 @@
-#	$Id: Makefile,v 1.2 1996/05/07 23:19:42 wosch Exp $
+#	$Id: Makefile,v 1.3 1996/06/23 14:58:14 bde Exp $
 
 .PATH:          ${.CURDIR}/../../sys/i386/isa
 KMOD            = wcd_mod
-SRCS            = wcd.c wdc.h wcd.h
+SRCS            = wcd.c wdc.h wcd.h opt_atapi.h
 NOMAN           =
 BINDIR          = /lkm
-CFLAGS         += -nostdinc -I. -DATAPI -DWCD_MODULE
-CLEANFILES     += $(KMOD) machine wdc.h wcd.h *.b
+CFLAGS         += -nostdinc -I. -DWCD_MODULE
+CLEANFILES     += $(KMOD) machine wdc.h wcd.h opt_atapi.h *.b
 LN              = ln -f -s
 
 load:           ${PROG}
@@ -22,6 +22,9 @@ wdc.h:
 wcd.h:
 		echo "#define NWCD 1" > wcd.h
 
+opt_atapi.h:
+		echo "#define ATAPI 1"> opt_atapi.h
+
 .c.o:
 		-@$(LN) /sys/i386/include machine
 		$(CC) $(CFLAGS) -c $<
diff --git a/sys/i386/isa/atapi.c b/sys/i386/isa/atapi.c
index 4f10d56e8376..70e7089a7aa3 100644
--- a/sys/i386/isa/atapi.c
+++ b/sys/i386/isa/atapi.c
@@ -100,6 +100,8 @@
 #undef DEBUG
 
 #include "wdc.h"
+#include "opt_atapi.h"
+
 #ifndef ATAPI_MODULE
 # include "wcd.h"
 /* # include "wmt.h" -- add your driver here */
diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c
index bf18d17daca2..6f3d1a54b285 100644
--- a/sys/i386/isa/wcd.c
+++ b/sys/i386/isa/wcd.c
@@ -17,6 +17,8 @@
 
 #include "wdc.h"
 #include "wcd.h"
+#include "opt_atapi.h"
+
 #if NWCD > 0 && NWDC > 0 && defined (ATAPI)
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 334ebf2ee1f5..466f8fe43463 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.115 1996/08/23 02:52:44 dyson Exp $
+ *	$Id: wd.c,v 1.116 1996/09/06 23:08:13 phk Exp $
  */
 
 /* TODO:
@@ -61,6 +61,8 @@
 #endif
 
 #include "wdc.h"
+#include "opt_atapi.h"
+
 #if     NWDC > 0
 
 #include <sys/param.h>
diff --git a/sys/modules/atapi/Makefile b/sys/modules/atapi/Makefile
index cdecdbbb51c0..d23244621776 100644
--- a/sys/modules/atapi/Makefile
+++ b/sys/modules/atapi/Makefile
@@ -1,12 +1,12 @@
-#	$Id: Makefile,v 1.3 1996/05/07 23:19:28 wosch Exp $
+#	$Id: Makefile,v 1.4 1996/06/23 14:58:08 bde Exp $
 
 .PATH:          ${.CURDIR}/../../sys/i386/isa
 KMOD            = atapi_mod
-SRCS            = atapi.c wdc.h #wcd.h
+SRCS            = atapi.c wdc.h opt_atapi.h #wcd.h 
 NOMAN           =
 BINDIR          = /lkm
-CFLAGS         += -nostdinc -I. -DATAPI -DATAPI_MODULE
-CLEANFILES     += $(KMOD) machine wdc.h wcd.h *.b
+CFLAGS         += -nostdinc -I. -DATAPI_MODULE
+CLEANFILES     += $(KMOD) machine wdc.h wcd.h opt_atapi.h *.b
 LN              = ln -f -s
 EXPORT_SYMS	= _atapi_mod _atapi_debug_ptr _atapi_intr_ptr \
 		  _atapi_request_callback_ptr _atapi_request_immediate_ptr \
@@ -26,6 +26,9 @@ wdc.h:
 wcd.h:
 		echo "#define NWCD 1" > wcd.h
 
+opt_atapi.h:
+		echo "#define ATAPI 1"> opt_atapi.h
+
 .c.o:
 		-@$(LN) /sys/i386/include machine
 		$(CC) $(CFLAGS) -c $<
diff --git a/sys/modules/wcd/Makefile b/sys/modules/wcd/Makefile
index 0922cde72720..ec1a07e574f4 100644
--- a/sys/modules/wcd/Makefile
+++ b/sys/modules/wcd/Makefile
@@ -1,12 +1,12 @@
-#	$Id: Makefile,v 1.2 1996/05/07 23:19:42 wosch Exp $
+#	$Id: Makefile,v 1.3 1996/06/23 14:58:14 bde Exp $
 
 .PATH:          ${.CURDIR}/../../sys/i386/isa
 KMOD            = wcd_mod
-SRCS            = wcd.c wdc.h wcd.h
+SRCS            = wcd.c wdc.h wcd.h opt_atapi.h
 NOMAN           =
 BINDIR          = /lkm
-CFLAGS         += -nostdinc -I. -DATAPI -DWCD_MODULE
-CLEANFILES     += $(KMOD) machine wdc.h wcd.h *.b
+CFLAGS         += -nostdinc -I. -DWCD_MODULE
+CLEANFILES     += $(KMOD) machine wdc.h wcd.h opt_atapi.h *.b
 LN              = ln -f -s
 
 load:           ${PROG}
@@ -22,6 +22,9 @@ wdc.h:
 wcd.h:
 		echo "#define NWCD 1" > wcd.h
 
+opt_atapi.h:
+		echo "#define ATAPI 1"> opt_atapi.h
+
 .c.o:
 		-@$(LN) /sys/i386/include machine
 		$(CC) $(CFLAGS) -c $<