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

Commit 74458e6c authored by Sascha Sommer's avatar Sascha Sommer Committed by Linus Torvalds
Browse files

[PATCH] v4l: 786: chip id removed since it isn t required anymore 



- Chip_id removed since it isn't required anymore.

Signed-off-by: default avatarSascha Sommer <saschasommer@freenet.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d5e52653

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

+0 −3
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ struct em2820_board em2820_boards[] = { 
	},

	[EM2800_BOARD_TERRATEC_CINERGY_200] = {

		.name         = "Terratec Cinergy 200 USB",

		.chip_id      = 0x4,

		.is_em2800    = 1,

		.vchannels    = 3,

		.norm         = VIDEO_MODE_PAL,
@@ -184,7 +183,6 @@ struct em2820_board em2820_boards[] = { 
	},

	[EM2800_BOARD_LEADTEK_WINFAST_USBII] = {

		.name         = "Leadtek Winfast USB II",

		.chip_id      = 0x2,

		.is_em2800    = 1,

		.vchannels    = 3,

		.norm         = VIDEO_MODE_PAL,
@@ -208,7 +206,6 @@ struct em2820_board em2820_boards[] = { 
	},

	[EM2800_BOARD_KWORLD_USB2800] = {

		.name         = "Kworld USB2800",

		.chip_id      = 0x7,

		.is_em2800    = 1,

		.vchannels    = 3,

		.norm         = VIDEO_MODE_PAL,

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

+12 −0
Original line number Diff line number Diff line
@@ -437,6 +437,18 @@ int em2820_scaler_set(struct em2820 *dev, u16 h, u16 v) 
	buf[0] = v;

	buf[1] = v >> 8;

	em2820_write_regs(dev, VSCALELOW_REG, (char *)buf, 2);

	if(dev->is_em2800){

		/* FIXME */

		/* random ratio scaling and 720x567 doesn't seem to work */

		/* the maximum we can get is 640x480 with disabled scaler */

		/* and norm_maxw set to 640 */

		if(dev->width == 640 && dev->height == 480)

			return em2820_write_regs(dev, COMPR_REG,"\x00",1);

		if(dev->height > 288)

			return em2820_write_regs(dev, COMPR_REG,"\x10",1);

		if(dev->width > 360)

			return em2820_write_regs(dev, COMPR_REG,"\x20",1);

	}

	/* when H and V mixershould be used? */

	/*	return em2820_write_reg_bits(dev, COMPR_REG, (h ? 0x20 : 0x00) | (v ? 0x10 : 0x00), 0x30); */

	/* it seems that both H and V scalers must be active to work correctly */

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

+12 −0
Original line number Diff line number Diff line
@@ -1272,6 +1272,18 @@ static int em2820_video_do_ioctl(struct inode *inode, struct file *filp, 
			if (width > maxw)

				width = maxw;



			/* FIXME*/

			if(dev->is_em2800){

				/* we only know how to scale to 50% */

				if(height % (maxh / 2))

					height=maxh;

				if(width % (maxw / 2))

					width=maxw;

				/* larger resoltion don't seem to work either */

				if(width == maxw && height == maxh)

					width /= 2;

			}



			if ((hscale =

			     (((unsigned long)maxw) << 12) / width - 4096L) >=

			    0x4000)

drivers/media/video/em28xx/em28xx.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ enum em2820_decoder { 


struct em2820_board {

	char *name;

	unsigned char chip_id;

	int vchannels;

	int norm;

	int tuner_type;