Commit 657de3cd authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab

V4L/DVB (4118): Whitespace cleanups

Signed-off-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent f49ba8d7
...@@ -280,7 +280,7 @@ Description ...@@ -280,7 +280,7 @@ Description
Param[0] Param[0]
Bitmask: Bitmask:
0:1 Data size: 0:1 Data size:
'00' 16 bit '00' 16 bit
'01' 20 bit '01' 20 bit
'10' 24 bit '10' 24 bit
2:7 Unused 2:7 Unused
...@@ -292,9 +292,9 @@ Param[0] ...@@ -292,9 +292,9 @@ Param[0]
(for left justified MSB first mode, 20 bit only) (for left justified MSB first mode, 20 bit only)
10:11 Unused 10:11 Unused
12:13 Channel format: 12:13 Channel format:
'00' right justified MSB first mode '00' right justified MSB first mode
'01' left justified MSB first mode '01' left justified MSB first mode
'10' I2S mode '10' I2S mode
14:15 Unused 14:15 Unused
16:21 Right justify bit count 16:21 Right justify bit count
22:31 Unused 22:31 Unused
......
...@@ -281,64 +281,64 @@ Description ...@@ -281,64 +281,64 @@ Description
Param[0] Param[0]
Bitmask: Bitmask:
0:1 '00' 44.1Khz 0:1 '00' 44.1Khz
'01' 48Khz '01' 48Khz
'10' 32Khz '10' 32Khz
'11' reserved '11' reserved
2:3 '01'=Layer I 2:3 '01'=Layer I
'10'=Layer II '10'=Layer II
4:7 Bitrate: 4:7 Bitrate:
Index | Layer I | Layer II Index | Layer I | Layer II
------+-------------+------------ ------+-------------+------------
'0000' | free format | free format '0000' | free format | free format
'0001' | 32 kbit/s | 32 kbit/s '0001' | 32 kbit/s | 32 kbit/s
'0010' | 64 kbit/s | 48 kbit/s '0010' | 64 kbit/s | 48 kbit/s
'0011' | 96 kbit/s | 56 kbit/s '0011' | 96 kbit/s | 56 kbit/s
'0100' | 128 kbit/s | 64 kbit/s '0100' | 128 kbit/s | 64 kbit/s
'0101' | 160 kbit/s | 80 kbit/s '0101' | 160 kbit/s | 80 kbit/s
'0110' | 192 kbit/s | 96 kbit/s '0110' | 192 kbit/s | 96 kbit/s
'0111' | 224 kbit/s | 112 kbit/s '0111' | 224 kbit/s | 112 kbit/s
'1000' | 256 kbit/s | 128 kbit/s '1000' | 256 kbit/s | 128 kbit/s
'1001' | 288 kbit/s | 160 kbit/s '1001' | 288 kbit/s | 160 kbit/s
'1010' | 320 kbit/s | 192 kbit/s '1010' | 320 kbit/s | 192 kbit/s
'1011' | 352 kbit/s | 224 kbit/s '1011' | 352 kbit/s | 224 kbit/s
'1100' | 384 kbit/s | 256 kbit/s '1100' | 384 kbit/s | 256 kbit/s
'1101' | 416 kbit/s | 320 kbit/s '1101' | 416 kbit/s | 320 kbit/s
'1110' | 448 kbit/s | 384 kbit/s '1110' | 448 kbit/s | 384 kbit/s
Note: For Layer II, not all combinations of total bitrate Note: For Layer II, not all combinations of total bitrate
and mode are allowed. See ISO11172-3 3-Annex B, Table 3-B.2 and mode are allowed. See ISO11172-3 3-Annex B, Table 3-B.2
8:9 '00'=Stereo 8:9 '00'=Stereo
'01'=JointStereo '01'=JointStereo
'10'=Dual '10'=Dual
'11'=Mono '11'=Mono
10:11 Mode Extension used in joint_stereo mode. 10:11 Mode Extension used in joint_stereo mode.
In Layer I and II they indicate which subbands are in In Layer I and II they indicate which subbands are in
intensity_stereo. All other subbands are coded in stereo. intensity_stereo. All other subbands are coded in stereo.
'00' subbands 4-31 in intensity_stereo, bound==4 '00' subbands 4-31 in intensity_stereo, bound==4
'01' subbands 8-31 in intensity_stereo, bound==8 '01' subbands 8-31 in intensity_stereo, bound==8
'10' subbands 12-31 in intensity_stereo, bound==12 '10' subbands 12-31 in intensity_stereo, bound==12
'11' subbands 16-31 in intensity_stereo, bound==16 '11' subbands 16-31 in intensity_stereo, bound==16
12:13 Emphasis: 12:13 Emphasis:
'00' None '00' None
'01' 50/15uS '01' 50/15uS
'10' reserved '10' reserved
'11' CCITT J.17 '11' CCITT J.17
14 CRC: 14 CRC:
'0' off '0' off
'1' on '1' on
15 Copyright: 15 Copyright:
'0' off '0' off
'1' on '1' on
16 Generation: 16 Generation:
'0' copy '0' copy
'1' original '1' original
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
......
...@@ -60,7 +60,7 @@ DMA Registers 0x000-0xff: ...@@ -60,7 +60,7 @@ DMA Registers 0x000-0xff:
if changed to 0xffffffff DMA write interrupts break. if changed to 0xffffffff DMA write interrupts break.
0x50 - always 0xffffffff 0x50 - always 0xffffffff
0x54 - always 0xffffffff (0x4c, 0x50, 0x54 seem like interrupt masks, are 0x54 - always 0xffffffff (0x4c, 0x50, 0x54 seem like interrupt masks, are
3 processors on chip, Java ones, VPU, SPU, APU, maybe these are the 3 processors on chip, Java ones, VPU, SPU, APU, maybe these are the
interrupt masks???). interrupt masks???).
0x60-0x7C - random values 0x60-0x7C - random values
0x80 - first write linked list reg, for Encoder Memory addr 0x80 - first write linked list reg, for Encoder Memory addr
......
...@@ -363,7 +363,7 @@ static int __init typhoon_init(void) ...@@ -363,7 +363,7 @@ static int __init typhoon_init(void)
#ifdef CONFIG_RADIO_TYPHOON_PROC_FS #ifdef CONFIG_RADIO_TYPHOON_PROC_FS
if (!create_proc_info_entry("driver/radio-typhoon", 0, NULL, if (!create_proc_info_entry("driver/radio-typhoon", 0, NULL,
typhoon_get_info)) typhoon_get_info))
printk(KERN_ERR "radio-typhoon: registering /proc/driver/radio-typhoon failed\n"); printk(KERN_ERR "radio-typhoon: registering /proc/driver/radio-typhoon failed\n");
#endif #endif
return 0; return 0;
......
...@@ -213,7 +213,7 @@ void init_iic(void) ...@@ -213,7 +213,7 @@ void init_iic(void)
ar_outl(0x0300, PLDI2CMOD); /* I2CMOD ACK/8b-data/7b-addr/auto */ ar_outl(0x0300, PLDI2CMOD); /* I2CMOD ACK/8b-data/7b-addr/auto */
ar_outl(0x1, PLDI2CACK); /* I2CACK ACK */ ar_outl(0x1, PLDI2CACK); /* I2CACK ACK */
/* I2C CLK */ /* I2C CLK */
/* 50MH-100k */ /* 50MH-100k */
if (freq == 75) { if (freq == 75) {
ar_outl(369, PLDI2CFREQ); /* BCLK = 75MHz */ ar_outl(369, PLDI2CFREQ); /* BCLK = 75MHz */
......
...@@ -269,7 +269,7 @@ static struct CARD { ...@@ -269,7 +269,7 @@ static struct CARD {
{ 0x41a0a051, BTTV_BOARD_FLYVIDEO_98FM, "Lifeview FlyVideo 98 LR50 Rev Q" }, { 0x41a0a051, BTTV_BOARD_FLYVIDEO_98FM, "Lifeview FlyVideo 98 LR50 Rev Q" },
{ 0x18501f7f, BTTV_BOARD_FLYVIDEO_98, "Lifeview Flyvideo 98" }, { 0x18501f7f, BTTV_BOARD_FLYVIDEO_98, "Lifeview Flyvideo 98" },
{ 0x010115cb, BTTV_BOARD_GMV1, "AG GMV1" }, { 0x010115cb, BTTV_BOARD_GMV1, "AG GMV1" },
{ 0x010114c7, BTTV_BOARD_MODTEC_205, "Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV" }, { 0x010114c7, BTTV_BOARD_MODTEC_205, "Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV" },
{ 0x10b42636, BTTV_BOARD_HAUPPAUGE878, "STB ???" }, { 0x10b42636, BTTV_BOARD_HAUPPAUGE878, "STB ???" },
......
...@@ -355,7 +355,7 @@ int bttv_input_init(struct bttv *btv) ...@@ -355,7 +355,7 @@ int bttv_input_init(struct bttv *btv)
if (ir->rc5_gpio) { if (ir->rc5_gpio) {
u32 gpio; u32 gpio;
/* enable remote irq */ /* enable remote irq */
bttv_gpio_inout(&btv->c, (1 << 4), 1 << 4); bttv_gpio_inout(&btv->c, (1 << 4), 1 << 4);
gpio = bttv_gpio_read(&btv->c); gpio = bttv_gpio_read(&btv->c);
bttv_gpio_write(&btv->c, gpio & ~(1 << 4)); bttv_gpio_write(&btv->c, gpio & ~(1 << 4));
......
...@@ -760,7 +760,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file, ...@@ -760,7 +760,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
{ {
struct video_picture *p = arg; struct video_picture *p = arg;
if(p->palette!=VIDEO_PALETTE_GREY) if(p->palette!=VIDEO_PALETTE_GREY)
return -EINVAL; return -EINVAL;
if(p->depth!=4 && p->depth!=6) if(p->depth!=4 && p->depth!=6)
return -EINVAL; return -EINVAL;
......
...@@ -1167,9 +1167,9 @@ static int ioctl_g_ctrl(void *arg,struct camera_data *cam) ...@@ -1167,9 +1167,9 @@ static int ioctl_g_ctrl(void *arg,struct camera_data *cam)
} else { } else {
if(cam->params.flicker_control.cam_register & if(cam->params.flicker_control.cam_register &
CPIA2_VP_FLICKER_MODES_50HZ) { CPIA2_VP_FLICKER_MODES_50HZ) {
mode = FLICKER_50; mode = FLICKER_50;
} else { } else {
mode = FLICKER_60; mode = FLICKER_60;
} }
} }
for(i=0; i<NUM_FLICKER_CONTROLS; i++) { for(i=0; i<NUM_FLICKER_CONTROLS; i++) {
......
...@@ -358,7 +358,7 @@ static struct or51132_config pchdtv_hd3000 = { ...@@ -358,7 +358,7 @@ static struct or51132_config pchdtv_hd3000 = {
#ifdef HAVE_LGDT330X #ifdef HAVE_LGDT330X
static int lgdt3302_tuner_set_params(struct dvb_frontend* fe, static int lgdt3302_tuner_set_params(struct dvb_frontend* fe,
struct dvb_frontend_parameters* params) struct dvb_frontend_parameters* params)
{ {
/* FIXME make this routine use the tuner-simple code. /* FIXME make this routine use the tuner-simple code.
* It could probably be shared with a number of ATSC * It could probably be shared with a number of ATSC
......
...@@ -3239,7 +3239,7 @@ ov511_move_data(struct usb_ov511 *ov, unsigned char *in, int n) ...@@ -3239,7 +3239,7 @@ ov511_move_data(struct usb_ov511 *ov, unsigned char *in, int n)
RESTRICT_TO_RANGE(frame->bytes_recvd, 8, max_raw); RESTRICT_TO_RANGE(frame->bytes_recvd, 8, max_raw);
if (frame->scanstate == STATE_LINES) { if (frame->scanstate == STATE_LINES) {
int nextf; int nextf;
frame->grabstate = FRAME_DONE; frame->grabstate = FRAME_DONE;
wake_up_interruptible(&frame->wq); wake_up_interruptible(&frame->wq);
...@@ -3405,7 +3405,7 @@ ov518_move_data(struct usb_ov511 *ov, unsigned char *in, int n) ...@@ -3405,7 +3405,7 @@ ov518_move_data(struct usb_ov511 *ov, unsigned char *in, int n)
RESTRICT_TO_RANGE(frame->bytes_recvd, 8, max_raw); RESTRICT_TO_RANGE(frame->bytes_recvd, 8, max_raw);
if (frame->scanstate == STATE_LINES) { if (frame->scanstate == STATE_LINES) {
int nextf; int nextf;
frame->grabstate = FRAME_DONE; frame->grabstate = FRAME_DONE;
wake_up_interruptible(&frame->wq); wake_up_interruptible(&frame->wq);
......
...@@ -805,7 +805,7 @@ static int pms_do_ioctl(struct inode *inode, struct file *file, ...@@ -805,7 +805,7 @@ static int pms_do_ioctl(struct inode *inode, struct file *file,
struct video_picture *p = arg; struct video_picture *p = arg;
if(!((p->palette==VIDEO_PALETTE_RGB565 && p->depth==16) if(!((p->palette==VIDEO_PALETTE_RGB565 && p->depth==16)
||(p->palette==VIDEO_PALETTE_RGB555 && p->depth==15))) ||(p->palette==VIDEO_PALETTE_RGB555 && p->depth==15)))
return -EINVAL; return -EINVAL;
pd->picture= *p; pd->picture= *p;
/* /*
......
...@@ -1385,7 +1385,7 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg) ...@@ -1385,7 +1385,7 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
ARG_IN(leds) ARG_IN(leds)
ret = pwc_set_leds(pdev, ARGR(leds).led_on, ARGR(leds).led_off); ret = pwc_set_leds(pdev, ARGR(leds).led_on, ARGR(leds).led_off);
break; break;
} }
......
...@@ -105,7 +105,7 @@ static void build_bit_powermask_table(struct pwc_dec23_private *pdec) ...@@ -105,7 +105,7 @@ static void build_bit_powermask_table(struct pwc_dec23_private *pdec)
static void build_table_color(const unsigned int romtable[16][8], static void build_table_color(const unsigned int romtable[16][8],
unsigned char p0004[16][1024], unsigned char p0004[16][1024],
unsigned char p8004[16][256]) unsigned char p8004[16][256])
{ {
int compression_mode, j, k, bit, pw; int compression_mode, j, k, bit, pw;
...@@ -787,7 +787,7 @@ static void DecompressBand23(struct pwc_dec23_private *pdec, ...@@ -787,7 +787,7 @@ static void DecompressBand23(struct pwc_dec23_private *pdec,
* *
*/ */
static void DecompressBandBayer(struct pwc_dec23_private *pdec, static void DecompressBandBayer(struct pwc_dec23_private *pdec,
const unsigned char *rawyuv, const unsigned char *rawyuv,
unsigned char *rgbbayer, unsigned char *rgbbayer,
unsigned int compressed_image_width, unsigned int compressed_image_width,
unsigned int real_image_width) unsigned int real_image_width)
......
...@@ -1064,7 +1064,7 @@ static const char *pwc_sensor_type_to_string(unsigned int sensor_type) ...@@ -1064,7 +1064,7 @@ static const char *pwc_sensor_type_to_string(unsigned int sensor_type)
case 0x101: case 0x101:
return "PAL MR sensor"; return "PAL MR sensor";
default: default:
return "unknown type of sensor"; return "unknown type of sensor";
} }
} }
#endif #endif
...@@ -1696,10 +1696,10 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id ...@@ -1696,10 +1696,10 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
(device_hint[hint].pdev == NULL)) { (device_hint[hint].pdev == NULL)) {
/* so far, so good... try serial number */ /* so far, so good... try serial number */
if ((device_hint[hint].serial_number[0] == '*') || !strcmp(device_hint[hint].serial_number, serial_number)) { if ((device_hint[hint].serial_number[0] == '*') || !strcmp(device_hint[hint].serial_number, serial_number)) {
/* match! */ /* match! */
video_nr = device_hint[hint].device_node; video_nr = device_hint[hint].device_node;
PWC_DEBUG_PROBE("Found hint, will try to register as /dev/video%d\n", video_nr); PWC_DEBUG_PROBE("Found hint, will try to register as /dev/video%d\n", video_nr);
break; break;
} }
} }
} }
......
...@@ -676,9 +676,9 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file, ...@@ -676,9 +676,9 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
break; break;
} }
/* V4L2 Layer */ /* V4L2 Layer */
case VIDIOC_QUERYCAP: case VIDIOC_QUERYCAP:
{ {
struct v4l2_capability *cap = arg; struct v4l2_capability *cap = arg;
PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCAP) This application "\ PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCAP) This application "\
...@@ -694,8 +694,8 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file, ...@@ -694,8 +694,8 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
return 0; return 0;
} }
case VIDIOC_ENUMINPUT: case VIDIOC_ENUMINPUT:
{ {
struct v4l2_input *i = arg; struct v4l2_input *i = arg;
if ( i->index ) /* Only one INPUT is supported */ if ( i->index ) /* Only one INPUT is supported */
...@@ -706,14 +706,14 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file, ...@@ -706,14 +706,14 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
return 0; return 0;
} }
case VIDIOC_G_INPUT: case VIDIOC_G_INPUT:
{ {
int *i = arg; int *i = arg;
*i = 0; /* Only one INPUT is supported */ *i = 0; /* Only one INPUT is supported */
return 0; return 0;
} }
case VIDIOC_S_INPUT: case VIDIOC_S_INPUT:
{ {
int *i = arg; int *i = arg;
if ( *i ) { /* Only one INPUT is supported */ if ( *i ) { /* Only one INPUT is supported */
...@@ -725,7 +725,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file, ...@@ -725,7 +725,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
} }
/* TODO: */ /* TODO: */
case VIDIOC_QUERYCTRL: case VIDIOC_QUERYCTRL:
{ {
struct v4l2_queryctrl *c = arg; struct v4l2_queryctrl *c = arg;
int i; int i;
...@@ -963,13 +963,13 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file, ...@@ -963,13 +963,13 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
case VIDIOC_ENUM_FMT: case VIDIOC_ENUM_FMT:
{ {
struct v4l2_fmtdesc *f = arg; struct v4l2_fmtdesc *f = arg;
int index; int index;
if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL; return -EINVAL;
/* We only support two format: the raw format, and YUV */ /* We only support two format: the raw format, and YUV */
index = f->index; index = f->index;
memset(f,0,sizeof(struct v4l2_fmtdesc)); memset(f,0,sizeof(struct v4l2_fmtdesc));
f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
...@@ -978,23 +978,23 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file, ...@@ -978,23 +978,23 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
{ {
case 0: case 0:
/* RAW format */ /* RAW format */
f->pixelformat = pdev->type<=646?V4L2_PIX_FMT_PWC1:V4L2_PIX_FMT_PWC2; f->pixelformat = pdev->type<=646?V4L2_PIX_FMT_PWC1:V4L2_PIX_FMT_PWC2;
f->flags = V4L2_FMT_FLAG_COMPRESSED; f->flags = V4L2_FMT_FLAG_COMPRESSED;
strlcpy(f->description,"Raw Philips Webcam",sizeof(f->description)); strlcpy(f->description,"Raw Philips Webcam",sizeof(f->description));
break; break;
case 1: case 1:
f->pixelformat = V4L2_PIX_FMT_YUV420; f->pixelformat = V4L2_PIX_FMT_YUV420;
strlcpy(f->description,"4:2:0, planar, Y-Cb-Cr",sizeof(f->description)); strlcpy(f->description,"4:2:0, planar, Y-Cb-Cr",sizeof(f->description));
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
} }
case VIDIOC_G_FMT: case VIDIOC_G_FMT:
{ {
struct v4l2_format *f = arg; struct v4l2_format *f = arg;
PWC_DEBUG_IOCTL("ioctl(VIDIOC_G_FMT) return size %dx%d\n",pdev->image.x,pdev->image.y); PWC_DEBUG_IOCTL("ioctl(VIDIOC_G_FMT) return size %dx%d\n",pdev->image.x,pdev->image.y);
if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
...@@ -1008,7 +1008,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file, ...@@ -1008,7 +1008,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
case VIDIOC_TRY_FMT: case VIDIOC_TRY_FMT:
return pwc_vidioc_try_fmt(pdev, arg); return pwc_vidioc_try_fmt(pdev, arg);
case VIDIOC_S_FMT: case VIDIOC_S_FMT:
return pwc_vidioc_set_fmt(pdev, arg); return pwc_vidioc_set_fmt(pdev, arg);
case VIDIOC_G_STD: case VIDIOC_G_STD:
......
...@@ -62,11 +62,11 @@ struct saa6752hs_state { ...@@ -62,11 +62,11 @@ struct saa6752hs_state {
enum saa6752hs_command { enum saa6752hs_command {
SAA6752HS_COMMAND_RESET = 0, SAA6752HS_COMMAND_RESET = 0,
SAA6752HS_COMMAND_STOP = 1, SAA6752HS_COMMAND_STOP = 1,
SAA6752HS_COMMAND_START = 2, SAA6752HS_COMMAND_START = 2,
SAA6752HS_COMMAND_PAUSE = 3, SAA6752HS_COMMAND_PAUSE = 3,
SAA6752HS_COMMAND_RECONFIGURE = 4, SAA6752HS_COMMAND_RECONFIGURE = 4,
SAA6752HS_COMMAND_SLEEP = 5, SAA6752HS_COMMAND_SLEEP = 5,
SAA6752HS_COMMAND_RECONFIGURE_FORCE = 6, SAA6752HS_COMMAND_RECONFIGURE_FORCE = 6,
SAA6752HS_COMMAND_MAX SAA6752HS_COMMAND_MAX
...@@ -241,19 +241,19 @@ static int saa6752hs_set_bitrate(struct i2c_client* client, ...@@ -241,19 +241,19 @@ static int saa6752hs_set_bitrate(struct i2c_client* client,
if (params->vi_bitrate.mode == V4L2_BITRATE_VBR) { if (params->vi_bitrate.mode == V4L2_BITRATE_VBR) {
/* set the target bitrate */ /* set the target bitrate */
buf[0] = 0x80; buf[0] = 0x80;
buf[1] = params->vi_bitrate.target >> 8; buf[1] = params->vi_bitrate.target >> 8;
buf[2] = params->vi_bitrate.target & 0xff; buf[2] = params->vi_bitrate.target & 0xff;
i2c_master_send(client, buf, 3); i2c_master_send(client, buf, 3);
/* set the max bitrate */ /* set the max bitrate */
buf[0] = 0x81; buf[0] = 0x81;
buf[1] = params->vi_bitrate.max >> 8; buf[1] = params->vi_bitrate.max >> 8;
buf[2] = params->vi_bitrate.max & 0xff; buf[2] = params->vi_bitrate.max & 0xff;
i2c_master_send(client, buf, 3); i2c_master_send(client, buf, 3);
} else { } else {
/* set the target bitrate (no max bitrate for CBR) */ /* set the target bitrate (no max bitrate for CBR) */
buf[0] = 0x81; buf[0] = 0x81;
buf[1] = params->vi_bitrate.target >> 8; buf[1] = params->vi_bitrate.target >> 8;
buf[2] = params->vi_bitrate.target & 0xff; buf[2] = params->vi_bitrate.target & 0xff;
i2c_master_send(client, buf, 3); i2c_master_send(client, buf, 3);
} }
...@@ -395,22 +395,22 @@ static int saa6752hs_init(struct i2c_client* client) ...@@ -395,22 +395,22 @@ static int saa6752hs_init(struct i2c_client* client)
buf[2] = 0x0D; buf[2] = 0x0D;
i2c_master_send(client,buf,3); i2c_master_send(client,buf,3);
/* Set minimum Q-scale {4} */ /* Set minimum Q-scale {4} */
buf[0] = 0x82; buf[0] = 0x82;
buf[1] = 0x04; buf[1] = 0x04;
i2c_master_send(client,buf,2); i2c_master_send(client,buf,2);
/* Set maximum Q-scale {12} */ /* Set maximum Q-scale {12} */
buf[0] = 0x83; buf[0] = 0x83;
buf[1] = 0x0C; buf[1] = 0x0C;
i2c_master_send(client,buf,2); i2c_master_send(client,buf,2);
/* Set Output Protocol */ /* Set Output Protocol */
buf[0] = 0xD0; buf[0] = 0xD0;
buf[1] = 0x81; buf[1] = 0x81;
i2c_master_send(client,buf,2); i2c_master_send(client,buf,2);
/* Set video output stream format {TS} */ /* Set video output stream format {TS} */
buf[0] = 0xB0; buf[0] = 0xB0;
buf[1] = 0x05; buf[1] = 0x05;
i2c_master_send(client,buf,2); i2c_master_send(client,buf,2);
...@@ -441,7 +441,7 @@ static int saa6752hs_init(struct i2c_client* client) ...@@ -441,7 +441,7 @@ static int saa6752hs_init(struct i2c_client* client)
localPMT[sizeof(PMT) - 2] = (crc >> 8) & 0xFF; localPMT[sizeof(PMT) - 2] = (crc >> 8) & 0xFF;
localPMT[sizeof(PMT) - 1] = crc & 0xFF; localPMT[sizeof(PMT) - 1] = crc & 0xFF;
/* Set Audio PID */ /* Set Audio PID */
buf[0] = 0xC1; buf[0] = 0xC1;
buf[1] = (h->params.ts_pid_audio >> 8) & 0xFF; buf[1] = (h->params.ts_pid_audio >> 8) & 0xFF;
buf[2] = h->params.ts_pid_audio & 0xFF; buf[2] = h->params.ts_pid_audio & 0xFF;
......
...@@ -818,7 +818,7 @@ static int snd_saa7134_capsrc_put(struct snd_kcontrol * kcontrol, ...@@ -818,7 +818,7 @@ static int snd_saa7134_capsrc_put(struct snd_kcontrol * kcontrol,
break; break;
} }
/* output xbar always main channel */ /* output xbar always main channel */
saa_dsp_writel(dev, SAA7133_DIGITAL_OUTPUT_SEL1, 0xbbbb10); saa_dsp_writel(dev, SAA7133_DIGITAL_OUTPUT_SEL1, 0xbbbb10);
if (left || right) { // We've got data, turn the input on if (left || right) { // We've got data, turn the input on
......
...@@ -2160,7 +2160,7 @@ struct saa7134_board saa7134_boards[] = { ...@@ -2160,7 +2160,7 @@ struct saa7134_board saa7134_boards[] = {
.radio = { .radio = {
.name = name_radio, .name = name_radio,
.amux = LINE2, .amux = LINE2,
}, },
}, },
[SAA7134_BOARD_GOTVIEW_7135] = { [SAA7134_BOARD_GOTVIEW_7135] = {
/* Mike Baikov <mike@baikov.com> */ /* Mike Baikov <mike@baikov.com> */
......
...@@ -164,7 +164,7 @@ static void do_tda9875_init(struct i2c_client *client) ...@@ -164,7 +164,7 @@ static void do_tda9875_init(struct i2c_client *client)
struct tda9875 *t = i2c_get_clientdata(client); struct tda9875 *t = i2c_get_clientdata(client);
dprintk("In tda9875_init\n"); dprintk("In tda9875_init\n");
tda9875_write(client, TDA9875_CFG, 0xd0 ); /*reg de config 0 (reset)*/ tda9875_write(client, TDA9875_CFG, 0xd0 ); /*reg de config 0 (reset)*/
tda9875_write(client, TDA9875_MSR, 0x03 ); /* Monitor 0b00000XXX*/ tda9875_write(client, TDA9875_MSR, 0x03 ); /* Monitor 0b00000XXX*/
tda9875_write(client, TDA9875_C1MSB, 0x00 ); /*Car1(FM) MSB XMHz*/ tda9875_write(client, TDA9875_C1MSB, 0x00 ); /*Car1(FM) MSB XMHz*/
tda9875_write(client, TDA9875_C1MIB, 0x00 ); /*Car1(FM) MIB XMHz*/ tda9875_write(client, TDA9875_C1MIB, 0x00 ); /*Car1(FM) MIB XMHz*/
tda9875_write(client, TDA9875_C1LSB, 0x00 ); /*Car1(FM) LSB XMHz*/ tda9875_write(client, TDA9875_C1LSB, 0x00 ); /*Car1(FM) LSB XMHz*/
......
...@@ -105,7 +105,7 @@ static int tuner_stereo(struct i2c_client *c) ...@@ -105,7 +105,7 @@ static int tuner_stereo(struct i2c_client *c)
switch (t->type) { switch (t->type) {
case TUNER_PHILIPS_FM1216ME_MK3: case TUNER_PHILIPS_FM1216ME_MK3:
case TUNER_PHILIPS_FM1236_MK3: case TUNER_PHILIPS_FM1236_MK3:
case TUNER_PHILIPS_FM1256_IH3: case TUNER_PHILIPS_FM1256_IH3:
stereo = ((status & TUNER_SIGNAL) == TUNER_STEREO_MK3); stereo = ((status & TUNER_SIGNAL) == TUNER_STEREO_MK3);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment