ports/54743: Add support for Canon PowerShot A60 to s10sh port

[Artem 'Zazoobr' Ignatjev]

>Number:         54743
>Category:       ports
>Synopsis:       Add support for Canon PowerShot A60 to s10sh port
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 22 01:40:18 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Artem 'Zazoobr' Ignatjev
>Release:        FreeBSD 5.0-RELEASE-p4 i386
>Organization:
PhML 1511 tied to MEPhI
>Environment:
System: FreeBSD memphis.mephi.ru 5.0-RELEASE-p4 FreeBSD 5.0-RELEASE-p4 #3: Wed Apr 2 22:44:43 MSD 2003 root@:/usr/src/sys/i386/compile/MEMPHIS.5 i386


	
>Description:
	Following patch lets s10sh talk to Canon PowerShot A60 cameras
	
>How-To-Repeat:
	# cd /usr/ports/graphics/s10sh && make install
	plug the Canon A60 PowerShot camera to your computer
	# s10sh -u -a
	 It will complain that no camera found
	
>Fix:

	apply following patch:

--- patch-s10sh-a60 begins here ---
diff -U3 /usr/ports/graphics/s10sh/work/s10sh-0.2.0/usb.c s10sh-0.2.0/usb.c
--- /usr/ports/graphics/s10sh/work/s10sh-0.2.0/usb.c	Mon Jul 21 19:24:25 2003
+++ s10sh-0.2.0/usb.c	Mon Jul 21 19:27:37 2003
@@ -90,6 +90,12 @@
 						printf("Canon A20 found\n");
 					return USB_INIT_A20;
 					break;
+				case PRODUCT_ID_A60:
+					*camera_dev = dev;
+					if (opt_debug)
+						printf("Canon A60 found\n");
+					return USB_INIT_A20;
+					break;
 				case PRODUCT_ID_S100_EU:
 				case PRODUCT_ID_S100_US:
 					*camera_dev = dev;
diff -U3 /usr/ports/graphics/s10sh/work/s10sh-0.2.0/usb.h s10sh-0.2.0/usb.h
--- /usr/ports/graphics/s10sh/work/s10sh-0.2.0/usb.h	Mon Jul 21 19:24:25 2003
+++ s10sh-0.2.0/usb.h	Mon Jul 21 19:25:25 2003
@@ -29,6 +29,7 @@
 #define PRODUCT_ID_S10          0x3041	/* PowerShot S10 */
 #define PRODUCT_ID_S20          0x3043	/* PowerShot S20 */
 #define PRODUCT_ID_A20		0x304E  /* PowerShot A20 */
+#define PRODUCT_ID_A60		0x3074	/* PowerShot A60 */
 #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 */
--- patch-s10sh-a60 ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: