diff options
| -rw-r--r-- | sys/cam/scsi/scsi_da.c | 7 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs | 4 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs.h | 4 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 12 |
4 files changed, 27 insertions, 0 deletions
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index fd9ca9e..4ad0191 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -354,6 +354,13 @@ static struct da_quirk_entry da_quirk_table[] = */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "DIVA USB", "Media Reader","*"}, /*quirks*/ DA_Q_NO_6_BYTE + }, + { + /* + * Daisy Technology PhotoClip USB Camera + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "Digital", "World DMC","*"}, + /*quirks*/ DA_Q_NO_6_BYTE } }; diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 30bfbfb..2acd4ee 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -325,6 +325,7 @@ vendor INSIDEOUT 0x1608 Inside Out Networks vendor ENTREGA 0x1645 Entrega vendor ACTIONTEC 0x1668 Actiontec Electronics, Inc. vendor DLINK 0x2001 D-Link Corp +vendor DAISY 0x3579 Daisy Technology vendor INTEL 0x8086 Intel vendor HP2 0xf003 Hewlett-Packard @@ -491,6 +492,9 @@ product DLINK DSB650TX 0x4002 10/100 ethernet adapter product DLINK DSB650TX_PNA 0x4003 1/10/100 ethernet adapter product DLINK DSB650 0xABC1 10/100 ethernet adapter +/* Daisy Technology products */ +product DAISY DMC 0x6901 PhotoClip Camera + /* Dallas Semiconductor products */ product DALLAS J6502 0x4201 J-6502 speakers diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 617aab1..fd37075 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -332,6 +332,7 @@ #define USB_VENDOR_ENTREGA 0x1645 /* Entrega */ #define USB_VENDOR_ACTIONTEC 0x1668 /* Actiontec Electronics, Inc. */ #define USB_VENDOR_DLINK 0x2001 /* D-Link Corp */ +#define USB_VENDOR_DAISY 0x3579 /* Daisy Technology */ #define USB_VENDOR_INTEL 0x8086 /* Intel */ #define USB_VENDOR_HP2 0xf003 /* Hewlett-Packard */ @@ -498,6 +499,9 @@ #define USB_PRODUCT_DLINK_DSB650TX_PNA 0x4003 /* 1/10/100 ethernet adapter */ #define USB_PRODUCT_DLINK_DSB650 0xABC1 /* 10/100 ethernet adapter */ +/* Daisy Technology products */ +#define USB_PRODUCT_DAISY_DMC 0x6901 /* PhotoClip Camera */ + /* Dallas Semiconductor products */ #define USB_PRODUCT_DALLAS_J6502 0x4201 /* J-6502 speakers */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 4af0b89..fab5a45 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -532,6 +532,12 @@ struct usb_knowndev usb_knowndevs[] = { "10/100 ethernet adapter", }, { + USB_VENDOR_DAISY, USB_PRODUCT_DAISY_DMC, + 0, + "Daisy Technology", + "PhotoClip Camera", + }, + { USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502, 0, "Dallas Semiconductor", @@ -3838,6 +3844,12 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_DAISY, 0, + USB_KNOWNDEV_NOPROD, + "Daisy Technology", + NULL, + }, + { USB_VENDOR_INTEL, 0, USB_KNOWNDEV_NOPROD, "Intel", |
