summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2004-04-10 08:11:21 +0000
committerderaadt <deraadt@openbsd.org>2004-04-10 08:11:21 +0000
commitc409cb899cbd8b18a1fb1d96250b9c34a48878ab (patch)
treee7dc4b97b1355943d3255c2bd9e379b28d7c5f9e
parentSupport for Sony Clie PEG-TJ25; from ilya voronin <ivoronin@ivoronin.pp.ru> (diff)
downloadwireguard-openbsd-c409cb899cbd8b18a1fb1d96250b9c34a48878ab.tar.xz
wireguard-openbsd-c409cb899cbd8b18a1fb1d96250b9c34a48878ab.zip
minolta dimage A1 quirk; 3734, michael@paddon.org
-rw-r--r--sys/dev/usb/umass_quirks.c10
-rw-r--r--sys/dev/usb/usbdevs3
2 files changed, 11 insertions, 2 deletions
diff --git a/sys/dev/usb/umass_quirks.c b/sys/dev/usb/umass_quirks.c
index 1c107d7dc02..dd3bc4ce005 100644
--- a/sys/dev/usb/umass_quirks.c
+++ b/sys/dev/usb/umass_quirks.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umass_quirks.c,v 1.10 2004/02/21 00:47:42 krw Exp $ */
+/* $OpenBSD: umass_quirks.c,v 1.11 2004/04/10 08:11:21 deraadt Exp $ */
/* $NetBSD: umass_quirks.c,v 1.39 2003/05/08 15:19:47 augustss Exp $ */
/*
@@ -224,6 +224,14 @@ Static const struct umass_quirk umass_quirks[] = {
NULL, NULL
},
+ { { USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_DIMAGEA1 },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ UMASS_QUIRK_NO_MAX_LUN,
+ 0,
+ UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
+ NULL, NULL
+ },
+
{ { USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
UMASS_QUIRK_NO_MAX_LUN,
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index be72050e854..f395528e14d 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.79 2004/04/10 08:03:52 grange Exp $
+$OpenBSD: usbdevs,v 1.80 2004/04/10 08:11:21 deraadt Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@@ -1065,6 +1065,7 @@ product MINDSATWORK DW 0x0001 Digital Wallet
product MINOLTA S304 0x4007 Dimage S304
product MINOLTA X 0x4009 Dimage X
product MINOLTA DIMAGE7I 0x400b Dimage 7i
+product MINOLTA DIMAGEA1 0x401a Dimage A1
/* Mitsumi products */
product MITSUMI CDRRW 0x0000 CD-R/RW Drive