Module Name: src
Committed By: rkujawa
Date: Fri Jul 1 13:30:19 UTC 2011
Modified Files:
src/sys/arch/amiga/conf: GENERIC GENERIC.in files.amiga
Log Message:
Add Bluetooth stack to Amiga. Tested with 3Com 3CRWB6096B on an A1200. Change
approved by phx.
To generate a diff of this commit:
cvs rdiff -u -r1.267 -r1.268 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.144 -r1.145 src/sys/arch/amiga/conf/files.amiga
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/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.267 src/sys/arch/amiga/conf/GENERIC:1.268
--- src/sys/arch/amiga/conf/GENERIC:1.267 Thu Jun 30 20:09:18 2011
+++ src/sys/arch/amiga/conf/GENERIC Fri Jul 1 13:30:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.267 2011/06/30 20:09:18 wiz Exp $
+# $NetBSD: GENERIC,v 1.268 2011/07/01 13:30:18 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -28,7 +28,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.267 $"
+#ident "GENERIC-$Revision: 1.268 $"
maxusers 8
@@ -462,6 +462,37 @@
ss* at scsibus? target ? lun ? # scsi scanner
uk* at scsibus? target ? lun ? # scsi unknown
+# 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?
+
#
# accept filters
pseudo-device accf_data # "dataready" accept filter
@@ -516,6 +547,9 @@
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)
+
# Veriexec
#
# a pseudo device needed for veriexec
Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.79 src/sys/arch/amiga/conf/GENERIC.in:1.80
--- src/sys/arch/amiga/conf/GENERIC.in:1.79 Thu Jun 30 20:09:18 2011
+++ src/sys/arch/amiga/conf/GENERIC.in Fri Jul 1 13:30:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.79 2011/06/30 20:09:18 wiz Exp $
+# $NetBSD: GENERIC.in,v 1.80 2011/07/01 13:30:18 rkujawa Exp $
#
# GENERIC machine description file
#
@@ -56,7 +56,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.79 $"
+#ident "GENERIC-$Revision: 1.80 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -566,6 +566,37 @@
m4_ifdef(`INSTALL_CONFIGURATION', `', `m4_dnl
ss* at scsibus? target ? lun ? # scsi scanner
uk* at scsibus? target ? lun ? # scsi unknown
+
+# 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?
')m4_dnl
m4_ifdef(`INSTALL_CONFIGURATION', `', `m4_dnl
@@ -637,6 +668,9 @@
m4_ifdef(`INSTALL_CONFIGURATION', `', `m4_dnl
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)
')m4_dnl
# Veriexec
Index: src/sys/arch/amiga/conf/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.144 src/sys/arch/amiga/conf/files.amiga:1.145
--- src/sys/arch/amiga/conf/files.amiga:1.144 Sun Jun 12 03:35:38 2011
+++ src/sys/arch/amiga/conf/files.amiga Fri Jul 1 13:30:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.144 2011/06/12 03:35:38 rmind Exp $
+# $NetBSD: files.amiga,v 1.145 2011/07/01 13:30:18 rkujawa Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -489,4 +489,7 @@
# OSS audio driver compatibility
include "compat/ossaudio/files.ossaudio"
+# Bluetooth stack
+include "dev/bluetooth/files.bluetooth"
+
include "arch/amiga/conf/majors.amiga"
