[src/netbsd-8]: src/sys Add bwfm config glue, requested by maya in ticket #1072.

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

details:   https://anonhg.NetBSD.org/src/rev/3030f7193aec
branches:  netbsd-8
changeset: 445508:3030f7193aec
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Oct 31 09:30:10 2018 +0000

description:
Add bwfm config glue, requested by maya in ticket #1072.

diffstat:

 sys/arch/amd64/conf/GENERIC |  5 +++--
 sys/arch/i386/conf/GENERIC  |  5 +++--
 sys/conf/files              |  7 ++++++-
 sys/dev/pci/files.pci       |  6 +++++-
 sys/dev/usb/files.usb       |  6 +++++-
 sys/dev/usb/usbdevs         |  8 +++++++-
 6 files changed, 29 insertions(+), 8 deletions(-)

diffs (134 lines):

diff -r ff0ec74d9fb0 -r 3030f7193aec sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Wed Oct 31 09:26:51 2018 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Wed Oct 31 09:30:10 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.459.2.11 2018/09/07 12:27:26 martin Exp $
+# $NetBSD: GENERIC,v 1.459.2.12 2018/10/31 09:30:10 martin Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.459.2.11 $"
+#ident         "GENERIC-$Revision: 1.459.2.12 $"
 
 maxusers       64              # estimated number of users
 
@@ -753,6 +753,7 @@
 bge*   at pci? dev ? function ?        # Broadcom 570x gigabit Ethernet
 bnx*   at pci? dev ? function ?        # Broadcom NetXtremeII gigabit Ethernet
 bwi*   at pci? dev ? function ?        # Broadcom BCM43xx wireless
+bwfm*  at pci? dev ? function ?        # Broadcom FullMAC
 dge*   at pci? dev ? function ?        # Intel 82597 10GbE LR
 en*    at pci? dev ? function ?        # ENI/Adaptec ATM
 ep*    at pci? dev ? function ?        # 3Com 3c59x
diff -r ff0ec74d9fb0 -r 3030f7193aec sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Wed Oct 31 09:26:51 2018 +0000
+++ b/sys/arch/i386/conf/GENERIC        Wed Oct 31 09:30:10 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1156.2.11 2018/09/07 12:27:26 martin Exp $
+# $NetBSD: GENERIC,v 1.1156.2.12 2018/10/31 09:30:10 martin Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.1156.2.11 $"
+#ident         "GENERIC-$Revision: 1.1156.2.12 $"
 
 maxusers       64              # estimated number of users
 
@@ -988,6 +988,7 @@
 bge*   at pci? dev ? function ?        # Broadcom 570x gigabit Ethernet
 bnx*   at pci? dev ? function ?        # Broadcom NetXtremeII gigabit Ethernet
 bwi*   at pci? dev ? function ?        # Broadcom BCM43xx wireless
+bwfm*  at pci? dev ? function ?        # Broadcom FullMAC
 dge*   at pci? dev ? function ?        # Intel 82597 10GbE LR
 en*    at pci? dev ? function ?        # ENI/Adaptec ATM
 ep*    at pci? dev ? function ?        # 3Com 3c59x
diff -r ff0ec74d9fb0 -r 3030f7193aec sys/conf/files
--- a/sys/conf/files    Wed Oct 31 09:26:51 2018 +0000
+++ b/sys/conf/files    Wed Oct 31 09:30:10 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.1173.2.5 2018/04/09 12:49:31 bouyer Exp $
+#      $NetBSD: files,v 1.1173.2.6 2018/10/31 09:30:10 martin Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
 version        20170615
@@ -1401,6 +1401,11 @@
 device iavc: isdndev, isdncapi, passive_isdn
 file   dev/ic/iavc.c                   iavc
 
+
+# Broadcom FullMAC 802.11 driver
+device bwfm: arp, ifnet, wlan
+file   dev/ic/bwfm.c                   bwfm
+
 # Broadcom AirForce / Apple Airport Extreme
 device bwi: arp, ifnet, firmload, wlan
 file   dev/ic/bwi.c                    bwi
diff -r ff0ec74d9fb0 -r 3030f7193aec sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci     Wed Oct 31 09:26:51 2018 +0000
+++ b/sys/dev/pci/files.pci     Wed Oct 31 09:30:10 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.pci,v 1.388.4.2 2018/09/23 18:00:53 martin Exp $
+#      $NetBSD: files.pci,v 1.388.4.3 2018/10/31 09:30:10 martin Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -1067,6 +1067,10 @@
 attach bwi at pci with bwi_pci
 file   dev/pci/if_bwi_pci.c            bwi_pci
 
+# Broadcom FullMAC USB wireless adapter
+attach bwfm at pci with bwfm_pci: firmload
+file   dev/pci/if_bwfm_pci.c           bwfm_pci
+
 # Marvell Serial-ATA Host Controller
 attach mvsata at pci with mvsata_pci
 file   dev/pci/mvsata_pci.c            mvsata_pci
diff -r ff0ec74d9fb0 -r 3030f7193aec sys/dev/usb/files.usb
--- a/sys/dev/usb/files.usb     Wed Oct 31 09:26:51 2018 +0000
+++ b/sys/dev/usb/files.usb     Wed Oct 31 09:30:10 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.usb,v 1.145 2017/05/24 20:23:58 christos Exp $
+#      $NetBSD: files.usb,v 1.145.2.1 2018/10/31 09:30:10 martin Exp $
 #
 # Config file and device description for machine-independent USB code.
 # Included by ports that need it.  Ports that use it must provide
@@ -551,3 +551,7 @@
 device ualea
 attach ualea at usbifif
 file   dev/usb/ualea.c                 ualea
+
+# Broadcom FullMAC USB wireless adapter
+attach bwfm at usbdevif with bwfm_usb: firmload
+file   dev/usb/if_bwfm_usb.c           bwfm_usb
diff -r ff0ec74d9fb0 -r 3030f7193aec sys/dev/usb/usbdevs
--- a/sys/dev/usb/usbdevs       Wed Oct 31 09:26:51 2018 +0000
+++ b/sys/dev/usb/usbdevs       Wed Oct 31 09:30:10 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.736 2017/05/30 20:13:35 jnemeth Exp $
+$NetBSD: usbdevs,v 1.736.2.1 2018/10/31 09:30:10 martin Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1095,8 +1095,14 @@
 product BILLIONTON USB2AR      0x90ff  USB2AR Ethernet
 
 /* Broadcom products */
+product BROADCOM BCMFW         0x0bdc  BCMFW
 product BROADCOM BCM2033       0x2000  BCM2033
 product BROADCOM BCM2033NF     0x2033  BCM2033 (no firmware)
+product BROADCOM BCM43236      0xbd17  BCM43236
+product BROADCOM BCM43143      0xbd1e  BCM43143
+product BROADCOM BCM43242      0xbd1f  BCM43242
+product BROADCOM BCM43569      0xbd27  BCM43569
+
 
 /* Brother Industries products */
 product BROTHER HL1050         0x0002  HL-1050 laser printer