diff options
author | Theodore Kilgore <kilgota@banach.math.auburn.edu> | 2009-10-30 03:29:56 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 15:41:05 -0500 |
commit | 1160a3818ec387ddadfd173b3bceea654a474b74 (patch) | |
tree | 72144127cbe64274fd9e17a16594ee3a4437e0c2 | |
parent | 8ac246cb8fc880cb8f438ab7ded454207cc8170d (diff) |
V4L/DVB (13244): gspca_mr97310a: Fix / update some comments
gspca_mr97310a: Fix / update some comments
Signed-off-by: Theodore Kilgore <kilgota@banach.math.auburn.edu>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/gspca/mr97310a.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/drivers/media/video/gspca/mr97310a.c b/drivers/media/video/gspca/mr97310a.c index d316b56e396e..b66169256dc4 100644 --- a/drivers/media/video/gspca/mr97310a.c +++ b/drivers/media/video/gspca/mr97310a.c | |||
@@ -18,7 +18,9 @@ | |||
18 | * Several previously unsupported cameras are owned and have been tested by | 18 | * Several previously unsupported cameras are owned and have been tested by |
19 | * Hans de Goede <hdgoede@redhat.com> and | 19 | * Hans de Goede <hdgoede@redhat.com> and |
20 | * Thomas Kaiser <thomas@kaiser-linux.li> and | 20 | * Thomas Kaiser <thomas@kaiser-linux.li> and |
21 | * Theodore Kilgore <kilgota@auburn.edu> | 21 | * Theodore Kilgore <kilgota@auburn.edu> and |
22 | * Edmond Rodriguez <erodrig_97@yahoo.com> and | ||
23 | * Aurelien Jacobs <aurel@gnuage.org> | ||
22 | * | 24 | * |
23 | * The MR97311A support in gspca/mars.c has been helpful in understanding some | 25 | * The MR97311A support in gspca/mars.c has been helpful in understanding some |
24 | * of the registers in these cameras. | 26 | * of the registers in these cameras. |
@@ -105,8 +107,8 @@ static void setgain(struct gspca_dev *gspca_dev); | |||
105 | 107 | ||
106 | /* V4L2 controls supported by the driver */ | 108 | /* V4L2 controls supported by the driver */ |
107 | static struct ctrl sd_ctrls[] = { | 109 | static struct ctrl sd_ctrls[] = { |
108 | /* Seprate brightness control description for Argus QuickClix as it has | 110 | /* Separate brightness control description for Argus QuickClix as it has |
109 | different limits from to other mr97310a camera's */ | 111 | different limits from the other mr97310a cameras */ |
110 | { | 112 | { |
111 | #define NORM_BRIGHTNESS_IDX 0 | 113 | #define NORM_BRIGHTNESS_IDX 0 |
112 | { | 114 | { |
@@ -428,7 +430,7 @@ static int isoc_enable(struct gspca_dev *gspca_dev) | |||
428 | return mr_write(gspca_dev, 2); | 430 | return mr_write(gspca_dev, 2); |
429 | } | 431 | } |
430 | 432 | ||
431 | /* this function is called at probe time */ | 433 | /* This function is called at probe time */ |
432 | static int sd_config(struct gspca_dev *gspca_dev, | 434 | static int sd_config(struct gspca_dev *gspca_dev, |
433 | const struct usb_device_id *id) | 435 | const struct usb_device_id *id) |
434 | { | 436 | { |
@@ -441,11 +443,11 @@ static int sd_config(struct gspca_dev *gspca_dev, | |||
441 | cam->nmodes = ARRAY_SIZE(vga_mode); | 443 | cam->nmodes = ARRAY_SIZE(vga_mode); |
442 | sd->do_lcd_stop = 0; | 444 | sd->do_lcd_stop = 0; |
443 | 445 | ||
444 | /* Now, logical layout of the driver must fall sacrifice to the | 446 | /* Several of the supported CIF cameras share the same USB ID but |
445 | * realities of the hardware supported. We have to sort out several | 447 | * require different initializations and different control settings. |
446 | * cameras which share the USB ID but are in fact different inside. | 448 | * The same is true of the VGA cameras. Therefore, we are forced |
447 | * We need to start the initialization process for the cameras in | 449 | * to start the initialization process in order to determine which |
448 | * order to classify them. Some of the supported cameras require the | 450 | * camera is present. Some of the supported cameras require the |
449 | * memory pointer to be set to 0 as the very first item of business | 451 | * memory pointer to be set to 0 as the very first item of business |
450 | * or else they will not stream. So we do that immediately. | 452 | * or else they will not stream. So we do that immediately. |
451 | */ | 453 | */ |
@@ -464,9 +466,10 @@ static int sd_config(struct gspca_dev *gspca_dev, | |||
464 | if (err_code < 0) | 466 | if (err_code < 0) |
465 | return err_code; | 467 | return err_code; |
466 | /* | 468 | /* |
467 | * The various CIF cameras share the same USB ID but use | 469 | * All but one of the known CIF cameras share the same USB ID, |
468 | * different init routines and different controls. We need to | 470 | * but two different init routines are in use, and the control |
469 | * detect which one is connected! | 471 | * settings are different, too. We need to detect which camera |
472 | * of the two known varieties is connected! | ||
470 | * | 473 | * |
471 | * A list of known CIF cameras follows. They all report either | 474 | * A list of known CIF cameras follows. They all report either |
472 | * 0002 for type 0 or 0003 for type 1. | 475 | * 0002 for type 0 or 0003 for type 1. |
@@ -481,6 +484,7 @@ static int sd_config(struct gspca_dev *gspca_dev, | |||
481 | * Vivitar Mini 1 T. Kilgore | 484 | * Vivitar Mini 1 T. Kilgore |
482 | * Elta-Media 8212dc 1 T. Kaiser | 485 | * Elta-Media 8212dc 1 T. Kaiser |
483 | * Philips dig. keych. 1 T. Kilgore | 486 | * Philips dig. keych. 1 T. Kilgore |
487 | * Trust Spyc@m 100 1 A. Jacobs | ||
484 | */ | 488 | */ |
485 | switch (gspca_dev->usb_buf[1]) { | 489 | switch (gspca_dev->usb_buf[1]) { |
486 | case 2: | 490 | case 2: |