prepare for bktr on macppc (commented out in generic for now); drahn@ ok

4 files changed, 26 insertions, 12 deletions

diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index dcef344bf75..8a2a7d6205d 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.99 2002/07/10 22:21:30 mickey Exp $	*/
+/*	$OpenBSD: conf.c,v 1.100 2002/11/08 19:00:37 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -116,13 +116,6 @@ int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
         (dev_type_stop((*))) enodev, 0,  dev_init(c,n,select), \
         (dev_type_mmap((*))) enodev, 0 }
 
-/* open, close, read, ioctl, mmap */
-#define	cdev_bktr_init(c, n) { \
-        dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
-        (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
-	(dev_type_stop((*))) enodev, 0, seltrue, \
-        dev_init(c,n,mmap) }
-
 /* open, close, read, ioctl */
 #define	cdev_wdt_init(c, n) { \
 	dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
@@ -180,7 +173,6 @@ cdev_decl(music);
 cdev_decl(xfs_dev);
 #endif
 #include "bktr.h"
-cdev_decl(bktr);
 #include "wdt.h"
 cdev_decl(wdt);
 #include "ksyms.h"
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index dbfa4c9f7dd..9a4beab31de 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.34 2002/10/20 15:36:13 drahn Exp $g
+#	$OpenBSD: GENERIC,v 1.35 2002/11/08 19:00:37 mickey Exp $g
 #
 # PPC GENERIC config file
 #
@@ -120,6 +120,9 @@ awacs*		at macobio?			# Apple audio device
 audio*		at awacs?
 audio*		at uaudio?
 
+#bktr*		at pci? dev ? function ?	# Bt8[47][89] tv/fmradio/video
+#radio*		at bktr?
+
 #scsibus*	at adv?
 #scsibus*	at ahc?
 #scsibus*	at ami?
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index 01aadf46fd6..ad046989de8 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.19 2002/09/15 09:01:58 deraadt Exp $ */
+/*	$OpenBSD: conf.c,v 1.20 2002/11/08 19:00:37 mickey Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -144,6 +144,9 @@ cdev_decl(pci);
 
 #include "systrace.h"
 
+#include "radio.h"
+#include "bktr.h"
+
 struct cdevsw cdevsw[] = {
 	cdev_cn_init(1,cn),		/* 0: virtual console */
 	cdev_ctty_init(1,ctty),		/* 1: controlling terminal */
@@ -232,6 +235,8 @@ struct cdevsw cdevsw[] = {
 	cdev_altq_init(NALTQ,altq),	/* 72: ALTQ control interface */
 	cdev_iop_init(NIOP,iop),	/* 73: I2O IOP control interface */
 	cdev_usbdev_init(NUSCANNER,uscanner), /* 74: usb scanner */
+	cdev_bktr_init(NBKTR,bktr),	/* 75: Bt848 video capture device */
+	cdev_radio_init(NRADIO, radio),	/* 76: generic radio I/O */
 };
 int nchrdev = sizeof cdevsw / sizeof cdevsw[0];
 
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 0ed86c40af4..73ac1bb39e3 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.66 2002/07/10 22:21:30 mickey Exp $	*/
+/*	$OpenBSD: conf.h,v 1.67 2002/11/08 19:00:37 mickey Exp $	*/
 /*	$NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $	*/
 
 /*-
@@ -41,6 +41,10 @@
  *	@(#)conf.h	8.3 (Berkeley) 1/21/94
  */
 
+
+#ifndef _SYS_CONF_H_
+#define _SYS_CONF_H_
+
 /*
  * Definitions of device driver entry switches
  */
@@ -446,6 +450,13 @@ void	randomattach(void);
 	dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
 	0, seltrue, (dev_type_mmap((*))) enodev }
 
+/* open, close, read, ioctl, mmap */
+#define cdev_bktr_init(c, n) { \
+	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
+	(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
+	(dev_type_stop((*))) enodev, 0, seltrue, \
+	dev_init(c,n,mmap) }
+				 
 /* symbolic sleep message strings */
 extern char devopn[], devio[], devwait[], devin[], devout[];
 extern char devioc[], devcls[];
@@ -587,6 +598,7 @@ cdev_decl(systrace);
 cdev_decl(bio);
 
 cdev_decl(gpr);
+cdev_decl(bktr);
 
 cdev_decl(usb);
 cdev_decl(ugen);
@@ -597,3 +609,5 @@ cdev_decl(uscanner);
 cdev_decl(urio);
 
 #endif
+
+#endif /* _SYS_CONF_H_ */