Commit b517af72 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab

V4L/DVB: gspca_konica: New gspca subdriver for konica chipset using cams

This new driver replaces the (known to not work / crash) usbvideo konicawc
driver.
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1fddcf0e
...@@ -77,6 +77,15 @@ config USB_GSPCA_JEILINJ ...@@ -77,6 +77,15 @@ config USB_GSPCA_JEILINJ
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called gspca_jeilinj. module will be called gspca_jeilinj.
config USB_GSPCA_KONICA
tristate "Konica USB Camera V4L2 driver"
depends on VIDEO_V4L2 && USB_GSPCA
help
Say Y here if you want support for cameras based on the Konica chip.
To compile this driver as a module, choose M here: the
module will be called gspca_konica.
config USB_GSPCA_MARS config USB_GSPCA_MARS
tristate "Mars USB Camera Driver" tristate "Mars USB Camera Driver"
depends on VIDEO_V4L2 && USB_GSPCA depends on VIDEO_V4L2 && USB_GSPCA
......
...@@ -5,6 +5,7 @@ obj-$(CONFIG_USB_GSPCA_CPIA1) += gspca_cpia1.o ...@@ -5,6 +5,7 @@ obj-$(CONFIG_USB_GSPCA_CPIA1) += gspca_cpia1.o
obj-$(CONFIG_USB_GSPCA_ETOMS) += gspca_etoms.o obj-$(CONFIG_USB_GSPCA_ETOMS) += gspca_etoms.o
obj-$(CONFIG_USB_GSPCA_FINEPIX) += gspca_finepix.o obj-$(CONFIG_USB_GSPCA_FINEPIX) += gspca_finepix.o
obj-$(CONFIG_USB_GSPCA_JEILINJ) += gspca_jeilinj.o obj-$(CONFIG_USB_GSPCA_JEILINJ) += gspca_jeilinj.o
obj-$(CONFIG_USB_GSPCA_KONICA) += gspca_konica.o
obj-$(CONFIG_USB_GSPCA_MARS) += gspca_mars.o obj-$(CONFIG_USB_GSPCA_MARS) += gspca_mars.o
obj-$(CONFIG_USB_GSPCA_MR97310A) += gspca_mr97310a.o obj-$(CONFIG_USB_GSPCA_MR97310A) += gspca_mr97310a.o
obj-$(CONFIG_USB_GSPCA_OV519) += gspca_ov519.o obj-$(CONFIG_USB_GSPCA_OV519) += gspca_ov519.o
...@@ -43,6 +44,7 @@ gspca_cpia1-objs := cpia1.o ...@@ -43,6 +44,7 @@ gspca_cpia1-objs := cpia1.o
gspca_etoms-objs := etoms.o gspca_etoms-objs := etoms.o
gspca_finepix-objs := finepix.o gspca_finepix-objs := finepix.o
gspca_jeilinj-objs := jeilinj.o gspca_jeilinj-objs := jeilinj.o
gspca_konica-objs := konica.o
gspca_mars-objs := mars.o gspca_mars-objs := mars.o
gspca_mr97310a-objs := mr97310a.o gspca_mr97310a-objs := mr97310a.o
gspca_ov519-objs := ov519.o gspca_ov519-objs := ov519.o
......
This diff is collapsed.
...@@ -30,10 +30,13 @@ config USB_IBMCAM ...@@ -30,10 +30,13 @@ config USB_IBMCAM
<file:Documentation/video4linux/ibmcam.txt> to learn more. <file:Documentation/video4linux/ibmcam.txt> to learn more.
config USB_KONICAWC config USB_KONICAWC
tristate "USB Konica Webcam support" tristate "USB Konica Webcam support (DEPRECATED)"
depends on VIDEO_V4L1 depends on VIDEO_V4L1
select VIDEO_USBVIDEO select VIDEO_USBVIDEO
---help--- ---help---
This driver is DEPRECATED (and known to crash) please use the
gspca konica module instead.
Say Y here if you want support for webcams based on a Konica Say Y here if you want support for webcams based on a Konica
chipset. This is known to work with the Intel YC76 webcam. chipset. This is known to work with the Intel YC76 webcam.
......
...@@ -364,6 +364,7 @@ struct v4l2_pix_format { ...@@ -364,6 +364,7 @@ struct v4l2_pix_format {
#define V4L2_PIX_FMT_STV0680 v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */ #define V4L2_PIX_FMT_STV0680 v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */
#define V4L2_PIX_FMT_TM6000 v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */ #define V4L2_PIX_FMT_TM6000 v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */
#define V4L2_PIX_FMT_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line of Y then 1 line of VYUY */ #define V4L2_PIX_FMT_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line of Y then 1 line of VYUY */
#define V4L2_PIX_FMT_KONICA420 v4l2_fourcc('K', 'O', 'N', 'I') /* YUV420 planar in blocks of 256 pixels */
/* /*
* F O R M A T E N U M E R A T I O N * F O R M A T E N U M E R A T I O N
......
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