Module Name: src
Committed By: martin
Date: Wed Oct 31 09:30:10 UTC 2018
Modified Files:
src/sys/arch/amd64/conf [netbsd-8]: GENERIC
src/sys/arch/i386/conf [netbsd-8]: GENERIC
src/sys/conf [netbsd-8]: files
src/sys/dev/pci [netbsd-8]: files.pci
src/sys/dev/usb [netbsd-8]: files.usb usbdevs
Log Message:
Add bwfm config glue, requested by maya in ticket #1072.
To generate a diff of this commit:
cvs rdiff -u -r1.459.2.11 -r1.459.2.12 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1156.2.11 -r1.1156.2.12 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.1173.2.5 -r1.1173.2.6 src/sys/conf/files
cvs rdiff -u -r1.388.4.2 -r1.388.4.3 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.145 -r1.145.2.1 src/sys/dev/usb/files.usb
cvs rdiff -u -r1.736 -r1.736.2.1 src/sys/dev/usb/usbdevs
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/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.459.2.11 src/sys/arch/amd64/conf/GENERIC:1.459.2.12
--- src/sys/arch/amd64/conf/GENERIC:1.459.2.11 Fri Sep 7 12:27:26 2018
+++ src/sys/arch/amd64/conf/GENERIC Wed Oct 31 09:30:10 2018
@@ -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 @@ include "arch/amd64/conf/std.amd64"
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 @@ bce* at pci? dev ? function ? # Broadcom
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
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1156.2.11 src/sys/arch/i386/conf/GENERIC:1.1156.2.12
--- src/sys/arch/i386/conf/GENERIC:1.1156.2.11 Fri Sep 7 12:27:26 2018
+++ src/sys/arch/i386/conf/GENERIC Wed Oct 31 09:30:10 2018
@@ -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 @@ include "arch/i386/conf/std.i386"
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 @@ bce* at pci? dev ? function ? # Broadcom
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
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1173.2.5 src/sys/conf/files:1.1173.2.6
--- src/sys/conf/files:1.1173.2.5 Mon Apr 9 12:49:31 2018
+++ src/sys/conf/files Wed Oct 31 09:30:10 2018
@@ -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 @@ file dev/ic/isic_bchan.c isic
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
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.388.4.2 src/sys/dev/pci/files.pci:1.388.4.3
--- src/sys/dev/pci/files.pci:1.388.4.2 Sun Sep 23 18:00:53 2018
+++ src/sys/dev/pci/files.pci Wed Oct 31 09:30:10 2018
@@ -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 @@ include "dev/pci/n8/files.n8"
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
Index: src/sys/dev/usb/files.usb
diff -u src/sys/dev/usb/files.usb:1.145 src/sys/dev/usb/files.usb:1.145.2.1
--- src/sys/dev/usb/files.usb:1.145 Wed May 24 20:23:58 2017
+++ src/sys/dev/usb/files.usb Wed Oct 31 09:30:10 2018
@@ -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 @@ file dev/usb/udsir.c udsir
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
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.736 src/sys/dev/usb/usbdevs:1.736.2.1
--- src/sys/dev/usb/usbdevs:1.736 Tue May 30 20:13:35 2017
+++ src/sys/dev/usb/usbdevs Wed Oct 31 09:30:10 2018
@@ -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 USBE100 0x8511 USBE10
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
