cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support for CyberShot A70; from Alexey E. Suslikov; ok sturm@

Browse Source
This commit is contained in:
markus 2004-09-23 12:24:11 +00:00
parent f8d56a3260
commit 43d0acfb98
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/s10sh/patches/patch-usb_c
View File

@ -1,7 +1,6 @@
$OpenBSD: patch-usb_c,v 1.3 2002/12/30 08:44:36 pvalchev Exp $
--- usb.c.orig Tue Mar 13 06:46:18 2001
+++ usb.c Mon Dec 30 00:30:02 2002
@@ -84,11 +84,23 @@ int USB_camera_init(struct usb_device **
--- usb.c.orig Tue Mar 13 15:46:18 2001
+++ usb.c Sun Sep 19 23:03:00 2004
@@ -84,11 +84,29 @@
printf("Canon S20 found\n");
return USB_INIT_S20;
break;
@ -10,6 +9,12 @@ $OpenBSD: patch-usb_c,v 1.3 2002/12/30 08:44:36 pvalchev Exp $
+ if (opt_debug)
+ printf("Canon S40 found\n");
+ return USB_INIT_S40;
+ break;
+ case PRODUCT_ID_A70:
+ *camera_dev = dev;
+ if (opt_debug)
+ printf("Canon A70 found\n");
+ return USB_INIT_A70;
+ break;
case PRODUCT_ID_S100_EU:
case PRODUCT_ID_S100_US:

10
graphics/s10sh/patches/patch-usb_h
View File

@ -1,18 +1,20 @@
$OpenBSD: patch-usb_h,v 1.2 2002/08/21 13:38:49 jcs Exp $
--- usb.h.orig Tue Mar 13 07:46:18 2001
+++ usb.h Sat Aug 17 16:02:27 2002
@@ -19,15 +19,18 @@
--- usb.h.orig Tue Mar 13 15:46:18 2001
+++ usb.h Sun Sep 19 23:00:24 2004
@@ -19,6 +19,8 @@
#define USB_INIT_S20 2 /* S20 found */
#define USB_INIT_S100 3 /* S100 (Digital Ixus) found */
#define USB_INIT_G1 4 /* G1 found */
+#define USB_INIT_S40 5 /* S40 found */
+#define USB_INIT_A70 6 /* A70 found */
#define USB_INIT_NEW 100 /* Unsupported PowerShot found! */
#define USB_INIT_FAILED -1 /* Unable to initialize USB */
@@ -25,9 +27,12 @@
#define VENDOR_ID_CANON 0x04A9
#define PRODUCT_ID_S10 0x3041 /* PowerShot S10 */
#define PRODUCT_ID_S20 0x3043 /* PowerShot S20 */
+#define PRODUCT_ID_S40 0x3056 /* PowerShot S40 */
+#define PRODUCT_ID_A70 0x3073 /* PowerShot A70 */
#define PRODUCT_ID_S100_US 0x3045 /* S100, aka. Digital Ixus, Elph */
#define PRODUCT_ID_S100_EU 0x3047 /* S100, aka. Digital Ixus, Elph */
#define PRODUCT_ID_G1 0x3048 /* PowerShot G1 */