Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f33de0f authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: gspca_xirlink_cit: New gspca subdriver replacing v4l1 usbvideo/ibmcam.c 

The old usbvideo ibmcam driver needs to be replaced with a v4l2 driver
preferably using the gspca webcam framework rather then the old usbvideo
framework.

This new gspca sub driver sets a first step in that direction. The ibmcam
driver supports 4 different model webcams. This new driver (for now) only
supports Model 3 cameras, as my test cam is a Model 3 cam, or so I thought.

Upon reading:
http://www.linux-usb.org/ibmcam/


I learned that the IBM Netcamera Pro I have even though having the same
usb id and the same bcd version is different from the Model 3 cameras
supported by the ibmcam driver. So this new gscpa subdriver supports Model 3
cameras (untested), and the IBM Netcamera Pro. Currently use with the
IBM Netcamera Pro requires a module parameter. I hope to be able to
autodetect which is which in the future.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f1edeea6

drivers/media/video/gspca/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -337,6 +337,15 @@ config USB_GSPCA_VC032X 
	  To compile this driver as a module, choose M here: the

	  module will be called gspca_vc032x.



config USB_GSPCA_XIRLINK_CIT

	tristate "Xirlink C-It USB Camera Driver"

	depends on VIDEO_V4L2 && USB_GSPCA

	help

	  Say Y here if you want support for Xirlink C-It bases cameras.



	  To compile this driver as a module, choose M here: the

	  module will be called gspca_xirlink_cit.



config USB_GSPCA_ZC3XX

	tristate "ZC3XX USB Camera Driver"

	depends on VIDEO_V4L2 && USB_GSPCA

drivers/media/video/gspca/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ obj-$(CONFIG_USB_GSPCA_STV0680) += gspca_stv0680.o 
obj-$(CONFIG_USB_GSPCA_T613)     += gspca_t613.o

obj-$(CONFIG_USB_GSPCA_TV8532)   += gspca_tv8532.o

obj-$(CONFIG_USB_GSPCA_VC032X)   += gspca_vc032x.o

obj-$(CONFIG_USB_GSPCA_XIRLINK_CIT) += gspca_xirlink_cit.o

obj-$(CONFIG_USB_GSPCA_ZC3XX)    += gspca_zc3xx.o



gspca_main-objs     := gspca.o
@@ -70,6 +71,7 @@ gspca_sunplus-objs := sunplus.o 
gspca_t613-objs     := t613.o

gspca_tv8532-objs   := tv8532.o

gspca_vc032x-objs   := vc032x.o

gspca_xirlink_cit-objs := xirlink_cit.o

gspca_zc3xx-objs    := zc3xx.o



obj-$(CONFIG_USB_M5602)   += m5602/

drivers/media/video/gspca/xirlink_cit.c

0 → 100644
+1765 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/videodev2.h

+1 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ struct v4l2_pix_format { 
#define V4L2_PIX_FMT_OV518    v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */

#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_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line of Y then 1 line of VYUY */



/*

 *	F O R M A T   E N U M E R A T I O N