Module Name: src Committed By: dholland Date: Wed Feb 28 21:52:40 UTC 2024
Modified Files: src/sys/dev/usb: usb_quirks.c usbdevs.h usbdevs_data.h Log Message: usbdevs: regen; usb_quirks.c: update to match Regen for additional Logitech B100, and update the UQ_ALWAYS_ON entry to refer to both device ids. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/dev/usb/usb_quirks.c cvs rdiff -u -r1.805 -r1.806 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/usb_quirks.c diff -u src/sys/dev/usb/usb_quirks.c:1.107 src/sys/dev/usb/usb_quirks.c:1.108 --- src/sys/dev/usb/usb_quirks.c:1.107 Sun May 14 23:58:35 2023 +++ src/sys/dev/usb/usb_quirks.c Wed Feb 28 21:52:40 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: usb_quirks.c,v 1.107 2023/05/14 23:58:35 pgoyette Exp $ */ +/* $NetBSD: usb_quirks.c,v 1.108 2024/02/28 21:52:40 dholland Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */ /* @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.107 2023/05/14 23:58:35 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.108 2024/02/28 21:52:40 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -399,7 +399,9 @@ Static const struct usbd_quirk_entry { { UQ_ALWAYS_ON, NULL }}, { USB_VENDOR_PIXART, USB_PRODUCT_PIXART_RPIMOUSE, ANY, { UQ_ALWAYS_ON, NULL }}, - { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_B100, ANY, + { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_B100_1, ANY, + { UQ_ALWAYS_ON, NULL }}, + { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_B100_2, ANY, { UQ_ALWAYS_ON, NULL }}, { USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_OPTUSBMOUSE, ANY, { UQ_ALWAYS_ON, NULL }}, /* Index: src/sys/dev/usb/usbdevs.h diff -u src/sys/dev/usb/usbdevs.h:1.805 src/sys/dev/usb/usbdevs.h:1.806 --- src/sys/dev/usb/usbdevs.h:1.805 Sat Jan 13 15:22:40 2024 +++ src/sys/dev/usb/usbdevs.h Wed Feb 28 21:52:40 2024 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.805 2024/01/13 15:22:40 hgutch Exp $ */ +/* $NetBSD: usbdevs.h,v 1.806 2024/02/28 21:52:40 dholland Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.813 2024/01/13 14:42:14 hgutch Exp + * NetBSD: usbdevs,v 1.814 2024/02/28 21:50:51 dholland Exp */ /*- @@ -2204,7 +2204,8 @@ #define USB_PRODUCT_LOGITECH_USBPS2MOUSE 0xc00e /* USB-PS/2 Optical Mouse */ #define USB_PRODUCT_LOGITECH_MUV55A 0xc016 /* M-UV55a */ #define USB_PRODUCT_LOGITECH_UN58A 0xc030 /* iFeel Mouse */ -#define USB_PRODUCT_LOGITECH_B100 0xc077 /* B100 Optical Mouse */ +#define USB_PRODUCT_LOGITECH_B100_1 0xc05a /* B100 Optical Mouse */ +#define USB_PRODUCT_LOGITECH_B100_2 0xc077 /* B100 Optical Mouse */ #define USB_PRODUCT_LOGITECH_WMPAD 0xc208 /* WingMan GamePad Extreme */ #define USB_PRODUCT_LOGITECH_WMRPAD 0xc20a /* WingMan RumblePad */ #define USB_PRODUCT_LOGITECH_WMJOY 0xc281 /* WingMan Force joystick */ Index: src/sys/dev/usb/usbdevs_data.h diff -u src/sys/dev/usb/usbdevs_data.h:1.805 src/sys/dev/usb/usbdevs_data.h:1.806 --- src/sys/dev/usb/usbdevs_data.h:1.805 Sat Jan 13 15:22:40 2024 +++ src/sys/dev/usb/usbdevs_data.h Wed Feb 28 21:52:40 2024 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs_data.h,v 1.805 2024/01/13 15:22:40 hgutch Exp $ */ +/* $NetBSD: usbdevs_data.h,v 1.806 2024/02/28 21:52:40 dholland Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.813 2024/01/13 14:42:14 hgutch Exp + * NetBSD: usbdevs,v 1.814 2024/02/28 21:50:51 dholland Exp */ /*- @@ -2903,7 +2903,9 @@ static const uint32_t usb_products[] = { 13531, 0, USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_UN58A, 13539, 6494, 0, - USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_B100, + USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_B100_1, + 13545, 3370, 6494, 0, + USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_B100_2, 13545, 3370, 6494, 0, USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD, 13502, 10939, 13550, 0, @@ -5519,7 +5521,7 @@ static const char usb_words[] = { "." "Cambridge\0" /* 1 refs @ 3349 */ "Radio\0" /* 8 refs @ 3359 */ "Trek\0" /* 1 refs @ 3365 */ - "Optical\0" /* 9 refs @ 3370 */ + "Optical\0" /* 10 refs @ 3370 */ "ShanTou\0" /* 1 refs @ 3378 */ "MediaGear\0" /* 1 refs @ 3386 */ "Broadcom\0" /* 2 refs @ 3396 */ @@ -5926,7 +5928,7 @@ static const char usb_words[] = { "." "(Wellspring2/JIS)\0" /* 1 refs @ 6463 */ "mouse\0" /* 16 refs @ 6481 */ "Mighty\0" /* 2 refs @ 6487 */ - "Mouse\0" /* 18 refs @ 6494 */ + "Mouse\0" /* 19 refs @ 6494 */ "Trackpad\0" /* 3 refs @ 6500 */ "(Fountain)\0" /* 1 refs @ 6509 */ "(Geyser)\0" /* 1 refs @ 6520 */ @@ -6877,7 +6879,7 @@ static const char usb_words[] = { "." "USB-PS/2\0" /* 2 refs @ 13522 */ "M-UV55a\0" /* 1 refs @ 13531 */ "iFeel\0" /* 1 refs @ 13539 */ - "B100\0" /* 1 refs @ 13545 */ + "B100\0" /* 2 refs @ 13545 */ "Extreme\0" /* 1 refs @ 13550 */ "RumblePad\0" /* 1 refs @ 13558 */ "Force\0" /* 2 refs @ 13568 */