View | Details | Raw Unified | Return to bug 35128
Collapse All | Expand All

(-)usb.c (+6 lines)
Lines 84-89 Link Here
84 
						printf("Canon S20 found\n");
 84 
						printf("Canon S20 found\n");
85 
					return USB_INIT_S20;
 85 
					return USB_INIT_S20;
86 
					break;
 86 
					break;
87 
				case PRODUCT_ID_A20:
88 
					*camera_dev = dev;
89 
					if (opt_debug)
90 
						printf("Canon A20 found\n");
91 
					return USB_INIT_A20;
92 
					break;
87 
				case PRODUCT_ID_S100_EU:
 93 
				case PRODUCT_ID_S100_EU:
88 
				case PRODUCT_ID_S100_US:
 94 
				case PRODUCT_ID_S100_US:
89 
					*camera_dev = dev;
 95 
					*camera_dev = dev;
(-)usb.h (+2 lines)
Lines 19-30 Link Here
19 
#define USB_INIT_S20            2       /* S20 found */
 19 
#define USB_INIT_S20            2       /* S20 found */
20 
#define USB_INIT_S100		3	/* S100 (Digital Ixus) found */
 20 
#define USB_INIT_S100		3	/* S100 (Digital Ixus) found */
21 
#define USB_INIT_G1		4	/* G1 found */
 21 
#define USB_INIT_G1		4	/* G1 found */
22 
#define USB_INIT_A20		5	/* A20 found */
22 
#define USB_INIT_NEW		100	/* Unsupported PowerShot found! */
 23 
#define USB_INIT_NEW		100	/* Unsupported PowerShot found! */
23 
#define USB_INIT_FAILED         -1      /* Unable to initialize USB */
 24 
#define USB_INIT_FAILED         -1      /* Unable to initialize USB */
24 

          25
          

        

        

          25
          
#define VENDOR_ID_CANON         0x04A9

          26
          
#define VENDOR_ID_CANON         0x04A9

        

        

          26
          
#define PRODUCT_ID_S10          0x3041	/* PowerShot S10 */

          27
          
#define PRODUCT_ID_S10          0x3041	/* PowerShot S10 */

        

        

          27
          
#define PRODUCT_ID_S20          0x3043	/* PowerShot S20 */

          28
          
#define PRODUCT_ID_S20          0x3043	/* PowerShot S20 */

        

            

              
              
              29
              
#define PRODUCT_ID_A20		0x304E  /* PowerShot A20 */

            

        

          28
          
#define PRODUCT_ID_S100_US	0x3045	/* S100, aka. Digital Ixus, Elph */

          30
          
#define PRODUCT_ID_S100_US	0x3045	/* S100, aka. Digital Ixus, Elph */

        

        

          29
          
#define PRODUCT_ID_S100_EU	0x3047	/* S100, aka. Digital Ixus, Elph */

          31
          
#define PRODUCT_ID_S100_EU	0x3047	/* S100, aka. Digital Ixus, Elph */

        

        

          30
          
#define PRODUCT_ID_G1		0x3048	/* PowerShot G1 */

          32
          
#define PRODUCT_ID_G1		0x3048	/* PowerShot G1 */

        






  

  Return to bug 35128