Commit 1160a381 authored by Theodore Kilgore's avatar Theodore Kilgore Committed by Mauro Carvalho Chehab

V4L/DVB (13244): gspca_mr97310a: Fix / update some comments

gspca_mr97310a: Fix / update some comments
Signed-off-by: default avatarTheodore Kilgore <kilgota@banach.math.auburn.edu>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8ac246cb
...@@ -18,7 +18,9 @@ ...@@ -18,7 +18,9 @@
* Several previously unsupported cameras are owned and have been tested by * Several previously unsupported cameras are owned and have been tested by
* Hans de Goede <hdgoede@redhat.com> and * Hans de Goede <hdgoede@redhat.com> and
* Thomas Kaiser <thomas@kaiser-linux.li> and * Thomas Kaiser <thomas@kaiser-linux.li> and
* Theodore Kilgore <kilgota@auburn.edu> * Theodore Kilgore <kilgota@auburn.edu> and
* Edmond Rodriguez <erodrig_97@yahoo.com> and
* Aurelien Jacobs <aurel@gnuage.org>
* *
* The MR97311A support in gspca/mars.c has been helpful in understanding some * The MR97311A support in gspca/mars.c has been helpful in understanding some
* of the registers in these cameras. * of the registers in these cameras.
...@@ -105,8 +107,8 @@ static void setgain(struct gspca_dev *gspca_dev); ...@@ -105,8 +107,8 @@ static void setgain(struct gspca_dev *gspca_dev);
/* V4L2 controls supported by the driver */ /* V4L2 controls supported by the driver */
static struct ctrl sd_ctrls[] = { static struct ctrl sd_ctrls[] = {
/* Seprate brightness control description for Argus QuickClix as it has /* Separate brightness control description for Argus QuickClix as it has
different limits from to other mr97310a camera's */ different limits from the other mr97310a cameras */
{ {
#define NORM_BRIGHTNESS_IDX 0 #define NORM_BRIGHTNESS_IDX 0
{ {
...@@ -428,7 +430,7 @@ static int isoc_enable(struct gspca_dev *gspca_dev) ...@@ -428,7 +430,7 @@ static int isoc_enable(struct gspca_dev *gspca_dev)
return mr_write(gspca_dev, 2); return mr_write(gspca_dev, 2);
} }
/* this function is called at probe time */ /* This function is called at probe time */
static int sd_config(struct gspca_dev *gspca_dev, static int sd_config(struct gspca_dev *gspca_dev,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
...@@ -441,11 +443,11 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -441,11 +443,11 @@ static int sd_config(struct gspca_dev *gspca_dev,
cam->nmodes = ARRAY_SIZE(vga_mode); cam->nmodes = ARRAY_SIZE(vga_mode);
sd->do_lcd_stop = 0; sd->do_lcd_stop = 0;
/* Now, logical layout of the driver must fall sacrifice to the /* Several of the supported CIF cameras share the same USB ID but
* realities of the hardware supported. We have to sort out several * require different initializations and different control settings.
* cameras which share the USB ID but are in fact different inside. * The same is true of the VGA cameras. Therefore, we are forced
* We need to start the initialization process for the cameras in * to start the initialization process in order to determine which
* order to classify them. Some of the supported cameras require the * camera is present. Some of the supported cameras require the
* memory pointer to be set to 0 as the very first item of business * memory pointer to be set to 0 as the very first item of business
* or else they will not stream. So we do that immediately. * or else they will not stream. So we do that immediately.
*/ */
...@@ -464,9 +466,10 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -464,9 +466,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
if (err_code < 0) if (err_code < 0)
return err_code; return err_code;
/* /*
* The various CIF cameras share the same USB ID but use * All but one of the known CIF cameras share the same USB ID,
* different init routines and different controls. We need to * but two different init routines are in use, and the control
* detect which one is connected! * settings are different, too. We need to detect which camera
* of the two known varieties is connected!
* *
* A list of known CIF cameras follows. They all report either * A list of known CIF cameras follows. They all report either
* 0002 for type 0 or 0003 for type 1. * 0002 for type 0 or 0003 for type 1.
...@@ -481,6 +484,7 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -481,6 +484,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
* Vivitar Mini 1 T. Kilgore * Vivitar Mini 1 T. Kilgore
* Elta-Media 8212dc 1 T. Kaiser * Elta-Media 8212dc 1 T. Kaiser
* Philips dig. keych. 1 T. Kilgore * Philips dig. keych. 1 T. Kilgore
* Trust Spyc@m 100 1 A. Jacobs
*/ */
switch (gspca_dev->usb_buf[1]) { switch (gspca_dev->usb_buf[1]) {
case 2: case 2:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment