Module Name: src
Committed By: rkujawa
Date: Fri Jul 1 15:46:30 UTC 2011
Modified Files:
src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL
Log Message:
Fix DRACO kernel breakage introduced by my previous commit.
To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.268 -r1.269 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/amiga/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.138 src/sys/arch/amiga/conf/DRACO:1.139
--- src/sys/arch/amiga/conf/DRACO:1.138 Thu Jun 30 20:09:18 2011
+++ src/sys/arch/amiga/conf/DRACO Fri Jul 1 15:46:30 2011
@@ -1,10 +1,11 @@
-# $NetBSD: DRACO,v 1.138 2011/06/30 20:09:18 wiz Exp $
+# $NetBSD: DRACO,v 1.139 2011/07/01 15:46:30 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.77 2011/01/14 10:01:12 phx Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.80 2011/07/01 13:30:18 rkujawa Exp $
#
+##
# GENERIC machine description file
#
# This machine description file is used to generate the default NetBSD
@@ -28,7 +29,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.138 $"
+#ident "GENERIC-$Revision: 1.139 $"
maxusers 8
@@ -320,7 +321,6 @@
ch* at scsibus? target ? lun ? # scsi autochangers
ss* at scsibus? target ? lun ? # scsi scanner
uk* at scsibus? target ? lun ? # scsi unknown
-
#
# accept filters
pseudo-device accf_data # "dataready" accept filter
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.268 src/sys/arch/amiga/conf/GENERIC:1.269
--- src/sys/arch/amiga/conf/GENERIC:1.268 Fri Jul 1 13:30:18 2011
+++ src/sys/arch/amiga/conf/GENERIC Fri Jul 1 15:46:30 2011
@@ -1,10 +1,11 @@
-# $NetBSD: GENERIC,v 1.268 2011/07/01 13:30:18 rkujawa Exp $
+# $NetBSD: GENERIC,v 1.269 2011/07/01 15:46:30 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.77 2011/01/14 10:01:12 phx Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.80 2011/07/01 13:30:18 rkujawa Exp $
#
+##
# GENERIC machine description file
#
# This machine description file is used to generate the default NetBSD
@@ -28,7 +29,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.268 $"
+#ident "GENERIC-$Revision: 1.269 $"
maxusers 8
@@ -546,7 +547,6 @@
pseudo-device ksyms # /dev/ksyms (kernel symbols)
pseudo-device nsmb # experimental - SMB requester
-
pseudo-device bcsp # BlueCore Serial Protocol
pseudo-device btuart # Bluetooth HCI UART (H4)
Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.80 src/sys/arch/amiga/conf/GENERIC.in:1.81
--- src/sys/arch/amiga/conf/GENERIC.in:1.80 Fri Jul 1 13:30:18 2011
+++ src/sys/arch/amiga/conf/GENERIC.in Fri Jul 1 15:46:30 2011
@@ -1,5 +1,6 @@
-# $NetBSD: GENERIC.in,v 1.80 2011/07/01 13:30:18 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.81 2011/07/01 15:46:30 rkujawa Exp $
#
+##
# GENERIC machine description file
#
# This machine description file is used to generate the default NetBSD
@@ -56,7 +57,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.80 $"
+#ident "GENERIC-$Revision: 1.81 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -566,6 +567,8 @@
m4_ifdef(`INSTALL_CONFIGURATION', `', `m4_dnl
ss* at scsibus? target ? lun ? # scsi scanner
uk* at scsibus? target ? lun ? # scsi unknown
+')m4_dnl
+m4_ifdef(`AMIGA_CONFIGURATION', `m4_dnl
# Bluetooth Controller and Device support
# tested only with btuart on an A1200
@@ -597,8 +600,8 @@
# Bluetooth Audio support
#btsco* at bthub?
-')m4_dnl
+')m4_dnl
m4_ifdef(`INSTALL_CONFIGURATION', `', `m4_dnl
#
# accept filters
@@ -668,7 +671,8 @@
m4_ifdef(`INSTALL_CONFIGURATION', `', `m4_dnl
pseudo-device ksyms # /dev/ksyms (kernel symbols)
pseudo-device nsmb # experimental - SMB requester
-
+')m4_dnl
+m4_ifdef(`AMIGA_CONFIGURATION', `m4_dnl
pseudo-device bcsp # BlueCore Serial Protocol
pseudo-device btuart # Bluetooth HCI UART (H4)
')m4_dnl
Index: src/sys/arch/amiga/conf/INSTALL
diff -u src/sys/arch/amiga/conf/INSTALL:1.90 src/sys/arch/amiga/conf/INSTALL:1.91
--- src/sys/arch/amiga/conf/INSTALL:1.90 Thu Jun 30 20:09:18 2011
+++ src/sys/arch/amiga/conf/INSTALL Fri Jul 1 15:46:30 2011
@@ -1,10 +1,11 @@
-# $NetBSD: INSTALL,v 1.90 2011/06/30 20:09:18 wiz Exp $
+# $NetBSD: INSTALL,v 1.91 2011/07/01 15:46:30 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.77 2011/01/14 10:01:12 phx Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.80 2011/07/01 13:30:18 rkujawa Exp $
#
+##
# GENERIC machine description file
#
# This machine description file is used to generate the default NetBSD
@@ -28,7 +29,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.90 $"
+#ident "GENERIC-$Revision: 1.91 $"
makeoptions COPTS="-Os"
@@ -406,6 +407,37 @@
cd* at scsibus? target ? lun ? # scsi cds
ch* at scsibus? target ? lun ? # scsi autochangers
+# Bluetooth Controller and Device support
+# tested only with btuart on an A1200
+
+# Bluetooth PCMCIA Controllers
+bt3c* at pcmcia? function ? # 3Com 3CRWB6096-A
+btbc* at pcmcia? function ? # AnyCom BlueCard LSE041/039/139
+
+# Bluetooth Device Hub
+bthub* at bcsp?
+bthub* at bt3c?
+bthub* at btbc?
+bthub* at btuart?
+
+# Bluetooth HID support
+bthidev* at bthub?
+
+# Bluetooth Mouse
+btms* at bthidev? reportid ?
+wsmouse* at btms? mux 0
+
+# Bluetooth Keyboard
+#btkbd* at bthidev? reportid ?
+#wskbd* at btkbd? console ? mux 1
+
+# Bluetooth Apple Magic Mouse
+btmagic* at bthub?
+wsmouse* at btmagic? mux 0
+
+# Bluetooth Audio support
+#btsco* at bthub?
+
pseudo-device loop # loopback network interface
pseudo-device sl # SLIP network interfaces
@@ -453,6 +485,8 @@
pseudo-device rnd # /dev/random and in-kernel generator
#options RND_COM # use "com" randomness as well (BROKEN)
+pseudo-device bcsp # BlueCore Serial Protocol
+pseudo-device btuart # Bluetooth HCI UART (H4)
# Veriexec
#
