Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] gspca - zc3xx: Cleanup source

- change some comments and copyright
- change an erroneous register name
- change hdcs2020b to hdcs2020

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Jean-François Moine and committed by
Mauro Carvalho Chehab
4e5144ee 170960fa

+24 -24
+24 -24
drivers/media/video/gspca/zc3xx.c
··· 1 1 /* 2 2 * Z-Star/Vimicro zc301/zc302p/vc30x library 3 3 * 4 - * Copyright (C) 2009-2010 Jean-Francois Moine <http://moinejf.free.fr> 4 + * Copyright (C) 2009-2011 Jean-Francois Moine <http://moinejf.free.fr> 5 5 * Copyright (C) 2004 2005 2006 Michel Xhaard mxhaard@magic.fr 6 6 * 7 7 * This program is free software; you can redistribute it and/or modify ··· 73 73 SENSOR_CS2102K, 74 74 SENSOR_GC0303, 75 75 SENSOR_GC0305, 76 - SENSOR_HDCS2020b, 76 + SENSOR_HDCS2020, 77 77 SENSOR_HV7131B, 78 78 SENSOR_HV7131R, 79 79 SENSOR_ICM105A, ··· 1498 1498 {} 1499 1499 }; 1500 1500 1501 - static const struct usb_action hdcs2020b_InitialScale[] = { 1501 + static const struct usb_action hdcs2020_InitialScale[] = { 1502 1502 {0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL}, 1503 1503 {0xa0, 0x11, ZC3XX_R002_CLOCKSELECT}, 1504 1504 {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING}, /* qtable 0x05 */ ··· 1630 1630 {0xa0, 0x40, ZC3XX_R118_BGAIN}, 1631 1631 {} 1632 1632 }; 1633 - static const struct usb_action hdcs2020b_Initial[] = { 1633 + static const struct usb_action hdcs2020_Initial[] = { 1634 1634 {0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL}, 1635 1635 {0xa0, 0x00, ZC3XX_R002_CLOCKSELECT}, 1636 1636 {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING}, ··· 1758 1758 {0xa0, 0x40, ZC3XX_R118_BGAIN}, 1759 1759 {} 1760 1760 }; 1761 - static const struct usb_action hdcs2020b_50HZ[] = { 1761 + static const struct usb_action hdcs2020_50HZ[] = { 1762 1762 {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ 1763 1763 {0xaa, 0x13, 0x0018}, /* 00,13,18,aa */ 1764 1764 {0xaa, 0x14, 0x0001}, /* 00,14,01,aa */ ··· 1779 1779 {0xa0, 0x2f, ZC3XX_R01F_HSYNC_2}, /* 00,1f,2f,cc */ 1780 1780 {} 1781 1781 }; 1782 - static const struct usb_action hdcs2020b_60HZ[] = { 1782 + static const struct usb_action hdcs2020_60HZ[] = { 1783 1783 {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ 1784 1784 {0xaa, 0x13, 0x0031}, /* 00,13,31,aa */ 1785 1785 {0xaa, 0x14, 0x0001}, /* 00,14,01,aa */ ··· 1800 1800 {0xa0, 0x2c, ZC3XX_R01F_HSYNC_2}, /* 00,1f,2c,cc */ 1801 1801 {} 1802 1802 }; 1803 - static const struct usb_action hdcs2020b_NoFliker[] = { 1803 + static const struct usb_action hdcs2020_NoFliker[] = { 1804 1804 {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ 1805 1805 {0xaa, 0x13, 0x0010}, /* 00,13,10,aa */ 1806 1806 {0xaa, 0x14, 0x0001}, /* 00,14,01,aa */ ··· 2126 2126 {0xa0, 0x80, ZC3XX_R004_FRAMEWIDTHLOW}, 2127 2127 {0xa0, 0x01, ZC3XX_R005_FRAMEHEIGHTHIGH}, 2128 2128 {0xa0, 0xe0, ZC3XX_R006_FRAMEHEIGHTLOW}, 2129 - 2130 2129 {0xa0, 0x00, ZC3XX_R098_WINYSTARTLOW}, 2131 2130 {0xa0, 0x00, ZC3XX_R09A_WINXSTARTLOW}, 2132 2131 {0xa0, 0x01, ZC3XX_R09B_WINHEIGHTHIGH}, ··· 2877 2878 {0xaa, 0x11, 0x0001}, /* 00,11,01,aa */ 2878 2879 {0xaa, 0x30, 0x0000}, /* 00,30,00,aa */ 2879 2880 {0xaa, 0x60, 0x0000}, /* 00,60,00,aa */ 2880 - {0xaa, 0xa0, ZC3XX_R01A_LASTFRAMESTATE}, /* 00,a0,1a,aa */ 2881 + {0xaa, 0xa0, 0x001a}, /* 00,a0,1a,aa */ 2881 2882 {0xaa, 0xa1, 0x0000}, /* 00,a1,00,aa */ 2882 2883 {0xaa, 0xa2, 0x003f}, /* 00,a2,3f,aa */ 2883 2884 {0xaa, 0xa3, 0x0028}, /* 00,a3,28,aa */ ··· 2997 2998 {0xaa, 0x11, 0x0001}, /* 00,11,01,aa */ 2998 2999 {0xaa, 0x30, 0x0000}, /* 00,30,00,aa */ 2999 3000 {0xaa, 0x60, 0x0000}, /* 00,60,00,aa */ 3000 - {0xaa, 0xa0, ZC3XX_R01A_LASTFRAMESTATE}, /* 00,a0,1a,aa */ 3001 + {0xaa, 0xa0, 0x001a}, /* 00,a0,1a,aa */ 3001 3002 {0xaa, 0xa1, 0x0000}, /* 00,a1,00,aa */ 3002 3003 {0xaa, 0xa2, 0x003f}, /* 00,a2,3f,aa */ 3003 3004 {0xaa, 0xa3, 0x0028}, /* 00,a3,28,aa */ ··· 3309 3310 {0xaa, 0x10, 0x0082}, /* 00,10,82,aa */ 3310 3311 {0xaa, 0x76, 0x0003}, /* 00,76,03,aa */ 3311 3312 /* {0xa0, 0x40, ZC3XX_R002_CLOCKSELECT}, * 00,02,40,cc 3312 - if mode0 (640x480) */ 3313 + * if mode0 (640x480) */ 3313 3314 {} 3314 3315 }; 3315 3316 static const struct usb_action ov7620_60HZ[] = { ··· 5827 5828 [SENSOR_CS2102K] = NULL, 5828 5829 [SENSOR_GC0303] = gc0303_matrix, 5829 5830 [SENSOR_GC0305] = gc0305_matrix, 5830 - [SENSOR_HDCS2020b] = NULL, 5831 + [SENSOR_HDCS2020] = NULL, 5831 5832 [SENSOR_HV7131B] = NULL, 5832 5833 [SENSOR_HV7131R] = po2030_matrix, 5833 5834 [SENSOR_ICM105A] = po2030_matrix, ··· 5989 5990 {gc0305_NoFliker, gc0305_NoFliker, 5990 5991 gc0305_50HZ, gc0305_50HZ, 5991 5992 gc0305_60HZ, gc0305_60HZ}, 5992 - [SENSOR_HDCS2020b] = 5993 - {hdcs2020b_NoFliker, hdcs2020b_NoFliker, 5994 - hdcs2020b_50HZ, hdcs2020b_50HZ, 5995 - hdcs2020b_60HZ, hdcs2020b_60HZ}, 5993 + [SENSOR_HDCS2020] = 5994 + {hdcs2020_NoFliker, hdcs2020_NoFliker, 5995 + hdcs2020_50HZ, hdcs2020_50HZ, 5996 + hdcs2020_60HZ, hdcs2020_60HZ}, 5996 5997 [SENSOR_HV7131B] = 5997 5998 {hv7131b_NoFliker, hv7131b_NoFlikerScale, 5998 5999 hv7131b_50HZ, hv7131b_50HZScale, ··· 6090 6091 6091 6092 static void send_unknown(struct gspca_dev *gspca_dev, int sensor) 6092 6093 { 6093 - reg_w(gspca_dev, 0x01, 0x0000); /* led off */ 6094 + reg_w(gspca_dev, 0x01, 0x0000); /* bridge reset */ 6094 6095 switch (sensor) { 6095 6096 case SENSOR_PAS106: 6096 6097 reg_w(gspca_dev, 0x03, 0x003a); ··· 6309 6310 return 0x0a; /* PB0330 */ 6310 6311 } 6311 6312 6313 + /* probe gc0303 / gc0305 */ 6312 6314 reg_w(gspca_dev, 0x01, 0x0000); 6313 6315 reg_w(gspca_dev, 0x01, 0x0001); 6314 6316 reg_w(gspca_dev, 0x98, 0x008b); ··· 6433 6433 [SENSOR_CS2102K] = 5, 6434 6434 [SENSOR_GC0303] = 3, 6435 6435 [SENSOR_GC0305] = 4, 6436 - [SENSOR_HDCS2020b] = 4, 6436 + [SENSOR_HDCS2020] = 4, 6437 6437 [SENSOR_HV7131B] = 4, 6438 6438 [SENSOR_HV7131R] = 4, 6439 6439 [SENSOR_ICM105A] = 4, ··· 6454 6454 [SENSOR_CS2102K] = 1, 6455 6455 [SENSOR_GC0303] = 1, 6456 6456 [SENSOR_GC0305] = 1, 6457 - [SENSOR_HDCS2020b] = 1, 6457 + [SENSOR_HDCS2020] = 1, 6458 6458 [SENSOR_HV7131B] = 1, 6459 6459 [SENSOR_HV7131R] = 1, 6460 6460 [SENSOR_ICM105A] = 1, ··· 6517 6517 sd->sensor = SENSOR_CS2102; 6518 6518 break; 6519 6519 case 0x08: 6520 - PDEBUG(D_PROBE, "Find Sensor HDCS2020(b)"); 6521 - sd->sensor = SENSOR_HDCS2020b; 6520 + PDEBUG(D_PROBE, "Find Sensor HDCS2020"); 6521 + sd->sensor = SENSOR_HDCS2020; 6522 6522 break; 6523 6523 case 0x0a: 6524 6524 PDEBUG(D_PROBE, ··· 6648 6648 {gc0303_Initial, gc0303_InitialScale}, 6649 6649 [SENSOR_GC0305] = 6650 6650 {gc0305_Initial, gc0305_InitialScale}, 6651 - [SENSOR_HDCS2020b] = 6652 - {hdcs2020b_Initial, hdcs2020b_InitialScale}, 6651 + [SENSOR_HDCS2020] = 6652 + {hdcs2020_Initial, hdcs2020_InitialScale}, 6653 6653 [SENSOR_HV7131B] = 6654 6654 {hv7131b_Initial, hv7131b_InitialScale}, 6655 6655 [SENSOR_HV7131R] = ··· 6743 6743 /* set the gamma tables when not set */ 6744 6744 switch (sd->sensor) { 6745 6745 case SENSOR_CS2102K: /* gamma set in xxx_Initial */ 6746 - case SENSOR_HDCS2020b: 6746 + case SENSOR_HDCS2020: 6747 6747 case SENSOR_OV7630C: 6748 6748 break; 6749 6749 default: