[src/trunk]: src/sys/arch/amiga/conf Add Bluetooth stack to Amiga. Tested wit...

[rkujawa <rkujawa%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1960c32cf6ed
branches:  trunk
changeset: 766759:1960c32cf6ed
user:      rkujawa <rkujawa%NetBSD.org@localhost>
date:      Fri Jul 01 13:30:18 2011 +0000

description:
Add Bluetooth stack to Amiga. Tested with 3Com 3CRWB6096B on an A1200. Change approved by phx.

diffstat:

 sys/arch/amiga/conf/GENERIC     |  38 ++++++++++++++++++++++++++++++++++++--
 sys/arch/amiga/conf/GENERIC.in  |  38 ++++++++++++++++++++++++++++++++++++--
 sys/arch/amiga/conf/files.amiga |   5 ++++-
 3 files changed, 76 insertions(+), 5 deletions(-)

diffs (149 lines):

diff -r 6c83f2a1c9e8 -r 1960c32cf6ed sys/arch/amiga/conf/GENERIC
--- a/sys/arch/amiga/conf/GENERIC       Fri Jul 01 12:09:34 2011 +0000
+++ b/sys/arch/amiga/conf/GENERIC       Fri Jul 01 13:30:18 2011 +0000
@@ -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
diff -r 6c83f2a1c9e8 -r 1960c32cf6ed sys/arch/amiga/conf/GENERIC.in
--- a/sys/arch/amiga/conf/GENERIC.in    Fri Jul 01 12:09:34 2011 +0000
+++ b/sys/arch/amiga/conf/GENERIC.in    Fri Jul 01 13:30:18 2011 +0000
@@ -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
diff -r 6c83f2a1c9e8 -r 1960c32cf6ed sys/arch/amiga/conf/files.amiga
--- a/sys/arch/amiga/conf/files.amiga   Fri Jul 01 12:09:34 2011 +0000
+++ b/sys/arch/amiga/conf/files.amiga   Fri Jul 01 13:30:18 2011 +0000
@@ -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"