diff options
| author | Todd T. Fries <todd@cvs.openbsd.org> | 2007-01-05 15:40:51 +0000 |
|---|---|---|
| committer | Todd T. Fries <todd@cvs.openbsd.org> | 2007-01-05 15:40:51 +0000 |
| commit | cfb9e9c8b88448fe3426fd7968fc3dc23d763fe4 (patch) | |
| tree | e54f748dbb45d123cb96681819614411b1664cf1 | |
| parent | d36f716d616bc5b20ebd36d659329c5618909886 (diff) | |
sync
| -rw-r--r-- | sys/dev/usb/usbdevs.h | 7 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 16 |
2 files changed, 19 insertions, 4 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index a42b9d7ecb5..ca38d6a9b6f 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs.h,v 1.254 2007/01/05 00:15:18 krw Exp $ */ +/* $OpenBSD: usbdevs.h,v 1.255 2007/01/05 15:40:50 todd Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.248 2007/01/05 00:12:09 krw Exp + * OpenBSD: usbdevs,v 1.249 2007/01/05 15:40:14 todd Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -816,12 +816,14 @@ #define USB_PRODUCT_CANON_N1220U 0x2207 /* CANOSCAN N1220U */ #define USB_PRODUCT_CANON_N670U 0x220d /* CANOSCAN N670U */ #define USB_PRODUCT_CANON_N1240U 0x220e /* CANOSCAN N1240U */ +#define USB_PRODUCT_CANON_LIDE60 0x221c /* CANOSCAN LiDE60 */ #define USB_PRODUCT_CANON_S10 0x3041 /* PowerShot S10 */ #define USB_PRODUCT_CANON_S20 0x3043 /* PowerShot S20 */ #define USB_PRODUCT_CANON_S100_US 0x3045 /* PowerShot S100 */ #define USB_PRODUCT_CANON_S100_EU 0x3047 /* PowerShot S100 */ #define USB_PRODUCT_CANON_G1 0x3048 /* PowerShot G1 */ #define USB_PRODUCT_CANON_A20 0x304e /* PowerShot A20 */ +#define USB_PRODUCT_CANON_A540 0x311b /* PowerShot A540 */ /* CATC products */ #define USB_PRODUCT_CATC_NETMATE 0x000a /* Netmate Ethernet */ @@ -1353,6 +1355,7 @@ #define USB_PRODUCT_KENSINGTON_ORBIT 0x1003 /* Orbit trackball */ #define USB_PRODUCT_KENSINGTON_TURBOBALL 0x1005 /* TurboBall */ #define USB_PRODUCT_KENSINGTON_ORBIT_MAC 0x1009 /* Orbit trackball for Mac */ +#define USB_PRODUCT_KENSINGTON_BT_EDR 0x105e /* Bluetooth */ #define USB_PRODUCT_KENSINGTON_VIDEOCAM_VGA 0x5002 /* VideoCAM VGA */ /* Keyspan products */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 534298bbc7c..1dcb94b875e 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.251 2007/01/05 00:15:18 krw Exp $ */ +/* $OpenBSD: usbdevs_data.h,v 1.252 2007/01/05 15:40:50 todd Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.248 2007/01/05 00:12:09 krw Exp + * OpenBSD: usbdevs,v 1.249 2007/01/05 15:40:14 todd Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -787,6 +787,10 @@ const struct usb_known_product usb_known_products[] = { "CANOSCAN N1240U", }, { + USB_VENDOR_CANON, USB_PRODUCT_CANON_LIDE60, + "CANOSCAN LiDE60", + }, + { USB_VENDOR_CANON, USB_PRODUCT_CANON_S10, "PowerShot S10", }, @@ -811,6 +815,10 @@ const struct usb_known_product usb_known_products[] = { "PowerShot A20", }, { + USB_VENDOR_CANON, USB_PRODUCT_CANON_A540, + "PowerShot A540", + }, + { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE, "Netmate Ethernet", }, @@ -2179,6 +2187,10 @@ const struct usb_known_product usb_known_products[] = { "Orbit trackball for Mac", }, { + USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_BT_EDR, + "Bluetooth", + }, + { USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_VIDEOCAM_VGA, "VideoCAM VGA", }, |