Consistently uppercase usb product defines.
Index: if_urtwn.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_urtwn.c,v
retrieving revision 1.85
diff -u -p -r1.85 if_urtwn.c
--- if_urtwn.c 16 Nov 2019 14:08:31 -0000 1.85
+++ if_urtwn.c 4 Jan 2020 04:22:37 -0000
@@ -283,7 +283,7 @@ static const struct urtwn_type {
URTWN_DEV_8192CU(IODATA, RTL8192CU),
URTWN_DEV_8192CU(NETGEAR, N300MA),
URTWN_DEV_8192CU(NETGEAR, WNA1000M),
- URTWN_DEV_8192CU(NETGEAR, WNA1000Mv2),
+ URTWN_DEV_8192CU(NETGEAR, WNA1000MV2),
URTWN_DEV_8192CU(NETGEAR, RTL8192CU),
URTWN_DEV_8192CU(NETGEAR4, RTL8188CU),
URTWN_DEV_8192CU(NETWEEN, RTL8192CU),
Index: umsm.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/umsm.c,v
retrieving revision 1.114
diff -u -p -r1.114 umsm.c
--- umsm.c 15 Aug 2018 14:13:07 -0000 1.114
+++ umsm.c 4 Jan 2020 04:22:00 -0000
@@ -139,7 +139,7 @@ static const struct umsm_type umsm_devs[
{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E618 }, DEV_HUAWEI},
{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E392_INIT }, DEV_UMASS5},
{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_EM770W }, 0},
- {{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_Mobile }, DEV_HUAWEI},
+ {{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE }, DEV_HUAWEI},
{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_K3765_INIT }, DEV_UMASS5},
{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_K3765 }, 0},
{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_K3772_INIT }, DEV_UMASS5},
Index: usb_quirks.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/usb_quirks.c,v
retrieving revision 1.75
diff -u -p -r1.75 usb_quirks.c
--- usb_quirks.c 10 Jul 2018 09:46:18 -0000 1.75
+++ usb_quirks.c 4 Jan 2020 04:22:22 -0000
@@ -86,7 +86,7 @@ const struct usbd_quirk_entry {
ANY, { UQ_ASSUME_CM_OVER_DATA }},
{ USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CCU550,
ANY, { UQ_ASSUME_CM_OVER_DATA }},
- { USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CNU550pro,
+ { USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CNU550PRO,
ANY, { UQ_ASSUME_CM_OVER_DATA }},
{ USB_VENDOR_SIEMENS2, USB_PRODUCT_SIEMENS2_ES75,
ANY, { UQ_ASSUME_CM_OVER_DATA }},
@@ -126,8 +126,8 @@ const struct usbd_quirk_entry {
{ USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_SISPM_OLD, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_SISPM, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_SISPM_FLASH, ANY, {
UQ_BAD_HID }},
- { USB_VENDOR_MICROCHIP, USB_PRODUCT_MICROCHIP_USBLCD20x2, ANY, {
UQ_BAD_HID }},
- { USB_VENDOR_MICROCHIP, USB_PRODUCT_MICROCHIP_USBLCD256x64, ANY, {
UQ_BAD_HID }},
+ { USB_VENDOR_MICROCHIP, USB_PRODUCT_MICROCHIP_USBLCD20X2, ANY, {
UQ_BAD_HID }},
+ { USB_VENDOR_MICROCHIP, USB_PRODUCT_MICROCHIP_USBLCD256X64, ANY, {
UQ_BAD_HID }},
{ USB_VENDOR_MECANIQUE, USB_PRODUCT_MECANIQUE_WISPY, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY24I, ANY, { UQ_BAD_HID }},
{ USB_VENDOR_MUSTEK2, USB_PRODUCT_MUSTEK2_PM800, ANY, { UQ_BAD_HID }},
Index: usbdevs
===================================================================
RCS file: /cvs/src/sys/dev/usb/usbdevs,v
retrieving revision 1.702
diff -u -p -r1.702 usbdevs
--- usbdevs 7 Dec 2019 08:45:28 -0000 1.702
+++ usbdevs 4 Jan 2020 04:20:20 -0000
@@ -1344,7 +1344,7 @@ product CLIPSAL 5800PC 0x0301 5800PC C-
product CLIPSAL 5500PCU 0x0303 5500PCU C-Bus
product CLIPSAL 5000CT2 0x0304 5000CT2 C-Bus Touch Screen
product CLIPSAL C5000CT2 0x0305 C5000CT2 C-Bus Touch Screen
-product CLIPSAL L51xx 0x0401 L51xx C-Bus Dimmer
+product CLIPSAL L51XX 0x0401 L51xx C-Bus Dimmer
/* Compaq products */
product COMPAQ IPAQPOCKETPC 0x0003 iPAQ PocketPC
@@ -1362,7 +1362,7 @@ product CTC CW6622 0x6622 CW6622
product CMOTECH CNU510 0x5141 CDMA Technologies USB modem
product CMOTECH CM5100P 0x5523 CM-5100P EVDO
product CMOTECH CCU550 0x5533 CCU-550 EVDO
-product CMOTECH CNU550pro 0x5543 CNU-550pro EVDO
+product CMOTECH CNU550PRO 0x5543 CNU-550pro EVDO
product CMOTECH CGU628 0x6006 CGU-628
product CMOTECH CNU680 0x6803 CNU-680
product CMOTECH CGU628_DISK 0xf000 CGU-628 disk mode
@@ -2163,7 +2163,7 @@ product HP KBDHUB 0x010c Multimedia Key
product HP HN210W 0x011c HN210W
product HP HPX9GP 0x0121 HP-x9G+
product HP 6200C 0x0201 ScanJet 6200C
-product HP S20b 0x0202 PhotoSmart S20
+product HP S20B 0x0202 PhotoSmart S20
product HP 815C 0x0204 DeskJet 815C
product HP 3300C 0x0205 ScanJet 3300C
product HP CDW8200 0x0207 CD-Writer Plus 8200e
@@ -2217,7 +2217,7 @@ product HTC ANDROID 0x0ffe Android phon
/* HUAWEI products */
product HUAWEI E618 0x1001 HUAWEI Mobile E618
product HUAWEI E220 0x1003 HUAWEI Mobile Modem
-product HUAWEI Mobile 0x1008 HUAWEI Mobile Modem
+product HUAWEI MOBILE 0x1008 HUAWEI Mobile Modem
product HUAWEI EM770W 0x1404 HUAWEI Mobile Modem
product HUAWEI E1750 0x1406 HUAWEI Mobile Modem
product HUAWEI E180 0x140c HUAWEI Mobile E180
@@ -2384,8 +2384,8 @@ product IRIVER IFP_5XX 0x1105 iFP-5xx
product ITEGNO WM1080A 0x1080 WM1080A
/* Microchip Technology, Inc. products */
-product MICROCHIP USBLCD20x2 0x0002 USB-LCD-20x2
-product MICROCHIP USBLCD256x64 0xc002 USB-LCD-256x64
+product MICROCHIP USBLCD20X2 0x0002 USB-LCD-20x2
+product MICROCHIP USBLCD256X64 0xc002 USB-LCD-256x64
/* Jablotron products */
product JABLOTRON PC60B 0x0001 PC-60B
@@ -3186,7 +3186,7 @@ product NETGEAR RTL8192CU 0x9021 RTL8192
product NETGEAR WNA1100 0x9030 WNA1100
product NETGEAR WNA1000 0x9040 WNA1000
product NETGEAR WNA1000M 0x9041 WNA1000M
-product NETGEAR WNA1000Mv2 0x9043 WNA1000Mv2
+product NETGEAR WNA1000MV2 0x9043 WNA1000Mv2
product NETGEAR N300MA 0xf001 N300MA
/* Netgear(2) products */
Index: uslcom.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/uslcom.c,v
retrieving revision 1.41
diff -u -p -r1.41 uslcom.c
--- uslcom.c 24 Apr 2019 20:36:59 -0000 1.41
+++ uslcom.c 4 Jan 2020 04:20:54 -0000
@@ -120,7 +120,7 @@ static const struct usb_devno uslcom_dev
{ USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_560884 },
{ USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_5800PC },
{ USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_C5000CT2 },
- { USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_L51xx },
+ { USB_VENDOR_CLIPSAL, USB_PRODUCT_CLIPSAL_L51XX },
{ USB_VENDOR_CORSAIR, USB_PRODUCT_CORSAIR_CP210X },
{ USB_VENDOR_DATAAPEX, USB_PRODUCT_DATAAPEX_MULTICOM },
{ USB_VENDOR_DELL, USB_PRODUCT_DELL_DW700 },
