From: sthen Date: Tue, 27 Aug 2024 12:31:43 +0000 (+0000) Subject: sync X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a27aded294634db9a7911563a4d78ba4482c3926;p=openbsd sync --- diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 80524949b94..98ff0d3a8a7 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs.h,v 1.779 2024/08/08 05:09:33 deraadt Exp $ */ +/* $OpenBSD: usbdevs.h,v 1.780 2024/08/27 12:31:43 sthen Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.767 2024/08/08 05:09:09 deraadt Exp + * OpenBSD: usbdevs,v 1.768 2024/08/27 12:31:18 sthen Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -372,6 +372,7 @@ #define USB_VENDOR_GOHUBS 0x0921 /* GoHubs */ #define USB_VENDOR_BIOMETRIC 0x0929 /* American Biometric Company */ #define USB_VENDOR_TOSHIBA 0x0930 /* Toshiba Corp */ +#define USB_VENDOR_PIXART 0x093a /* PixArt */ #define USB_VENDOR_INTREPIDCS 0x093c /* Intrepid */ #define USB_VENDOR_YANO 0x094f /* Yano */ #define USB_VENDOR_KINGSTON 0x0951 /* Kingston Technology */ @@ -1354,6 +1355,7 @@ /* Chicony products */ #define USB_PRODUCT_CHICONY_KB8933 0x0001 /* KB-8933 keyboard */ +#define USB_PRODUCT_CHICONY_OPTMOUSE 0x0939 /* Optical Mouse */ #define USB_PRODUCT_CHICONY_CAMERA 0x480c /* Integrated Camera */ #define USB_PRODUCT_CHICONY_RTL8188CUS_1 0xaff7 /* RTL8188CUS */ #define USB_PRODUCT_CHICONY_RTL8188CUS_2 0xaff8 /* RTL8188CUS */ @@ -2645,6 +2647,7 @@ #define USB_PRODUCT_LENOVO_RTL8153B_3 0x309b /* RTL8153B */ #define USB_PRODUCT_LENOVO_RTL8153B_4 0x309c /* RTL8153B */ #define USB_PRODUCT_LENOVO_RTL8153B_5 0x309d /* RTL8153B */ +#define USB_PRODUCT_LENOVO_OPTUSBMOUSE 0x600e /* Optical Mouse */ #define USB_PRODUCT_LENOVO_ETHERNET 0x7203 /* USB 2.0 Ethernet */ #define USB_PRODUCT_LENOVO_RTL8153_1 0x7205 /* RTL8153 */ #define USB_PRODUCT_LENOVO_ONELINK 0x720a /* OneLink */ @@ -2760,6 +2763,8 @@ #define USB_PRODUCT_LOGITECH_WMMOUSE 0xc004 /* WingMan Gaming Mouse */ #define USB_PRODUCT_LOGITECH_BD58 0xc00c /* BD58 mouse */ #define USB_PRODUCT_LOGITECH_UN58A 0xc030 /* iFeel Mouse */ +#define USB_PRODUCT_LOGITECH_B100_1 0xc05a /* B100 mouse */ +#define USB_PRODUCT_LOGITECH_B100_2 0xc077 /* B100 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 */ @@ -3146,6 +3151,7 @@ #define USB_PRODUCT_MICROSOFT_TBEXPLORER 0x0024 /* Trackball Explorer */ #define USB_PRODUCT_MICROSOFT_INTELLIEYE 0x0025 /* IntelliEye mouse */ #define USB_PRODUCT_MICROSOFT_INETPRO2 0x002b /* Internet Keyboard Pro */ +#define USB_PRODUCT_MICROSOFT_PIXARTMOUSE 0x00cb /* Optical Mouse */ #define USB_PRODUCT_MICROSOFT_MN510 0x006e /* MN510 Wireless */ #define USB_PRODUCT_MICROSOFT_700WX 0x0079 /* Palm 700WX */ #define USB_PRODUCT_MICROSOFT_MN110 0x007a /* 10/100 Ethernet */ @@ -3607,6 +3613,10 @@ #define USB_PRODUCT_PIONEERDJ_RTL8152B 0x0007 /* RTL8152B */ #define USB_PRODUCT_PIONEERDJ_RTL8153B 0x0031 /* RTL8153B */ +/* PixArt products */ + +#define USB_PRODUCT_PIXART_RPIMOUSE 0x2510 /* Raspberry Pi Mouse */ + /* Planex Communications products */ #define USB_PRODUCT_PLANEX_GW_US11H 0x14ea /* GW-US11H WLAN */ #define USB_PRODUCT_PLANEX2_RTL8188CUS 0x1201 /* RTL8188CUS */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 6cb37aa3755..3a7644ade13 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs_data.h,v 1.773 2024/08/08 05:09:33 deraadt Exp $ */ +/* $OpenBSD: usbdevs_data.h,v 1.774 2024/08/27 12:31:43 sthen Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.767 2024/08/08 05:09:09 deraadt Exp + * OpenBSD: usbdevs,v 1.768 2024/08/27 12:31:18 sthen Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -1941,6 +1941,10 @@ const struct usb_known_product usb_known_products[] = { USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_KB8933, "KB-8933 keyboard", }, + { + USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_OPTMOUSE, + "Optical Mouse", + }, { USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_CAMERA, "Integrated Camera", @@ -5841,6 +5845,10 @@ const struct usb_known_product usb_known_products[] = { USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_RTL8153B_5, "RTL8153B", }, + { + USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_OPTUSBMOUSE, + "Optical Mouse", + }, { USB_VENDOR_LENOVO, USB_PRODUCT_LENOVO_ETHERNET, "USB 2.0 Ethernet", @@ -6229,6 +6237,14 @@ const struct usb_known_product usb_known_products[] = { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_UN58A, "iFeel Mouse", }, + { + USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_B100_1, + "B100 mouse", + }, + { + USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_B100_2, + "B100 mouse", + }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD, "WingMan GamePad Extreme", @@ -7605,6 +7621,10 @@ const struct usb_known_product usb_known_products[] = { USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INETPRO2, "Internet Keyboard Pro", }, + { + USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_PIXARTMOUSE, + "Optical Mouse", + }, { USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN510, "MN510 Wireless", @@ -8881,6 +8901,10 @@ const struct usb_known_product usb_known_products[] = { USB_VENDOR_PIONEERDJ, USB_PRODUCT_PIONEERDJ_RTL8153B, "RTL8153B", }, + { + USB_VENDOR_PIXART, USB_PRODUCT_PIXART_RPIMOUSE, + "Raspberry Pi Mouse", + }, { USB_VENDOR_PLANEX, USB_PRODUCT_PLANEX_GW_US11H, "GW-US11H WLAN", @@ -13597,6 +13621,10 @@ const struct usb_known_vendor usb_known_vendors[] = { USB_VENDOR_TOSHIBA, "Toshiba Corp", }, + { + USB_VENDOR_PIXART, + "PixArt", + }, { USB_VENDOR_INTREPIDCS, "Intrepid",