consistently uppercase usb product defines

ok mpi@

5 files changed, 18 insertions, 18 deletions

diff --git a/sys/dev/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c
index 2147ce40f8b..2a88b3971f7 100644
--- a/sys/dev/usb/if_urtwn.c
+++ b/sys/dev/usb/if_urtwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtwn.c,v 1.85 2019/11/16 14:08:31 kevlo Exp $	*/
+/*	$OpenBSD: if_urtwn.c,v 1.86 2020/01/05 00:54:13 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -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),
diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c
index 32fdaaa6031..b2b925c2bb7 100644
--- a/sys/dev/usb/umsm.c
+++ b/sys/dev/usb/umsm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umsm.c,v 1.114 2018/08/15 14:13:07 mpi Exp $	*/
+/*	$OpenBSD: umsm.c,v 1.115 2020/01/05 00:54:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2008 Yojiro UO <yuo@nui.org>
@@ -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},
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index 7316a372a90..ad7c107b2ff 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_quirks.c,v 1.75 2018/07/10 09:46:18 jasper Exp $ */
+/*	$OpenBSD: usb_quirks.c,v 1.76 2020/01/05 00:54:13 jsg Exp $ */
 /*	$NetBSD: usb_quirks.c,v 1.45 2003/05/10 17:47:14 hamajima Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $	*/
 
@@ -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 }},
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index c506a7bcc28..9a28228f5db 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.702 2019/12/07 08:45:28 kevlo Exp $
+$OpenBSD: usbdevs,v 1.703 2020/01/05 00:54:13 jsg Exp $
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
@@ -1344,7 +1344,7 @@ product CLIPSAL 5800PC		0x0301	5800PC C-Bus Wireless
 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 Keyboard Hub
 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 phone
 /* 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	RTL8192CU
 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 */
diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c
index 6abfd76857f..6f41cf539a9 100644
--- a/sys/dev/usb/uslcom.c
+++ b/sys/dev/usb/uslcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uslcom.c,v 1.41 2019/04/24 20:36:59 remi Exp $	*/
+/*	$OpenBSD: uslcom.c,v 1.42 2020/01/05 00:54:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -120,7 +120,7 @@ static const struct usb_devno uslcom_devs[] = {
 	{ 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 },