[src/trunk]: src/sys/arch/amiga/conf Fix DRACO kernel breakage introduced by ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/amiga/conf Fix DRACO kernel breakage introduced by ...
From: rkujawa <rkujawa%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 20:43:43 +0000

details:   https://anonhg.NetBSD.org/src/rev/427c0ddc98a8
branches:  trunk
changeset: 766762:427c0ddc98a8
user:      rkujawa <rkujawa%NetBSD.org@localhost>
date:      Fri Jul 01 15:46:30 2011 +0000

description:
Fix DRACO kernel breakage introduced by my previous commit.

diffstat:

 sys/arch/amiga/conf/DRACO      |   8 ++++----
 sys/arch/amiga/conf/GENERIC    |   8 ++++----
 sys/arch/amiga/conf/GENERIC.in |  12 ++++++++----
 sys/arch/amiga/conf/INSTALL    |  40 +++++++++++++++++++++++++++++++++++++---
 4 files changed, 53 insertions(+), 15 deletions(-)

diffs (190 lines):

diff -r 154e962c16e3 -r 427c0ddc98a8 sys/arch/amiga/conf/DRACO
--- a/sys/arch/amiga/conf/DRACO Fri Jul 01 15:09:28 2011 +0000
+++ b/sys/arch/amiga/conf/DRACO Fri Jul 01 15:46:30 2011 +0000
@@ -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
diff -r 154e962c16e3 -r 427c0ddc98a8 sys/arch/amiga/conf/GENERIC
--- a/sys/arch/amiga/conf/GENERIC       Fri Jul 01 15:09:28 2011 +0000
+++ b/sys/arch/amiga/conf/GENERIC       Fri Jul 01 15:46:30 2011 +0000
@@ -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)
 
diff -r 154e962c16e3 -r 427c0ddc98a8 sys/arch/amiga/conf/GENERIC.in
--- a/sys/arch/amiga/conf/GENERIC.in    Fri Jul 01 15:09:28 2011 +0000
+++ b/sys/arch/amiga/conf/GENERIC.in    Fri Jul 01 15:46:30 2011 +0000
@@ -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_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
diff -r 154e962c16e3 -r 427c0ddc98a8 sys/arch/amiga/conf/INSTALL
--- a/sys/arch/amiga/conf/INSTALL       Fri Jul 01 15:09:28 2011 +0000
+++ b/sys/arch/amiga/conf/INSTALL       Fri Jul 01 15:46:30 2011 +0000
@@ -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
 #

Prev by Date: [src/trunk]: src/sys/dev/nand Make this actually compile by adding a wrapper ...
Next by Date: [src/trunk]: src/sys/arch/prep #include <sys/bus.h> instead of <machine/bus.h>.
Previous by Thread: [src/trunk]: src/sys/dev/nand Make this actually compile by adding a wrapper ...
Next by Thread: [src/trunk]: src/sys/arch/prep #include <sys/bus.h> instead of <machine/bus.h>.
Indexes:

Home | Main Index | Thread Index | Old Index