Commit 4f7cb883 authored by Olivier Lorin's avatar Olivier Lorin Committed by Mauro Carvalho Chehab

V4L/DVB (12954): gspca - gl860: Addition of GL860 based webcams

- add the Genesys Logic 05e3:0503 and 05e3:f191 webcam
Signed-off-by: default avatarOlivier Lorin <o.lorin@laposte.net>
Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ba624ce4
...@@ -173,6 +173,8 @@ ov519 05a9:8519 OmniVision ...@@ -173,6 +173,8 @@ ov519 05a9:8519 OmniVision
ov519 05a9:a518 D-Link DSB-C310 Webcam ov519 05a9:a518 D-Link DSB-C310 Webcam
sunplus 05da:1018 Digital Dream Enigma 1.3 sunplus 05da:1018 Digital Dream Enigma 1.3
stk014 05e1:0893 Syntek DV4000 stk014 05e1:0893 Syntek DV4000
gl860 05e3:0503 Genesys Logic PC Camera
gl860 05e3:f191 Genesys Logic PC Camera
spca561 060b:a001 Maxell Compact Pc PM3 spca561 060b:a001 Maxell Compact Pc PM3
zc3xx 0698:2003 CTX M730V built in zc3xx 0698:2003 CTX M730V built in
spca500 06bd:0404 Agfa CL20 spca500 06bd:0404 Agfa CL20
......
...@@ -19,6 +19,7 @@ if USB_GSPCA && VIDEO_V4L2 ...@@ -19,6 +19,7 @@ if USB_GSPCA && VIDEO_V4L2
source "drivers/media/video/gspca/m5602/Kconfig" source "drivers/media/video/gspca/m5602/Kconfig"
source "drivers/media/video/gspca/stv06xx/Kconfig" source "drivers/media/video/gspca/stv06xx/Kconfig"
source "drivers/media/video/gspca/gl860/Kconfig"
config USB_GSPCA_CONEX config USB_GSPCA_CONEX
tristate "Conexant Camera Driver" tristate "Conexant Camera Driver"
......
...@@ -58,3 +58,4 @@ gspca_zc3xx-objs := zc3xx.o ...@@ -58,3 +58,4 @@ gspca_zc3xx-objs := zc3xx.o
obj-$(CONFIG_USB_M5602) += m5602/ obj-$(CONFIG_USB_M5602) += m5602/
obj-$(CONFIG_USB_STV06XX) += stv06xx/ obj-$(CONFIG_USB_STV06XX) += stv06xx/
obj-$(CONFIG_USB_GL860) += gl860/
config USB_GL860
tristate "GL860 USB Camera Driver"
depends on VIDEO_V4L2 && USB_GSPCA
help
Say Y here if you want support for cameras based on the GL860 chip.
To compile this driver as a module, choose M here: the
module will be called gspca_gl860.
obj-$(CONFIG_USB_GL860) += gspca_gl860.o
gspca_gl860-objs := gl860.o \
gl860-mi1320.o \
gl860-ov2640.o \
gl860-ov9655.o \
gl860-mi2020.o
EXTRA_CFLAGS += -Idrivers/media/video/gspca
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/* @file gl860.h
* @author Olivier LORIN, tiré du pilote Syntek par Nicolas VIVIEN
* @date 2009-08-27
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef GL860_DEV_H
#define GL860_DEV_H
#include <linux/version.h>
#include "gspca.h"
#define MODULE_NAME "gspca_gl860"
#define DRIVER_VERSION "0.9d10"
#define ctrl_in gl860_RTx
#define ctrl_out gl860_RTx
#define ID_MI1320 1
#define ID_OV2640 2
#define ID_OV9655 4
#define ID_MI2020 8
#define ID_MI2020b 16
#define _MI1320_ (((struct sd *) gspca_dev)->sensor == ID_MI1320)
#define _MI2020_ (((struct sd *) gspca_dev)->sensor == ID_MI2020)
#define _MI2020b_ (((struct sd *) gspca_dev)->sensor == ID_MI2020b)
#define _MI2020c_ 0
#define _OV2640_ (((struct sd *) gspca_dev)->sensor == ID_OV2640)
#define _OV9655_ (((struct sd *) gspca_dev)->sensor == ID_OV9655)
#define IMAGE_640 0
#define IMAGE_800 1
#define IMAGE_1280 2
#define IMAGE_1600 3
struct sd_gl860 {
u16 backlight;
u16 brightness;
u16 sharpness;
u16 contrast;
u16 gamma;
u16 hue;
u16 saturation;
u16 whitebal;
u8 mirror;
u8 flip;
u8 AC50Hz;
};
/* Specific webcam descriptor */
struct sd {
struct gspca_dev gspca_dev; /* !! must be the first item */
struct sd_gl860 vcur;
struct sd_gl860 vold;
struct sd_gl860 vmax;
int (*dev_configure_alt) (struct gspca_dev *);
int (*dev_init_at_startup)(struct gspca_dev *);
int (*dev_init_pre_alt) (struct gspca_dev *);
void (*dev_post_unset_alt) (struct gspca_dev *);
int (*dev_camera_settings)(struct gspca_dev *);
u8 swapRB;
u8 mirrorMask;
u8 sensor;
s32 nbIm;
s32 nbRightUp;
u8 waitSet;
};
struct validx {
u16 val;
u16 idx;
};
struct idxdata {
u8 idx;
u8 data[3];
};
int fetch_validx(struct gspca_dev *gspca_dev, struct validx *tbl, int len);
int keep_on_fetching_validx(struct gspca_dev *gspca_dev, struct validx *tbl,
int len, int n);
void fetch_idxdata(struct gspca_dev *gspca_dev, struct idxdata *tbl, int len);
int gl860_RTx(struct gspca_dev *gspca_dev,
unsigned char pref, u32 req, u16 val, u16 index,
s32 len, void *pdata);
void mi1320_init_settings(struct gspca_dev *);
void ov2640_init_settings(struct gspca_dev *);
void ov9655_init_settings(struct gspca_dev *);
void mi2020_init_settings(struct gspca_dev *);
#endif
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