Update to build both bktr and bktr_mem modules

3 files changed, 34 insertions, 26 deletions

diff --git a/sys/modules/bktr/Makefile b/sys/modules/bktr/Makefile
index 3c7e651..1a9e037 100644
--- a/sys/modules/bktr/Makefile
+++ b/sys/modules/bktr/Makefile
@@ -1,29 +1,7 @@
-# Makefile for the bktr Brooktree Bt848/Bt878 PCI video capture device
-# Using the new FreeBSD 4.x device driver API (newbus) the Bt848 driver
-# can be loaded dynamically both in the boot loader phase and once
-# the system has booted.
-# The driver can also be unloaded, recompiled and reloaded.
-#
-# Use kldload bktr   and kldunload bktr  to load/unload the driver
-#
-# Note - as the driver requires contiguous memory, loading the driver once
-# memory has filled or become fragmented may fail.
-
 # $FreeBSD$
 
-.PATH:  ${.CURDIR}/../../dev/bktr
-KMOD=	bktr 
-SRCS=	bktr_core.c bktr_os.c bktr_audio.c bktr_tuner.c bktr_card.c \
-	bktr.h opt_bktr.h smbus.h bus_if.h device_if.h \
-	pci_if.h vnode_if.h
-CLEANFILES= bktr.h smbus.h
-
-bktr.h:
-	echo "#define NBKTR 1" > bktr.h
-
-# Does not use SMBUS/IICBUS. Uses the old i2c code self contained in
-# the bt848 driver.
-smbus.h:
-	echo "#define NSMBUS 0" > smbus.h
+SUBDIR =
+SUBDIR += bktr
+SUBDIR += bktr_mem
 
-.include <bsd.kmod.mk>
+.include <bsd.subdir.mk>
diff --git a/sys/modules/bktr/bktr/Makefile b/sys/modules/bktr/bktr/Makefile
new file mode 100644
index 0000000..253e479
--- /dev/null
+++ b/sys/modules/bktr/bktr/Makefile
@@ -0,0 +1,21 @@
+# Makefile for the bktr Brooktree Bt848/Bt878 PCI video capture device
+
+# $FreeBSD$
+
+.PATH:  ${.CURDIR}/../../../dev/bktr
+KMOD=	bktr 
+SRCS=	bktr_core.c bktr_os.c bktr_audio.c bktr_tuner.c bktr_card.c \
+	bktr.h opt_devfs.h opt_bktr.h smbus.h bus_if.h device_if.h \
+	pci_if.h vnode_if.h
+CLEANFILES= bktr.h smbus.h
+
+bktr.h:
+	echo "#define NBKTR 1" > bktr.h
+	echo "#define BKTR_FREEBSD_MODULE 1" >> bktr.h
+
+# Does not use SMBUS/IICBUS. Uses the old i2c code self contained in
+# the bt848 driver.
+smbus.h:
+	echo "#define NSMBUS 0" > smbus.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/bktr/bktr_mem/Makefile b/sys/modules/bktr/bktr_mem/Makefile
new file mode 100644
index 0000000..4d2bba3
--- /dev/null
+++ b/sys/modules/bktr/bktr_mem/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+MAINTAINER      = roger@freebsd.org
+
+.PATH:	${.CURDIR}/../../../dev/bktr
+KMOD=	bktr_mem 
+SRCS=	bktr_mem.c
+
+.include <bsd.kmod.mk>