diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2008-12-08 04:25:40 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:38:58 -0500 |
commit | f4f4ef7618c0839326aa6f462a7c95ed76fb26b6 (patch) | |
tree | 5bad3854004e86dff10d7f4765be4b1dc8c438d3 /drivers/media/video | |
parent | 34e21c34c621821a44bd49f3e889bc17fadfbfa7 (diff) |
V4L/DVB (9868): gspca - zc3xx: Remove the duplicated register names
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/gspca/zc3xx-reg.h | 8 | ||||
-rw-r--r-- | drivers/media/video/gspca/zc3xx.c | 72 |
2 files changed, 36 insertions, 44 deletions
diff --git a/drivers/media/video/gspca/zc3xx-reg.h b/drivers/media/video/gspca/zc3xx-reg.h index f52e09c2cc1..bfb559c3b71 100644 --- a/drivers/media/video/gspca/zc3xx-reg.h +++ b/drivers/media/video/gspca/zc3xx-reg.h | |||
@@ -244,14 +244,6 @@ | |||
244 | #define ZC3XX_R1CA_SHARPNESS04 0x01ca | 244 | #define ZC3XX_R1CA_SHARPNESS04 0x01ca |
245 | #define ZC3XX_R1CB_SHARPNESS05 0x01cb | 245 | #define ZC3XX_R1CB_SHARPNESS05 0x01cb |
246 | 246 | ||
247 | /* Synchronization */ | ||
248 | #define ZC3XX_R190_SYNC00LOW 0x0190 | ||
249 | #define ZC3XX_R191_SYNC00MID 0x0191 | ||
250 | #define ZC3XX_R192_SYNC00HIGH 0x0192 | ||
251 | #define ZC3XX_R195_SYNC01LOW 0x0195 | ||
252 | #define ZC3XX_R196_SYNC01MID 0x0196 | ||
253 | #define ZC3XX_R197_SYNC01HIGH 0x0197 | ||
254 | |||
255 | /* Dead pixels */ | 247 | /* Dead pixels */ |
256 | #define ZC3XX_R250_DEADPIXELSMODE 0x0250 | 248 | #define ZC3XX_R250_DEADPIXELSMODE 0x0250 |
257 | 249 | ||
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c index 6c126f41dbe..4f95ab8f375 100644 --- a/drivers/media/video/gspca/zc3xx.c +++ b/drivers/media/video/gspca/zc3xx.c | |||
@@ -2368,12 +2368,12 @@ static const struct usb_action hv7131b_50HZ[] = { /* 640x480*/ | |||
2368 | {0xaa, 0x21, 0x0050}, /* 00,21,50,aa */ | 2368 | {0xaa, 0x21, 0x0050}, /* 00,21,50,aa */ |
2369 | {0xaa, 0x22, 0x001b}, /* 00,22,1b,aa */ | 2369 | {0xaa, 0x22, 0x001b}, /* 00,22,1b,aa */ |
2370 | {0xaa, 0x23, 0x00fc}, /* 00,23,fc,aa */ | 2370 | {0xaa, 0x23, 0x00fc}, /* 00,23,fc,aa */ |
2371 | {0xa0, 0x2f, ZC3XX_R190_SYNC00LOW}, /* 01,90,2f,cc */ | 2371 | {0xa0, 0x2f, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,2f,cc */ |
2372 | {0xa0, 0x9b, ZC3XX_R191_SYNC00MID}, /* 01,91,9b,cc */ | 2372 | {0xa0, 0x9b, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,9b,cc */ |
2373 | {0xa0, 0x80, ZC3XX_R192_SYNC00HIGH}, /* 01,92,80,cc */ | 2373 | {0xa0, 0x80, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,80,cc */ |
2374 | {0xa0, 0x00, ZC3XX_R195_SYNC01LOW}, /* 01,95,00,cc */ | 2374 | {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,00,cc */ |
2375 | {0xa0, 0xea, ZC3XX_R196_SYNC01MID}, /* 01,96,ea,cc */ | 2375 | {0xa0, 0xea, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,ea,cc */ |
2376 | {0xa0, 0x60, ZC3XX_R197_SYNC01HIGH}, /* 01,97,60,cc */ | 2376 | {0xa0, 0x60, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,60,cc */ |
2377 | {0xa0, 0x0c, ZC3XX_R18C_AEFREEZE}, /* 01,8c,0c,cc */ | 2377 | {0xa0, 0x0c, ZC3XX_R18C_AEFREEZE}, /* 01,8c,0c,cc */ |
2378 | {0xa0, 0x18, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,18,cc */ | 2378 | {0xa0, 0x18, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,18,cc */ |
2379 | {0xa0, 0x18, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,18,cc */ | 2379 | {0xa0, 0x18, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,18,cc */ |
@@ -2393,12 +2393,12 @@ static const struct usb_action hv7131b_50HZScale[] = { /* 320x240 */ | |||
2393 | {0xaa, 0x21, 0x0050}, /* 00,21,50,aa */ | 2393 | {0xaa, 0x21, 0x0050}, /* 00,21,50,aa */ |
2394 | {0xaa, 0x22, 0x0012}, /* 00,22,12,aa */ | 2394 | {0xaa, 0x22, 0x0012}, /* 00,22,12,aa */ |
2395 | {0xaa, 0x23, 0x0080}, /* 00,23,80,aa */ | 2395 | {0xaa, 0x23, 0x0080}, /* 00,23,80,aa */ |
2396 | {0xa0, 0x2f, ZC3XX_R190_SYNC00LOW}, /* 01,90,2f,cc */ | 2396 | {0xa0, 0x2f, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,2f,cc */ |
2397 | {0xa0, 0x9b, ZC3XX_R191_SYNC00MID}, /* 01,91,9b,cc */ | 2397 | {0xa0, 0x9b, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,9b,cc */ |
2398 | {0xa0, 0x80, ZC3XX_R192_SYNC00HIGH}, /* 01,92,80,cc */ | 2398 | {0xa0, 0x80, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,80,cc */ |
2399 | {0xa0, 0x01, ZC3XX_R195_SYNC01LOW}, /* 01,95,01,cc */ | 2399 | {0xa0, 0x01, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,01,cc */ |
2400 | {0xa0, 0xd4, ZC3XX_R196_SYNC01MID}, /* 01,96,d4,cc */ | 2400 | {0xa0, 0xd4, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,d4,cc */ |
2401 | {0xa0, 0xc0, ZC3XX_R197_SYNC01HIGH}, /* 01,97,c0,cc */ | 2401 | {0xa0, 0xc0, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,c0,cc */ |
2402 | {0xa0, 0x07, ZC3XX_R18C_AEFREEZE}, /* 01,8c,07,cc */ | 2402 | {0xa0, 0x07, ZC3XX_R18C_AEFREEZE}, /* 01,8c,07,cc */ |
2403 | {0xa0, 0x0f, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,0f,cc */ | 2403 | {0xa0, 0x0f, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,0f,cc */ |
2404 | {0xa0, 0x18, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,18,cc */ | 2404 | {0xa0, 0x18, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,18,cc */ |
@@ -2418,12 +2418,12 @@ static const struct usb_action hv7131b_60HZ[] = { /* 640x480*/ | |||
2418 | {0xaa, 0x21, 0x0040}, /* 00,21,40,aa */ | 2418 | {0xaa, 0x21, 0x0040}, /* 00,21,40,aa */ |
2419 | {0xaa, 0x22, 0x0013}, /* 00,22,13,aa */ | 2419 | {0xaa, 0x22, 0x0013}, /* 00,22,13,aa */ |
2420 | {0xaa, 0x23, 0x004c}, /* 00,23,4c,aa */ | 2420 | {0xaa, 0x23, 0x004c}, /* 00,23,4c,aa */ |
2421 | {0xa0, 0x2f, ZC3XX_R190_SYNC00LOW}, /* 01,90,2f,cc */ | 2421 | {0xa0, 0x2f, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,2f,cc */ |
2422 | {0xa0, 0x4d, ZC3XX_R191_SYNC00MID}, /* 01,91,4d,cc */ | 2422 | {0xa0, 0x4d, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,4d,cc */ |
2423 | {0xa0, 0x60, ZC3XX_R192_SYNC00HIGH}, /* 01,92,60,cc */ | 2423 | {0xa0, 0x60, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,60,cc */ |
2424 | {0xa0, 0x00, ZC3XX_R195_SYNC01LOW}, /* 01,95,00,cc */ | 2424 | {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,00,cc */ |
2425 | {0xa0, 0xc3, ZC3XX_R196_SYNC01MID}, /* 01,96,c3,cc */ | 2425 | {0xa0, 0xc3, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,c3,cc */ |
2426 | {0xa0, 0x50, ZC3XX_R197_SYNC01HIGH}, /* 01,97,50,cc */ | 2426 | {0xa0, 0x50, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,50,cc */ |
2427 | {0xa0, 0x0c, ZC3XX_R18C_AEFREEZE}, /* 01,8c,0c,cc */ | 2427 | {0xa0, 0x0c, ZC3XX_R18C_AEFREEZE}, /* 01,8c,0c,cc */ |
2428 | {0xa0, 0x18, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,18,cc */ | 2428 | {0xa0, 0x18, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,18,cc */ |
2429 | {0xa0, 0x18, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,18,cc */ | 2429 | {0xa0, 0x18, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,18,cc */ |
@@ -2443,12 +2443,12 @@ static const struct usb_action hv7131b_60HZScale[] = { /* 320x240 */ | |||
2443 | {0xaa, 0x21, 0x00a0}, /* 00,21,a0,aa */ | 2443 | {0xaa, 0x21, 0x00a0}, /* 00,21,a0,aa */ |
2444 | {0xaa, 0x22, 0x0016}, /* 00,22,16,aa */ | 2444 | {0xaa, 0x22, 0x0016}, /* 00,22,16,aa */ |
2445 | {0xaa, 0x23, 0x0040}, /* 00,23,40,aa */ | 2445 | {0xaa, 0x23, 0x0040}, /* 00,23,40,aa */ |
2446 | {0xa0, 0x2f, ZC3XX_R190_SYNC00LOW}, /* 01,90,2f,cc */ | 2446 | {0xa0, 0x2f, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,2f,cc */ |
2447 | {0xa0, 0x4d, ZC3XX_R191_SYNC00MID}, /* 01,91,4d,cc */ | 2447 | {0xa0, 0x4d, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,4d,cc */ |
2448 | {0xa0, 0x60, ZC3XX_R192_SYNC00HIGH}, /* 01,92,60,cc */ | 2448 | {0xa0, 0x60, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,60,cc */ |
2449 | {0xa0, 0x01, ZC3XX_R195_SYNC01LOW}, /* 01,95,01,cc */ | 2449 | {0xa0, 0x01, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,01,cc */ |
2450 | {0xa0, 0x86, ZC3XX_R196_SYNC01MID}, /* 01,96,86,cc */ | 2450 | {0xa0, 0x86, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,86,cc */ |
2451 | {0xa0, 0xa0, ZC3XX_R197_SYNC01HIGH}, /* 01,97,a0,cc */ | 2451 | {0xa0, 0xa0, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,a0,cc */ |
2452 | {0xa0, 0x07, ZC3XX_R18C_AEFREEZE}, /* 01,8c,07,cc */ | 2452 | {0xa0, 0x07, ZC3XX_R18C_AEFREEZE}, /* 01,8c,07,cc */ |
2453 | {0xa0, 0x0f, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,0f,cc */ | 2453 | {0xa0, 0x0f, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,0f,cc */ |
2454 | {0xa0, 0x18, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,18,cc */ | 2454 | {0xa0, 0x18, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,18,cc */ |
@@ -2468,12 +2468,12 @@ static const struct usb_action hv7131b_NoFliker[] = { /* 640x480*/ | |||
2468 | {0xaa, 0x21, 0x0010}, /* 00,21,10,aa */ | 2468 | {0xaa, 0x21, 0x0010}, /* 00,21,10,aa */ |
2469 | {0xaa, 0x22, 0x0000}, /* 00,22,00,aa */ | 2469 | {0xaa, 0x22, 0x0000}, /* 00,22,00,aa */ |
2470 | {0xaa, 0x23, 0x0003}, /* 00,23,03,aa */ | 2470 | {0xaa, 0x23, 0x0003}, /* 00,23,03,aa */ |
2471 | {0xa0, 0x2f, ZC3XX_R190_SYNC00LOW}, /* 01,90,2f,cc */ | 2471 | {0xa0, 0x2f, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,2f,cc */ |
2472 | {0xa0, 0xf8, ZC3XX_R191_SYNC00MID}, /* 01,91,f8,cc */ | 2472 | {0xa0, 0xf8, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,f8,cc */ |
2473 | {0xa0, 0x00, ZC3XX_R192_SYNC00HIGH}, /* 01,92,00,cc */ | 2473 | {0xa0, 0x00, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,00,cc */ |
2474 | {0xa0, 0x00, ZC3XX_R195_SYNC01LOW}, /* 01,95,00,cc */ | 2474 | {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,00,cc */ |
2475 | {0xa0, 0x02, ZC3XX_R196_SYNC01MID}, /* 01,96,02,cc */ | 2475 | {0xa0, 0x02, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,02,cc */ |
2476 | {0xa0, 0x00, ZC3XX_R197_SYNC01HIGH}, /* 01,97,00,cc */ | 2476 | {0xa0, 0x00, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,00,cc */ |
2477 | {0xa0, 0x10, ZC3XX_R18C_AEFREEZE}, /* 01,8c,10,cc */ | 2477 | {0xa0, 0x10, ZC3XX_R18C_AEFREEZE}, /* 01,8c,10,cc */ |
2478 | {0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,20,cc */ | 2478 | {0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,20,cc */ |
2479 | {0xa0, 0x00, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,00,cc */ | 2479 | {0xa0, 0x00, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,00,cc */ |
@@ -2493,12 +2493,12 @@ static const struct usb_action hv7131b_NoFlikerScale[] = { /* 320x240 */ | |||
2493 | {0xaa, 0x21, 0x00a0}, /* 00,21,a0,aa */ | 2493 | {0xaa, 0x21, 0x00a0}, /* 00,21,a0,aa */ |
2494 | {0xaa, 0x22, 0x0016}, /* 00,22,16,aa */ | 2494 | {0xaa, 0x22, 0x0016}, /* 00,22,16,aa */ |
2495 | {0xaa, 0x23, 0x0040}, /* 00,23,40,aa */ | 2495 | {0xaa, 0x23, 0x0040}, /* 00,23,40,aa */ |
2496 | {0xa0, 0x2f, ZC3XX_R190_SYNC00LOW}, /* 01,90,2f,cc */ | 2496 | {0xa0, 0x2f, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,2f,cc */ |
2497 | {0xa0, 0xf8, ZC3XX_R191_SYNC00MID}, /* 01,91,f8,cc */ | 2497 | {0xa0, 0xf8, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,f8,cc */ |
2498 | {0xa0, 0x00, ZC3XX_R192_SYNC00HIGH}, /* 01,92,00,cc */ | 2498 | {0xa0, 0x00, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,00,cc */ |
2499 | {0xa0, 0x00, ZC3XX_R195_SYNC01LOW}, /* 01,95,00,cc */ | 2499 | {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,00,cc */ |
2500 | {0xa0, 0x02, ZC3XX_R196_SYNC01MID}, /* 01,96,02,cc */ | 2500 | {0xa0, 0x02, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,02,cc */ |
2501 | {0xa0, 0x00, ZC3XX_R197_SYNC01HIGH}, /* 01,97,00,cc */ | 2501 | {0xa0, 0x00, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,00,cc */ |
2502 | {0xa0, 0x10, ZC3XX_R18C_AEFREEZE}, /* 01,8c,10,cc */ | 2502 | {0xa0, 0x10, ZC3XX_R18C_AEFREEZE}, /* 01,8c,10,cc */ |
2503 | {0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,20,cc */ | 2503 | {0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,20,cc */ |
2504 | {0xa0, 0x00, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,00,cc */ | 2504 | {0xa0, 0x00, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,00,cc */ |