PERFORCE change 175340 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Thu Mar 4 08:09:49 UTC 2010
http://p4web.freebsd.org/chv.cgi?CH=175340
Change 175340 by hselasky at hselasky_laptop001 on 2010/03/04 08:08:47
USB WLAN:
- unlock before calling firmware_get()
Users won't have to load firmware manually, anymore.
- device_printf after loaded firmware rather than before loading fw
- added more IDs including one in pr usb/144423
total 193 IDs
- patch by: Akinori
PR: usb/144423
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#108 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#7 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/usbdevs#108 (text+ko) ====
@@ -277,6 +277,7 @@
vendor FUJIFILM 0x05a2 Fuji Film
vendor ARC 0x05a3 ARC
vendor ORTEK 0x05a4 Ortek
+vendor CISCOLINKSYS3 0x05a6 Cisco-Linksys
vendor BOSE 0x05a7 Bose
vendor OMNIVISION 0x05a9 OmniVision
vendor INSYSTEM 0x05ab In-System Design
@@ -642,6 +643,7 @@
vendor QUALCOMMINC 0x19d2 Qualcomm, Incorporated
vendor WCH2 0x1a86 QinHeng Electronics
vendor STELERA 0x1a8d Stelera Wireless
+vendor OVISLINK 0x1b75 OvisLink
vendor TCTMOBILE 0x1bbb TCT Mobile
vendor TELIT 0x1bc7 Telit
vendor MPMAN 0x1cae MpMan
@@ -683,6 +685,7 @@
vendor EDIMAX 0x7392 Edimax
vendor INTEL 0x8086 Intel
vendor INTEL2 0x8087 Intel
+vendor ALLWIN 0x8516 ALLWIN Tech
vendor SITECOM2 0x9016 Sitecom
vendor MOSCHIP 0x9710 MosChip Semiconductor
vendor MARVELL 0x9e88 Marvell Technology Group Ltd.
@@ -762,6 +765,7 @@
product ACCTON RT3070_2 0xa702 RT3070
product ACCTON RT2870_1 0xb522 RT2870
product ACCTON RT3070_3 0xc522 RT3070
+product ACCTON RT3070_5 0xd522 RT3070
product ACCTON ZD1211B 0xe501 ZD1211B
/* Aceeca products */
@@ -894,6 +898,15 @@
/* Allied Telesyn International products */
product ALLIEDTELESYN ATUSB100 0xb100 AT-USB100
+/* ALLWIN Tech products */
+product ALLWIN RT2070 0x2070 RT2070
+product ALLWIN RT2770 0x2770 RT2770
+product ALLWIN RT2870 0x2870 RT2870
+product ALLWIN RT3070 0x3070 RT3070
+product ALLWIN RT3071 0x3071 RT3071
+product ALLWIN RT3072 0x3072 RT3072
+product ALLWIN RT3572 0x3572 RT3572
+
/* AlphaSmart, Inc. products */
product ALPHASMART DANA_KB 0xdbac AlphaSmart Dana Keyboard
product ALPHASMART DANA_SYNC 0xdf00 AlphaSmart Dana HotSync
@@ -996,7 +1009,8 @@
product ASUS RT2870_3 0x1742 RT2870
product ASUS RT2870_4 0x1760 RT2870
product ASUS RT2870_5 0x1761 RT2870
-product ASUS RT3070 0x1784 RT3070
+product ASUS USBN13 0x1784 USB-N13
+product ASUS RT3070_1 0x1790 RT3070
product ASUS P535 0x420f ASUS P535 PDA
product ASUS GMSC 0x422f ASUS Generic Mass Storage
product ASUS RT2570 0x1706 RT2500USB Wireless Adapter
@@ -1154,7 +1168,8 @@
product CISCOLINKSYS WUSB54GC 0x0020 WUSB54GC
product CISCOLINKSYS WUSB54GR 0x0023 WUSB54GR
product CISCOLINKSYS WUSBF54G 0x0024 WUSBF54G
-product CISCOLINKSYS2 RT3070 0x4001 RT3070
+product CISCOLINKSYS2 RT3070 0x4001 RT3070
+product CISCOLINKSYS3 RT3070 0x0101 RT3070
/* CMOTECH products */
product CMOTECH CNU510 0x5141 CDMA Technologies USB modem
@@ -1181,6 +1196,8 @@
product CONCEPTRONIC AR5523_2_NF 0x7812 AR5523 (no firmware)
product CONCEPTRONIC2 C54RU 0x3c02 C54RU WLAN
product CONCEPTRONIC2 C54RU2 0x3c22 C54RU
+product CONCEPTRONIC2 RT3070_1 0x3c08 RT3070
+product CONCEPTRONIC2 RT3070_2 0x3c11 RT3070
product CONCEPTRONIC2 VIGORN61 0x3c25 VIGORN61
product CONCEPTRONIC2 RT2870_1 0x3c06 RT2870
product CONCEPTRONIC2 RT2870_2 0x3c07 RT2870
@@ -1333,12 +1350,14 @@
product DLINK2 RT2870_1 0x3c09 RT2870
product DLINK2 DWA110 0x3c07 DWA-110
product DLINK2 RT3072 0x3c0a RT3072
+product DLINK2 RT3072_1 0x3c0b RT3072
product DLINK2 RT3070_1 0x3c0d RT3070
product DLINK2 RT3070_2 0x3c0e RT3070
product DLINK2 RT3070_3 0x3c0f RT3070
product DLINK2 RT2870_2 0x3c11 RT2870
product DLINK2 DWA130 0x3c13 DWA-130
product DLINK2 RT3070_4 0x3c15 RT3070
+product DLINK2 RT3070_5 0x3c16 RT3070
product DLINK3 DWM652 0x3e04 DWM-652
/* DMI products */
@@ -1909,6 +1928,7 @@
product LINKSYS4 WUSB600N 0x0071 WUSB600N
product LINKSYS4 WUSB54GCV2 0x0073 WUSB54GC v2
product LINKSYS4 WUSB54GCV3 0x0077 WUSB54GC v3
+product LINKSYS4 RT3070 0x0078 RT3070
product LINKSYS4 WUSB600NV2 0x0079 WUSB600N v2
/* Logitech products */
@@ -1982,6 +2002,8 @@
product MELCO WLIUCG300N 0x00e8 WLI-UC-G300N
product MELCO SG54HG 0x00f4 WLI-U2-SG54HG
product MELCO WLIUCAG300N 0x012e WLI-UC-AG300N
+product MELCO RT2870_1 0x0148 RT2870
+product MELCO RT2870_2 0x0150 RT2870
product MELCO WLIUCGN 0x015d WLI-UC-GN
/* Merlin products */
@@ -2002,7 +2024,9 @@
product MSI BT_DONGLE 0x1967 Bluetooth USB dongle
product MSI RT3070_1 0x3820 RT3070
product MSI RT3070_2 0x3821 RT3070
+product MSI RT3070_8 0x3822 RT3070
product MSI RT3070_3 0x3870 RT3070
+product MSI RT3070_9 0x3871 RT3070
product MSI UB11B 0x6823 UB11B
product MSI RT2570 0x6861 RT2570
product MSI RT2570_2 0x6865 RT2570
@@ -2011,7 +2035,9 @@
product MSI RT2573_2 0x6877 RT2573
product MSI RT3070_4 0x6899 RT3070
product MSI RT3070_5 0x821a RT3070
+product MSI RT3070_10 0x822a RT3070
product MSI RT3070_6 0x870a RT3070
+product MSI RT3070_11 0x871a RT3070
product MSI RT3070_7 0x899a RT3070
product MSI RT2573_3 0xa861 RT2573
product MSI RT2573_4 0xa874 RT2573
@@ -2097,6 +2123,7 @@
product MOTOROLA2 USBLAN 0x600c USBLAN
product MOTOROLA2 USBLAN2 0x6027 USBLAN
product MOTOROLA4 RT2770 0x9031 RT2770
+product MOTOROLA4 RT3070 0x9032 RT3070
/* MultiTech products */
product MULTITECH ATLAS 0xf101 MT5634ZBA-USB modem
@@ -2267,6 +2294,9 @@
product OPTION ICON321 0xd031 Globetrotter HSUPA
product OPTION ICON505 0xd055 Globetrotter iCON 505
+/* OvisLink product */
+product OVISLINK RT3072 0x3072 RT3072
+
/* OQO */
product OQO WIFI01 0x0002 model 01 WiFi interface
product OQO BT01 0x0003 model 01 Bluetooth interface
@@ -2301,6 +2331,7 @@
product PEGATRON RT2870 0x0002 RT2870
product PEGATRON RT3070 0x000c RT3070
product PEGATRON RT3070_2 0x000e RT3070
+product PEGATRON RT3070_3 0x0010 RT3070
/* Peracom products */
product PERACOM SERIAL1 0x0001 Serial
@@ -2519,7 +2550,9 @@
product RALINK RT3070 0x3070 RT3070
product RALINK RT3071 0x3071 RT3071
product RALINK RT3072 0x3072 RT3072
+product RALINK RT3370 0x3370 RT3370
product RALINK RT3572 0x3572 RT3572
+product RALINK RT8070 0x8070 RT8070
product RALINK RT2570_3 0x9020 RT2500USB Wireless Adapter
product RALINK RT2573_2 0x9021 RT2501USB Wireless Adapter
@@ -2892,6 +2925,7 @@
/* Sweex products */
product SWEEX ZD1211 0x1809 ZD1211
+product SWEEX2 LW153 0x0153 LW153
product SWEEX2 LW303 0x0302 LW303
product SWEEX2 LW313 0x0313 LW313
@@ -2947,6 +2981,7 @@
/* Toshiba Corporation products */
product TOSHIBA POCKETPC_E740 0x0706 PocketPC e740
+product TOSHIBA RT3070 0x0a07 RT3070
product TOSHIBA G450 0x0d45 G450 modem
product TOSHIBA HSDPA 0x1302 G450 modem
@@ -3127,3 +3162,4 @@
product ZYXEL G220V2 0x340f G-220 v2
product ZYXEL G202 0x3410 G-202
product ZYXEL RT2870_1 0x3416 RT2870
+product ZYXEL RT2870_2 0x341a RT2870
==== //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#7 (text+ko) ====
@@ -106,11 +106,20 @@
{ USB_VP(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT2870_3) },
{ USB_VP(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT2870_4) },
{ USB_VP(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT2870_5) },
+ { USB_VP(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT3070) },
{ USB_VP(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT3070_1) },
{ USB_VP(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT3070_2) },
{ USB_VP(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT3070_3) },
{ USB_VP(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT3070_4) },
+ { USB_VP(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT3070_5) },
{ USB_VP(USB_VENDOR_AIRTIES, USB_PRODUCT_AIRTIES_RT3070) },
+ { USB_VP(USB_VENDOR_ALLWIN, USB_PRODUCT_ALLWIN_RT2070) },
+ { USB_VP(USB_VENDOR_ALLWIN, USB_PRODUCT_ALLWIN_RT2770) },
+ { USB_VP(USB_VENDOR_ALLWIN, USB_PRODUCT_ALLWIN_RT2870) },
+ { USB_VP(USB_VENDOR_ALLWIN, USB_PRODUCT_ALLWIN_RT3070) },
+ { USB_VP(USB_VENDOR_ALLWIN, USB_PRODUCT_ALLWIN_RT3071) },
+ { USB_VP(USB_VENDOR_ALLWIN, USB_PRODUCT_ALLWIN_RT3072) },
+ { USB_VP(USB_VENDOR_ALLWIN, USB_PRODUCT_ALLWIN_RT3572) },
{ USB_VP(USB_VENDOR_AMIGO, USB_PRODUCT_AMIGO_RT2870_1) },
{ USB_VP(USB_VENDOR_AMIGO, USB_PRODUCT_AMIGO_RT2870_2) },
{ USB_VP(USB_VENDOR_AMIT, USB_PRODUCT_AMIT_CGWLUSB2GNR) },
@@ -121,6 +130,8 @@
{ USB_VP(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2870_3) },
{ USB_VP(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2870_4) },
{ USB_VP(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2870_5) },
+ { USB_VP(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_USBN13) },
+ { USB_VP(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT3070_1) },
{ USB_VP(USB_VENDOR_ASUS2, USB_PRODUCT_ASUS2_USBN11) },
{ USB_VP(USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT2870_1) },
{ USB_VP(USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT2870_2) },
@@ -132,6 +143,8 @@
{ USB_VP(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6D4050V1) },
{ USB_VP(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_RT2870_1) },
{ USB_VP(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_RT2870_2) },
+ { USB_VP(USB_VENDOR_CISCOLINKSYS2, USB_PRODUCT_CISCOLINKSYS2_RT3070) },
+ { USB_VP(USB_VENDOR_CISCOLINKSYS3, USB_PRODUCT_CISCOLINKSYS2_RT3070) },
{ USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_1) },
{ USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_2) },
{ USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_3) },
@@ -140,6 +153,8 @@
{ USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_6) },
{ USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_7) },
{ USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_8) },
+ { USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT3070_1) },
+ { USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT3070_2) },
{ USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_VIGORN61) },
{ USB_VP(USB_VENDOR_COREGA, USB_PRODUCT_COREGA_CGWLUSB300GNM) },
{ USB_VP(USB_VENDOR_COREGA, USB_PRODUCT_COREGA_RT2870_1) },
@@ -156,7 +171,9 @@
{ USB_VP(USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RT3070_2) },
{ USB_VP(USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RT3070_3) },
{ USB_VP(USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RT3070_4) },
+ { USB_VP(USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RT3070_5) },
{ USB_VP(USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RT3072) },
+ { USB_VP(USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RT3072_1) },
{ USB_VP(USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_EW7717) },
{ USB_VP(USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_EW7718) },
{ USB_VP(USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_RT2870_1) },
@@ -177,6 +194,7 @@
{ USB_VP(USB_VENDOR_IODATA, USB_PRODUCT_IODATA_RT3072_2) },
{ USB_VP(USB_VENDOR_IODATA, USB_PRODUCT_IODATA_RT3072_3) },
{ USB_VP(USB_VENDOR_IODATA, USB_PRODUCT_IODATA_RT3072_4) },
+ { USB_VP(USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_RT3070) },
{ USB_VP(USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB100) },
{ USB_VP(USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54GCV3) },
{ USB_VP(USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB600N) },
@@ -184,10 +202,13 @@
{ USB_VP(USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_RT2870_1) },
{ USB_VP(USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_RT2870_2) },
{ USB_VP(USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_RT2870_3) },
+ { USB_VP(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_RT2870_1) },
+ { USB_VP(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_RT2870_2) },
{ USB_VP(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCAG300N) },
{ USB_VP(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCG300N) },
{ USB_VP(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCGN) },
{ USB_VP(USB_VENDOR_MOTOROLA4, USB_PRODUCT_MOTOROLA4_RT2770) },
+ { USB_VP(USB_VENDOR_MOTOROLA4, USB_PRODUCT_MOTOROLA4_RT3070) },
{ USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_1) },
{ USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_2) },
{ USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_3) },
@@ -195,10 +216,16 @@
{ USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_5) },
{ USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_6) },
{ USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_7) },
+ { USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_8) },
+ { USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_9) },
+ { USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_10) },
+ { USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_11) },
+ { USB_VP(USB_VENDOR_OVISLINK, USB_PRODUCT_OVISLINK_RT3072) },
{ USB_VP(USB_VENDOR_PARA, USB_PRODUCT_PARA_RT3070) },
{ USB_VP(USB_VENDOR_PEGATRON, USB_PRODUCT_PEGATRON_RT2870) },
{ USB_VP(USB_VENDOR_PEGATRON, USB_PRODUCT_PEGATRON_RT3070) },
{ USB_VP(USB_VENDOR_PEGATRON, USB_PRODUCT_PEGATRON_RT3070_2) },
+ { USB_VP(USB_VENDOR_PEGATRON, USB_PRODUCT_PEGATRON_RT3070_3) },
{ USB_VP(USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_RT2870) },
{ USB_VP(USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS300MINIS) },
{ USB_VP(USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUSMICRON) },
@@ -212,7 +239,9 @@
{ USB_VP(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3070) },
{ USB_VP(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3071) },
{ USB_VP(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3072) },
+ { USB_VP(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3370) },
{ USB_VP(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT3572) },
+ { USB_VP(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT8070) },
{ USB_VP(USB_VENDOR_SAMSUNG2, USB_PRODUCT_SAMSUNG2_RT2870_1) },
{ USB_VP(USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT2870_1) },
{ USB_VP(USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT2870_2) },
@@ -244,8 +273,10 @@
{ USB_VP(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL608) },
{ USB_VP(USB_VENDOR_SPARKLAN, USB_PRODUCT_SPARKLAN_RT2870_1) },
{ USB_VP(USB_VENDOR_SPARKLAN, USB_PRODUCT_SPARKLAN_RT3070) },
+ { USB_VP(USB_VENDOR_SWEEX2, USB_PRODUCT_SWEEX2_LW153) },
{ USB_VP(USB_VENDOR_SWEEX2, USB_PRODUCT_SWEEX2_LW303) },
{ USB_VP(USB_VENDOR_SWEEX2, USB_PRODUCT_SWEEX2_LW313) },
+ { USB_VP(USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_RT3070) },
{ USB_VP(USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_RT2870_1) },
{ USB_VP(USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_RT2870_1) },
{ USB_VP(USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_RT2870_2) },
@@ -255,6 +286,7 @@
{ USB_VP(USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT3072_1) },
{ USB_VP(USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT3072_2) },
{ USB_VP(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_RT2870_1) },
+ { USB_VP(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_RT2870_2) },
};
MODULE_DEPEND(run, wlan, 1, 1, 1);
@@ -818,7 +850,9 @@
const uint64_t *temp;
uint64_t bytes;
+ RUN_UNLOCK(sc);
fw = firmware_get("runfw");
+ RUN_LOCK(sc);
if(fw == NULL){
device_printf(sc->sc_dev,
"failed loadfirmware of file %s\n", "runfw");
@@ -843,9 +877,7 @@
(sc->mac_ver) != 0x2872 &&
(sc->mac_ver) != 0x3070){
base += 4096;
- device_printf(sc->sc_dev, "loading RT3071 firmware\n");
- } else
- device_printf(sc->sc_dev, "loading RT2870 firmware\n");
+ }
/* cheap sanity check */
temp = fw->data;
@@ -893,7 +925,8 @@
error = ETIMEDOUT;
goto fail;
}
- DPRINTF("microcode successfully loaded after %d tries\n", ntries);
+ device_printf(sc->sc_dev, "firmware %s loaded\n",
+ (base == fw->data) ? "RT2870" : "RT3071");
fail:
firmware_put(fw, FIRMWARE_UNLOAD);
More information about the p4-projects
mailing list