Skip to content

Commit

Permalink
V4L/DVB (3332): XC3028 code marked with an special define option
Browse files Browse the repository at this point in the history
- Current xc3028 support is still experimental, requiring more work to be
  sent to mainstream. So, it was marked inside some defines, in order to be
  removed by gentree.pl stript. Script also updated to remove it.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Mauro Carvalho Chehab committed Feb 27, 2006
1 parent 9475fb1 commit cfcd718
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 18 deletions.
4 changes: 4 additions & 0 deletions drivers/media/video/em28xx/em28xx-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ struct em28xx_board em28xx_boards[] = {
.amux = 1,
}},
},
#ifdef CONFIG_XC3028
[EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = {
.name = "Hauppauge WinTV HVR 900",
.vchannels = 3,
Expand Down Expand Up @@ -222,6 +223,7 @@ struct em28xx_board em28xx_boards[] = {
.amux = 1,
}},
},
#endif
[EM2820_BOARD_MSI_VOX_USB_2] = {
.name = "MSI VOX USB 2.0",
.vchannels = 3,
Expand Down Expand Up @@ -340,9 +342,11 @@ struct usb_device_id em28xx_id_table [] = {
{ USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 },
{ USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },
{ USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },
#ifdef CONFIG_XC3028
{ USB_DEVICE(0x2040, 0x6500), .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 },
{ USB_DEVICE(0x0ccd, 0x0042), .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS },
{ USB_DEVICE(0x0ccd, 0x0047), .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },
#endif
{ },
};

Expand Down
2 changes: 2 additions & 0 deletions drivers/media/video/tuner-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,11 @@ static void set_type(struct i2c_client *c, unsigned int type,
i2c_master_send(c,buffer,4);
default_tuner_init(c);
break;
#ifdef CONFIG_XC3028
case TUNER_XCEIVE_XC3028:
xc3028_init(c);
break;
#endif
default:
default_tuner_init(c);
break;
Expand Down
19 changes: 1 addition & 18 deletions drivers/media/video/tuner-types.c
Original file line number Diff line number Diff line change
Expand Up @@ -983,23 +983,6 @@ static struct tuner_params tuner_samsung_tcpn_2121p30a_params[] = {
},
};

/* ------------ TUNER_XCEIVE_XC3028 - Xceive xc3028 ------------ */

static struct tuner_range tuner_xceive_xc3028_ranges[] = {
{ 16 * 140.25 /*MHz*/, 0x02, },
{ 16 * 463.25 /*MHz*/, 0x04, },
{ 16 * 999.99 , 0x01, },
};

static struct tuner_params tuner_xceive_xc3028_params[] = {
{
.type = TUNER_XCEIVE_XC3028,
.ranges = tuner_xceive_xc3028_ranges,
.count = ARRAY_SIZE(tuner_xceive_xc3028_ranges),
},
};


/* --------------------------------------------------------------------- */

struct tunertype tuners[] = {
Expand Down Expand Up @@ -1369,7 +1352,7 @@ struct tunertype tuners[] = {
},
[TUNER_XCEIVE_XC3028] = { /* Xceive 3028 */
.name = "Xceive xc3028",
.params = tuner_xceive_xc3028_params,
/* see xc3028.c for details */
},
};

Expand Down

0 comments on commit cfcd718

Please sign in to comment.