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

Commit ce5b2acc authored by Jean-François Moine's avatar Jean-François Moine Committed by Mauro Carvalho Chehab
Browse files

[media] gspca - nw80x: New subdriver for Divio based webcams 



[mchehab@redhat.com: Fix a few CodingStyle issues]
Tested-by: default avatarKjell Claesson <kjell.claesson@epost.tidanet.se>
Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 59929cef

Documentation/video4linux/gspca.txt

+9 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ spca561 046d:092d Logitech QC Elch2 
spca561		046d:092e	Logitech QC Elch2

spca561		046d:092f	Logitech QuickCam Express Plus

sunplus		046d:0960	Logitech ClickSmart 420

nw80x		046d:d001	Logitech QuickCam Pro (dark focus ring)

sunplus		0471:0322	Philips DMVC1300K

zc3xx		0471:0325	Philips SPC 200 NC

zc3xx		0471:0326	Philips SPC 300 NC
@@ -150,10 +151,12 @@ sunplus 04fc:5330 Digitrex 2110 
sunplus		04fc:5360	Sunplus Generic

spca500		04fc:7333	PalmPixDC85

sunplus		04fc:ffff	Pure DigitalDakota

nw80x		0502:d001	DVC V6

spca501		0506:00df	3Com HomeConnect Lite

sunplus		052b:1507	Megapixel 5 Pretec DC-1007

sunplus		052b:1513	Megapix V4

sunplus		052b:1803	MegaImage VI

nw80x		052b:d001	EZCam Pro p35u

tv8532		0545:808b	Veo Stingray

tv8532		0545:8333	Veo Stingray

sunplus		0546:3155	Polaroid PDC3070
@@ -177,6 +180,7 @@ sunplus 055f:c530 Mustek Gsmart LCD 3 
sunplus		055f:c540	Gsmart D30

sunplus		055f:c630	Mustek MDC4000

sunplus		055f:c650	Mustek MDC5500Z

nw80x		055f:d001	Mustek Wcam 300 mini

zc3xx		055f:d003	Mustek WCam300A

zc3xx		055f:d004	Mustek WCam300 AN

conex		0572:0041	Creative Notebook cx11646
@@ -195,8 +199,12 @@ gl860 05e3:0503 Genesys Logic PC Camera 
gl860		05e3:f191	Genesys Logic PC Camera

spca561		060b:a001	Maxell Compact Pc PM3

zc3xx		0698:2003	CTX M730V built in

nw80x		06a5:0000	Typhoon Webcam 100 USB

nw80x		06a5:d001	Divio based webcams

nw80x		06a5:d800	Divio Chicony TwinkleCam, Trust SpaceCam

spca500		06bd:0404	Agfa CL20

spca500		06be:0800	Optimedia

nw80x		06be:d001	EZCam Pro p35u

sunplus		06d6:0031	Trust 610 LCD PowerC@m Zoom

spca506		06e1:a190	ADS Instant VCD

ov534		06f8:3002	Hercules Blog Webcam
@@ -204,6 +212,7 @@ ov534_9 06f8:3003 Hercules Dualpix HD Weblog 
sonixj		06f8:3004	Hercules Classic Silver

sonixj		06f8:3008	Hercules Deluxe Optical Glass

pac7302		06f8:3009	Hercules Classic Link

nw80x		0728:d001	AVerMedia Camguard

spca508		0733:0110	ViewQuest VQ110

spca501		0733:0401	Intel Create and Share

spca501		0733:0402	ViewQuest M318B

drivers/media/video/gspca/Kconfig

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

	  module will be called gspca_mr97310a.



config USB_GSPCA_NW80X

	tristate "Divio based (NW80x) USB Camera Driver"

	depends on VIDEO_V4L2 && USB_GSPCA

	help

	  Say Y here if you want support for cameras based on the NW80x chips.



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

	  module will be called gspca_nw80x.



config USB_GSPCA_OV519

	tristate "OV51x / OVFX2 / W996xCF USB Camera Driver"

	depends on VIDEO_V4L2 && USB_GSPCA

drivers/media/video/gspca/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 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_MR97310A) += gspca_mr97310a.o

obj-$(CONFIG_USB_GSPCA_NW80X)    += gspca_nw80x.o

obj-$(CONFIG_USB_GSPCA_OV519)    += gspca_ov519.o

obj-$(CONFIG_USB_GSPCA_OV534)    += gspca_ov534.o

obj-$(CONFIG_USB_GSPCA_OV534_9)  += gspca_ov534_9.o
@@ -48,6 +49,7 @@ gspca_jeilinj-objs := jeilinj.o 
gspca_konica-objs   := konica.o

gspca_mars-objs     := mars.o

gspca_mr97310a-objs := mr97310a.o

gspca_nw80x-objs    := nw80x.o

gspca_ov519-objs    := ov519.o

gspca_ov534-objs    := ov534.o

gspca_ov534_9-objs  := ov534_9.o

drivers/media/video/gspca/nw80x.c

0 → 100644
+2443 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/videodev2.h

+1 −0
Original line number Diff line number Diff line
@@ -396,6 +396,7 @@ struct v4l2_pix_format { 
#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_KONICA420  v4l2_fourcc('K', 'O', 'N', 'I') /* YUV420 planar in blocks of 256 pixels */

#define V4L2_PIX_FMT_JPGL	v4l2_fourcc('J', 'P', 'G', 'L') /* JPEG-Lite */



/*

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