diff options
Diffstat (limited to 'drivers/media/usb/gspca')
-rw-r--r-- | drivers/media/usb/gspca/gl860/gl860-mi1320.c | 87 | ||||
-rw-r--r-- | drivers/media/usb/gspca/gl860/gl860-ov9655.c | 169 | ||||
-rw-r--r-- | drivers/media/usb/gspca/gspca.c | 2 | ||||
-rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_ov7660.h | 1 | ||||
-rw-r--r-- | drivers/media/usb/gspca/sn9c20x.c | 22 |
5 files changed, 189 insertions, 92 deletions
diff --git a/drivers/media/usb/gspca/gl860/gl860-mi1320.c b/drivers/media/usb/gspca/gl860/gl860-mi1320.c index 0749fe13160f..d6a540ed378c 100644 --- a/drivers/media/usb/gspca/gl860/gl860-mi1320.c +++ b/drivers/media/usb/gspca/gl860/gl860-mi1320.c @@ -50,42 +50,69 @@ static struct validx tbl_post_unset_alt[] = { }; static u8 *tbl_1280[] = { - "\x0d\x80\xf1\x08\x03\x04\xf1\x00" "\x04\x05\xf1\x02\x05\x00\xf1\xf1" - "\x06\x00\xf1\x0d\x20\x01\xf1\x00" "\x21\x84\xf1\x00\x0d\x00\xf1\x08" - "\xf0\x00\xf1\x01\x34\x00\xf1\x00" "\x9b\x43\xf1\x00\xa6\x05\xf1\x00" - "\xa9\x04\xf1\x00\xa1\x05\xf1\x00" "\xa4\x04\xf1\x00\xae\x0a\xf1\x08" - , - "\xf0\x00\xf1\x02\x3a\x05\xf1\xf1" "\x3c\x05\xf1\xf1\x59\x01\xf1\x47" - "\x5a\x01\xf1\x88\x5c\x0a\xf1\x06" "\x5d\x0e\xf1\x0a\x64\x5e\xf1\x1c" - "\xd2\x00\xf1\xcf\xcb\x00\xf1\x01" - , - "\xd3\x02\xd4\x28\xd5\x01\xd0\x02" "\xd1\x18\xd2\xc1" + (u8[]){ + 0x0d, 0x80, 0xf1, 0x08, 0x03, 0x04, 0xf1, 0x00, + 0x04, 0x05, 0xf1, 0x02, 0x05, 0x00, 0xf1, 0xf1, + 0x06, 0x00, 0xf1, 0x0d, 0x20, 0x01, 0xf1, 0x00, + 0x21, 0x84, 0xf1, 0x00, 0x0d, 0x00, 0xf1, 0x08, + 0xf0, 0x00, 0xf1, 0x01, 0x34, 0x00, 0xf1, 0x00, + 0x9b, 0x43, 0xf1, 0x00, 0xa6, 0x05, 0xf1, 0x00, + 0xa9, 0x04, 0xf1, 0x00, 0xa1, 0x05, 0xf1, 0x00, + 0xa4, 0x04, 0xf1, 0x00, 0xae, 0x0a, 0xf1, 0x08 + }, (u8[]){ + 0xf0, 0x00, 0xf1, 0x02, 0x3a, 0x05, 0xf1, 0xf1, + 0x3c, 0x05, 0xf1, 0xf1, 0x59, 0x01, 0xf1, 0x47, + 0x5a, 0x01, 0xf1, 0x88, 0x5c, 0x0a, 0xf1, 0x06, + 0x5d, 0x0e, 0xf1, 0x0a, 0x64, 0x5e, 0xf1, 0x1c, + 0xd2, 0x00, 0xf1, 0xcf, 0xcb, 0x00, 0xf1, 0x01 + }, (u8[]){ + 0xd3, 0x02, 0xd4, 0x28, 0xd5, 0x01, 0xd0, 0x02, + 0xd1, 0x18, 0xd2, 0xc1 + } }; static u8 *tbl_800[] = { - "\x0d\x80\xf1\x08\x03\x03\xf1\xc0" "\x04\x05\xf1\x02\x05\x00\xf1\xf1" - "\x06\x00\xf1\x0d\x20\x01\xf1\x00" "\x21\x84\xf1\x00\x0d\x00\xf1\x08" - "\xf0\x00\xf1\x01\x34\x00\xf1\x00" "\x9b\x43\xf1\x00\xa6\x05\xf1\x00" - "\xa9\x03\xf1\xc0\xa1\x03\xf1\x20" "\xa4\x02\xf1\x5a\xae\x0a\xf1\x08" - , - "\xf0\x00\xf1\x02\x3a\x05\xf1\xf1" "\x3c\x05\xf1\xf1\x59\x01\xf1\x47" - "\x5a\x01\xf1\x88\x5c\x0a\xf1\x06" "\x5d\x0e\xf1\x0a\x64\x5e\xf1\x1c" - "\xd2\x00\xf1\xcf\xcb\x00\xf1\x01" - , - "\xd3\x02\xd4\x18\xd5\x21\xd0\x02" "\xd1\x10\xd2\x59" + (u8[]){ + 0x0d, 0x80, 0xf1, 0x08, 0x03, 0x03, 0xf1, 0xc0, + 0x04, 0x05, 0xf1, 0x02, 0x05, 0x00, 0xf1, 0xf1, + 0x06, 0x00, 0xf1, 0x0d, 0x20, 0x01, 0xf1, 0x00, + 0x21, 0x84, 0xf1, 0x00, 0x0d, 0x00, 0xf1, 0x08, + 0xf0, 0x00, 0xf1, 0x01, 0x34, 0x00, 0xf1, 0x00, + 0x9b, 0x43, 0xf1, 0x00, 0xa6, 0x05, 0xf1, 0x00, + 0xa9, 0x03, 0xf1, 0xc0, 0xa1, 0x03, 0xf1, 0x20, + 0xa4, 0x02, 0xf1, 0x5a, 0xae, 0x0a, 0xf1, 0x08 + }, (u8[]){ + 0xf0, 0x00, 0xf1, 0x02, 0x3a, 0x05, 0xf1, 0xf1, + 0x3c, 0x05, 0xf1, 0xf1, 0x59, 0x01, 0xf1, 0x47, + 0x5a, 0x01, 0xf1, 0x88, 0x5c, 0x0a, 0xf1, 0x06, + 0x5d, 0x0e, 0xf1, 0x0a, 0x64, 0x5e, 0xf1, 0x1c, + 0xd2, 0x00, 0xf1, 0xcf, 0xcb, 0x00, 0xf1, 0x01 + }, (u8[]){ + 0xd3, 0x02, 0xd4, 0x18, 0xd5, 0x21, 0xd0, 0x02, + 0xd1, 0x10, 0xd2, 0x59 + } }; static u8 *tbl_640[] = { - "\x0d\x80\xf1\x08\x03\x04\xf1\x04" "\x04\x05\xf1\x02\x07\x01\xf1\x7c" - "\x08\x00\xf1\x0e\x21\x80\xf1\x00" "\x0d\x00\xf1\x08\xf0\x00\xf1\x01" - "\x34\x10\xf1\x10\x3a\x43\xf1\x00" "\xa6\x05\xf1\x02\xa9\x04\xf1\x04" - "\xa7\x02\xf1\x81\xaa\x01\xf1\xe2" "\xae\x0c\xf1\x09" - , - "\xf0\x00\xf1\x02\x39\x03\xf1\xfc" "\x3b\x04\xf1\x04\x57\x01\xf1\xb6" - "\x58\x02\xf1\x0d\x5c\x1f\xf1\x19" "\x5d\x24\xf1\x1e\x64\x5e\xf1\x1c" - "\xd2\x00\xf1\x00\xcb\x00\xf1\x01" - , - "\xd3\x02\xd4\x10\xd5\x81\xd0\x02" "\xd1\x08\xd2\xe1" + (u8[]){ + 0x0d, 0x80, 0xf1, 0x08, 0x03, 0x04, 0xf1, 0x04, + 0x04, 0x05, 0xf1, 0x02, 0x07, 0x01, 0xf1, 0x7c, + 0x08, 0x00, 0xf1, 0x0e, 0x21, 0x80, 0xf1, 0x00, + 0x0d, 0x00, 0xf1, 0x08, 0xf0, 0x00, 0xf1, 0x01, + 0x34, 0x10, 0xf1, 0x10, 0x3a, 0x43, 0xf1, 0x00, + 0xa6, 0x05, 0xf1, 0x02, 0xa9, 0x04, 0xf1, 0x04, + 0xa7, 0x02, 0xf1, 0x81, 0xaa, 0x01, 0xf1, 0xe2, + 0xae, 0x0c, 0xf1, 0x09 + }, (u8[]){ + 0xf0, 0x00, 0xf1, 0x02, 0x39, 0x03, 0xf1, 0xfc, + 0x3b, 0x04, 0xf1, 0x04, 0x57, 0x01, 0xf1, 0xb6, + 0x58, 0x02, 0xf1, 0x0d, 0x5c, 0x1f, 0xf1, 0x19, + 0x5d, 0x24, 0xf1, 0x1e, 0x64, 0x5e, 0xf1, 0x1c, + 0xd2, 0x00, 0xf1, 0x00, 0xcb, 0x00, 0xf1, 0x01 + }, (u8[]){ + 0xd3, 0x02, 0xd4, 0x10, 0xd5, 0x81, 0xd0, 0x02, + 0xd1, 0x08, 0xd2, 0xe1 + } }; static s32 tbl_sat[] = {0x25, 0x1d, 0x15, 0x0d, 0x05, 0x4d, 0x55, 0x5d, 0x2d}; diff --git a/drivers/media/usb/gspca/gl860/gl860-ov9655.c b/drivers/media/usb/gspca/gl860/gl860-ov9655.c index 59b87d066187..766677ebcb34 100644 --- a/drivers/media/usb/gspca/gl860/gl860-ov9655.c +++ b/drivers/media/usb/gspca/gl860/gl860-ov9655.c @@ -25,69 +25,118 @@ static struct validx tbl_commmon[] = { static s32 tbl_length[] = {12, 56, 52, 54, 56, 42, 32, 12}; static u8 *tbl_640[] = { - "\x00\x40\x07\x6a\x06\xf3\x0d\x6a" "\x10\x10\xc1\x01" - , - "\x12\x80\x00\x00\x01\x98\x02\x80" "\x03\x12\x04\x03\x0b\x57\x0e\x61" - "\x0f\x42\x11\x01\x12\x60\x13\x00" "\x14\x3a\x16\x24\x17\x14\x18\x00" - "\x19\x01\x1a\x3d\x1e\x04\x24\x3c" "\x25\x36\x26\x72\x27\x08\x28\x08" - "\x29\x15\x2a\x00\x2b\x00\x2c\x08" - , - "\x32\xff\x33\x00\x34\x3d\x35\x00" "\x36\xfa\x38\x72\x39\x57\x3a\x00" - "\x3b\x0c\x3d\x99\x3e\x0c\x3f\xc1" "\x40\xc0\x41\x00\x42\xc0\x43\x0a" - "\x44\xf0\x45\x46\x46\x62\x47\x2a" "\x48\x3c\x4a\xee\x4b\xe7\x4c\xe7" - "\x4d\xe7\x4e\xe7" - , - "\x4f\x98\x50\x98\x51\x00\x52\x28" "\x53\x70\x54\x98\x58\x1a\x59\x85" - "\x5a\xa9\x5b\x64\x5c\x84\x5d\x53" "\x5e\x0e\x5f\xf0\x60\xf0\x61\xf0" - "\x62\x00\x63\x00\x64\x02\x65\x20" "\x66\x00\x69\x0a\x6b\x5a\x6c\x04" - "\x6d\x55\x6e\x00\x6f\x9d" - , - "\x70\x15\x71\x78\x72\x00\x73\x00" "\x74\x3a\x75\x35\x76\x01\x77\x02" - "\x7a\x24\x7b\x04\x7c\x07\x7d\x10" "\x7e\x28\x7f\x36\x80\x44\x81\x52" - "\x82\x60\x83\x6c\x84\x78\x85\x8c" "\x86\x9e\x87\xbb\x88\xd2\x89\xe5" - "\x8a\x23\x8c\x8d\x90\x7c\x91\x7b" - , - "\x9d\x02\x9e\x02\x9f\x74\xa0\x73" "\xa1\x40\xa4\x50\xa5\x68\xa6\x70" - "\xa8\xc1\xa9\xef\xaa\x92\xab\x04" "\xac\x80\xad\x80\xae\x80\xaf\x80" - "\xb2\xf2\xb3\x20\xb4\x20\xb5\x00" "\xb6\xaf" - , - "\xbb\xae\xbc\x4f\xbd\x4e\xbe\x6a" "\xbf\x68\xc0\xaa\xc1\xc0\xc2\x01" - "\xc3\x4e\xc6\x85\xc7\x81\xc9\xe0" "\xca\xe8\xcb\xf0\xcc\xd8\xcd\x93" - , - "\xd0\x01\xd1\x08\xd2\xe0\xd3\x01" "\xd4\x10\xd5\x80" + (u8[]){ + 0x00, 0x40, 0x07, 0x6a, 0x06, 0xf3, 0x0d, 0x6a, + 0x10, 0x10, 0xc1, 0x01 + }, (u8[]){ + 0x12, 0x80, 0x00, 0x00, 0x01, 0x98, 0x02, 0x80, + 0x03, 0x12, 0x04, 0x03, 0x0b, 0x57, 0x0e, 0x61, + 0x0f, 0x42, 0x11, 0x01, 0x12, 0x60, 0x13, 0x00, + 0x14, 0x3a, 0x16, 0x24, 0x17, 0x14, 0x18, 0x00, + 0x19, 0x01, 0x1a, 0x3d, 0x1e, 0x04, 0x24, 0x3c, + 0x25, 0x36, 0x26, 0x72, 0x27, 0x08, 0x28, 0x08, + 0x29, 0x15, 0x2a, 0x00, 0x2b, 0x00, 0x2c, 0x08 + }, (u8[]){ + 0x32, 0xff, 0x33, 0x00, 0x34, 0x3d, 0x35, 0x00, + 0x36, 0xfa, 0x38, 0x72, 0x39, 0x57, 0x3a, 0x00, + 0x3b, 0x0c, 0x3d, 0x99, 0x3e, 0x0c, 0x3f, 0xc1, + 0x40, 0xc0, 0x41, 0x00, 0x42, 0xc0, 0x43, 0x0a, + 0x44, 0xf0, 0x45, 0x46, 0x46, 0x62, 0x47, 0x2a, + 0x48, 0x3c, 0x4a, 0xee, 0x4b, 0xe7, 0x4c, 0xe7, + 0x4d, 0xe7, 0x4e, 0xe7 + }, (u8[]){ + 0x4f, 0x98, 0x50, 0x98, 0x51, 0x00, 0x52, 0x28, + 0x53, 0x70, 0x54, 0x98, 0x58, 0x1a, 0x59, 0x85, + 0x5a, 0xa9, 0x5b, 0x64, 0x5c, 0x84, 0x5d, 0x53, + 0x5e, 0x0e, 0x5f, 0xf0, 0x60, 0xf0, 0x61, 0xf0, + 0x62, 0x00, 0x63, 0x00, 0x64, 0x02, 0x65, 0x20, + 0x66, 0x00, 0x69, 0x0a, 0x6b, 0x5a, 0x6c, 0x04, + 0x6d, 0x55, 0x6e, 0x00, 0x6f, 0x9d + }, (u8[]){ + 0x70, 0x15, 0x71, 0x78, 0x72, 0x00, 0x73, 0x00, + 0x74, 0x3a, 0x75, 0x35, 0x76, 0x01, 0x77, 0x02, + 0x7a, 0x24, 0x7b, 0x04, 0x7c, 0x07, 0x7d, 0x10, + 0x7e, 0x28, 0x7f, 0x36, 0x80, 0x44, 0x81, 0x52, + 0x82, 0x60, 0x83, 0x6c, 0x84, 0x78, 0x85, 0x8c, + 0x86, 0x9e, 0x87, 0xbb, 0x88, 0xd2, 0x89, 0xe5, + 0x8a, 0x23, 0x8c, 0x8d, 0x90, 0x7c, 0x91, 0x7b + }, (u8[]){ + 0x9d, 0x02, 0x9e, 0x02, 0x9f, 0x74, 0xa0, 0x73, + 0xa1, 0x40, 0xa4, 0x50, 0xa5, 0x68, 0xa6, 0x70, + 0xa8, 0xc1, 0xa9, 0xef, 0xaa, 0x92, 0xab, 0x04, + 0xac, 0x80, 0xad, 0x80, 0xae, 0x80, 0xaf, 0x80, + 0xb2, 0xf2, 0xb3, 0x20, 0xb4, 0x20, 0xb5, 0x00, + 0xb6, 0xaf + }, (u8[]){ + 0xbb, 0xae, 0xbc, 0x4f, 0xbd, 0x4e, 0xbe, 0x6a, + 0xbf, 0x68, 0xc0, 0xaa, 0xc1, 0xc0, 0xc2, 0x01, + 0xc3, 0x4e, 0xc6, 0x85, 0xc7, 0x81, 0xc9, 0xe0, + 0xca, 0xe8, 0xcb, 0xf0, 0xcc, 0xd8, 0xcd, 0x93 + }, (u8[]){ + 0xd0, 0x01, 0xd1, 0x08, 0xd2, 0xe0, 0xd3, 0x01, + 0xd4, 0x10, 0xd5, 0x80 + } }; static u8 *tbl_1280[] = { - "\x00\x40\x07\x6a\x06\xf3\x0d\x6a" "\x10\x10\xc1\x01" - , - "\x12\x80\x00\x00\x01\x98\x02\x80" "\x03\x12\x04\x01\x0b\x57\x0e\x61" - "\x0f\x42\x11\x00\x12\x00\x13\x00" "\x14\x3a\x16\x24\x17\x1b\x18\xbb" - "\x19\x01\x1a\x81\x1e\x04\x24\x3c" "\x25\x36\x26\x72\x27\x08\x28\x08" - "\x29\x15\x2a\x00\x2b\x00\x2c\x08" - , - "\x32\xa4\x33\x00\x34\x3d\x35\x00" "\x36\xf8\x38\x72\x39\x57\x3a\x00" - "\x3b\x0c\x3d\x99\x3e\x0c\x3f\xc2" "\x40\xc0\x41\x00\x42\xc0\x43\x0a" - "\x44\xf0\x45\x46\x46\x62\x47\x2a" "\x48\x3c\x4a\xec\x4b\xe8\x4c\xe8" - "\x4d\xe8\x4e\xe8" - , - "\x4f\x98\x50\x98\x51\x00\x52\x28" "\x53\x70\x54\x98\x58\x1a\x59\x85" - "\x5a\xa9\x5b\x64\x5c\x84\x5d\x53" "\x5e\x0e\x5f\xf0\x60\xf0\x61\xf0" - "\x62\x00\x63\x00\x64\x02\x65\x20" "\x66\x00\x69\x02\x6b\x5a\x6c\x04" - "\x6d\x55\x6e\x00\x6f\x9d" - , - "\x70\x08\x71\x78\x72\x00\x73\x01" "\x74\x3a\x75\x35\x76\x01\x77\x02" - "\x7a\x24\x7b\x04\x7c\x07\x7d\x10" "\x7e\x28\x7f\x36\x80\x44\x81\x52" - "\x82\x60\x83\x6c\x84\x78\x85\x8c" "\x86\x9e\x87\xbb\x88\xd2\x89\xe5" - "\x8a\x23\x8c\x0d\x90\x90\x91\x90" - , - "\x9d\x02\x9e\x02\x9f\x94\xa0\x94" "\xa1\x01\xa4\x50\xa5\x68\xa6\x70" - "\xa8\xc1\xa9\xef\xaa\x92\xab\x04" "\xac\x80\xad\x80\xae\x80\xaf\x80" - "\xb2\xf2\xb3\x20\xb4\x20\xb5\x00" "\xb6\xaf" - , - "\xbb\xae\xbc\x38\xbd\x39\xbe\x01" "\xbf\x01\xc0\xe2\xc1\xc0\xc2\x01" - "\xc3\x4e\xc6\x85\xc7\x81\xc9\xe0" "\xca\xe8\xcb\xf0\xcc\xd8\xcd\x93" - , - "\xd0\x21\xd1\x18\xd2\xe0\xd3\x01" "\xd4\x28\xd5\x00" + (u8[]){ + 0x00, 0x40, 0x07, 0x6a, 0x06, 0xf3, 0x0d, 0x6a, + 0x10, 0x10, 0xc1, 0x01 + }, + (u8[]){ + 0x12, 0x80, 0x00, 0x00, 0x01, 0x98, 0x02, 0x80, + 0x03, 0x12, 0x04, 0x01, 0x0b, 0x57, 0x0e, 0x61, + 0x0f, 0x42, 0x11, 0x00, 0x12, 0x00, 0x13, 0x00, + 0x14, 0x3a, 0x16, 0x24, 0x17, 0x1b, 0x18, 0xbb, + 0x19, 0x01, 0x1a, 0x81, 0x1e, 0x04, 0x24, 0x3c, + 0x25, 0x36, 0x26, 0x72, 0x27, 0x08, 0x28, 0x08, + 0x29, 0x15, 0x2a, 0x00, 0x2b, 0x00, 0x2c, 0x08 + }, + (u8[]){ + 0x32, 0xa4, 0x33, 0x00, 0x34, 0x3d, 0x35, 0x00, + 0x36, 0xf8, 0x38, 0x72, 0x39, 0x57, 0x3a, 0x00, + 0x3b, 0x0c, 0x3d, 0x99, 0x3e, 0x0c, 0x3f, 0xc2, + 0x40, 0xc0, 0x41, 0x00, 0x42, 0xc0, 0x43, 0x0a, + 0x44, 0xf0, 0x45, 0x46, 0x46, 0x62, 0x47, 0x2a, + 0x48, 0x3c, 0x4a, 0xec, 0x4b, 0xe8, 0x4c, 0xe8, + 0x4d, 0xe8, 0x4e, 0xe8 + }, + (u8[]){ + 0x4f, 0x98, 0x50, 0x98, 0x51, 0x00, 0x52, 0x28, + 0x53, 0x70, 0x54, 0x98, 0x58, 0x1a, 0x59, 0x85, + 0x5a, 0xa9, 0x5b, 0x64, 0x5c, 0x84, 0x5d, 0x53, + 0x5e, 0x0e, 0x5f, 0xf0, 0x60, 0xf0, 0x61, 0xf0, + 0x62, 0x00, 0x63, 0x00, 0x64, 0x02, 0x65, 0x20, + 0x66, 0x00, 0x69, 0x02, 0x6b, 0x5a, 0x6c, 0x04, + 0x6d, 0x55, 0x6e, 0x00, 0x6f, 0x9d + }, + (u8[]){ + 0x70, 0x08, 0x71, 0x78, 0x72, 0x00, 0x73, 0x01, + 0x74, 0x3a, 0x75, 0x35, 0x76, 0x01, 0x77, 0x02, + 0x7a, 0x24, 0x7b, 0x04, 0x7c, 0x07, 0x7d, 0x10, + 0x7e, 0x28, 0x7f, 0x36, 0x80, 0x44, 0x81, 0x52, + 0x82, 0x60, 0x83, 0x6c, 0x84, 0x78, 0x85, 0x8c, + 0x86, 0x9e, 0x87, 0xbb, 0x88, 0xd2, 0x89, 0xe5, + 0x8a, 0x23, 0x8c, 0x0d, 0x90, 0x90, 0x91, 0x90 + }, + (u8[]){ + 0x9d, 0x02, 0x9e, 0x02, 0x9f, 0x94, 0xa0, 0x94, + 0xa1, 0x01, 0xa4, 0x50, 0xa5, 0x68, 0xa6, 0x70, + 0xa8, 0xc1, 0xa9, 0xef, 0xaa, 0x92, 0xab, 0x04, + 0xac, 0x80, 0xad, 0x80, 0xae, 0x80, 0xaf, 0x80, + 0xb2, 0xf2, 0xb3, 0x20, 0xb4, 0x20, 0xb5, 0x00, + 0xb6, 0xaf + }, + (u8[]){ + 0xbb, 0xae, 0xbc, 0x38, 0xbd, 0x39, 0xbe, 0x01, + 0xbf, 0x01, 0xc0, 0xe2, 0xc1, 0xc0, 0xc2, 0x01, + 0xc3, 0x4e, 0xc6, 0x85, 0xc7, 0x81, 0xc9, 0xe0, + 0xca, 0xe8, 0xcb, 0xf0, 0xcc, 0xd8, 0xcd, 0x93 + }, + (u8[]){ + 0xd0, 0x21, 0xd1, 0x18, 0xd2, 0xe0, 0xd3, 0x01, + 0xd4, 0x28, 0xd5, 0x00 + } }; static u8 c04[] = {0x04}; diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c index 47d8f28bfdfc..770714c34295 100644 --- a/drivers/media/usb/gspca/gspca.c +++ b/drivers/media/usb/gspca/gspca.c @@ -444,6 +444,8 @@ void gspca_frame_add(struct gspca_dev *gspca_dev, * next first packet, wake up the application and advance * in the queue */ if (packet_type == LAST_PACKET) { + if (gspca_dev->image_len > gspca_dev->pixfmt.sizeimage) + gspca_dev->image_len = gspca_dev->pixfmt.sizeimage; spin_lock_irqsave(&gspca_dev->qlock, flags); list_del(&buf->list); spin_unlock_irqrestore(&gspca_dev->qlock, flags); diff --git a/drivers/media/usb/gspca/m5602/m5602_ov7660.h b/drivers/media/usb/gspca/m5602/m5602_ov7660.h index d60247e10c2c..6146e8ef17c0 100644 --- a/drivers/media/usb/gspca/m5602/m5602_ov7660.h +++ b/drivers/media/usb/gspca/m5602/m5602_ov7660.h @@ -86,7 +86,6 @@ extern bool dump_sensor; int ov7660_probe(struct sd *sd); int ov7660_init(struct sd *sd); -int ov7660_init(struct sd *sd); int ov7660_init_controls(struct sd *sd); int ov7660_start(struct sd *sd); int ov7660_stop(struct sd *sd); diff --git a/drivers/media/usb/gspca/sn9c20x.c b/drivers/media/usb/gspca/sn9c20x.c index bfd194c61819..da916127a896 100644 --- a/drivers/media/usb/gspca/sn9c20x.c +++ b/drivers/media/usb/gspca/sn9c20x.c @@ -50,6 +50,7 @@ MODULE_LICENSE("GPL"); #define HAS_NO_BUTTON 0x1 #define LED_REVERSE 0x2 /* some cameras unset gpio to turn on leds */ #define FLIP_DETECT 0x4 +#define HAS_LED_TORCH 0x8 /* specific webcam descriptor */ struct sd { @@ -77,6 +78,8 @@ struct sd { }; struct v4l2_ctrl *jpegqual; + struct v4l2_ctrl *led_mode; + struct work_struct work; u32 pktsz; /* (used by pkt_scan) */ @@ -1533,6 +1536,12 @@ static void set_gain(struct gspca_dev *gspca_dev, s32 g) i2c_w(gspca_dev, gain); } +static void set_led_mode(struct gspca_dev *gspca_dev, s32 val) +{ + reg_w1(gspca_dev, 0x1007, 0x60); + reg_w1(gspca_dev, 0x1006, val ? 0x40 : 0x00); +} + static void set_quality(struct gspca_dev *gspca_dev, s32 val) { struct sd *sd = (struct sd *) gspca_dev; @@ -1699,6 +1708,9 @@ static int sd_s_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_JPEG_COMPRESSION_QUALITY: set_quality(gspca_dev, ctrl->val); break; + case V4L2_CID_FLASH_LED_MODE: + set_led_mode(gspca_dev, ctrl->val); + break; } return gspca_dev->usb_err; } @@ -1757,6 +1769,12 @@ static int sd_init_controls(struct gspca_dev *gspca_dev) sd->jpegqual = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops, V4L2_CID_JPEG_COMPRESSION_QUALITY, 50, 90, 1, 80); + + if (sd->flags & HAS_LED_TORCH) + sd->led_mode = v4l2_ctrl_new_std_menu(hdl, &sd_ctrl_ops, + V4L2_CID_FLASH_LED_MODE, V4L2_FLASH_LED_MODE_TORCH, + ~0x5, V4L2_FLASH_LED_MODE_NONE); + if (hdl->error) { pr_err("Could not initialize controls\n"); return hdl->error; @@ -2048,6 +2066,8 @@ static int sd_start(struct gspca_dev *gspca_dev) sd->pktsz = sd->npkt = 0; sd->nchg = 0; } + if (sd->led_mode) + v4l2_ctrl_s_ctrl(sd->led_mode, 0); return gspca_dev->usb_err; } @@ -2325,7 +2345,7 @@ static const struct sd_desc sd_desc = { static const struct usb_device_id device_table[] = { {USB_DEVICE(0x0c45, 0x6240), SN9C20X(MT9M001, 0x5d, 0)}, - {USB_DEVICE(0x0c45, 0x6242), SN9C20X(MT9M111, 0x5d, 0)}, + {USB_DEVICE(0x0c45, 0x6242), SN9C20X(MT9M111, 0x5d, HAS_LED_TORCH)}, {USB_DEVICE(0x0c45, 0x6248), SN9C20X(OV9655, 0x30, 0)}, {USB_DEVICE(0x0c45, 0x624c), SN9C20X(MT9M112, 0x5d, 0)}, {USB_DEVICE(0x0c45, 0x624e), SN9C20X(SOI968, 0x30, LED_REVERSE)}, |