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

Commit 59d07f1b authored by Aron Szabo's avatar Aron Szabo Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8538): em28xx-cards: Add GrabBeeX+ USB2800 model 



Added GrabBeeX+ USB2800 model (analog only)

[mchehab@infradead.org: Need to fix some merge conflicts]
Signed-off-by: default avatarAron Szabo <aron@aron.ws>
Signed-off-by: default avatarDouglas Schilling Landgraf <dougsland@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 50cb993e

Documentation/video4linux/CARDLIST.em28xx

+1 −0
Original line number Diff line number Diff line
@@ -19,3 +19,4 @@ 
 18 -> Hauppauge WinTV HVR 900 (R2)             (em2880)        [2040:6502]

 19 -> PointNix Intra-Oral Camera               (em2860)

 20 -> AMD ATI TV Wonder HD 600                 (em2880)        [0438:b002]

 21 -> eMPIA Technology, Inc. GrabBeeX+ Video Encoder (em2800)        [eb1a:2801]

drivers/media/video/em28xx/em28xx-cards.c

+19 −0
Original line number Diff line number Diff line
@@ -375,6 +375,21 @@ struct em28xx_board em28xx_boards[] = { 
			.amux     = 1,

		} },

	},

	[EM2800_BOARD_GRABBEEX_USB2800] = {

		.name         = "eMPIA Technology, Inc. GrabBeeX+ Video Encoder",

		.is_em2800    = 1,

		.vchannels    = 2,

		.decoder      = EM28XX_SAA7113,

		.input          = { {

			.type     = EM28XX_VMUX_COMPOSITE1,

			.vmux     = SAA7115_COMPOSITE0,

			.amux     = 1,

		}, {

			.type     = EM28XX_VMUX_SVIDEO,

			.vmux     = SAA7115_SVIDEO3,

			.amux     = 1,

		} },

	},

	[EM2800_BOARD_LEADTEK_WINFAST_USBII] = {

		.name         = "Leadtek Winfast USB II",

		.is_em2800    = 1,
@@ -541,6 +556,8 @@ struct usb_device_id em28xx_id_table [] = { 
			.driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },

	{ USB_DEVICE(0x0438, 0xb002),

			.driver_info = EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600 },

	{ USB_DEVICE(0xeb1a, 0x2801),

			.driver_info = EM2800_BOARD_GRABBEEX_USB2800 },

	{ },

};

MODULE_DEVICE_TABLE(usb, em28xx_id_table);
@@ -863,6 +880,8 @@ void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir) 
		break;

	case (EM2800_BOARD_KWORLD_USB2800):

		break;

	case (EM2800_BOARD_GRABBEEX_USB2800):

		break;

	}

}

drivers/media/video/em28xx/em28xx.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2	18

#define EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA  19

#define EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600   20

#define EM2800_BOARD_GRABBEEX_USB2800           21



/* Limits minimum and default number of buffers */

#define EM28XX_MIN_BUF 4