Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: replace all <spaces><tab> occurrences

There are a lot of places where sequences of space/tabs are
found. Get rid of all spaces before tabs.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

+1715 -1715
+4 -4
drivers/media/common/saa7146/saa7146_video.c
··· 1001 1001 .vidioc_try_fmt_vid_overlay = vidioc_try_fmt_vid_overlay, 1002 1002 .vidioc_s_fmt_vid_overlay = vidioc_s_fmt_vid_overlay, 1003 1003 1004 - .vidioc_overlay = vidioc_overlay, 1005 - .vidioc_g_fbuf = vidioc_g_fbuf, 1006 - .vidioc_s_fbuf = vidioc_s_fbuf, 1004 + .vidioc_overlay = vidioc_overlay, 1005 + .vidioc_g_fbuf = vidioc_g_fbuf, 1006 + .vidioc_s_fbuf = vidioc_s_fbuf, 1007 1007 .vidioc_reqbufs = vidioc_reqbufs, 1008 1008 .vidioc_querybuf = vidioc_querybuf, 1009 1009 .vidioc_qbuf = vidioc_qbuf, ··· 1012 1012 .vidioc_s_std = vidioc_s_std, 1013 1013 .vidioc_streamon = vidioc_streamon, 1014 1014 .vidioc_streamoff = vidioc_streamoff, 1015 - .vidioc_g_parm = vidioc_g_parm, 1015 + .vidioc_g_parm = vidioc_g_parm, 1016 1016 .vidioc_subscribe_event = v4l2_ctrl_subscribe_event, 1017 1017 .vidioc_unsubscribe_event = v4l2_event_unsubscribe, 1018 1018 };
+1 -1
drivers/media/dvb-core/Makefile
··· 7 7 dvb-vb2-$(CONFIG_DVB_MMSP) := dvb_vb2.o 8 8 9 9 dvb-core-objs := dvbdev.o dmxdev.o dvb_demux.o \ 10 - dvb_ca_en50221.o dvb_frontend.o \ 10 + dvb_ca_en50221.o dvb_frontend.o \ 11 11 $(dvb-net-y) dvb_ringbuffer.o $(dvb-vb2-y) dvb_math.o 12 12 13 13 obj-$(CONFIG_DVB_CORE) += dvb-core.o
+109 -109
drivers/media/dvb-frontends/au8522_priv.h
··· 99 99 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H 0x0A5 100 100 #define AU8522_AGC_CONTROL_RANGE_REG0A6H 0x0A6 101 101 #define AU8522_SYSTEM_GAIN_CONTROL_REG0A7H 0x0A7 102 - #define AU8522_TUNER_AGC_RF_STOP_REG0A8H 0x0A8 102 + #define AU8522_TUNER_AGC_RF_STOP_REG0A8H 0x0A8 103 103 #define AU8522_TUNER_AGC_RF_START_REG0A9H 0x0A9 104 104 #define AU8522_TUNER_RF_AGC_DEFAULT_REG0AAH 0x0AA 105 105 #define AU8522_TUNER_AGC_IF_STOP_REG0ABH 0x0AB ··· 110 110 111 111 /* Receiver registers */ 112 112 #define AU8522_FRMREGTHRD1_REG0B0H 0x0B0 113 - #define AU8522_FRMREGAGC1H_REG0B1H 0x0B1 114 - #define AU8522_FRMREGSHIFT1_REG0B2H 0x0B2 115 - #define AU8522_TOREGAGC1_REG0B3H 0x0B3 116 - #define AU8522_TOREGASHIFT1_REG0B4H 0x0B4 113 + #define AU8522_FRMREGAGC1H_REG0B1H 0x0B1 114 + #define AU8522_FRMREGSHIFT1_REG0B2H 0x0B2 115 + #define AU8522_TOREGAGC1_REG0B3H 0x0B3 116 + #define AU8522_TOREGASHIFT1_REG0B4H 0x0B4 117 117 #define AU8522_FRMREGBBH_REG0B5H 0x0B5 118 - #define AU8522_FRMREGBBM_REG0B6H 0x0B6 119 - #define AU8522_FRMREGBBL_REG0B7H 0x0B7 118 + #define AU8522_FRMREGBBM_REG0B6H 0x0B6 119 + #define AU8522_FRMREGBBL_REG0B7H 0x0B7 120 120 /* 0xB8 TO 0xD7 are the filter coefficients */ 121 - #define AU8522_FRMREGTHRD2_REG0D8H 0x0D8 122 - #define AU8522_FRMREGAGC2H_REG0D9H 0x0D9 123 - #define AU8522_TOREGAGC2_REG0DAH 0x0DA 124 - #define AU8522_TOREGSHIFT2_REG0DBH 0x0DB 121 + #define AU8522_FRMREGTHRD2_REG0D8H 0x0D8 122 + #define AU8522_FRMREGAGC2H_REG0D9H 0x0D9 123 + #define AU8522_TOREGAGC2_REG0DAH 0x0DA 124 + #define AU8522_TOREGSHIFT2_REG0DBH 0x0DB 125 125 #define AU8522_FRMREGPILOTH_REG0DCH 0x0DC 126 126 #define AU8522_FRMREGPILOTM_REG0DDH 0x0DD 127 127 #define AU8522_FRMREGPILOTL_REG0DEH 0x0DE ··· 134 134 #define AU8522_CHIP_MODE_REG0FEH 0x0FE 135 135 136 136 /* I2C bus control registers */ 137 - #define AU8522_I2C_CONTROL_REG0_REG090H 0x090 138 - #define AU8522_I2C_CONTROL_REG1_REG091H 0x091 139 - #define AU8522_I2C_STATUS_REG092H 0x092 137 + #define AU8522_I2C_CONTROL_REG0_REG090H 0x090 138 + #define AU8522_I2C_CONTROL_REG1_REG091H 0x091 139 + #define AU8522_I2C_STATUS_REG092H 0x092 140 140 #define AU8522_I2C_WR_DATA0_REG093H 0x093 141 141 #define AU8522_I2C_WR_DATA1_REG094H 0x094 142 142 #define AU8522_I2C_WR_DATA2_REG095H 0x095 ··· 156 156 157 157 #define AU8522_ENA_USB_REG101H 0x101 158 158 159 - #define AU8522_I2S_CTRL_0_REG110H 0x110 160 - #define AU8522_I2S_CTRL_1_REG111H 0x111 161 - #define AU8522_I2S_CTRL_2_REG112H 0x112 159 + #define AU8522_I2S_CTRL_0_REG110H 0x110 160 + #define AU8522_I2S_CTRL_1_REG111H 0x111 161 + #define AU8522_I2S_CTRL_2_REG112H 0x112 162 162 163 - #define AU8522_FRMREGFFECONTROL_REG121H 0x121 164 - #define AU8522_FRMREGDFECONTROL_REG122H 0x122 163 + #define AU8522_FRMREGFFECONTROL_REG121H 0x121 164 + #define AU8522_FRMREGDFECONTROL_REG122H 0x122 165 165 166 - #define AU8522_CARRFREQOFFSET0_REG201H 0x201 166 + #define AU8522_CARRFREQOFFSET0_REG201H 0x201 167 167 #define AU8522_CARRFREQOFFSET1_REG202H 0x202 168 168 169 169 #define AU8522_DECIMATION_GAIN_REG21AH 0x21A 170 - #define AU8522_FRMREGIFSLP_REG21BH 0x21B 171 - #define AU8522_FRMREGTHRDL2_REG21CH 0x21C 172 - #define AU8522_FRMREGSTEP3DB_REG21DH 0x21D 170 + #define AU8522_FRMREGIFSLP_REG21BH 0x21B 171 + #define AU8522_FRMREGTHRDL2_REG21CH 0x21C 172 + #define AU8522_FRMREGSTEP3DB_REG21DH 0x21D 173 173 #define AU8522_DAGC_GAIN_ADJUSTMENT_REG21EH 0x21E 174 - #define AU8522_FRMREGPLLMODE_REG21FH 0x21F 175 - #define AU8522_FRMREGCSTHRD_REG220H 0x220 176 - #define AU8522_FRMREGCRLOCKDMAX_REG221H 0x221 177 - #define AU8522_FRMREGCRPERIODMASK_REG222H 0x222 178 - #define AU8522_FRMREGCRLOCK0THH_REG223H 0x223 179 - #define AU8522_FRMREGCRLOCK1THH_REG224H 0x224 180 - #define AU8522_FRMREGCRLOCK0THL_REG225H 0x225 181 - #define AU8522_FRMREGCRLOCK1THL_REG226H 0x226 174 + #define AU8522_FRMREGPLLMODE_REG21FH 0x21F 175 + #define AU8522_FRMREGCSTHRD_REG220H 0x220 176 + #define AU8522_FRMREGCRLOCKDMAX_REG221H 0x221 177 + #define AU8522_FRMREGCRPERIODMASK_REG222H 0x222 178 + #define AU8522_FRMREGCRLOCK0THH_REG223H 0x223 179 + #define AU8522_FRMREGCRLOCK1THH_REG224H 0x224 180 + #define AU8522_FRMREGCRLOCK0THL_REG225H 0x225 181 + #define AU8522_FRMREGCRLOCK1THL_REG226H 0x226 182 182 #define AU_FRMREGPLLACQPHASESCL_REG227H 0x227 183 - #define AU8522_FRMREGFREQFBCTRL_REG228H 0x228 183 + #define AU8522_FRMREGFREQFBCTRL_REG228H 0x228 184 184 185 185 /* Analog TV Decoder */ 186 186 #define AU8522_TVDEC_STATUS_REG000H 0x000 187 187 #define AU8522_TVDEC_INT_STATUS_REG001H 0x001 188 - #define AU8522_TVDEC_MACROVISION_STATUS_REG002H 0x002 188 + #define AU8522_TVDEC_MACROVISION_STATUS_REG002H 0x002 189 189 #define AU8522_TVDEC_SHARPNESSREG009H 0x009 190 190 #define AU8522_TVDEC_BRIGHTNESS_REG00AH 0x00A 191 191 #define AU8522_TVDEC_CONTRAST_REG00BH 0x00B 192 192 #define AU8522_TVDEC_SATURATION_CB_REG00CH 0x00C 193 193 #define AU8522_TVDEC_SATURATION_CR_REG00DH 0x00D 194 194 #define AU8522_TVDEC_HUE_H_REG00EH 0x00E 195 - #define AU8522_TVDEC_HUE_L_REG00FH 0x00F 195 + #define AU8522_TVDEC_HUE_L_REG00FH 0x00F 196 196 #define AU8522_TVDEC_INT_MASK_REG010H 0x010 197 197 #define AU8522_VIDEO_MODE_REG011H 0x011 198 198 #define AU8522_TVDEC_PGA_REG012H 0x012 199 199 #define AU8522_TVDEC_COMB_MODE_REG015H 0x015 200 - #define AU8522_REG016H 0x016 200 + #define AU8522_REG016H 0x016 201 201 #define AU8522_TVDED_DBG_MODE_REG060H 0x060 202 202 #define AU8522_TVDEC_FORMAT_CTRL1_REG061H 0x061 203 203 #define AU8522_TVDEC_FORMAT_CTRL2_REG062H 0x062 ··· 207 207 #define AU8522_TVDEC_COMB_VDIF_THR2_REG066H 0x066 208 208 #define AU8522_TVDEC_COMB_VDIF_THR3_REG067H 0x067 209 209 #define AU8522_TVDEC_COMB_NOTCH_THR_REG068H 0x068 210 - #define AU8522_TVDEC_COMB_HDIF_THR1_REG069H 0x069 210 + #define AU8522_TVDEC_COMB_HDIF_THR1_REG069H 0x069 211 211 #define AU8522_TVDEC_COMB_HDIF_THR2_REG06AH 0x06A 212 - #define AU8522_TVDEC_COMB_HDIF_THR3_REG06BH 0x06B 213 - #define AU8522_TVDEC_COMB_DCDIF_THR1_REG06CH 0x06C 214 - #define AU8522_TVDEC_COMB_DCDIF_THR2_REG06DH 0x06D 215 - #define AU8522_TVDEC_COMB_DCDIF_THR3_REG06EH 0x06E 216 - #define AU8522_TVDEC_UV_SEP_THR_REG06FH 0x06F 212 + #define AU8522_TVDEC_COMB_HDIF_THR3_REG06BH 0x06B 213 + #define AU8522_TVDEC_COMB_DCDIF_THR1_REG06CH 0x06C 214 + #define AU8522_TVDEC_COMB_DCDIF_THR2_REG06DH 0x06D 215 + #define AU8522_TVDEC_COMB_DCDIF_THR3_REG06EH 0x06E 216 + #define AU8522_TVDEC_UV_SEP_THR_REG06FH 0x06F 217 217 #define AU8522_TVDEC_COMB_DC_THR1_NTSC_REG070H 0x070 218 218 #define AU8522_TVDEC_COMB_DC_THR2_NTSC_REG073H 0x073 219 219 #define AU8522_TVDEC_DCAGC_CTRL_REG077H 0x077 ··· 229 229 230 230 #define AU8522_TVDEC_CHROMA_AGC_REG401H 0x401 231 231 #define AU8522_TVDEC_CHROMA_SFT_REG402H 0x402 232 - #define AU8522_FILTER_COEF_R410 0x410 233 - #define AU8522_FILTER_COEF_R411 0x411 234 - #define AU8522_FILTER_COEF_R412 0x412 235 - #define AU8522_FILTER_COEF_R413 0x413 236 - #define AU8522_FILTER_COEF_R414 0x414 237 - #define AU8522_FILTER_COEF_R415 0x415 238 - #define AU8522_FILTER_COEF_R416 0x416 239 - #define AU8522_FILTER_COEF_R417 0x417 240 - #define AU8522_FILTER_COEF_R418 0x418 241 - #define AU8522_FILTER_COEF_R419 0x419 242 - #define AU8522_FILTER_COEF_R41A 0x41A 243 - #define AU8522_FILTER_COEF_R41B 0x41B 244 - #define AU8522_FILTER_COEF_R41C 0x41C 245 - #define AU8522_FILTER_COEF_R41D 0x41D 246 - #define AU8522_FILTER_COEF_R41E 0x41E 247 - #define AU8522_FILTER_COEF_R41F 0x41F 248 - #define AU8522_FILTER_COEF_R420 0x420 249 - #define AU8522_FILTER_COEF_R421 0x421 250 - #define AU8522_FILTER_COEF_R422 0x422 251 - #define AU8522_FILTER_COEF_R423 0x423 252 - #define AU8522_FILTER_COEF_R424 0x424 253 - #define AU8522_FILTER_COEF_R425 0x425 254 - #define AU8522_FILTER_COEF_R426 0x426 255 - #define AU8522_FILTER_COEF_R427 0x427 256 - #define AU8522_FILTER_COEF_R428 0x428 257 - #define AU8522_FILTER_COEF_R429 0x429 258 - #define AU8522_FILTER_COEF_R42A 0x42A 259 - #define AU8522_FILTER_COEF_R42B 0x42B 260 - #define AU8522_FILTER_COEF_R42C 0x42C 261 - #define AU8522_FILTER_COEF_R42D 0x42D 232 + #define AU8522_FILTER_COEF_R410 0x410 233 + #define AU8522_FILTER_COEF_R411 0x411 234 + #define AU8522_FILTER_COEF_R412 0x412 235 + #define AU8522_FILTER_COEF_R413 0x413 236 + #define AU8522_FILTER_COEF_R414 0x414 237 + #define AU8522_FILTER_COEF_R415 0x415 238 + #define AU8522_FILTER_COEF_R416 0x416 239 + #define AU8522_FILTER_COEF_R417 0x417 240 + #define AU8522_FILTER_COEF_R418 0x418 241 + #define AU8522_FILTER_COEF_R419 0x419 242 + #define AU8522_FILTER_COEF_R41A 0x41A 243 + #define AU8522_FILTER_COEF_R41B 0x41B 244 + #define AU8522_FILTER_COEF_R41C 0x41C 245 + #define AU8522_FILTER_COEF_R41D 0x41D 246 + #define AU8522_FILTER_COEF_R41E 0x41E 247 + #define AU8522_FILTER_COEF_R41F 0x41F 248 + #define AU8522_FILTER_COEF_R420 0x420 249 + #define AU8522_FILTER_COEF_R421 0x421 250 + #define AU8522_FILTER_COEF_R422 0x422 251 + #define AU8522_FILTER_COEF_R423 0x423 252 + #define AU8522_FILTER_COEF_R424 0x424 253 + #define AU8522_FILTER_COEF_R425 0x425 254 + #define AU8522_FILTER_COEF_R426 0x426 255 + #define AU8522_FILTER_COEF_R427 0x427 256 + #define AU8522_FILTER_COEF_R428 0x428 257 + #define AU8522_FILTER_COEF_R429 0x429 258 + #define AU8522_FILTER_COEF_R42A 0x42A 259 + #define AU8522_FILTER_COEF_R42B 0x42B 260 + #define AU8522_FILTER_COEF_R42C 0x42C 261 + #define AU8522_FILTER_COEF_R42D 0x42D 262 262 263 263 /* VBI Control Registers */ 264 - #define AU8522_TVDEC_VBI_RX_FIFO_CONTAIN_REG004H 0x004 265 - #define AU8522_TVDEC_VBI_TX_FIFO_CONTAIN_REG005H 0x005 266 - #define AU8522_TVDEC_VBI_RX_FIFO_READ_REG006H 0x006 267 - #define AU8522_TVDEC_VBI_FIFO_STATUS_REG007H 0x007 264 + #define AU8522_TVDEC_VBI_RX_FIFO_CONTAIN_REG004H 0x004 265 + #define AU8522_TVDEC_VBI_TX_FIFO_CONTAIN_REG005H 0x005 266 + #define AU8522_TVDEC_VBI_RX_FIFO_READ_REG006H 0x006 267 + #define AU8522_TVDEC_VBI_FIFO_STATUS_REG007H 0x007 268 268 #define AU8522_TVDEC_VBI_CTRL_H_REG017H 0x017 269 269 #define AU8522_TVDEC_VBI_CTRL_L_REG018H 0x018 270 270 #define AU8522_TVDEC_VBI_USER_TOTAL_BITS_REG019H 0x019 ··· 272 272 #define AU8522_TVDEC_VBI_USER_TUNIT_L_REG01BH 0x01B 273 273 #define AU8522_TVDEC_VBI_USER_THRESH1_REG01CH 0x01C 274 274 #define AU8522_TVDEC_VBI_USER_FRAME_PAT2_REG01EH 0x01E 275 - #define AU8522_TVDEC_VBI_USER_FRAME_PAT1_REG01FH 0x01F 276 - #define AU8522_TVDEC_VBI_USER_FRAME_PAT0_REG020H 0x020 277 - #define AU8522_TVDEC_VBI_USER_FRAME_MASK2_REG021H 0x021 278 - #define AU8522_TVDEC_VBI_USER_FRAME_MASK1_REG022H 0x022 275 + #define AU8522_TVDEC_VBI_USER_FRAME_PAT1_REG01FH 0x01F 276 + #define AU8522_TVDEC_VBI_USER_FRAME_PAT0_REG020H 0x020 277 + #define AU8522_TVDEC_VBI_USER_FRAME_MASK2_REG021H 0x021 278 + #define AU8522_TVDEC_VBI_USER_FRAME_MASK1_REG022H 0x022 279 279 #define AU8522_TVDEC_VBI_USER_FRAME_MASK0_REG023H 0x023 280 280 281 281 #define AU8522_REG071H 0x071 ··· 315 315 #define AU8522_GPIO_DATA_REG0E2H 0x0E2 316 316 317 317 /* Audio Control Registers */ 318 - #define AU8522_AUDIOAGC_REG0EEH 0x0EE 319 - #define AU8522_AUDIO_STATUS_REG0F0H 0x0F0 320 - #define AU8522_AUDIO_MODE_REG0F1H 0x0F1 321 - #define AU8522_AUDIO_VOLUME_L_REG0F2H 0x0F2 322 - #define AU8522_AUDIO_VOLUME_R_REG0F3H 0x0F3 323 - #define AU8522_AUDIO_VOLUME_REG0F4H 0x0F4 324 - #define AU8522_FRMREGAUPHASE_REG0F7H 0x0F7 318 + #define AU8522_AUDIOAGC_REG0EEH 0x0EE 319 + #define AU8522_AUDIO_STATUS_REG0F0H 0x0F0 320 + #define AU8522_AUDIO_MODE_REG0F1H 0x0F1 321 + #define AU8522_AUDIO_VOLUME_L_REG0F2H 0x0F2 322 + #define AU8522_AUDIO_VOLUME_R_REG0F3H 0x0F3 323 + #define AU8522_AUDIO_VOLUME_REG0F4H 0x0F4 324 + #define AU8522_FRMREGAUPHASE_REG0F7H 0x0F7 325 325 #define AU8522_REG0F9H 0x0F9 326 326 327 - #define AU8522_AUDIOAGC2_REG605H 0x605 328 - #define AU8522_AUDIOFREQ_REG606H 0x606 327 + #define AU8522_AUDIOAGC2_REG605H 0x605 328 + #define AU8522_AUDIOFREQ_REG606H 0x606 329 329 330 330 331 331 /**************************************************************/ ··· 356 356 #define AU8522_TVDEC_FORMAT_CTRL2_REG062H_STD_PAL_M 0x02 357 357 358 358 359 - #define AU8522_INPUT_CONTROL_REG081H_ATSC 0xC4 359 + #define AU8522_INPUT_CONTROL_REG081H_ATSC 0xC4 360 360 #define AU8522_INPUT_CONTROL_REG081H_ATVRF 0xC4 361 361 #define AU8522_INPUT_CONTROL_REG081H_ATVRF13 0xC4 362 - #define AU8522_INPUT_CONTROL_REG081H_J83B64 0xC4 363 - #define AU8522_INPUT_CONTROL_REG081H_J83B256 0xC4 364 - #define AU8522_INPUT_CONTROL_REG081H_CVBS 0x20 362 + #define AU8522_INPUT_CONTROL_REG081H_J83B64 0xC4 363 + #define AU8522_INPUT_CONTROL_REG081H_J83B256 0xC4 364 + #define AU8522_INPUT_CONTROL_REG081H_CVBS 0x20 365 365 #define AU8522_INPUT_CONTROL_REG081H_CVBS_CH1 0xA2 366 366 #define AU8522_INPUT_CONTROL_REG081H_CVBS_CH2 0xA0 367 367 #define AU8522_INPUT_CONTROL_REG081H_CVBS_CH3 0x69 368 368 #define AU8522_INPUT_CONTROL_REG081H_CVBS_CH4 0x68 369 - #define AU8522_INPUT_CONTROL_REG081H_CVBS_CH4_SIF 0x28 369 + #define AU8522_INPUT_CONTROL_REG081H_CVBS_CH4_SIF 0x28 370 370 /* CH1 AS Y,CH3 AS C */ 371 - #define AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH13 0x23 371 + #define AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH13 0x23 372 372 /* CH2 AS Y,CH4 AS C */ 373 - #define AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH24 0x20 374 - #define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_ATSC 0x0C 375 - #define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_J83B64 0x09 376 - #define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_J83B256 0x09 377 - #define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_CVBS 0x12 378 - #define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_ATVRF 0x1A 373 + #define AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH24 0x20 374 + #define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_ATSC 0x0C 375 + #define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_J83B64 0x09 376 + #define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_J83B256 0x09 377 + #define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_CVBS 0x12 378 + #define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_ATVRF 0x1A 379 379 #define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_ATVRF13 0x1A 380 380 #define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_SVIDEO 0x02 381 381 382 382 #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_CLEAR 0x00 383 383 #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_SVIDEO 0x9C 384 - #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_CVBS 0x9D 384 + #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_CVBS 0x9D 385 385 #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_ATSC 0xE8 386 - #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_J83B256 0xCA 387 - #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_J83B64 0xCA 388 - #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_ATVRF 0xDD 386 + #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_J83B256 0xCA 387 + #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_J83B64 0xCA 388 + #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_ATVRF 0xDD 389 389 #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_ATVRF13 0xDD 390 390 #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_PAL 0xDD 391 391 #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_FM 0xDD 392 392 393 393 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_ATSC 0x80 394 - #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_J83B256 0x80 395 - #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_J83B64 0x80 394 + #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_J83B256 0x80 395 + #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_J83B64 0x80 396 396 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_DONGLE_ATSC 0x40 397 397 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_DONGLE_J83B256 0x40 398 398 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_DONGLE_J83B64 0x40 399 399 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_DONGLE_CLEAR 0x00 400 400 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_ATVRF 0x01 401 401 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_ATVRF13 0x01 402 - #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_SVIDEO 0x04 402 + #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_SVIDEO 0x04 403 403 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_CVBS 0x01 404 - #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_PWM 0x03 405 - #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_IIS 0x09 404 + #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_PWM 0x03 405 + #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_IIS 0x09 406 406 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_PAL 0x01 407 407 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_FM 0x01 408 408
+1 -1
drivers/media/dvb-frontends/drx39xyj/drx_driver.h
··· 932 932 * Used by DRX_CTRL_LOAD_UCODE and DRX_CTRL_VERIFY_UCODE 933 933 */ 934 934 struct drxu_code_info { 935 - char *mc_file; 935 + char *mc_file; 936 936 }; 937 937 938 938 /*
+5 -5
drivers/media/dvb-frontends/stb0899_drv.c
··· 1583 1583 static const struct dvb_frontend_ops stb0899_ops = { 1584 1584 .delsys = { SYS_DVBS, SYS_DVBS2, SYS_DSS }, 1585 1585 .info = { 1586 - .name = "STB0899 Multistandard", 1586 + .name = "STB0899 Multistandard", 1587 1587 .frequency_min = 950000, 1588 - .frequency_max = 2150000, 1588 + .frequency_max = 2150000, 1589 1589 .frequency_stepsize = 0, 1590 1590 .frequency_tolerance = 0, 1591 - .symbol_rate_min = 5000000, 1592 - .symbol_rate_max = 45000000, 1591 + .symbol_rate_min = 5000000, 1592 + .symbol_rate_max = 45000000, 1593 1593 1594 - .caps = FE_CAN_INVERSION_AUTO | 1594 + .caps = FE_CAN_INVERSION_AUTO | 1595 1595 FE_CAN_FEC_AUTO | 1596 1596 FE_CAN_2G_MODULATION | 1597 1597 FE_CAN_QPSK
+1 -1
drivers/media/dvb-frontends/stb0899_drv.h
··· 82 82 * 1. POWER ON/OFF (index 0) 83 83 * 2. FE_HAS_LOCK/LOCK_LOSS (index 1) 84 84 * 85 - * @gpio = one of the above listed GPIO's 85 + * @gpio = one of the above listed GPIO's 86 86 * @level = output state: pulled up or low 87 87 */ 88 88 struct stb0899_postproc {
+1 -1
drivers/media/dvb-frontends/stb0899_priv.h
··· 252 252 extern int stb0899_i2c_gate_ctrl(struct dvb_frontend *fe, int enable); 253 253 254 254 255 - #define STB0899_READ_S2REG(DEVICE, REG) (_stb0899_read_s2reg(state, DEVICE, STB0899_BASE_##REG, STB0899_OFF0_##REG)) 255 + #define STB0899_READ_S2REG(DEVICE, REG) (_stb0899_read_s2reg(state, DEVICE, STB0899_BASE_##REG, STB0899_OFF0_##REG)) 256 256 //#define STB0899_WRITE_S2REG(DEVICE, REG, DATA) (_stb0899_write_s2reg(state, DEVICE, STB0899_BASE_##REG, STB0899_OFF0_##REG, DATA)) 257 257 258 258 /* stb0899_algo.c */
+1 -1
drivers/media/dvb-frontends/stv0900_core.c
··· 1929 1929 switch (demod) { 1930 1930 case 0: 1931 1931 case 1: 1932 - init_params.dmd_ref_clk = config->xtal; 1932 + init_params.dmd_ref_clk = config->xtal; 1933 1933 init_params.demod_mode = config->demod_mode; 1934 1934 init_params.rolloff = STV0900_35; 1935 1935 init_params.path1_ts_clock = config->path1_mode;
+17 -17
drivers/media/dvb-frontends/stv0900_init.h
··· 148 148 149 149 /* Cut 1.x Tracking carrier loop carrier QPSK 1/2 to 8PSK 9/10 long Frame */ 150 150 static const struct stv0900_car_loop_optim FE_STV0900_S2CarLoop[14] = { 151 - /*Modcod 2MPon 2MPoff 5MPon 5MPoff 10MPon 152 - 10MPoff 20MPon 20MPoff 30MPon 30MPoff */ 151 + /*Modcod 2MPon 2MPoff 5MPon 5MPoff 10MPon 152 + 10MPoff 20MPon 20MPoff 30MPon 30MPoff */ 153 153 { STV0900_QPSK_12, 0x1C, 0x0D, 0x1B, 0x2C, 0x3A, 154 154 0x1C, 0x2A, 0x3B, 0x2A, 0x1B }, 155 155 { STV0900_QPSK_35, 0x2C, 0x0D, 0x2B, 0x2C, 0x3A, ··· 176 176 0x0B, 0x39, 0x1A, 0x19, 0x0A }, 177 177 { STV0900_8PSK_89, 0x3B, 0x3B, 0x0B, 0x2B, 0x2A, 178 178 0x0B, 0x39, 0x1A, 0x29, 0x39 }, 179 - { STV0900_8PSK_910, 0x3B, 0x3B, 0x0B, 0x2B, 0x2A, 179 + { STV0900_8PSK_910, 0x3B, 0x3B, 0x0B, 0x2B, 0x2A, 180 180 0x0B, 0x39, 0x1A, 0x29, 0x39 } 181 181 }; 182 182 183 183 184 184 /* Cut 2.0 Tracking carrier loop carrier QPSK 1/2 to 8PSK 9/10 long Frame */ 185 185 static const struct stv0900_car_loop_optim FE_STV0900_S2CarLoopCut20[14] = { 186 - /* Modcod 2MPon 2MPoff 5MPon 5MPoff 10MPon 187 - 10MPoff 20MPon 20MPoff 30MPon 30MPoff */ 186 + /* Modcod 2MPon 2MPoff 5MPon 5MPoff 10MPon 187 + 10MPoff 20MPon 20MPoff 30MPon 30MPoff */ 188 188 { STV0900_QPSK_12, 0x1F, 0x3F, 0x1E, 0x3F, 0x3D, 189 189 0x1F, 0x3D, 0x3E, 0x3D, 0x1E }, 190 190 { STV0900_QPSK_35, 0x2F, 0x3F, 0x2E, 0x2F, 0x3D, ··· 211 211 0x1e, 0x3c, 0x2d, 0x2c, 0x1d }, 212 212 { STV0900_8PSK_89, 0x3e, 0x3e, 0x1e, 0x2e, 0x3d, 213 213 0x1e, 0x0d, 0x2d, 0x3c, 0x1d }, 214 - { STV0900_8PSK_910, 0x3e, 0x3e, 0x1e, 0x2e, 0x3d, 214 + { STV0900_8PSK_910, 0x3e, 0x3e, 0x1e, 0x2e, 0x3d, 215 215 0x1e, 0x1d, 0x2d, 0x0d, 0x1d }, 216 216 }; 217 217 ··· 219 219 220 220 /* Cut 2.0 Tracking carrier loop carrier 16APSK 2/3 to 32APSK 9/10 long Frame */ 221 221 static const struct stv0900_car_loop_optim FE_STV0900_S2APSKCarLoopCut20[11] = { 222 - /* Modcod 2MPon 2MPoff 5MPon 5MPoff 10MPon 223 - 10MPoff 20MPon 20MPoff 30MPon 30MPoff */ 222 + /* Modcod 2MPon 2MPoff 5MPon 5MPoff 10MPon 223 + 10MPoff 20MPon 20MPoff 30MPon 30MPoff */ 224 224 { STV0900_16APSK_23, 0x0C, 0x0C, 0x0C, 0x0C, 0x1D, 225 225 0x0C, 0x3C, 0x0C, 0x2C, 0x0C }, 226 226 { STV0900_16APSK_34, 0x0C, 0x0C, 0x0C, 0x0C, 0x0E, ··· 248 248 249 249 /* Cut 2.0 Tracking carrier loop carrier QPSK 1/4 to QPSK 2/5 long Frame */ 250 250 static const struct stv0900_car_loop_optim FE_STV0900_S2LowQPCarLoopCut20[3] = { 251 - /* Modcod 2MPon 2MPoff 5MPon 5MPoff 10MPon 252 - 10MPoff 20MPon 20MPoff 30MPon 30MPoff */ 251 + /* Modcod 2MPon 2MPoff 5MPon 5MPoff 10MPon 252 + 10MPoff 20MPon 20MPoff 30MPon 30MPoff */ 253 253 { STV0900_QPSK_14, 0x0F, 0x3F, 0x0E, 0x3F, 0x2D, 254 254 0x2F, 0x2D, 0x1F, 0x3D, 0x3E }, 255 255 { STV0900_QPSK_13, 0x0F, 0x3F, 0x0E, 0x3F, 0x2D, ··· 275 275 }; 276 276 277 277 static const struct stv0900_car_loop_optim FE_STV0900_S2CarLoopCut30[14] = { 278 - /*Modcod 2MPon 2MPoff 5MPon 5MPoff 10MPon 279 - 10MPoff 20MPon 20MPoff 30MPon 30MPoff */ 278 + /*Modcod 2MPon 2MPoff 5MPon 5MPoff 10MPon 279 + 10MPoff 20MPon 20MPoff 30MPon 30MPoff */ 280 280 { STV0900_QPSK_12, 0x3C, 0x2C, 0x0C, 0x2C, 0x1B, 281 - 0x2C, 0x1B, 0x1C, 0x0B, 0x3B }, 281 + 0x2C, 0x1B, 0x1C, 0x0B, 0x3B }, 282 282 { STV0900_QPSK_35, 0x0D, 0x0D, 0x0C, 0x0D, 0x1B, 283 283 0x3C, 0x1B, 0x1C, 0x0B, 0x3B }, 284 284 { STV0900_QPSK_23, 0x1D, 0x0D, 0x0C, 0x1D, 0x2B, ··· 309 309 310 310 static const 311 311 struct stv0900_car_loop_optim FE_STV0900_S2APSKCarLoopCut30[11] = { 312 - /*Modcod 2MPon 2MPoff 5MPon 5MPoff 10MPon 313 - 10MPoff 20MPon 20MPoff 30MPon 30MPoff */ 312 + /*Modcod 2MPon 2MPoff 5MPon 5MPoff 10MPon 313 + 10MPoff 20MPon 20MPoff 30MPon 30MPoff */ 314 314 { STV0900_16APSK_23, 0x0A, 0x0A, 0x0A, 0x0A, 0x1A, 315 315 0x0A, 0x3A, 0x0A, 0x2A, 0x0A }, 316 316 { STV0900_16APSK_34, 0x0A, 0x0A, 0x0A, 0x0A, 0x0B, ··· 337 337 338 338 static const 339 339 struct stv0900_car_loop_optim FE_STV0900_S2LowQPCarLoopCut30[3] = { 340 - /*Modcod 2MPon 2MPoff 5MPon 5MPoff 10MPon 341 - 10MPoff 20MPon 20MPoff 30MPon 30MPoff*/ 340 + /*Modcod 2MPon 2MPoff 5MPon 5MPoff 10MPon 341 + 10MPoff 20MPon 20MPoff 30MPon 30MPoff*/ 342 342 { STV0900_QPSK_14, 0x0C, 0x3C, 0x0B, 0x3C, 0x2A, 343 343 0x2C, 0x2A, 0x1C, 0x3A, 0x3B }, 344 344 { STV0900_QPSK_13, 0x0C, 0x3C, 0x0B, 0x3C, 0x2A,
+1 -1
drivers/media/dvb-frontends/stv0900_priv.h
··· 243 243 244 244 u8 tun1_maddress; 245 245 int tuner1_adc; 246 - int tuner1_type; 246 + int tuner1_type; 247 247 248 248 /* IQ from the tuner1 to the demod */ 249 249 enum stv0900_iq_inversion tun1_iq_inv;
+6 -6
drivers/media/dvb-frontends/stv090x.c
··· 677 677 678 678 /* Cut 3.0 Short Frame Tracking CR Loop */ 679 679 static struct stv090x_short_frame_crloop stv090x_s2_short_crl_cut30[] = { 680 - /* MODCOD 2M 5M 10M 20M 30M */ 680 + /* MODCOD 2M 5M 10M 20M 30M */ 681 681 { STV090x_QPSK, 0x2C, 0x2B, 0x0B, 0x0B, 0x3A }, 682 682 { STV090x_8PSK, 0x3B, 0x0B, 0x2A, 0x0A, 0x39 }, 683 683 { STV090x_16APSK, 0x1B, 0x1B, 0x1B, 0x3A, 0x2A }, ··· 701 701 u8 buf; 702 702 703 703 struct i2c_msg msg[] = { 704 - { .addr = config->address, .flags = 0, .buf = b0, .len = 2 }, 704 + { .addr = config->address, .flags = 0, .buf = b0, .len = 2 }, 705 705 { .addr = config->address, .flags = I2C_M_RD, .buf = &buf, .len = 1 } 706 706 }; 707 707 ··· 4906 4906 .info = { 4907 4907 .name = "STV090x Multistandard", 4908 4908 .frequency_min = 950000, 4909 - .frequency_max = 2150000, 4909 + .frequency_max = 2150000, 4910 4910 .frequency_stepsize = 0, 4911 4911 .frequency_tolerance = 0, 4912 - .symbol_rate_min = 1000000, 4913 - .symbol_rate_max = 45000000, 4912 + .symbol_rate_min = 1000000, 4913 + .symbol_rate_max = 45000000, 4914 4914 .caps = FE_CAN_INVERSION_AUTO | 4915 4915 FE_CAN_FEC_AUTO | 4916 4916 FE_CAN_QPSK | ··· 4953 4953 state->frontend.ops = stv090x_ops; 4954 4954 state->frontend.demodulator_priv = state; 4955 4955 state->demod = demod; 4956 - state->demod_mode = config->demod_mode; /* Single or Dual mode */ 4956 + state->demod_mode = config->demod_mode; /* Single or Dual mode */ 4957 4957 state->device = config->device; 4958 4958 state->rolloff = STV090x_RO_35; /* default */ 4959 4959
+1 -1
drivers/media/dvb-frontends/stv090x_priv.h
··· 231 231 }; 232 232 233 233 struct stv090x_internal { 234 - struct i2c_adapter *i2c_adap; 234 + struct i2c_adapter *i2c_adap; 235 235 u8 i2c_addr; 236 236 237 237 struct mutex demod_lock; /* Lock access to shared register */
+1 -1
drivers/media/dvb-frontends/stv6110x.c
··· 46 46 u8 b0[] = { reg }; 47 47 u8 b1[] = { 0 }; 48 48 struct i2c_msg msg[] = { 49 - { .addr = config->addr, .flags = 0, .buf = b0, .len = 1 }, 49 + { .addr = config->addr, .flags = 0, .buf = b0, .len = 1 }, 50 50 { .addr = config->addr, .flags = I2C_M_RD, .buf = b1, .len = 1 } 51 51 }; 52 52
+3 -3
drivers/media/dvb-frontends/stv6110x_priv.h
··· 48 48 49 49 #define STV6110x_SETFIELD(mask, bitf, val) \ 50 50 (mask = (mask & (~(((1 << STV6110x_WIDTH_##bitf) - 1) << \ 51 - STV6110x_OFFST_##bitf))) | \ 51 + STV6110x_OFFST_##bitf))) | \ 52 52 (val << STV6110x_OFFST_##bitf)) 53 53 54 54 #define STV6110x_GETFIELD(bitf, val) \ 55 - ((val >> STV6110x_OFFST_##bitf) & \ 55 + ((val >> STV6110x_OFFST_##bitf) & \ 56 56 ((1 << STV6110x_WIDTH_##bitf) - 1)) 57 57 58 58 #define MAKEWORD16(a, b) (((a) << 8) | (b)) ··· 68 68 struct stv6110x_state { 69 69 struct i2c_adapter *i2c; 70 70 const struct stv6110x_config *config; 71 - u8 regs[8]; 71 + u8 regs[8]; 72 72 73 73 const struct stv6110x_devctl *devctl; 74 74 };
+1 -1
drivers/media/dvb-frontends/tda10023.c
··· 211 211 212 212 BDRX=1<<(24+NDEC); 213 213 BDRX*=sr; 214 - do_div(BDRX, state->sysclk); /* BDRX/=SYSCLK; */ 214 + do_div(BDRX, state->sysclk); /* BDRX/=SYSCLK; */ 215 215 216 216 BDR=(s32)BDRX; 217 217 }
+2 -2
drivers/media/firewire/firedtv-avc.c
··· 47 47 #define AVC_OPCODE_DSIT 0xc8 48 48 #define AVC_OPCODE_DSD 0xcb 49 49 50 - #define DESCRIPTOR_TUNER_STATUS 0x80 50 + #define DESCRIPTOR_TUNER_STATUS 0x80 51 51 #define DESCRIPTOR_SUBUNIT_IDENTIFIER 0x00 52 52 53 53 #define SFE_VENDOR_DE_COMPANYID_0 0x00 /* OUI of Digital Everywhere */ ··· 688 688 c->operand[2] = 0xff; /* status */ 689 689 c->operand[3] = 0x20; /* system id = DVB */ 690 690 c->operand[4] = 0x00; /* antenna number */ 691 - c->operand[5] = 0x0; /* system_specific_search_flags */ 691 + c->operand[5] = 0x0; /* system_specific_search_flags */ 692 692 c->operand[6] = sl; /* system_specific_multiplex selection_length */ 693 693 /* 694 694 * operand[7]: valid_flags[0]
+3 -3
drivers/media/firewire/firedtv-fe.c
··· 165 165 ops->read_snr = fdtv_read_snr; 166 166 ops->read_ucblocks = fdtv_read_uncorrected_blocks; 167 167 168 - ops->diseqc_send_master_cmd = fdtv_diseqc_send_master_cmd; 168 + ops->diseqc_send_master_cmd = fdtv_diseqc_send_master_cmd; 169 169 ops->diseqc_send_burst = fdtv_diseqc_send_burst; 170 170 ops->set_tone = fdtv_set_tone; 171 171 ops->set_voltage = fdtv_set_voltage; ··· 220 220 fi->symbol_rate_min = 870000; 221 221 fi->symbol_rate_max = 6900000; 222 222 223 - fi->caps = FE_CAN_INVERSION_AUTO | 223 + fi->caps = FE_CAN_INVERSION_AUTO | 224 224 FE_CAN_QAM_16 | 225 225 FE_CAN_QAM_32 | 226 226 FE_CAN_QAM_64 | ··· 236 236 fi->frequency_max = 861000000; 237 237 fi->frequency_stepsize = 62500; 238 238 239 - fi->caps = FE_CAN_INVERSION_AUTO | 239 + fi->caps = FE_CAN_INVERSION_AUTO | 240 240 FE_CAN_FEC_2_3 | 241 241 FE_CAN_TRANSMISSION_MODE_AUTO | 242 242 FE_CAN_GUARD_INTERVAL_AUTO |
+1 -1
drivers/media/i2c/cx25840/cx25840-core.c
··· 1263 1263 static int set_v4lstd(struct i2c_client *client) 1264 1264 { 1265 1265 struct cx25840_state *state = to_state(i2c_get_clientdata(client)); 1266 - u8 fmt = 0; /* zero is autodetect */ 1266 + u8 fmt = 0; /* zero is autodetect */ 1267 1267 u8 pal_m = 0; 1268 1268 1269 1269 /* First tests should be against specific std */
+1 -1
drivers/media/i2c/cx25840/cx25840-core.h
··· 118 118 } 119 119 120 120 /* ----------------------------------------------------------------------- */ 121 - /* cx25850-core.c */ 121 + /* cx25850-core.c */ 122 122 int cx25840_write(struct i2c_client *client, u16 addr, u8 value); 123 123 int cx25840_write4(struct i2c_client *client, u16 addr, u32 value); 124 124 u8 cx25840_read(struct i2c_client *client, u16 addr);
+1 -1
drivers/media/i2c/cx25840/cx25840-ir.c
··· 28 28 module_param(ir_debug, int, 0644); 29 29 MODULE_PARM_DESC(ir_debug, "enable integrated IR debug messages"); 30 30 31 - #define CX25840_IR_REG_BASE 0x200 31 + #define CX25840_IR_REG_BASE 0x200 32 32 33 33 #define CX25840_IR_CNTRL_REG 0x200 34 34 #define CNTRL_WIN_3_3 0x00000000
+1 -1
drivers/media/i2c/ks0127.c
··· 195 195 struct ks0127 { 196 196 struct v4l2_subdev sd; 197 197 v4l2_std_id norm; 198 - u8 regs[256]; 198 + u8 regs[256]; 199 199 }; 200 200 201 201 static inline struct ks0127 *to_ks0127(struct v4l2_subdev *sd)
+19 -19
drivers/media/i2c/ov7670.c
··· 412 412 { REG_COM1, 0 }, /* CCIR601 */ 413 413 { REG_COM15, COM15_R00FF }, 414 414 { REG_COM9, 0x48 }, /* 32x gain ceiling; 0x8 is reserved bit */ 415 - { 0x4f, 0x80 }, /* "matrix coefficient 1" */ 416 - { 0x50, 0x80 }, /* "matrix coefficient 2" */ 415 + { 0x4f, 0x80 }, /* "matrix coefficient 1" */ 416 + { 0x50, 0x80 }, /* "matrix coefficient 2" */ 417 417 { 0x51, 0 }, /* vb */ 418 - { 0x52, 0x22 }, /* "matrix coefficient 4" */ 419 - { 0x53, 0x5e }, /* "matrix coefficient 5" */ 420 - { 0x54, 0x80 }, /* "matrix coefficient 6" */ 418 + { 0x52, 0x22 }, /* "matrix coefficient 4" */ 419 + { 0x53, 0x5e }, /* "matrix coefficient 5" */ 420 + { 0x54, 0x80 }, /* "matrix coefficient 6" */ 421 421 { REG_COM13, COM13_GAMMA|COM13_UVSAT }, 422 422 { 0xff, 0xff }, 423 423 }; ··· 427 427 { REG_RGB444, 0 }, /* No RGB444 please */ 428 428 { REG_COM1, 0x0 }, /* CCIR601 */ 429 429 { REG_COM15, COM15_RGB565 }, 430 - { REG_COM9, 0x38 }, /* 16x gain ceiling; 0x8 is reserved bit */ 431 - { 0x4f, 0xb3 }, /* "matrix coefficient 1" */ 432 - { 0x50, 0xb3 }, /* "matrix coefficient 2" */ 430 + { REG_COM9, 0x38 }, /* 16x gain ceiling; 0x8 is reserved bit */ 431 + { 0x4f, 0xb3 }, /* "matrix coefficient 1" */ 432 + { 0x50, 0xb3 }, /* "matrix coefficient 2" */ 433 433 { 0x51, 0 }, /* vb */ 434 - { 0x52, 0x3d }, /* "matrix coefficient 4" */ 435 - { 0x53, 0xa7 }, /* "matrix coefficient 5" */ 436 - { 0x54, 0xe4 }, /* "matrix coefficient 6" */ 434 + { 0x52, 0x3d }, /* "matrix coefficient 4" */ 435 + { 0x53, 0xa7 }, /* "matrix coefficient 5" */ 436 + { 0x54, 0xe4 }, /* "matrix coefficient 6" */ 437 437 { REG_COM13, COM13_GAMMA|COM13_UVSAT }, 438 438 { 0xff, 0xff }, 439 439 }; ··· 443 443 { REG_RGB444, R444_ENABLE }, /* Enable xxxxrrrr ggggbbbb */ 444 444 { REG_COM1, 0x0 }, /* CCIR601 */ 445 445 { REG_COM15, COM15_R01FE|COM15_RGB565 }, /* Data range needed? */ 446 - { REG_COM9, 0x38 }, /* 16x gain ceiling; 0x8 is reserved bit */ 447 - { 0x4f, 0xb3 }, /* "matrix coefficient 1" */ 448 - { 0x50, 0xb3 }, /* "matrix coefficient 2" */ 446 + { REG_COM9, 0x38 }, /* 16x gain ceiling; 0x8 is reserved bit */ 447 + { 0x4f, 0xb3 }, /* "matrix coefficient 1" */ 448 + { 0x50, 0xb3 }, /* "matrix coefficient 2" */ 449 449 { 0x51, 0 }, /* vb */ 450 - { 0x52, 0x3d }, /* "matrix coefficient 4" */ 451 - { 0x53, 0xa7 }, /* "matrix coefficient 5" */ 452 - { 0x54, 0xe4 }, /* "matrix coefficient 6" */ 450 + { 0x52, 0x3d }, /* "matrix coefficient 4" */ 451 + { 0x53, 0xa7 }, /* "matrix coefficient 5" */ 452 + { 0x54, 0xe4 }, /* "matrix coefficient 6" */ 453 453 { REG_COM13, COM13_GAMMA|COM13_UVSAT|0x2 }, /* Magic rsvd bit */ 454 454 { 0xff, 0xff }, 455 455 }; ··· 667 667 { 668 668 .mbus_code = MEDIA_BUS_FMT_YUYV8_2X8, 669 669 .colorspace = V4L2_COLORSPACE_SRGB, 670 - .regs = ov7670_fmt_yuv422, 670 + .regs = ov7670_fmt_yuv422, 671 671 .cmatrix = { 128, -128, 0, -34, -94, 128 }, 672 672 }, 673 673 { ··· 685 685 { 686 686 .mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8, 687 687 .colorspace = V4L2_COLORSPACE_SRGB, 688 - .regs = ov7670_fmt_raw, 688 + .regs = ov7670_fmt_raw, 689 689 .cmatrix = { 0, 0, 0, 0, 0, 0 }, 690 690 }, 691 691 };
+4 -4
drivers/media/i2c/saa6752hs.c
··· 72 72 /* video */ 73 73 enum v4l2_mpeg_video_aspect vi_aspect; 74 74 enum v4l2_mpeg_video_bitrate_mode vi_bitrate_mode; 75 - __u32 vi_bitrate; 76 - __u32 vi_bitrate_peak; 75 + __u32 vi_bitrate; 76 + __u32 vi_bitrate_peak; 77 77 }; 78 78 79 79 static const struct v4l2_format v4l2_format_table[] = ··· 98 98 struct v4l2_ctrl *video_bitrate; 99 99 struct v4l2_ctrl *video_bitrate_peak; 100 100 }; 101 - u32 revision; 102 - int has_ac3; 101 + u32 revision; 102 + int has_ac3; 103 103 struct saa6752hs_mpeg_params params; 104 104 enum saa6752hs_videoformat video_format; 105 105 v4l2_std_id standard;
+1 -1
drivers/media/i2c/saa7115.c
··· 748 748 u32 acni; 749 749 u32 hz; 750 750 u64 f; 751 - u8 acc = 0; /* reg 0x3a, audio clock control */ 751 + u8 acc = 0; /* reg 0x3a, audio clock control */ 752 752 753 753 /* Checks for chips that don't have audio clock (saa7111, saa7113) */ 754 754 if (!saa711x_has_reg(state->ident, R_30_AUD_MAST_CLK_CYCLES_PER_FIELD))
+81 -81
drivers/media/i2c/saa7127.c
··· 132 132 }; 133 133 134 134 static const struct i2c_reg_value saa7129_init_config_extra[] = { 135 - { SAA7127_REG_OUTPUT_PORT_CONTROL, 0x38 }, 136 - { SAA7127_REG_VTRIG, 0xfa }, 135 + { SAA7127_REG_OUTPUT_PORT_CONTROL, 0x38 }, 136 + { SAA7127_REG_VTRIG, 0xfa }, 137 137 { 0, 0 } 138 138 }; 139 139 140 140 static const struct i2c_reg_value saa7127_init_config_common[] = { 141 - { SAA7127_REG_WIDESCREEN_CONFIG, 0x0d }, 142 - { SAA7127_REG_WIDESCREEN_ENABLE, 0x00 }, 143 - { SAA7127_REG_COPYGEN_0, 0x77 }, 144 - { SAA7127_REG_COPYGEN_1, 0x41 }, 145 - { SAA7127_REG_COPYGEN_2, 0x00 }, /* Macrovision enable/disable */ 146 - { SAA7127_REG_OUTPUT_PORT_CONTROL, 0xbf }, 147 - { SAA7127_REG_GAIN_LUMINANCE_RGB, 0x00 }, 148 - { SAA7127_REG_GAIN_COLORDIFF_RGB, 0x00 }, 149 - { SAA7127_REG_INPUT_PORT_CONTROL_1, 0x80 }, /* for color bars */ 150 - { SAA7127_REG_LINE_21_ODD_0, 0x77 }, 151 - { SAA7127_REG_LINE_21_ODD_1, 0x41 }, 152 - { SAA7127_REG_LINE_21_EVEN_0, 0x88 }, 153 - { SAA7127_REG_LINE_21_EVEN_1, 0x41 }, 154 - { SAA7127_REG_RCV_PORT_CONTROL, 0x12 }, 155 - { SAA7127_REG_VTRIG, 0xf9 }, 156 - { SAA7127_REG_HTRIG_HI, 0x00 }, 157 - { SAA7127_REG_RCV2_OUTPUT_START, 0x41 }, 158 - { SAA7127_REG_RCV2_OUTPUT_END, 0xc3 }, 159 - { SAA7127_REG_RCV2_OUTPUT_MSBS, 0x00 }, 160 - { SAA7127_REG_TTX_REQUEST_H_START, 0x3e }, 161 - { SAA7127_REG_TTX_REQUEST_H_DELAY_LENGTH, 0xb8 }, 162 - { SAA7127_REG_CSYNC_ADVANCE_VSYNC_SHIFT, 0x03 }, 163 - { SAA7127_REG_TTX_ODD_REQ_VERT_START, 0x15 }, 164 - { SAA7127_REG_TTX_ODD_REQ_VERT_END, 0x16 }, 165 - { SAA7127_REG_TTX_EVEN_REQ_VERT_START, 0x15 }, 166 - { SAA7127_REG_TTX_EVEN_REQ_VERT_END, 0x16 }, 167 - { SAA7127_REG_FIRST_ACTIVE, 0x1a }, 168 - { SAA7127_REG_LAST_ACTIVE, 0x01 }, 169 - { SAA7127_REG_MSB_VERTICAL, 0xc0 }, 170 - { SAA7127_REG_DISABLE_TTX_LINE_LO_0, 0x00 }, 171 - { SAA7127_REG_DISABLE_TTX_LINE_LO_1, 0x00 }, 141 + { SAA7127_REG_WIDESCREEN_CONFIG, 0x0d }, 142 + { SAA7127_REG_WIDESCREEN_ENABLE, 0x00 }, 143 + { SAA7127_REG_COPYGEN_0, 0x77 }, 144 + { SAA7127_REG_COPYGEN_1, 0x41 }, 145 + { SAA7127_REG_COPYGEN_2, 0x00 }, /* Macrovision enable/disable */ 146 + { SAA7127_REG_OUTPUT_PORT_CONTROL, 0xbf }, 147 + { SAA7127_REG_GAIN_LUMINANCE_RGB, 0x00 }, 148 + { SAA7127_REG_GAIN_COLORDIFF_RGB, 0x00 }, 149 + { SAA7127_REG_INPUT_PORT_CONTROL_1, 0x80 }, /* for color bars */ 150 + { SAA7127_REG_LINE_21_ODD_0, 0x77 }, 151 + { SAA7127_REG_LINE_21_ODD_1, 0x41 }, 152 + { SAA7127_REG_LINE_21_EVEN_0, 0x88 }, 153 + { SAA7127_REG_LINE_21_EVEN_1, 0x41 }, 154 + { SAA7127_REG_RCV_PORT_CONTROL, 0x12 }, 155 + { SAA7127_REG_VTRIG, 0xf9 }, 156 + { SAA7127_REG_HTRIG_HI, 0x00 }, 157 + { SAA7127_REG_RCV2_OUTPUT_START, 0x41 }, 158 + { SAA7127_REG_RCV2_OUTPUT_END, 0xc3 }, 159 + { SAA7127_REG_RCV2_OUTPUT_MSBS, 0x00 }, 160 + { SAA7127_REG_TTX_REQUEST_H_START, 0x3e }, 161 + { SAA7127_REG_TTX_REQUEST_H_DELAY_LENGTH, 0xb8 }, 162 + { SAA7127_REG_CSYNC_ADVANCE_VSYNC_SHIFT, 0x03 }, 163 + { SAA7127_REG_TTX_ODD_REQ_VERT_START, 0x15 }, 164 + { SAA7127_REG_TTX_ODD_REQ_VERT_END, 0x16 }, 165 + { SAA7127_REG_TTX_EVEN_REQ_VERT_START, 0x15 }, 166 + { SAA7127_REG_TTX_EVEN_REQ_VERT_END, 0x16 }, 167 + { SAA7127_REG_FIRST_ACTIVE, 0x1a }, 168 + { SAA7127_REG_LAST_ACTIVE, 0x01 }, 169 + { SAA7127_REG_MSB_VERTICAL, 0xc0 }, 170 + { SAA7127_REG_DISABLE_TTX_LINE_LO_0, 0x00 }, 171 + { SAA7127_REG_DISABLE_TTX_LINE_LO_1, 0x00 }, 172 172 { 0, 0 } 173 173 }; 174 174 175 175 #define SAA7127_60HZ_DAC_CONTROL 0x15 176 176 static const struct i2c_reg_value saa7127_init_config_60hz[] = { 177 - { SAA7127_REG_BURST_START, 0x19 }, 177 + { SAA7127_REG_BURST_START, 0x19 }, 178 178 /* BURST_END is also used as a chip ID in saa7127_probe */ 179 - { SAA7127_REG_BURST_END, 0x1d }, 180 - { SAA7127_REG_CHROMA_PHASE, 0xa3 }, 181 - { SAA7127_REG_GAINU, 0x98 }, 182 - { SAA7127_REG_GAINV, 0xd3 }, 183 - { SAA7127_REG_BLACK_LEVEL, 0x39 }, 184 - { SAA7127_REG_BLANKING_LEVEL, 0x2e }, 185 - { SAA7127_REG_VBI_BLANKING, 0x2e }, 186 - { SAA7127_REG_DAC_CONTROL, 0x15 }, 187 - { SAA7127_REG_BURST_AMP, 0x4d }, 188 - { SAA7127_REG_SUBC3, 0x1f }, 189 - { SAA7127_REG_SUBC2, 0x7c }, 190 - { SAA7127_REG_SUBC1, 0xf0 }, 191 - { SAA7127_REG_SUBC0, 0x21 }, 192 - { SAA7127_REG_MULTI, 0x90 }, 193 - { SAA7127_REG_CLOSED_CAPTION, 0x11 }, 179 + { SAA7127_REG_BURST_END, 0x1d }, 180 + { SAA7127_REG_CHROMA_PHASE, 0xa3 }, 181 + { SAA7127_REG_GAINU, 0x98 }, 182 + { SAA7127_REG_GAINV, 0xd3 }, 183 + { SAA7127_REG_BLACK_LEVEL, 0x39 }, 184 + { SAA7127_REG_BLANKING_LEVEL, 0x2e }, 185 + { SAA7127_REG_VBI_BLANKING, 0x2e }, 186 + { SAA7127_REG_DAC_CONTROL, 0x15 }, 187 + { SAA7127_REG_BURST_AMP, 0x4d }, 188 + { SAA7127_REG_SUBC3, 0x1f }, 189 + { SAA7127_REG_SUBC2, 0x7c }, 190 + { SAA7127_REG_SUBC1, 0xf0 }, 191 + { SAA7127_REG_SUBC0, 0x21 }, 192 + { SAA7127_REG_MULTI, 0x90 }, 193 + { SAA7127_REG_CLOSED_CAPTION, 0x11 }, 194 194 { 0, 0 } 195 195 }; 196 196 197 197 #define SAA7127_50HZ_PAL_DAC_CONTROL 0x02 198 198 static struct i2c_reg_value saa7127_init_config_50hz_pal[] = { 199 - { SAA7127_REG_BURST_START, 0x21 }, 199 + { SAA7127_REG_BURST_START, 0x21 }, 200 200 /* BURST_END is also used as a chip ID in saa7127_probe */ 201 - { SAA7127_REG_BURST_END, 0x1d }, 202 - { SAA7127_REG_CHROMA_PHASE, 0x3f }, 203 - { SAA7127_REG_GAINU, 0x7d }, 204 - { SAA7127_REG_GAINV, 0xaf }, 205 - { SAA7127_REG_BLACK_LEVEL, 0x33 }, 206 - { SAA7127_REG_BLANKING_LEVEL, 0x35 }, 207 - { SAA7127_REG_VBI_BLANKING, 0x35 }, 208 - { SAA7127_REG_DAC_CONTROL, 0x02 }, 209 - { SAA7127_REG_BURST_AMP, 0x2f }, 210 - { SAA7127_REG_SUBC3, 0xcb }, 211 - { SAA7127_REG_SUBC2, 0x8a }, 212 - { SAA7127_REG_SUBC1, 0x09 }, 213 - { SAA7127_REG_SUBC0, 0x2a }, 214 - { SAA7127_REG_MULTI, 0xa0 }, 215 - { SAA7127_REG_CLOSED_CAPTION, 0x00 }, 201 + { SAA7127_REG_BURST_END, 0x1d }, 202 + { SAA7127_REG_CHROMA_PHASE, 0x3f }, 203 + { SAA7127_REG_GAINU, 0x7d }, 204 + { SAA7127_REG_GAINV, 0xaf }, 205 + { SAA7127_REG_BLACK_LEVEL, 0x33 }, 206 + { SAA7127_REG_BLANKING_LEVEL, 0x35 }, 207 + { SAA7127_REG_VBI_BLANKING, 0x35 }, 208 + { SAA7127_REG_DAC_CONTROL, 0x02 }, 209 + { SAA7127_REG_BURST_AMP, 0x2f }, 210 + { SAA7127_REG_SUBC3, 0xcb }, 211 + { SAA7127_REG_SUBC2, 0x8a }, 212 + { SAA7127_REG_SUBC1, 0x09 }, 213 + { SAA7127_REG_SUBC0, 0x2a }, 214 + { SAA7127_REG_MULTI, 0xa0 }, 215 + { SAA7127_REG_CLOSED_CAPTION, 0x00 }, 216 216 { 0, 0 } 217 217 }; 218 218 219 219 #define SAA7127_50HZ_SECAM_DAC_CONTROL 0x08 220 220 static struct i2c_reg_value saa7127_init_config_50hz_secam[] = { 221 - { SAA7127_REG_BURST_START, 0x21 }, 221 + { SAA7127_REG_BURST_START, 0x21 }, 222 222 /* BURST_END is also used as a chip ID in saa7127_probe */ 223 - { SAA7127_REG_BURST_END, 0x1d }, 224 - { SAA7127_REG_CHROMA_PHASE, 0x3f }, 225 - { SAA7127_REG_GAINU, 0x6a }, 226 - { SAA7127_REG_GAINV, 0x81 }, 227 - { SAA7127_REG_BLACK_LEVEL, 0x33 }, 228 - { SAA7127_REG_BLANKING_LEVEL, 0x35 }, 229 - { SAA7127_REG_VBI_BLANKING, 0x35 }, 230 - { SAA7127_REG_DAC_CONTROL, 0x08 }, 231 - { SAA7127_REG_BURST_AMP, 0x2f }, 232 - { SAA7127_REG_SUBC3, 0xb2 }, 233 - { SAA7127_REG_SUBC2, 0x3b }, 234 - { SAA7127_REG_SUBC1, 0xa3 }, 235 - { SAA7127_REG_SUBC0, 0x28 }, 236 - { SAA7127_REG_MULTI, 0x90 }, 237 - { SAA7127_REG_CLOSED_CAPTION, 0x00 }, 223 + { SAA7127_REG_BURST_END, 0x1d }, 224 + { SAA7127_REG_CHROMA_PHASE, 0x3f }, 225 + { SAA7127_REG_GAINU, 0x6a }, 226 + { SAA7127_REG_GAINV, 0x81 }, 227 + { SAA7127_REG_BLACK_LEVEL, 0x33 }, 228 + { SAA7127_REG_BLANKING_LEVEL, 0x35 }, 229 + { SAA7127_REG_VBI_BLANKING, 0x35 }, 230 + { SAA7127_REG_DAC_CONTROL, 0x08 }, 231 + { SAA7127_REG_BURST_AMP, 0x2f }, 232 + { SAA7127_REG_SUBC3, 0xb2 }, 233 + { SAA7127_REG_SUBC2, 0x3b }, 234 + { SAA7127_REG_SUBC1, 0xa3 }, 235 + { SAA7127_REG_SUBC0, 0x28 }, 236 + { SAA7127_REG_MULTI, 0x90 }, 237 + { SAA7127_REG_CLOSED_CAPTION, 0x00 }, 238 238 { 0, 0 } 239 239 }; 240 240
+6 -6
drivers/media/i2c/saa717x.c
··· 82 82 /* ----------------------------------------------------------------------- */ 83 83 84 84 /* for audio mode */ 85 - #define TUNER_AUDIO_MONO 0 /* LL */ 86 - #define TUNER_AUDIO_STEREO 1 /* LR */ 87 - #define TUNER_AUDIO_LANG1 2 /* LL */ 88 - #define TUNER_AUDIO_LANG2 3 /* RR */ 85 + #define TUNER_AUDIO_MONO 0 /* LL */ 86 + #define TUNER_AUDIO_STEREO 1 /* LR */ 87 + #define TUNER_AUDIO_LANG1 2 /* LL */ 88 + #define TUNER_AUDIO_LANG2 3 /* RR */ 89 89 90 - #define SAA717X_NTSC_WIDTH (704) 91 - #define SAA717X_NTSC_HEIGHT (480) 90 + #define SAA717X_NTSC_WIDTH (704) 91 + #define SAA717X_NTSC_HEIGHT (480) 92 92 93 93 /* ----------------------------------------------------------------------- */ 94 94
+1 -1
drivers/media/i2c/ths7303.c
··· 319 319 320 320 static const struct v4l2_subdev_ops ths7303_ops = { 321 321 .core = &ths7303_core_ops, 322 - .video = &ths7303_video_ops, 322 + .video = &ths7303_video_ops, 323 323 }; 324 324 325 325 static int ths7303_probe(struct i2c_client *client,
+1 -1
drivers/media/i2c/tvaudio.c
··· 134 134 /* thread */ 135 135 struct task_struct *thread; 136 136 struct timer_list wt; 137 - int audmode; 137 + int audmode; 138 138 }; 139 139 140 140 static inline struct CHIPSTATE *to_state(struct v4l2_subdev *sd)
+3 -3
drivers/media/i2c/tvp7002_reg.h
··· 109 109 #define TVP7002_L_FRAME_STAT_LSBS 0x37 110 110 #define TVP7002_L_FRAME_STAT_MSBS 0x38 111 111 #define TVP7002_CLK_L_STAT_LSBS 0x39 112 - #define TVP7002_CLK_L_STAT_MSBS 0x3a 112 + #define TVP7002_CLK_L_STAT_MSBS 0x3a 113 113 #define TVP7002_HSYNC_W 0x3b 114 114 #define TVP7002_VSYNC_W 0x3c 115 - #define TVP7002_L_LENGTH_TOL 0x3d 115 + #define TVP7002_L_LENGTH_TOL 0x3d 116 116 /* Reserved 0x3e */ 117 117 #define TVP7002_VIDEO_BWTH_CTL 0x3f 118 118 #define TVP7002_AVID_START_PIXEL_LSBS 0x40 119 119 #define TVP7002_AVID_START_PIXEL_MSBS 0x41 120 - #define TVP7002_AVID_STOP_PIXEL_LSBS 0x42 120 + #define TVP7002_AVID_STOP_PIXEL_LSBS 0x42 121 121 #define TVP7002_AVID_STOP_PIXEL_MSBS 0x43 122 122 #define TVP7002_VBLK_F_0_START_L_OFF 0x44 123 123 #define TVP7002_VBLK_F_1_START_L_OFF 0x45
+1 -1
drivers/media/i2c/vpx3220.c
··· 201 201 * skipped by the VFE) */ 202 202 0x8b, 16, /* Horizontal begin */ 203 203 0x8c, 768, /* Horizontal length */ 204 - 0x8d, 784, /* Number of pixels 204 + 0x8d, 784, /* Number of pixels 205 205 * Must be >= Horizontal begin + Horizontal length */ 206 206 0x8f, 0xc00, /* Disable window 2 */ 207 207 0xf0, 0x77, /* 13.5 MHz transport, Forced
+133 -133
drivers/media/pci/bt8xx/bttv-cards.c
··· 373 373 .svhs = 2, 374 374 .gpiomask = 15, 375 375 .muxsel = MUXSEL(2, 3, 1, 1), 376 - .gpiomux = { 2, 0, 0, 0 }, 377 - .gpiomute = 10, 376 + .gpiomux = { 2, 0, 0, 0 }, 377 + .gpiomute = 10, 378 378 .tuner_type = UNSET, 379 379 .tuner_addr = ADDR_UNSET, 380 380 }, ··· 385 385 .svhs = 2, 386 386 .gpiomask = 7, 387 387 .muxsel = MUXSEL(2, 3, 1, 1), 388 - .gpiomux = { 0, 1, 2, 3 }, 389 - .gpiomute = 4, 388 + .gpiomux = { 0, 1, 2, 3 }, 389 + .gpiomute = 4, 390 390 .tuner_type = UNSET, 391 391 .tuner_addr = ADDR_UNSET, 392 392 }, ··· 397 397 .svhs = 2, 398 398 .gpiomask = 7, 399 399 .muxsel = MUXSEL(2, 3, 1, 1), 400 - .gpiomux = { 4, 0, 2, 3 }, 401 - .gpiomute = 1, 400 + .gpiomux = { 4, 0, 2, 3 }, 401 + .gpiomute = 1, 402 402 .no_msp34xx = 1, 403 403 .tuner_type = TUNER_PHILIPS_NTSC, 404 404 .tuner_addr = ADDR_UNSET, ··· 414 414 .svhs = 2, 415 415 .gpiomask = 0, 416 416 .muxsel = MUXSEL(2, 3, 1, 1), 417 - .gpiomux = { 0 }, 417 + .gpiomux = { 0 }, 418 418 .tuner_type = TUNER_ABSENT, 419 419 .tuner_addr = ADDR_UNSET, 420 420 }, ··· 425 425 .svhs = 2, 426 426 .gpiomask = 3, 427 427 .muxsel = MUXSEL(2, 3, 1, 0), 428 - .gpiomux = { 0, 1, 0, 1 }, 429 - .gpiomute = 3, 428 + .gpiomux = { 0, 1, 0, 1 }, 429 + .gpiomute = 3, 430 430 .tuner_type = UNSET, 431 431 .tuner_addr = ADDR_UNSET, 432 432 }, ··· 437 437 .svhs = 3, 438 438 .muxsel = MUXSEL(2, 3, 1, 1), 439 439 .gpiomask = 0x0f, 440 - .gpiomux = { 0x0c, 0x04, 0x08, 0x04 }, 440 + .gpiomux = { 0x0c, 0x04, 0x08, 0x04 }, 441 441 /* 0x04 for some cards ?? */ 442 442 .tuner_type = UNSET, 443 443 .tuner_addr = ADDR_UNSET, ··· 451 451 .svhs = 3, 452 452 .gpiomask = 0, 453 453 .muxsel = MUXSEL(2, 3, 1, 0, 0), 454 - .gpiomux = { 0 }, 454 + .gpiomux = { 0 }, 455 455 .tuner_type = TUNER_ABSENT, 456 456 .tuner_addr = ADDR_UNSET, 457 457 }, ··· 464 464 .svhs = 2, 465 465 .gpiomask = 0xc00, 466 466 .muxsel = MUXSEL(2, 3, 1, 1), 467 - .gpiomux = { 0, 0xc00, 0x800, 0x400 }, 468 - .gpiomute = 0xc00, 467 + .gpiomux = { 0, 0xc00, 0x800, 0x400 }, 468 + .gpiomute = 0xc00, 469 469 .pll = PLL_28, 470 470 .tuner_type = UNSET, 471 471 .tuner_addr = ADDR_UNSET, ··· 477 477 .svhs = 2, 478 478 .gpiomask = 3, 479 479 .muxsel = MUXSEL(2, 3, 1, 1), 480 - .gpiomux = { 1, 1, 2, 3 }, 480 + .gpiomux = { 1, 1, 2, 3 }, 481 481 .pll = PLL_28, 482 482 .tuner_type = TUNER_TEMIC_PAL, 483 483 .tuner_addr = ADDR_UNSET, ··· 489 489 .svhs = 2, 490 490 .gpiomask = 0x0f, /* old: 7 */ 491 491 .muxsel = MUXSEL(2, 0, 1, 1), 492 - .gpiomux = { 0, 1, 2, 3 }, 493 - .gpiomute = 4, 492 + .gpiomux = { 0, 1, 2, 3 }, 493 + .gpiomute = 4, 494 494 .pll = PLL_28, 495 495 .tuner_type = UNSET, 496 496 .tuner_addr = ADDR_UNSET, ··· 502 502 .svhs = 2, 503 503 .gpiomask = 0x3014f, 504 504 .muxsel = MUXSEL(2, 3, 1, 1), 505 - .gpiomux = { 0x20001,0x10001, 0, 0 }, 506 - .gpiomute = 10, 505 + .gpiomux = { 0x20001,0x10001, 0, 0 }, 506 + .gpiomute = 10, 507 507 .tuner_type = UNSET, 508 508 .tuner_addr = ADDR_UNSET, 509 509 }, ··· 516 516 .svhs = 2, 517 517 .gpiomask = 15, 518 518 .muxsel = MUXSEL(2, 3, 1, 1), 519 - .gpiomux = { 13, 14, 11, 7 }, 519 + .gpiomux = { 13, 14, 11, 7 }, 520 520 .tuner_type = UNSET, 521 521 .tuner_addr = ADDR_UNSET, 522 522 }, ··· 527 527 .svhs = 2, 528 528 .gpiomask = 15, 529 529 .muxsel = MUXSEL(2, 3, 1, 1), 530 - .gpiomux = { 13, 14, 11, 7 }, 530 + .gpiomux = { 13, 14, 11, 7 }, 531 531 .msp34xx_alt = 1, 532 532 .pll = PLL_28, 533 533 .tuner_type = TUNER_PHILIPS_PAL, ··· 542 542 .svhs = 2, 543 543 .gpiomask = 7, 544 544 .muxsel = MUXSEL(2, 3, 1, 1), 545 - .gpiomux = { 0, 2, 1, 3 }, /* old: {0, 1, 2, 3, 4} */ 546 - .gpiomute = 4, 545 + .gpiomux = { 0, 2, 1, 3 }, /* old: {0, 1, 2, 3, 4} */ 546 + .gpiomute = 4, 547 547 .pll = PLL_28, 548 548 .tuner_type = UNSET, 549 549 .tuner_addr = ADDR_UNSET, ··· 555 555 .svhs = 2, 556 556 .gpiomask = 15, 557 557 .muxsel = MUXSEL(2, 3, 1, 1), 558 - .gpiomux = { 0, 0, 1, 0 }, 559 - .gpiomute = 10, 558 + .gpiomux = { 0, 0, 1, 0 }, 559 + .gpiomute = 10, 560 560 .tuner_type = UNSET, 561 561 .tuner_addr = ADDR_UNSET, 562 562 }, ··· 571 571 .muxsel = MUXSEL(2, 3, 1, 1), 572 572 /* 2003-10-20 by "Anton A. Arapov" <arapov@mail.ru> */ 573 573 .gpiomux = { 0x001e00, 0, 0x018000, 0x014000 }, 574 - .gpiomute = 0x002000, 574 + .gpiomute = 0x002000, 575 575 .pll = PLL_28, 576 576 .tuner_type = UNSET, 577 577 .tuner_addr = ADDR_UNSET, ··· 583 583 .svhs = 2, 584 584 .gpiomask = 0x8300f8, 585 585 .muxsel = MUXSEL(2, 3, 1, 1, 0), 586 - .gpiomux = { 0x4fa007,0xcfa007,0xcfa007,0xcfa007 }, 587 - .gpiomute = 0xcfa007, 586 + .gpiomux = { 0x4fa007,0xcfa007,0xcfa007,0xcfa007 }, 587 + .gpiomute = 0xcfa007, 588 588 .tuner_type = UNSET, 589 589 .tuner_addr = ADDR_UNSET, 590 590 .volume_gpio = winview_volume, ··· 597 597 .svhs = 2, 598 598 .gpiomask = 0, 599 599 .muxsel = MUXSEL(2, 3, 1, 1), 600 - .gpiomux = { 1, 0, 0, 0 }, 600 + .gpiomux = { 1, 0, 0, 0 }, 601 601 .tuner_type = UNSET, 602 602 .tuner_addr = ADDR_UNSET, 603 603 }, ··· 608 608 .svhs = NO_SVHS, 609 609 .gpiomask = 0x8dff00, 610 610 .muxsel = MUXSEL(2, 3, 1, 1), 611 - .gpiomux = { 0 }, 611 + .gpiomux = { 0 }, 612 612 .no_msp34xx = 1, 613 613 .tuner_type = TUNER_ABSENT, 614 614 .tuner_addr = ADDR_UNSET, ··· 631 631 .svhs = 2, 632 632 .gpiomask = 0x1800, 633 633 .muxsel = MUXSEL(2, 3, 1, 1), 634 - .gpiomux = { 0, 0x800, 0x1000, 0x1000 }, 635 - .gpiomute = 0x1800, 634 + .gpiomux = { 0, 0x800, 0x1000, 0x1000 }, 635 + .gpiomute = 0x1800, 636 636 .pll = PLL_28, 637 637 .tuner_type = TUNER_PHILIPS_PAL_I, 638 638 .tuner_addr = ADDR_UNSET, ··· 644 644 .svhs = 2, 645 645 .gpiomask = 0xc00, 646 646 .muxsel = MUXSEL(2, 3, 1, 1), 647 - .gpiomux = { 0, 1, 0x800, 0x400 }, 648 - .gpiomute = 0xc00, 647 + .gpiomux = { 0, 1, 0x800, 0x400 }, 648 + .gpiomute = 0xc00, 649 649 .pll = PLL_28, 650 650 .tuner_type = UNSET, 651 651 .tuner_addr = ADDR_UNSET, ··· 659 659 .gpiomask = 7, 660 660 .muxsel = MUXSEL(2, 3, 0), /* input 2 is digital */ 661 661 /* .digital_mode= DIGITAL_MODE_CAMERA, */ 662 - .gpiomux = { 0, 0, 0, 0 }, 662 + .gpiomux = { 0, 0, 0, 0 }, 663 663 .no_msp34xx = 1, 664 664 .pll = PLL_28, 665 665 .tuner_type = TUNER_ALPS_TSBB5_PAL_I, ··· 674 674 .svhs = 2, 675 675 .gpiomask = 0xe00, 676 676 .muxsel = MUXSEL(2, 3, 1, 1), 677 - .gpiomux = {0x400, 0x400, 0x400, 0x400 }, 678 - .gpiomute = 0xc00, 677 + .gpiomux = {0x400, 0x400, 0x400, 0x400 }, 678 + .gpiomute = 0xc00, 679 679 .pll = PLL_28, 680 680 .tuner_type = UNSET, 681 681 .tuner_addr = ADDR_UNSET, ··· 690 690 .gpiomask = 0x1f0fff, 691 691 .muxsel = MUXSEL(2, 3, 1, 1), 692 692 .gpiomux = { 0x20000, 0x30000, 0x10000, 0 }, 693 - .gpiomute = 0x40000, 693 + .gpiomute = 0x40000, 694 694 .tuner_type = TUNER_PHILIPS_PAL, 695 695 .tuner_addr = ADDR_UNSET, 696 696 .audio_mode_gpio= terratv_audio, ··· 702 702 .svhs = 3, 703 703 .gpiomask = 7, 704 704 .muxsel = MUXSEL(2, 0, 1, 1), 705 - .gpiomux = { 0, 1, 2, 3 }, 706 - .gpiomute = 4, 705 + .gpiomux = { 0, 1, 2, 3 }, 706 + .gpiomute = 4, 707 707 .tuner_type = UNSET, 708 708 .tuner_addr = ADDR_UNSET, 709 709 }, ··· 714 714 .svhs = 2, 715 715 .gpiomask = 0x1800, 716 716 .muxsel = MUXSEL(2, 3, 1, 1), 717 - .gpiomux = { 0, 0x800, 0x1000, 0x1000 }, 718 - .gpiomute = 0x1800, 717 + .gpiomux = { 0, 0x800, 0x1000, 0x1000 }, 718 + .gpiomute = 0x1800, 719 719 .pll = PLL_28, 720 720 .tuner_type = TUNER_PHILIPS_SECAM, 721 721 .tuner_addr = ADDR_UNSET, ··· 729 729 .svhs = 2, 730 730 .gpiomask = 0x1f0fff, 731 731 .muxsel = MUXSEL(2, 3, 1, 1), 732 - .gpiomux = { 0x20000, 0x30000, 0x10000, 0x00000 }, 733 - .gpiomute = 0x40000, 732 + .gpiomux = { 0x20000, 0x30000, 0x10000, 0x00000 }, 733 + .gpiomute = 0x40000, 734 734 .tuner_type = TUNER_PHILIPS_PAL, 735 735 .tuner_addr = ADDR_UNSET, 736 736 .audio_mode_gpio= terratv_audio, ··· 774 774 .svhs = 1, /* was: 4 */ 775 775 .gpiomask = 0, 776 776 .muxsel = MUXSEL(2, 3, 1, 0, 0), 777 - .gpiomux = { 0 }, 777 + .gpiomux = { 0 }, 778 778 .tuner_type = TUNER_ABSENT, 779 779 .tuner_addr = ADDR_UNSET, 780 780 .muxsel_hook = PXC200_muxsel, ··· 787 787 .svhs = 2, 788 788 .gpiomask = 0x1800, /* 0x8dfe00 */ 789 789 .muxsel = MUXSEL(2, 3, 1, 1), 790 - .gpiomux = { 0, 0x0800, 0x1000, 0x1000 }, 791 - .gpiomute = 0x1800, 790 + .gpiomux = { 0, 0x0800, 0x1000, 0x1000 }, 791 + .gpiomute = 0x1800, 792 792 .pll = PLL_28, 793 793 .tuner_type = UNSET, 794 794 .tuner_addr = ADDR_UNSET, ··· 800 800 .svhs = 3, 801 801 .gpiomask = 1, 802 802 .muxsel = MUXSEL(2, 3, 1, 1), 803 - .gpiomux = { 1, 0, 0, 0 }, 803 + .gpiomux = { 1, 0, 0, 0 }, 804 804 .pll = PLL_28, 805 805 .tuner_type = TUNER_PHILIPS_PAL, 806 806 .tuner_addr = ADDR_UNSET, ··· 814 814 .svhs = 2, 815 815 .gpiomask = 0, 816 816 .muxsel = MUXSEL(2, 3, 1, 1), 817 - .gpiomux = { 0 }, 817 + .gpiomux = { 0 }, 818 818 .tuner_type = TUNER_ABSENT, 819 819 .tuner_addr = ADDR_UNSET, 820 820 }, ··· 825 825 .svhs = 2, 826 826 .gpiomask = 0xffff00, 827 827 .muxsel = MUXSEL(2, 3, 1, 1), 828 - .gpiomux = { 0x500, 0, 0x300, 0x900 }, 829 - .gpiomute = 0x900, 828 + .gpiomux = { 0x500, 0, 0x300, 0x900 }, 829 + .gpiomute = 0x900, 830 830 .pll = PLL_28, 831 831 .tuner_type = TUNER_PHILIPS_PAL, 832 832 .tuner_addr = ADDR_UNSET, ··· 840 840 .muxsel = MUXSEL(2, 3, 1, 1, 0), 841 841 /* Alexander Varakin <avarakin@hotmail.com> [stereo version] */ 842 842 .gpiomask = 0xb33000, 843 - .gpiomux = { 0x122000,0x1000,0x0000,0x620000 }, 844 - .gpiomute = 0x800000, 843 + .gpiomux = { 0x122000,0x1000,0x0000,0x620000 }, 844 + .gpiomute = 0x800000, 845 845 /* Audio Routing for "WinFast 2000 XP" (no tv stereo !) 846 846 gpio23 -- hef4052:nEnable (0x800000) 847 847 gpio12 -- hef4052:A1 ··· 867 867 .svhs = 2, 868 868 .gpiomask = 0x1800, 869 869 .muxsel = MUXSEL(2, 3, 1, 1), 870 - .gpiomux = { 0, 0x800, 0x1000, 0x1000 }, 871 - .gpiomute = 0x1800, 870 + .gpiomux = { 0, 0x800, 0x1000, 0x1000 }, 871 + .gpiomute = 0x1800, 872 872 .pll = PLL_28, 873 873 .tuner_type = UNSET, 874 874 .tuner_addr = ADDR_UNSET, ··· 882 882 .svhs = 2, 883 883 .gpiomask = 0x1800, 884 884 .muxsel = MUXSEL(2, 3, 1, 1), 885 - .gpiomux = { 0, 0x800, 0x1000, 0x1000 }, 886 - .gpiomute = 0x1800, 885 + .gpiomux = { 0, 0x800, 0x1000, 0x1000 }, 886 + .gpiomute = 0x1800, 887 887 .pll = PLL_28, 888 888 .tuner_type = UNSET, 889 889 .tuner_addr = ADDR_UNSET, ··· 896 896 .svhs = 2, 897 897 .gpiomask = 0xff, 898 898 .muxsel = MUXSEL(2, 3, 1, 1), 899 - .gpiomux = { 0x21, 0x20, 0x24, 0x2c }, 900 - .gpiomute = 0x29, 899 + .gpiomux = { 0x21, 0x20, 0x24, 0x2c }, 900 + .gpiomute = 0x29, 901 901 .no_msp34xx = 1, 902 902 .pll = PLL_28, 903 903 .tuner_type = UNSET, ··· 910 910 .svhs = 2, 911 911 .gpiomask = 0x551e00, 912 912 .muxsel = MUXSEL(2, 3, 1, 0), 913 - .gpiomux = { 0x551400, 0x551200, 0, 0 }, 914 - .gpiomute = 0x551c00, 913 + .gpiomux = { 0x551400, 0x551200, 0, 0 }, 914 + .gpiomute = 0x551c00, 915 915 .pll = PLL_28, 916 916 .tuner_type = TUNER_PHILIPS_PAL_I, 917 917 .tuner_addr = ADDR_UNSET, ··· 924 924 .svhs = 2, 925 925 .gpiomask = 0x03000F, 926 926 .muxsel = MUXSEL(2, 3, 1, 1), 927 - .gpiomux = { 2, 0xd0001, 0, 0 }, 928 - .gpiomute = 1, 927 + .gpiomux = { 2, 0xd0001, 0, 0 }, 928 + .gpiomute = 1, 929 929 .pll = PLL_28, 930 930 .tuner_type = UNSET, 931 931 .tuner_addr = ADDR_UNSET, ··· 939 939 .svhs = 2, 940 940 .gpiomask = 7, 941 941 .muxsel = MUXSEL(2, 3, 1, 1), 942 - .gpiomux = { 4, 0, 2, 3 }, 943 - .gpiomute = 1, 942 + .gpiomux = { 4, 0, 2, 3 }, 943 + .gpiomute = 1, 944 944 .no_msp34xx = 1, 945 945 .tuner_type = TUNER_PHILIPS_NTSC, 946 946 .tuner_addr = ADDR_UNSET, ··· 954 954 .svhs = 2, 955 955 .gpiomask = 15, 956 956 .muxsel = MUXSEL(2, 3, 1, 1), 957 - .gpiomux = { 13, 4, 11, 7 }, 957 + .gpiomux = { 13, 4, 11, 7 }, 958 958 .pll = PLL_28, 959 959 .tuner_type = UNSET, 960 960 .tuner_addr = ADDR_UNSET, ··· 968 968 .svhs = 2, 969 969 .gpiomask = 0, 970 970 .muxsel = MUXSEL(2, 3, 1, 1), 971 - .gpiomux = { 0, 0, 0, 0}, 971 + .gpiomux = { 0, 0, 0, 0}, 972 972 .no_msp34xx = 1, 973 973 .pll = PLL_28, 974 974 .tuner_type = TUNER_PHILIPS_PAL_I, ··· 981 981 .svhs = 2, 982 982 .gpiomask = 0xe00b, 983 983 .muxsel = MUXSEL(2, 3, 1, 1), 984 - .gpiomux = { 0xff9ff6, 0xff9ff6, 0xff1ff7, 0 }, 985 - .gpiomute = 0xff3ffc, 984 + .gpiomux = { 0xff9ff6, 0xff9ff6, 0xff1ff7, 0 }, 985 + .gpiomute = 0xff3ffc, 986 986 .no_msp34xx = 1, 987 987 .tuner_type = UNSET, 988 988 .tuner_addr = ADDR_UNSET, ··· 996 996 .svhs = NO_SVHS, 997 997 .gpiomask = 3, 998 998 .muxsel = MUXSEL(2, 3, 1, 1), 999 - .gpiomux = { 1, 1, 0, 2 }, 1000 - .gpiomute = 3, 999 + .gpiomux = { 1, 1, 0, 2 }, 1000 + .gpiomute = 3, 1001 1001 .no_msp34xx = 1, 1002 1002 .pll = PLL_NONE, 1003 1003 .tuner_type = UNSET, ··· 1010 1010 .svhs = 3, 1011 1011 .gpiomask = 0, 1012 1012 .muxsel = MUXSEL(2, 3, 1, 0, 0), 1013 - .gpiomux = { 0 }, 1013 + .gpiomux = { 0 }, 1014 1014 .no_msp34xx = 1, 1015 1015 .pll = PLL_28, 1016 1016 .tuner_type = TUNER_ABSENT, ··· 1023 1023 .svhs = 2, 1024 1024 .gpiomask = 0xbcf03f, 1025 1025 .muxsel = MUXSEL(2, 3, 1, 1), 1026 - .gpiomux = { 0xbc803f, 0xbc903f, 0xbcb03f, 0 }, 1027 - .gpiomute = 0xbcb03f, 1026 + .gpiomux = { 0xbc803f, 0xbc903f, 0xbcb03f, 0 }, 1027 + .gpiomute = 0xbcb03f, 1028 1028 .no_msp34xx = 1, 1029 1029 .pll = PLL_28, 1030 1030 .tuner_type = TUNER_TEMIC_4039FR5_NTSC, ··· 1037 1037 .svhs = 2, 1038 1038 .gpiomask = 0x70000, 1039 1039 .muxsel = MUXSEL(2, 3, 1, 1), 1040 - .gpiomux = { 0x20000, 0x30000, 0x10000, 0 }, 1041 - .gpiomute = 0x40000, 1040 + .gpiomux = { 0x20000, 0x30000, 0x10000, 0 }, 1041 + .gpiomute = 0x40000, 1042 1042 .no_msp34xx = 1, 1043 1043 .pll = PLL_35, 1044 1044 .tuner_type = TUNER_PHILIPS_PAL_I, ··· 1054 1054 .svhs = 2, 1055 1055 .gpiomask = 15, 1056 1056 .muxsel = MUXSEL(2, 3, 1, 1), 1057 - .gpiomux = {2,0,0,0 }, 1058 - .gpiomute = 1, 1057 + .gpiomux = {2,0,0,0 }, 1058 + .gpiomute = 1, 1059 1059 .pll = PLL_28, 1060 1060 .tuner_type = UNSET, 1061 1061 .tuner_addr = ADDR_UNSET, ··· 1067 1067 .svhs = 2, 1068 1068 .gpiomask = 0x010f00, 1069 1069 .muxsel = MUXSEL(2, 3, 0, 0), 1070 - .gpiomux = {0x10000, 0, 0x10000, 0 }, 1070 + .gpiomux = {0x10000, 0, 0x10000, 0 }, 1071 1071 .no_msp34xx = 1, 1072 1072 .pll = PLL_28, 1073 1073 .tuner_type = TUNER_ALPS_TSHC6_NTSC, ··· 1083 1083 .gpiomask = 0xAA0000, 1084 1084 .muxsel = MUXSEL(2, 3, 1, 1, 0), /* in 4 is digital */ 1085 1085 /* .digital_mode= DIGITAL_MODE_CAMERA, */ 1086 - .gpiomux = { 0x20000, 0, 0x80000, 0x80000 }, 1087 - .gpiomute = 0xa8000, 1086 + .gpiomux = { 0x20000, 0, 0x80000, 0x80000 }, 1087 + .gpiomute = 0xa8000, 1088 1088 .no_msp34xx = 1, 1089 1089 .pll = PLL_28, 1090 1090 .tuner_type = TUNER_PHILIPS_PAL_I, ··· 1108 1108 .gpiomask = 7, 1109 1109 .muxsel = MUXSEL(2, 0, 1, 1), 1110 1110 .gpiomux = { 0, 1, 2, 3 }, 1111 - .gpiomute = 4, 1111 + .gpiomute = 4, 1112 1112 .pll = PLL_28, 1113 1113 .tuner_type = UNSET /* TUNER_ALPS_TMDH2_NTSC */, 1114 1114 .tuner_addr = ADDR_UNSET, ··· 1123 1123 .svhs = 3, 1124 1124 .gpiomask = 0x03000F, 1125 1125 .muxsel = MUXSEL(2, 3, 1, 1), 1126 - .gpiomux = { 1, 0xd0001, 0, 0 }, 1127 - .gpiomute = 10, 1126 + .gpiomux = { 1, 0xd0001, 0, 0 }, 1127 + .gpiomute = 10, 1128 1128 /* sound path (5 sources): 1129 1129 MUX1 (mask 0x03), Enable Pin 0x08 (0=enable, 1=disable) 1130 1130 0= ext. Audio IN ··· 1147 1147 .svhs = 2, 1148 1148 .gpiomask = 0x1c, 1149 1149 .muxsel = MUXSEL(2, 3, 1, 1), 1150 - .gpiomux = { 0, 0, 0x10, 8 }, 1151 - .gpiomute = 4, 1150 + .gpiomux = { 0, 0, 0x10, 8 }, 1151 + .gpiomute = 4, 1152 1152 .pll = PLL_28, 1153 1153 .tuner_type = TUNER_PHILIPS_PAL, 1154 1154 .tuner_addr = ADDR_UNSET, ··· 1166 1166 .svhs = 2, 1167 1167 .gpiomask = 0x18e0, 1168 1168 .muxsel = MUXSEL(2, 3, 1, 1), 1169 - .gpiomux = { 0x0000,0x0800,0x1000,0x1000 }, 1170 - .gpiomute = 0x18e0, 1169 + .gpiomux = { 0x0000,0x0800,0x1000,0x1000 }, 1170 + .gpiomute = 0x18e0, 1171 1171 /* For cards with tda9820/tda9821: 1172 1172 0x0000: Tuner normal stereo 1173 1173 0x0080: Tuner A2 SAP (second audio program = Zweikanalton) ··· 1186 1186 .gpiomask = 0xF, 1187 1187 .muxsel = MUXSEL(2, 3, 1, 0), 1188 1188 .gpiomux = { 2, 0, 0, 0 }, 1189 - .gpiomute = 10, 1189 + .gpiomute = 10, 1190 1190 .pll = PLL_28, 1191 1191 .tuner_type = TUNER_TEMIC_PAL, 1192 1192 .tuner_addr = ADDR_UNSET, ··· 1202 1202 .gpiomask = 0x1800, 1203 1203 .muxsel = MUXSEL(2, 3, 1, 1), 1204 1204 .gpiomux = { 0, 0x800, 0x1000, 0x1000 }, 1205 - .gpiomute = 0x1800, 1205 + .gpiomute = 0x1800, 1206 1206 .pll = PLL_28, 1207 1207 .tuner_type = TUNER_PHILIPS_PAL, 1208 1208 .tuner_addr = ADDR_UNSET, ··· 1232 1232 .gpiomask = 0xe00, 1233 1233 .muxsel = MUXSEL(2, 3, 1, 1), 1234 1234 .gpiomux = { 0x400, 0x400, 0x400, 0x400 }, 1235 - .gpiomute = 0x800, 1235 + .gpiomute = 0x800, 1236 1236 .pll = PLL_28, 1237 1237 .tuner_type = TUNER_TEMIC_4036FY5_NTSC, 1238 1238 .tuner_addr = ADDR_UNSET, ··· 1246 1246 .gpiomask = 0x03000F, 1247 1247 .muxsel = MUXSEL(2, 3, 1, 0), 1248 1248 .gpiomux = { 2, 0, 0, 0 }, 1249 - .gpiomute = 1, 1249 + .gpiomute = 1, 1250 1250 .pll = PLL_28, 1251 1251 .tuner_type = TUNER_TEMIC_PAL, 1252 1252 .tuner_addr = ADDR_UNSET, ··· 1263 1263 .gpiomask = 11, 1264 1264 .muxsel = MUXSEL(2, 3, 1, 1), 1265 1265 .gpiomux = { 2, 0, 0, 1 }, 1266 - .gpiomute = 8, 1266 + .gpiomute = 8, 1267 1267 .pll = PLL_35, 1268 1268 .tuner_type = TUNER_TEMIC_PAL, 1269 1269 .tuner_addr = ADDR_UNSET, ··· 1293 1293 .gpiomask = 0xFF, 1294 1294 .muxsel = MUXSEL(2, 3, 1, 0), 1295 1295 .gpiomux = { 1, 0, 4, 4 }, 1296 - .gpiomute = 9, 1296 + .gpiomute = 9, 1297 1297 .pll = PLL_28, 1298 1298 .tuner_type = TUNER_PHILIPS_PAL, 1299 1299 .tuner_addr = ADDR_UNSET, ··· 1306 1306 .svhs = 2, 1307 1307 .gpiomask = 0xf03f, 1308 1308 .muxsel = MUXSEL(2, 3, 1, 0), 1309 - .gpiomux = { 0xbffe, 0, 0xbfff, 0 }, 1310 - .gpiomute = 0xbffe, 1309 + .gpiomux = { 0xbffe, 0, 0xbfff, 0 }, 1310 + .gpiomute = 0xbffe, 1311 1311 .pll = PLL_28, 1312 1312 .tuner_type = TUNER_TEMIC_4006FN5_MULTI_PAL, 1313 1313 .tuner_addr = ADDR_UNSET, ··· 1322 1322 .svhs = NO_SVHS, 1323 1323 .gpiomask = 1, 1324 1324 .muxsel = MUXSEL(2, 3, 0, 1), 1325 - .gpiomux = { 0, 0, 1, 0 }, 1325 + .gpiomux = { 0, 0, 1, 0 }, 1326 1326 .no_msp34xx = 1, 1327 1327 .pll = PLL_28, 1328 1328 .tuner_type = TUNER_TEMIC_4006FN5_MULTI_PAL, ··· 1339 1339 /* Radio changed from 1e80 to 0x800 to make 1340 1340 FlyVideo2000S in .hu happy (gm)*/ 1341 1341 /* -dk-???: set mute=0x1800 for tda9874h daughterboard */ 1342 - .gpiomux = { 0x0000,0x0800,0x1000,0x1000 }, 1343 - .gpiomute = 0x1800, 1342 + .gpiomux = { 0x0000,0x0800,0x1000,0x1000 }, 1343 + .gpiomute = 0x1800, 1344 1344 .audio_mode_gpio= fv2000s_audio, 1345 1345 .no_msp34xx = 1, 1346 1346 .pll = PLL_28, ··· 1354 1354 .svhs = 2, 1355 1355 .gpiomask = 0xffff00, 1356 1356 .muxsel = MUXSEL(2, 3, 1, 1), 1357 - .gpiomux = { 0x500, 0x500, 0x300, 0x900 }, 1358 - .gpiomute = 0x900, 1357 + .gpiomux = { 0x500, 0x500, 0x300, 0x900 }, 1358 + .gpiomute = 0x900, 1359 1359 .pll = PLL_28, 1360 1360 .tuner_type = TUNER_PHILIPS_PAL, 1361 1361 .tuner_addr = ADDR_UNSET, ··· 1389 1389 /* 0x100000: 1=MSP enabled (0=disable again) 1390 1390 * 0x010000: Connected to "S0" on tda9880 (0=Pal/BG, 1=NTSC) */ 1391 1391 .gpiomux = {0x947fff, 0x987fff,0x947fff,0x947fff }, 1392 - .gpiomute = 0x947fff, 1392 + .gpiomute = 0x947fff, 1393 1393 /* tvtuner, radio, external,internal, mute, stereo 1394 1394 * tuner, Composit, SVid, Composit-on-Svid-adapter */ 1395 1395 .muxsel = MUXSEL(2, 3, 0, 1), ··· 1409 1409 /* 0x100000: 1=MSP enabled (0=disable again) 1410 1410 * 0x010000: Connected to "S0" on tda9880 (0=Pal/BG, 1=NTSC) */ 1411 1411 .gpiomux = {0x947fff, 0x987fff,0x947fff,0x947fff }, 1412 - .gpiomute = 0x947fff, 1412 + .gpiomute = 0x947fff, 1413 1413 /* tvtuner, radio, external,internal, mute, stereo 1414 1414 * tuner, Composit, SVid, Composit-on-Svid-adapter */ 1415 1415 .muxsel = MUXSEL(2, 3, 0, 1), ··· 1438 1438 .gpiomask = 15, 1439 1439 .muxsel = MUXSEL(2, 3, 1, 1), 1440 1440 .gpiomux = { 0, 0, 11, 7 }, /* TV and Radio with same GPIO ! */ 1441 - .gpiomute = 13, 1441 + .gpiomute = 13, 1442 1442 .pll = PLL_28, 1443 1443 .tuner_type = TUNER_LG_PAL_I_FM, 1444 1444 .tuner_addr = ADDR_UNSET, ··· 1473 1473 .svhs = 2, 1474 1474 .gpiomask = 0x3f, 1475 1475 .muxsel = MUXSEL(2, 3, 1, 1), 1476 - .gpiomux = { 0x01, 0x00, 0x03, 0x03 }, 1477 - .gpiomute = 0x09, 1476 + .gpiomux = { 0x01, 0x00, 0x03, 0x03 }, 1477 + .gpiomute = 0x09, 1478 1478 .no_msp34xx = 1, 1479 1479 .pll = PLL_28, 1480 1480 .tuner_type = TUNER_PHILIPS_PAL, ··· 1525 1525 .gpiomask = 0x1C800F, /* Bit0-2: Audio select, 8-12:remote control 14:remote valid 15:remote reset */ 1526 1526 .muxsel = MUXSEL(2, 1, 1), 1527 1527 .gpiomux = { 0, 1, 2, 2 }, 1528 - .gpiomute = 4, 1528 + .gpiomute = 4, 1529 1529 .tuner_type = TUNER_PHILIPS_PAL, 1530 1530 .tuner_addr = ADDR_UNSET, 1531 1531 .pll = PLL_28, ··· 1542 1542 .gpiomask = 0x140007, 1543 1543 .muxsel = MUXSEL(2, 3, 1, 1), 1544 1544 .gpiomux = { 0, 1, 2, 3 }, 1545 - .gpiomute = 4, 1545 + .gpiomute = 4, 1546 1546 .tuner_type = TUNER_PHILIPS_NTSC, 1547 1547 .tuner_addr = ADDR_UNSET, 1548 1548 .audio_mode_gpio= windvr_audio, ··· 1575 1575 * gpiomux =1: lower volume, 2+3: mute 1576 1576 * btwincap uses 0x80000/0x80003 1577 1577 */ 1578 - .gpiomute = 4, 1578 + .gpiomute = 4, 1579 1579 .no_msp34xx = 1, 1580 1580 .pll = PLL_28, 1581 1581 .tuner_type = TUNER_PHILIPS_PAL, ··· 1626 1626 .gpiomask = 0x0f0f80, 1627 1627 .muxsel = MUXSEL(2, 3, 1, 0), 1628 1628 .gpiomux = {0x030000, 0x010000, 0, 0 }, 1629 - .gpiomute = 0x020000, 1629 + .gpiomute = 0x020000, 1630 1630 .no_msp34xx = 1, 1631 1631 .pll = PLL_28, 1632 1632 .tuner_type = TUNER_PHILIPS_NTSC_M, ··· 1829 1829 .gpiomask = 7, 1830 1830 .muxsel = MUXSEL(2, 3, 1, 1), 1831 1831 .gpiomux = { 0, 1, 2, 3}, 1832 - .gpiomute = 4, 1832 + .gpiomute = 4, 1833 1833 .tuner_type = TUNER_PHILIPS_PAL, 1834 1834 .tuner_addr = ADDR_UNSET, 1835 1835 .pll = PLL_28, ··· 1872 1872 .muxsel = MUXSEL(2, 3, 1, 0), 1873 1873 /* Tuner, Radio, external, internal, off, on */ 1874 1874 .gpiomux = { 0x08, 0x0f, 0x0a, 0x08 }, 1875 - .gpiomute = 0x0f, 1875 + .gpiomute = 0x0f, 1876 1876 .no_msp34xx = 1, 1877 1877 .pll = PLL_28, 1878 1878 .tuner_type = TUNER_PHILIPS_NTSC, ··· 2139 2139 .gpiomask = 0x008007, 2140 2140 .muxsel = MUXSEL(2, 3, 0, 0), 2141 2141 .gpiomux = { 0, 0, 0, 0 }, 2142 - .gpiomute = 0x000003, 2142 + .gpiomute = 0x000003, 2143 2143 .pll = PLL_28, 2144 2144 .tuner_type = TUNER_PHILIPS_PAL, 2145 2145 .tuner_addr = ADDR_UNSET, ··· 2182 2182 .gpiomask = 0x008007, 2183 2183 .muxsel = MUXSEL(2, 3, 1, 1), 2184 2184 .gpiomux = { 0, 1, 2, 2 }, 2185 - .gpiomute = 3, 2185 + .gpiomute = 3, 2186 2186 .pll = PLL_28, 2187 2187 .tuner_type = TUNER_PHILIPS_PAL, 2188 2188 .tuner_addr = ADDR_UNSET, ··· 2297 2297 .gpiomask = 0xFF, 2298 2298 .muxsel = MUXSEL(2, 3, 1, 1), 2299 2299 .gpiomux = { 2, 0, 0, 0 }, 2300 - .gpiomute = 10, 2300 + .gpiomute = 10, 2301 2301 .pll = PLL_28, 2302 2302 .tuner_type = TUNER_PHILIPS_PAL, 2303 2303 .tuner_addr = ADDR_UNSET, ··· 2326 2326 .gpiomask = 0x3f, 2327 2327 .muxsel = MUXSEL(2, 3, 1, 0), 2328 2328 .gpiomux = {0x31, 0x31, 0x31, 0x31 }, 2329 - .gpiomute = 0x31, 2329 + .gpiomute = 0x31, 2330 2330 .no_msp34xx = 1, 2331 2331 .pll = PLL_28, 2332 2332 .tuner_type = TUNER_PHILIPS_NTSC_M, ··· 2440 2440 .muxsel = MUXSEL(2, 3, 1), 2441 2441 .gpiomask = 0x00e00007, 2442 2442 .gpiomux = { 0x00400005, 0, 0x00000001, 0 }, 2443 - .gpiomute = 0x00c00007, 2443 + .gpiomute = 0x00c00007, 2444 2444 .no_msp34xx = 1, 2445 2445 .no_tda7432 = 1, 2446 2446 .has_dvb = 1, ··· 2455 2455 .gpiomask = 0x01fe00, 2456 2456 .muxsel = MUXSEL(2, 3, 1, 1), 2457 2457 .gpiomux = { 0x001e00, 0, 0x018000, 0x014000 }, 2458 - .gpiomute = 0x002000, 2458 + .gpiomute = 0x002000, 2459 2459 .pll = PLL_28, 2460 2460 .tuner_type = TUNER_YMEC_TVF66T5_B_DFF, 2461 2461 .tuner_addr = 0xc1 >>1, ··· 2470 2470 .gpiomask = 0x001c0007, 2471 2471 .muxsel = MUXSEL(2, 3, 1, 1), 2472 2472 .gpiomux = { 0, 1, 2, 2 }, 2473 - .gpiomute = 3, 2473 + .gpiomute = 3, 2474 2474 .pll = PLL_28, 2475 2475 .tuner_type = TUNER_TENA_9533_DI, 2476 2476 .tuner_addr = ADDR_UNSET, ··· 2505 2505 .gpiomask = 0x3f, 2506 2506 .muxsel = MUXSEL(2, 3, 1, 1), 2507 2507 .gpiomux = { 0x21, 0x20, 0x24, 0x2c }, 2508 - .gpiomute = 0x29, 2508 + .gpiomute = 0x29, 2509 2509 .no_msp34xx = 1, 2510 2510 .pll = PLL_28, 2511 2511 .tuner_type = TUNER_YMEC_TVF_5533MF, ··· 2549 2549 .svhs = 2, 2550 2550 .gpiomask = 15, 2551 2551 .muxsel = MUXSEL(2, 3, 1, 1), 2552 - .gpiomux = { 2, 0, 0, 0 }, 2553 - .gpiomute = 1, 2552 + .gpiomux = { 2, 0, 0, 0 }, 2553 + .gpiomute = 1, 2554 2554 .pll = PLL_28, 2555 2555 .tuner_type = TUNER_PHILIPS_NTSC, 2556 2556 .tuner_addr = ADDR_UNSET, ··· 2563 2563 .svhs = 2, 2564 2564 .gpiomask = 0x108007, 2565 2565 .muxsel = MUXSEL(2, 3, 1, 1), 2566 - .gpiomux = { 100000, 100002, 100002, 100000 }, 2566 + .gpiomux = { 100000, 100002, 100002, 100000 }, 2567 2567 .no_msp34xx = 1, 2568 2568 .no_tda7432 = 1, 2569 2569 .pll = PLL_28, ··· 2599 2599 .gpiomask = 7, 2600 2600 .muxsel = MUXSEL(2, 3, 1, 1), 2601 2601 .gpiomux = { 0, 1, 2, 3 }, 2602 - .gpiomute = 4, 2602 + .gpiomute = 4, 2603 2603 .tuner_type = TUNER_TEMIC_4009FR5_PAL, 2604 2604 .tuner_addr = ADDR_UNSET, 2605 2605 .pll = PLL_28, ··· 2635 2635 .muxsel = MUXSEL(2, 3, 1), 2636 2636 .gpiomask = 0x00e00007, 2637 2637 .gpiomux = { 0x00400005, 0, 0x00000001, 0 }, 2638 - .gpiomute = 0x00c00007, 2638 + .gpiomute = 0x00c00007, 2639 2639 .no_msp34xx = 1, 2640 2640 .no_tda7432 = 1, 2641 2641 }, ··· 2679 2679 .gpiomask = 0x008007, 2680 2680 .muxsel = MUXSEL(2, 3, 1, 1), 2681 2681 .gpiomux = { 0, 1, 2, 2 }, /* CONTVFMi */ 2682 - .gpiomute = 3, /* CONTVFMi */ 2682 + .gpiomute = 3, /* CONTVFMi */ 2683 2683 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* TCL MK3 */ 2684 2684 .tuner_addr = ADDR_UNSET, 2685 2685 .pll = PLL_28, ··· 2702 2702 .gpiomask = 0x060040, 2703 2703 .muxsel = MUXSEL(2, 3, 3), 2704 2704 .gpiomux = { 0x60000, 0x60000, 0x20000, 0x20000 }, 2705 - .gpiomute = 0, 2705 + .gpiomute = 0, 2706 2706 .tuner_type = TUNER_TCL_MF02GIP_5N, 2707 2707 .tuner_addr = ADDR_UNSET, 2708 2708 .pll = PLL_28, ··· 2752 2752 /* Bruno Christo <bchristo@inf.ufsm.br> 2753 2753 * 2754 2754 * GeoVision GV-800(S) has 4 Conexant Fusion 878A: 2755 - * 1 audio input per BT878A = 4 audio inputs 2756 - * 4 video inputs per BT878A = 16 video inputs 2755 + * 1 audio input per BT878A = 4 audio inputs 2756 + * 4 video inputs per BT878A = 16 video inputs 2757 2757 * This is the first BT878A chip of the GV-800(S). It's the 2758 2758 * "master" chip and it controls the video inputs through an 2759 2759 * analog multiplexer (a CD22M3494) via some GPIO pins. The ··· 2779 2779 /* Bruno Christo <bchristo@inf.ufsm.br> 2780 2780 * 2781 2781 * GeoVision GV-800(S) has 4 Conexant Fusion 878A: 2782 - * 1 audio input per BT878A = 4 audio inputs 2783 - * 4 video inputs per BT878A = 16 video inputs 2782 + * 1 audio input per BT878A = 4 audio inputs 2783 + * 4 video inputs per BT878A = 16 video inputs 2784 2784 * The 3 other BT878A chips are "slave" chips of the GV-800(S) 2785 2785 * and should use this card type. 2786 2786 * The audio input is not working yet. ··· 4784 4784 * GPIO bits 0-9 are used for the analog switch: 4785 4785 * 00 - 03: camera selector 4786 4786 * 04 - 06: 878A (controller) selector 4787 - * 16: cselect 4787 + * 16: cselect 4788 4788 * 17: strobe 4789 - * 18: data (1->on, 0->off) 4789 + * 18: data (1->on, 0->off) 4790 4790 * 19: reset 4791 4791 */ 4792 4792 const u32 ADDRESS = ((xaddr&0xf) | (yaddr&3)<<4); ··· 4882 4882 int pcipci_fail = 0; 4883 4883 struct pci_dev *dev = NULL; 4884 4884 4885 - if (pci_pci_problems & (PCIPCI_FAIL|PCIAGP_FAIL)) /* should check if target is AGP */ 4885 + if (pci_pci_problems & (PCIPCI_FAIL|PCIAGP_FAIL)) /* should check if target is AGP */ 4886 4886 pcipci_fail = 1; 4887 4887 if (pci_pci_problems & (PCIPCI_TRITON|PCIPCI_NATOMA|PCIPCI_VIAETBF)) 4888 4888 triton1 = 1;
+4 -4
drivers/media/pci/bt8xx/bttv-input.c
··· 349 349 * NOTE: 350 350 * lirc_i2c maps the pv951 code as: 351 351 * addr = 0x61D6 352 - * cmd = bit_reverse (b) 352 + * cmd = bit_reverse (b) 353 353 * So, it seems that this device uses NEC extended 354 354 * I decided to not fix the table, due to two reasons: 355 - * 1) Without the actual device, this is only a guess; 356 - * 2) As the addr is not reported via I2C, nor can be changed, 357 - * the device is bound to the vendor-provided RC. 355 + * 1) Without the actual device, this is only a guess; 356 + * 2) As the addr is not reported via I2C, nor can be changed, 357 + * the device is bound to the vendor-provided RC. 358 358 */ 359 359 360 360 *protocol = RC_PROTO_UNKNOWN;
+2 -2
drivers/media/pci/bt8xx/bttv.h
··· 165 165 #define BTTV_BOARD_PV_M4900 0x8b 166 166 #define BTTV_BOARD_OSPREY440 0x8c 167 167 #define BTTV_BOARD_ASOUND_SKYEYE 0x8d 168 - #define BTTV_BOARD_SABRENT_TVFM 0x8e 168 + #define BTTV_BOARD_SABRENT_TVFM 0x8e 169 169 #define BTTV_BOARD_HAUPPAUGE_IMPACTVCB 0x8f 170 170 #define BTTV_BOARD_MACHTV_MAGICTV 0x90 171 171 #define BTTV_BOARD_SSAI_SECURITY 0x91 ··· 265 265 * that they are changed to octal. One should not use hex number, macros, or 266 266 * anything else with this macro. Just use plain integers from 0 to 3. 267 267 */ 268 - #define _MUXSELf(a) 0##a << 30 268 + #define _MUXSELf(a) 0##a << 30 269 269 #define _MUXSELe(a, b...) 0##a << 28 | _MUXSELf(b) 270 270 #define _MUXSELd(a, b...) 0##a << 26 | _MUXSELe(b) 271 271 #define _MUXSELc(a, b...) 0##a << 24 | _MUXSELd(b)
+3 -3
drivers/media/pci/bt8xx/bttvp.h
··· 141 141 bool rc5_gpio; /* Is RC5 legacy GPIO enabled? */ 142 142 u32 last_bit; /* last raw bit seen */ 143 143 u32 code; /* raw code under construction */ 144 - ktime_t base_time; /* time of last seen code */ 144 + ktime_t base_time; /* time of last seen code */ 145 145 bool active; /* building raw code */ 146 146 }; 147 147 ··· 400 400 int i2c_state, i2c_rc; 401 401 int i2c_done; 402 402 wait_queue_head_t i2c_queue; 403 - struct v4l2_subdev *sd_msp34xx; 404 - struct v4l2_subdev *sd_tvaudio; 403 + struct v4l2_subdev *sd_msp34xx; 404 + struct v4l2_subdev *sd_tvaudio; 405 405 struct v4l2_subdev *sd_tda7432; 406 406 407 407 /* video4linux (1) */
+1 -1
drivers/media/pci/cx18/cx18-alsa-pcm.c
··· 41 41 #define dprintk(fmt, arg...) do { \ 42 42 if (pcm_debug) \ 43 43 printk(KERN_INFO "cx18-alsa-pcm %s: " fmt, \ 44 - __func__, ##arg); \ 44 + __func__, ##arg); \ 45 45 } while (0) 46 46 47 47 static const struct snd_pcm_hardware snd_cx18_hw_capture = {
+1 -1
drivers/media/pci/cx18/cx18-av-audio.c
··· 31 31 * would ideally be: 32 32 * 33 33 * NTSC Color subcarrier freq * 8 = 34 - * 4.5 MHz/286 * 455/2 * 8 = 28.63636363... MHz 34 + * 4.5 MHz/286 * 455/2 * 8 = 28.63636363... MHz 35 35 * 36 36 * The accidents of history and rationale that explain from where this 37 37 * combination of magic numbers originate can be found in:
+9 -9
drivers/media/pci/cx18/cx18-av-core.c
··· 236 236 */ 237 237 cx18_av_and_or4(cx, CXADEC_AFE_CTRL, 0xFF000000, 0x00005D00); 238 238 239 - /* if(dwEnable && dw3DCombAvailable) { */ 240 - /* CxDevWrReg(CXADEC_SRC_COMB_CFG, 0x7728021F); */ 239 + /* if(dwEnable && dw3DCombAvailable) { */ 240 + /* CxDevWrReg(CXADEC_SRC_COMB_CFG, 0x7728021F); */ 241 241 /* } else { */ 242 - /* CxDevWrReg(CXADEC_SRC_COMB_CFG, 0x6628021F); */ 242 + /* CxDevWrReg(CXADEC_SRC_COMB_CFG, 0x6628021F); */ 243 243 /* } */ 244 244 cx18_av_write4(cx, CXADEC_SRC_COMB_CFG, 0x6628021F); 245 245 default_volume = cx18_av_read(cx, 0x8d4); ··· 319 319 * vblank656: half lines after line 625/mid-313 of blanked video 320 320 * vblank: half lines, after line 5/317, of blanked video 321 321 * vactive: half lines of active video + 322 - * 5 half lines after the end of active video 322 + * 5 half lines after the end of active video 323 323 * 324 324 * As far as I can tell: 325 325 * vblank656 starts counting from the falling edge of the first 326 - * vsync pulse (start of line 1 or mid-313) 326 + * vsync pulse (start of line 1 or mid-313) 327 327 * vblank starts counting from the after the 5 vsync pulses and 328 - * 5 or 4 equalization pulses (start of line 6 or 318) 328 + * 5 or 4 equalization pulses (start of line 6 or 318) 329 329 * 330 330 * For 625 line systems the driver will extract VBI information 331 331 * from lines 6-23 and lines 318-335 (but the slicer can only ··· 395 395 * 396 396 * As far as I can tell: 397 397 * vblank656 starts counting from the falling edge of the first 398 - * vsync pulse (start of line 4 or mid-266) 398 + * vsync pulse (start of line 4 or mid-266) 399 399 * vblank starts counting from the after the 6 vsync pulses and 400 - * 6 or 5 equalization pulses (start of line 10 or 272) 400 + * 6 or 5 equalization pulses (start of line 10 or 272) 401 401 * 402 402 * For 525 line systems the driver will extract VBI information 403 403 * from lines 10-21 and lines 273-284. ··· 851 851 struct cx18_av_state *state = to_cx18_av_state(sd); 852 852 struct cx18 *cx = v4l2_get_subdevdata(sd); 853 853 854 - u8 fmt = 0; /* zero is autodetect */ 854 + u8 fmt = 0; /* zero is autodetect */ 855 855 u8 pal_m = 0; 856 856 857 857 if (state->radio == 0 && state->std == norm)
+1 -1
drivers/media/pci/cx18/cx18-av-core.h
··· 349 349 } 350 350 351 351 /* ----------------------------------------------------------------------- */ 352 - /* cx18_av-core.c */ 352 + /* cx18_av-core.c */ 353 353 int cx18_av_write(struct cx18 *cx, u16 addr, u8 value); 354 354 int cx18_av_write4(struct cx18 *cx, u16 addr, u32 value); 355 355 int cx18_av_write4_noretry(struct cx18 *cx, u16 addr, u32 value);
+4 -4
drivers/media/pci/cx18/cx18-cards.c
··· 388 388 { CX18_CARD_INPUT_COMPOSITE2, 2, CX18_AV_COMPOSITE6 }, 389 389 }, 390 390 .audio_inputs = { 391 - { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 0 }, 391 + { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 0 }, 392 392 { CX18_CARD_INPUT_LINE_IN1, CX18_AV_AUDIO_SERIAL1, 1 }, 393 393 { CX18_CARD_INPUT_LINE_IN2, CX18_AV_AUDIO_SERIAL2, 1 }, 394 394 }, ··· 439 439 { CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE1 }, 440 440 }, 441 441 .audio_inputs = { 442 - { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 0 }, 442 + { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 0 }, 443 443 { CX18_CARD_INPUT_LINE_IN1, CX18_AV_AUDIO_SERIAL1, 1 }, 444 444 }, 445 445 .tuners = { ··· 485 485 { CX18_CARD_INPUT_COMPONENT1, 1, CX18_AV_COMPONENT1 }, 486 486 }, 487 487 .audio_inputs = { 488 - { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 0 }, 488 + { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 0 }, 489 489 { CX18_CARD_INPUT_LINE_IN1, CX18_AV_AUDIO_SERIAL1, 1 }, 490 490 }, 491 491 .tuners = { ··· 538 538 { CX18_CARD_INPUT_COMPONENT1, 1, CX18_AV_COMPONENT1 }, 539 539 }, 540 540 .audio_inputs = { 541 - { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 0 }, 541 + { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 0 }, 542 542 { CX18_CARD_INPUT_LINE_IN1, CX18_AV_AUDIO_SERIAL1, 1 }, 543 543 }, 544 544 .tuners = {
+16 -16
drivers/media/pci/cx18/cx18-cards.h
··· 29 29 30 30 /* video inputs */ 31 31 #define CX18_CARD_INPUT_VID_TUNER 1 32 - #define CX18_CARD_INPUT_SVIDEO1 2 33 - #define CX18_CARD_INPUT_SVIDEO2 3 34 - #define CX18_CARD_INPUT_COMPOSITE1 4 35 - #define CX18_CARD_INPUT_COMPOSITE2 5 36 - #define CX18_CARD_INPUT_COMPONENT1 6 32 + #define CX18_CARD_INPUT_SVIDEO1 2 33 + #define CX18_CARD_INPUT_SVIDEO2 3 34 + #define CX18_CARD_INPUT_COMPOSITE1 4 35 + #define CX18_CARD_INPUT_COMPOSITE2 5 36 + #define CX18_CARD_INPUT_COMPONENT1 6 37 37 38 38 /* audio inputs */ 39 39 #define CX18_CARD_INPUT_AUD_TUNER 1 40 - #define CX18_CARD_INPUT_LINE_IN1 2 41 - #define CX18_CARD_INPUT_LINE_IN2 3 40 + #define CX18_CARD_INPUT_LINE_IN1 2 41 + #define CX18_CARD_INPUT_LINE_IN2 3 42 42 43 43 #define CX18_CARD_MAX_VIDEO_INPUTS 6 44 44 #define CX18_CARD_MAX_AUDIO_INPUTS 3 45 - #define CX18_CARD_MAX_TUNERS 2 45 + #define CX18_CARD_MAX_TUNERS 2 46 46 47 47 /* V4L2 capability aliases */ 48 48 #define CX18_CAP_ENCODER (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER | \ ··· 51 51 V4L2_CAP_SLICED_VBI_CAPTURE) 52 52 53 53 struct cx18_card_video_input { 54 - u8 video_type; /* video input type */ 54 + u8 video_type; /* video input type */ 55 55 u8 audio_index; /* index in cx18_card_audio_input array */ 56 56 u32 video_input; /* hardware video input */ 57 57 }; ··· 74 74 /* The mask is the set of bits used by the operation */ 75 75 76 76 struct cx18_gpio_init { /* set initial GPIO DIR and OUT values */ 77 - u32 direction; /* DIR setting. Leave to 0 if no init is needed */ 77 + u32 direction; /* DIR setting. Leave to 0 if no init is needed */ 78 78 u32 initial_value; 79 79 }; 80 80 ··· 86 86 u32 ir_reset_mask; /* GPIO to reset the Zilog Z8F0811 IR contoller */ 87 87 }; 88 88 89 - struct cx18_gpio_audio_input { /* select tuner/line in input */ 90 - u32 mask; /* leave to 0 if not supported */ 89 + struct cx18_gpio_audio_input { /* select tuner/line in input */ 90 + u32 mask; /* leave to 0 if not supported */ 91 91 u32 tuner; 92 92 u32 linein; 93 93 u32 radio; 94 94 }; 95 95 96 96 struct cx18_card_tuner { 97 - v4l2_std_id std; /* standard for which the tuner is suitable */ 98 - int tuner; /* tuner ID (from tuner.h) */ 97 + v4l2_std_id std; /* standard for which the tuner is suitable */ 98 + int tuner; /* tuner ID (from tuner.h) */ 99 99 }; 100 100 101 101 struct cx18_card_tuner_i2c { ··· 128 128 struct cx18_card_audio_input radio_input; 129 129 130 130 /* GPIO card-specific settings */ 131 - u8 xceive_pin; /* XCeive tuner GPIO reset pin */ 132 - struct cx18_gpio_init gpio_init; 131 + u8 xceive_pin; /* XCeive tuner GPIO reset pin */ 132 + struct cx18_gpio_init gpio_init; 133 133 struct cx18_gpio_i2c_slave_reset gpio_i2c_slave_reset; 134 134 struct cx18_gpio_audio_input gpio_audio_input; 135 135
+23 -23
drivers/media/pci/cx18/cx18-driver.h
··· 75 75 /* Supported cards */ 76 76 #define CX18_CARD_HVR_1600_ESMT 0 /* Hauppauge HVR 1600 (ESMT memory) */ 77 77 #define CX18_CARD_HVR_1600_SAMSUNG 1 /* Hauppauge HVR 1600 (Samsung memory) */ 78 - #define CX18_CARD_COMPRO_H900 2 /* Compro VideoMate H900 */ 79 - #define CX18_CARD_YUAN_MPC718 3 /* Yuan MPC718 */ 78 + #define CX18_CARD_COMPRO_H900 2 /* Compro VideoMate H900 */ 79 + #define CX18_CARD_YUAN_MPC718 3 /* Yuan MPC718 */ 80 80 #define CX18_CARD_CNXT_RAPTOR_PAL 4 /* Conexant Raptor PAL */ 81 81 #define CX18_CARD_TOSHIBA_QOSMIO_DVBT 5 /* Toshiba Qosmio Interal DVB-T/Analog*/ 82 82 #define CX18_CARD_LEADTEK_PVR2100 6 /* Leadtek WinFast PVR2100 */ ··· 99 99 #define PCI_DEVICE_ID_CX23418 0x5b7a 100 100 101 101 /* subsystem vendor ID */ 102 - #define CX18_PCI_ID_HAUPPAUGE 0x0070 103 - #define CX18_PCI_ID_COMPRO 0x185b 104 - #define CX18_PCI_ID_YUAN 0x12ab 102 + #define CX18_PCI_ID_HAUPPAUGE 0x0070 103 + #define CX18_PCI_ID_COMPRO 0x185b 104 + #define CX18_PCI_ID_YUAN 0x12ab 105 105 #define CX18_PCI_ID_CONEXANT 0x14f1 106 106 #define CX18_PCI_ID_TOSHIBA 0x1179 107 107 #define CX18_PCI_ID_LEADTEK 0x107D ··· 260 260 #define CX18_F_M_NEED_SWAP 0 /* mdl buffer data must be endianness swapped */ 261 261 262 262 /* per-stream, s_flags */ 263 - #define CX18_F_S_CLAIMED 3 /* this stream is claimed */ 263 + #define CX18_F_S_CLAIMED 3 /* this stream is claimed */ 264 264 #define CX18_F_S_STREAMING 4 /* the fw is decoding/encoding this stream */ 265 265 #define CX18_F_S_INTERNAL_USE 5 /* this stream is used internally (sliced VBI processing) */ 266 266 #define CX18_F_S_STREAMOFF 7 /* signal end of stream EOS */ ··· 268 268 #define CX18_F_S_STOPPING 9 /* telling the fw to stop capturing */ 269 269 270 270 /* per-cx18, i_flags */ 271 - #define CX18_F_I_LOADED_FW 0 /* Loaded firmware 1st time */ 272 - #define CX18_F_I_EOS 4 /* End of encoder stream */ 273 - #define CX18_F_I_RADIO_USER 5 /* radio tuner is selected */ 274 - #define CX18_F_I_ENC_PAUSED 13 /* the encoder is paused */ 275 - #define CX18_F_I_INITED 21 /* set after first open */ 276 - #define CX18_F_I_FAILED 22 /* set if first open failed */ 271 + #define CX18_F_I_LOADED_FW 0 /* Loaded firmware 1st time */ 272 + #define CX18_F_I_EOS 4 /* End of encoder stream */ 273 + #define CX18_F_I_RADIO_USER 5 /* radio tuner is selected */ 274 + #define CX18_F_I_ENC_PAUSED 13 /* the encoder is paused */ 275 + #define CX18_F_I_INITED 21 /* set after first open */ 276 + #define CX18_F_I_FAILED 22 /* set if first open failed */ 277 277 278 278 /* These are the VBI types as they appear in the embedded VBI private packets. */ 279 279 #define CX18_SLICED_TYPE_TELETEXT_B (1) ··· 370 370 is not actually created. */ 371 371 struct video_device video_dev; /* v4l2_dev is NULL when stream not created */ 372 372 struct cx18_dvb *dvb; /* DVB / Digital Transport */ 373 - struct cx18 *cx; /* for ease of use */ 373 + struct cx18 *cx; /* for ease of use */ 374 374 const char *name; /* name of the stream */ 375 375 int type; /* stream type */ 376 376 u32 handle; /* task handle */ ··· 525 525 * into the MPEG PS stream. 526 526 * 527 527 * In each sliced_mpeg_data[] buffer is: 528 - * 16 byte MPEG-2 PS Program Pack Header 529 - * 16 byte MPEG-2 Private Stream 1 PES Header 530 - * 4 byte magic number: "itv0" or "ITV0" 531 - * 4 byte first field line mask, if "itv0" 532 - * 4 byte second field line mask, if "itv0" 533 - * 36 lines, if "ITV0"; or <36 lines, if "itv0"; of sliced VBI data 528 + * 16 byte MPEG-2 PS Program Pack Header 529 + * 16 byte MPEG-2 Private Stream 1 PES Header 530 + * 4 byte magic number: "itv0" or "ITV0" 531 + * 4 byte first field line mask, if "itv0" 532 + * 4 byte second field line mask, if "itv0" 533 + * 36 lines, if "ITV0"; or <36 lines, if "itv0"; of sliced VBI data 534 534 * 535 - * Each line in the payload is 535 + * Each line in the payload is 536 536 * 1 byte line header derived from the SDID (WSS, CC, VPS, etc.) 537 537 * 42 bytes of line data 538 538 * ··· 583 583 u8 nof_inputs; /* number of video inputs */ 584 584 u8 nof_audio_inputs; /* number of audio inputs */ 585 585 u32 v4l2_cap; /* V4L2 capabilities of card */ 586 - u32 hw_flags; /* Hardware description of the board */ 586 + u32 hw_flags; /* Hardware description of the board */ 587 587 unsigned int free_mdl_idx; 588 588 struct cx18_scb __iomem *scb; /* pointer to SCB */ 589 589 struct mutex epu2apu_mb_lock; /* protect driver to chip mailbox in SCB*/ ··· 602 602 u32 dualwatch_stereo_mode; 603 603 604 604 struct mutex serialize_lock; /* mutex used to serialize open/close/start/stop/ioctl operations */ 605 - struct cx18_options options; /* User options */ 605 + struct cx18_options options; /* User options */ 606 606 int stream_buffers[CX18_MAX_STREAMS]; /* # of buffers for each stream */ 607 607 int stream_buf_size[CX18_MAX_STREAMS]; /* Stream buffer size */ 608 - struct cx18_stream streams[CX18_MAX_STREAMS]; /* Stream data */ 608 + struct cx18_stream streams[CX18_MAX_STREAMS]; /* Stream data */ 609 609 struct snd_cx18_card *alsa; /* ALSA interface for PCM capture stream */ 610 610 void (*pcm_announce_callback)(struct snd_cx18_card *card, u8 *pcm_data, 611 611 size_t num_bytes);
+44 -44
drivers/media/pci/cx18/cx18-firmware.c
··· 23 23 #include "cx18-cards.h" 24 24 #include <linux/firmware.h> 25 25 26 - #define CX18_PROC_SOFT_RESET 0xc70010 27 - #define CX18_DDR_SOFT_RESET 0xc70014 28 - #define CX18_CLOCK_SELECT1 0xc71000 29 - #define CX18_CLOCK_SELECT2 0xc71004 30 - #define CX18_HALF_CLOCK_SELECT1 0xc71008 31 - #define CX18_HALF_CLOCK_SELECT2 0xc7100C 32 - #define CX18_CLOCK_POLARITY1 0xc71010 33 - #define CX18_CLOCK_POLARITY2 0xc71014 34 - #define CX18_ADD_DELAY_ENABLE1 0xc71018 35 - #define CX18_ADD_DELAY_ENABLE2 0xc7101C 36 - #define CX18_CLOCK_ENABLE1 0xc71020 37 - #define CX18_CLOCK_ENABLE2 0xc71024 26 + #define CX18_PROC_SOFT_RESET 0xc70010 27 + #define CX18_DDR_SOFT_RESET 0xc70014 28 + #define CX18_CLOCK_SELECT1 0xc71000 29 + #define CX18_CLOCK_SELECT2 0xc71004 30 + #define CX18_HALF_CLOCK_SELECT1 0xc71008 31 + #define CX18_HALF_CLOCK_SELECT2 0xc7100C 32 + #define CX18_CLOCK_POLARITY1 0xc71010 33 + #define CX18_CLOCK_POLARITY2 0xc71014 34 + #define CX18_ADD_DELAY_ENABLE1 0xc71018 35 + #define CX18_ADD_DELAY_ENABLE2 0xc7101C 36 + #define CX18_CLOCK_ENABLE1 0xc71020 37 + #define CX18_CLOCK_ENABLE2 0xc71024 38 38 39 - #define CX18_REG_BUS_TIMEOUT_EN 0xc72024 39 + #define CX18_REG_BUS_TIMEOUT_EN 0xc72024 40 40 41 - #define CX18_FAST_CLOCK_PLL_INT 0xc78000 42 - #define CX18_FAST_CLOCK_PLL_FRAC 0xc78004 43 - #define CX18_FAST_CLOCK_PLL_POST 0xc78008 44 - #define CX18_FAST_CLOCK_PLL_PRESCALE 0xc7800C 41 + #define CX18_FAST_CLOCK_PLL_INT 0xc78000 42 + #define CX18_FAST_CLOCK_PLL_FRAC 0xc78004 43 + #define CX18_FAST_CLOCK_PLL_POST 0xc78008 44 + #define CX18_FAST_CLOCK_PLL_PRESCALE 0xc7800C 45 45 #define CX18_FAST_CLOCK_PLL_ADJUST_BANDWIDTH 0xc78010 46 46 47 - #define CX18_SLOW_CLOCK_PLL_INT 0xc78014 48 - #define CX18_SLOW_CLOCK_PLL_FRAC 0xc78018 49 - #define CX18_SLOW_CLOCK_PLL_POST 0xc7801C 47 + #define CX18_SLOW_CLOCK_PLL_INT 0xc78014 48 + #define CX18_SLOW_CLOCK_PLL_FRAC 0xc78018 49 + #define CX18_SLOW_CLOCK_PLL_POST 0xc7801C 50 50 #define CX18_MPEG_CLOCK_PLL_INT 0xc78040 51 51 #define CX18_MPEG_CLOCK_PLL_FRAC 0xc78044 52 52 #define CX18_MPEG_CLOCK_PLL_POST 0xc78048 53 - #define CX18_PLL_POWER_DOWN 0xc78088 53 + #define CX18_PLL_POWER_DOWN 0xc78088 54 54 #define CX18_SW1_INT_STATUS 0xc73104 55 55 #define CX18_SW1_INT_ENABLE_PCI 0xc7311C 56 56 #define CX18_SW2_INT_SET 0xc73140 57 57 #define CX18_SW2_INT_STATUS 0xc73144 58 - #define CX18_ADEC_CONTROL 0xc78120 58 + #define CX18_ADEC_CONTROL 0xc78120 59 59 60 - #define CX18_DDR_REQUEST_ENABLE 0xc80000 61 - #define CX18_DDR_CHIP_CONFIG 0xc80004 62 - #define CX18_DDR_REFRESH 0xc80008 63 - #define CX18_DDR_TIMING1 0xc8000C 64 - #define CX18_DDR_TIMING2 0xc80010 60 + #define CX18_DDR_REQUEST_ENABLE 0xc80000 61 + #define CX18_DDR_CHIP_CONFIG 0xc80004 62 + #define CX18_DDR_REFRESH 0xc80008 63 + #define CX18_DDR_TIMING1 0xc8000C 64 + #define CX18_DDR_TIMING2 0xc80010 65 65 #define CX18_DDR_POWER_REG 0xc8001C 66 66 67 - #define CX18_DDR_TUNE_LANE 0xc80048 68 - #define CX18_DDR_INITIAL_EMRS 0xc80054 69 - #define CX18_DDR_MB_PER_ROW_7 0xc8009C 70 - #define CX18_DDR_BASE_63_ADDR 0xc804FC 67 + #define CX18_DDR_TUNE_LANE 0xc80048 68 + #define CX18_DDR_INITIAL_EMRS 0xc80054 69 + #define CX18_DDR_MB_PER_ROW_7 0xc8009C 70 + #define CX18_DDR_BASE_63_ADDR 0xc804FC 71 71 72 - #define CX18_WMB_CLIENT02 0xc90108 73 - #define CX18_WMB_CLIENT05 0xc90114 74 - #define CX18_WMB_CLIENT06 0xc90118 75 - #define CX18_WMB_CLIENT07 0xc9011C 76 - #define CX18_WMB_CLIENT08 0xc90120 77 - #define CX18_WMB_CLIENT09 0xc90124 78 - #define CX18_WMB_CLIENT10 0xc90128 79 - #define CX18_WMB_CLIENT11 0xc9012C 80 - #define CX18_WMB_CLIENT12 0xc90130 81 - #define CX18_WMB_CLIENT13 0xc90134 82 - #define CX18_WMB_CLIENT14 0xc90138 72 + #define CX18_WMB_CLIENT02 0xc90108 73 + #define CX18_WMB_CLIENT05 0xc90114 74 + #define CX18_WMB_CLIENT06 0xc90118 75 + #define CX18_WMB_CLIENT07 0xc9011C 76 + #define CX18_WMB_CLIENT08 0xc90120 77 + #define CX18_WMB_CLIENT09 0xc90124 78 + #define CX18_WMB_CLIENT10 0xc90128 79 + #define CX18_WMB_CLIENT11 0xc9012C 80 + #define CX18_WMB_CLIENT12 0xc90130 81 + #define CX18_WMB_CLIENT13 0xc90134 82 + #define CX18_WMB_CLIENT14 0xc90138 83 83 84 - #define CX18_DSP0_INTERRUPT_MASK 0xd0004C 84 + #define CX18_DSP0_INTERRUPT_MASK 0xd0004C 85 85 86 86 #define APU_ROM_SYNC1 0x6D676553 /* "mgeS" */ 87 87 #define APU_ROM_SYNC2 0x72646548 /* "rdeH" */ ··· 229 229 * would ideally be: 230 230 * 231 231 * NTSC Color subcarrier freq * 8 = 232 - * 4.5 MHz/286 * 455/2 * 8 = 28.63636363... MHz 232 + * 4.5 MHz/286 * 455/2 * 8 = 28.63636363... MHz 233 233 * 234 234 * The accidents of history and rationale that explain from where this 235 235 * combination of magic numbers originate can be found in:
+4 -4
drivers/media/pci/cx18/cx18-mailbox.c
··· 35 35 u32 cmd; 36 36 u8 flags; /* Flags, see above */ 37 37 u8 rpu; /* Processing unit */ 38 - const char *name; /* The name of the command */ 38 + const char *name; /* The name of the command */ 39 39 }; 40 40 41 41 #define API_ENTRY(rpu, x, f) { (x), (f), (rpu), #x } ··· 43 43 static const struct cx18_api_info api_info[] = { 44 44 /* MPEG encoder API */ 45 45 API_ENTRY(CPU, CX18_CPU_SET_CHANNEL_TYPE, 0), 46 - API_ENTRY(CPU, CX18_EPU_DEBUG, 0), 47 - API_ENTRY(CPU, CX18_CREATE_TASK, 0), 48 - API_ENTRY(CPU, CX18_DESTROY_TASK, 0), 46 + API_ENTRY(CPU, CX18_EPU_DEBUG, 0), 47 + API_ENTRY(CPU, CX18_CREATE_TASK, 0), 48 + API_ENTRY(CPU, CX18_DESTROY_TASK, 0), 49 49 API_ENTRY(CPU, CX18_CPU_CAPTURE_START, API_SLOW), 50 50 API_ENTRY(CPU, CX18_CPU_CAPTURE_STOP, API_SLOW), 51 51 API_ENTRY(CPU, CX18_CPU_CAPTURE_PAUSE, 0),
+1 -1
drivers/media/pci/cx18/cx18-streams.c
··· 29 29 #include "cx18-scb.h" 30 30 #include "cx18-dvb.h" 31 31 32 - #define CX18_DSP0_INTERRUPT_MASK 0xd0004C 32 + #define CX18_DSP0_INTERRUPT_MASK 0xd0004C 33 33 34 34 static const struct v4l2_file_operations cx18_v4l2_enc_fops = { 35 35 .owner = THIS_MODULE,
+1 -1
drivers/media/pci/cx18/cx18-vbi.c
··· 47 47 0x00, 0x00, 0x01, 0xbd, /* Priv Stream 1 start */ 48 48 0x00, 0x1a, /* length */ 49 49 0x84, 0x80, 0x07, /* flags, hdr data len */ 50 - 0x21, 0x00, 0x5d, 0x63, 0xa7, /* PTS, markers */ 50 + 0x21, 0x00, 0x5d, 0x63, 0xa7, /* PTS, markers */ 51 51 0xff, 0xff /* stuffing */ 52 52 }; 53 53 const int sd = sizeof(mpeg_hdr_data); /* start of vbi data */
+43 -43
drivers/media/pci/cx18/cx23418.h
··· 19 19 20 20 #include <media/drv-intf/cx2341x.h> 21 21 22 - #define MGR_CMD_MASK 0x40000000 22 + #define MGR_CMD_MASK 0x40000000 23 23 /* The MSB of the command code indicates that this is the completion of a 24 24 command */ 25 - #define MGR_CMD_MASK_ACK (MGR_CMD_MASK | 0x80000000) 25 + #define MGR_CMD_MASK_ACK (MGR_CMD_MASK | 0x80000000) 26 26 27 27 /* Description: This command creates a new instance of a certain task 28 28 IN[0] - Task ID. This is one of the XPU_CMD_MASK_YYY where XPU is ··· 30 30 OUT[0] - Task handle. This handle is passed along with commands to 31 31 dispatch to the right instance of the task 32 32 ReturnCode - One of the ERR_SYS_... */ 33 - #define CX18_CREATE_TASK (MGR_CMD_MASK | 0x0001) 33 + #define CX18_CREATE_TASK (MGR_CMD_MASK | 0x0001) 34 34 35 35 /* Description: This command destroys an instance of a task 36 36 IN[0] - Task handle. Hanlde of the task to destroy 37 37 ReturnCode - One of the ERR_SYS_... */ 38 - #define CX18_DESTROY_TASK (MGR_CMD_MASK | 0x0002) 38 + #define CX18_DESTROY_TASK (MGR_CMD_MASK | 0x0002) 39 39 40 40 /* All commands for CPU have the following mask set */ 41 - #define CPU_CMD_MASK 0x20000000 42 - #define CPU_CMD_MASK_DEBUG (CPU_CMD_MASK | 0x00000000) 43 - #define CPU_CMD_MASK_ACK (CPU_CMD_MASK | 0x80000000) 44 - #define CPU_CMD_MASK_CAPTURE (CPU_CMD_MASK | 0x00020000) 45 - #define CPU_CMD_MASK_TS (CPU_CMD_MASK | 0x00040000) 41 + #define CPU_CMD_MASK 0x20000000 42 + #define CPU_CMD_MASK_DEBUG (CPU_CMD_MASK | 0x00000000) 43 + #define CPU_CMD_MASK_ACK (CPU_CMD_MASK | 0x80000000) 44 + #define CPU_CMD_MASK_CAPTURE (CPU_CMD_MASK | 0x00020000) 45 + #define CPU_CMD_MASK_TS (CPU_CMD_MASK | 0x00040000) 46 46 47 - #define EPU_CMD_MASK 0x02000000 48 - #define EPU_CMD_MASK_DEBUG (EPU_CMD_MASK | 0x000000) 49 - #define EPU_CMD_MASK_DE (EPU_CMD_MASK | 0x040000) 47 + #define EPU_CMD_MASK 0x02000000 48 + #define EPU_CMD_MASK_DEBUG (EPU_CMD_MASK | 0x000000) 49 + #define EPU_CMD_MASK_DE (EPU_CMD_MASK | 0x040000) 50 50 51 - #define APU_CMD_MASK 0x10000000 52 - #define APU_CMD_MASK_ACK (APU_CMD_MASK | 0x80000000) 51 + #define APU_CMD_MASK 0x10000000 52 + #define APU_CMD_MASK_ACK (APU_CMD_MASK | 0x80000000) 53 53 54 54 #define CX18_APU_ENCODING_METHOD_MPEG (0 << 28) 55 55 #define CX18_APU_ENCODING_METHOD_AC3 (1 << 28) ··· 67 67 68 68 /* Description: Command APU to reset the AI 69 69 ReturnCode - ??? */ 70 - #define CX18_APU_RESETAI (APU_CMD_MASK | 0x05) 70 + #define CX18_APU_RESETAI (APU_CMD_MASK | 0x05) 71 71 72 72 /* Description: This command indicates that a Memory Descriptor List has been 73 73 filled with the requested channel type ··· 75 75 IN[1] - Offset of the MDL_ACK from the beginning of the local DDR. 76 76 IN[2] - Number of CNXT_MDL_ACK structures in the array pointed to by IN[1] 77 77 ReturnCode - One of the ERR_DE_... */ 78 - #define CX18_EPU_DMA_DONE (EPU_CMD_MASK_DE | 0x0001) 78 + #define CX18_EPU_DMA_DONE (EPU_CMD_MASK_DE | 0x0001) 79 79 80 80 /* Something interesting happened 81 81 IN[0] - A value to log 82 82 IN[1] - An offset of a string in the MiniMe memory; 83 83 0/zero/NULL means "I have nothing to say" */ 84 - #define CX18_EPU_DEBUG (EPU_CMD_MASK_DEBUG | 0x0003) 84 + #define CX18_EPU_DEBUG (EPU_CMD_MASK_DEBUG | 0x0003) 85 85 86 86 /* Reads memory/registers (32-bit) 87 87 IN[0] - Address ··· 91 91 /* Description: This command starts streaming with the set channel type 92 92 IN[0] - Task handle. Handle of the task to start 93 93 ReturnCode - One of the ERR_CAPTURE_... */ 94 - #define CX18_CPU_CAPTURE_START (CPU_CMD_MASK_CAPTURE | 0x0002) 94 + #define CX18_CPU_CAPTURE_START (CPU_CMD_MASK_CAPTURE | 0x0002) 95 95 96 96 /* Description: This command stops streaming with the set channel type 97 97 IN[0] - Task handle. Handle of the task to stop 98 98 IN[1] - 0 = stop at end of GOP, 1 = stop at end of frame (MPEG only) 99 99 ReturnCode - One of the ERR_CAPTURE_... */ 100 - #define CX18_CPU_CAPTURE_STOP (CPU_CMD_MASK_CAPTURE | 0x0003) 100 + #define CX18_CPU_CAPTURE_STOP (CPU_CMD_MASK_CAPTURE | 0x0003) 101 101 102 102 /* Description: This command pauses streaming with the set channel type 103 103 IN[0] - Task handle. Handle of the task to pause 104 104 ReturnCode - One of the ERR_CAPTURE_... */ 105 - #define CX18_CPU_CAPTURE_PAUSE (CPU_CMD_MASK_CAPTURE | 0x0007) 105 + #define CX18_CPU_CAPTURE_PAUSE (CPU_CMD_MASK_CAPTURE | 0x0007) 106 106 107 107 /* Description: This command resumes streaming with the set channel type 108 108 IN[0] - Task handle. Handle of the task to resume 109 109 ReturnCode - One of the ERR_CAPTURE_... */ 110 - #define CX18_CPU_CAPTURE_RESUME (CPU_CMD_MASK_CAPTURE | 0x0008) 110 + #define CX18_CPU_CAPTURE_RESUME (CPU_CMD_MASK_CAPTURE | 0x0008) 111 111 112 - #define CAPTURE_CHANNEL_TYPE_NONE 0 113 - #define CAPTURE_CHANNEL_TYPE_MPEG 1 114 - #define CAPTURE_CHANNEL_TYPE_INDEX 2 115 - #define CAPTURE_CHANNEL_TYPE_YUV 3 116 - #define CAPTURE_CHANNEL_TYPE_PCM 4 117 - #define CAPTURE_CHANNEL_TYPE_VBI 5 112 + #define CAPTURE_CHANNEL_TYPE_NONE 0 113 + #define CAPTURE_CHANNEL_TYPE_MPEG 1 114 + #define CAPTURE_CHANNEL_TYPE_INDEX 2 115 + #define CAPTURE_CHANNEL_TYPE_YUV 3 116 + #define CAPTURE_CHANNEL_TYPE_PCM 4 117 + #define CAPTURE_CHANNEL_TYPE_VBI 5 118 118 #define CAPTURE_CHANNEL_TYPE_SLICED_VBI 6 119 119 #define CAPTURE_CHANNEL_TYPE_TS 7 120 - #define CAPTURE_CHANNEL_TYPE_MAX 15 120 + #define CAPTURE_CHANNEL_TYPE_MAX 15 121 121 122 122 /* Description: This command sets the channel type. This can only be done 123 123 when stopped. 124 124 IN[0] - Task handle. Handle of the task to start 125 125 IN[1] - Channel Type. See Below. 126 126 ReturnCode - One of the ERR_CAPTURE_... */ 127 - #define CX18_CPU_SET_CHANNEL_TYPE (CPU_CMD_MASK_CAPTURE + 1) 127 + #define CX18_CPU_SET_CHANNEL_TYPE (CPU_CMD_MASK_CAPTURE + 1) 128 128 129 129 /* Description: Set stream output type 130 130 IN[0] - task handle. Handle of the task to start ··· 140 140 IN[4] - reserved 141 141 IN[5] - frame rate, 0 - 29.97f/s, 1 - 25f/s 142 142 ReturnCode - One of the ERR_CAPTURE_... */ 143 - #define CX18_CPU_SET_VIDEO_IN (CPU_CMD_MASK_CAPTURE | 0x0004) 143 + #define CX18_CPU_SET_VIDEO_IN (CPU_CMD_MASK_CAPTURE | 0x0004) 144 144 145 145 /* Description: Set video frame rate 146 146 IN[0] - task handle. Handle of the task to start ··· 149 149 IN[3] - video peak rate 150 150 IN[4] - system mux rate 151 151 ReturnCode - One of the ERR_CAPTURE_... */ 152 - #define CX18_CPU_SET_VIDEO_RATE (CPU_CMD_MASK_CAPTURE | 0x0005) 152 + #define CX18_CPU_SET_VIDEO_RATE (CPU_CMD_MASK_CAPTURE | 0x0005) 153 153 154 154 /* Description: Set video output resolution 155 155 IN[0] - task handle ··· 166 166 3 = horizontal/vertical, 4 = diagonal 167 167 IN[3] - strength, temporal 0 - 31, spatial 0 - 15 168 168 ReturnCode - One of the ERR_CAPTURE_... */ 169 - #define CX18_CPU_SET_FILTER_PARAM (CPU_CMD_MASK_CAPTURE | 0x0009) 169 + #define CX18_CPU_SET_FILTER_PARAM (CPU_CMD_MASK_CAPTURE | 0x0009) 170 170 171 171 /* Description: This command set spatial filter type 172 172 IN[0] - Task handle. ··· 174 174 3 = 2D H/V separable, 4 = 2D symmetric non-separable 175 175 IN[2] - chroma type: 0 - disable, 1 = 1D horizontal 176 176 ReturnCode - One of the ERR_CAPTURE_... */ 177 - #define CX18_CPU_SET_SPATIAL_FILTER_TYPE (CPU_CMD_MASK_CAPTURE | 0x000C) 177 + #define CX18_CPU_SET_SPATIAL_FILTER_TYPE (CPU_CMD_MASK_CAPTURE | 0x000C) 178 178 179 179 /* Description: This command set coring levels for median filter 180 180 IN[0] - Task handle. ··· 183 183 IN[3] - chroma_high 184 184 IN[4] - chroma_low 185 185 ReturnCode - One of the ERR_CAPTURE_... */ 186 - #define CX18_CPU_SET_MEDIAN_CORING (CPU_CMD_MASK_CAPTURE | 0x000E) 186 + #define CX18_CPU_SET_MEDIAN_CORING (CPU_CMD_MASK_CAPTURE | 0x000E) 187 187 188 188 /* Description: This command set the picture type mask for index file 189 189 IN[0] - Task handle (ignored by firmware) 190 - IN[1] - 0 = disable index file output 190 + IN[1] - 0 = disable index file output 191 191 1 = output I picture 192 192 2 = P picture 193 193 4 = B picture 194 194 other = illegal */ 195 - #define CX18_CPU_SET_INDEXTABLE (CPU_CMD_MASK_CAPTURE | 0x0010) 195 + #define CX18_CPU_SET_INDEXTABLE (CPU_CMD_MASK_CAPTURE | 0x0010) 196 196 197 197 /* Description: Set audio parameters 198 198 IN[0] - task handle. Handle of the task to start ··· 218 218 /* Description: Set stream output type 219 219 IN[0] - task handle. Handle of the task to start 220 220 IN[1] - subType 221 - SET_INITIAL_SCR 1 221 + SET_INITIAL_SCR 1 222 222 SET_QUALITY_MODE 2 223 223 SET_VIM_PROTECT_MODE 3 224 224 SET_PTS_CORRECTION 4 ··· 311 311 bit 0: output user data, 1 - enable 312 312 bit 1: output private stream, 1 - enable 313 313 bit 2: mux option, 0 - in GOP, 1 - in picture 314 - bit[7:0] private stream ID 314 + bit[7:0] private stream ID 315 315 IN[5] - insertion period while mux option is in picture 316 316 ReturnCode - VBI data offset */ 317 317 #define CX18_CPU_SET_SLICED_VBI_PARAM (CPU_CMD_MASK_CAPTURE | 0x0020) ··· 344 344 #define CX18_CPU_SET_VFC_PARAM (CPU_CMD_MASK_CAPTURE | 0x0023) 345 345 346 346 /* Below is the list of commands related to the data exchange */ 347 - #define CPU_CMD_MASK_DE (CPU_CMD_MASK | 0x040000) 347 + #define CPU_CMD_MASK_DE (CPU_CMD_MASK | 0x040000) 348 348 349 349 /* Description: This command provides the physical base address of the local 350 350 DDR as viewed by EPU 351 351 IN[0] - Physical offset where EPU has the local DDR mapped 352 352 ReturnCode - One of the ERR_DE_... */ 353 - #define CPU_CMD_DE_SetBase (CPU_CMD_MASK_DE | 0x0001) 353 + #define CPU_CMD_DE_SetBase (CPU_CMD_MASK_DE | 0x0001) 354 354 355 355 /* Description: This command provides the offsets in the device memory where 356 356 the 2 cx18_mdl_ack blocks reside ··· 360 360 IN[2] - Offset of the second cx18_mdl_ack from the beginning of the 361 361 local DDR. 362 362 ReturnCode - One of the ERR_DE_... */ 363 - #define CX18_CPU_DE_SET_MDL_ACK (CPU_CMD_MASK_DE | 0x0002) 363 + #define CX18_CPU_DE_SET_MDL_ACK (CPU_CMD_MASK_DE | 0x0002) 364 364 365 365 /* Description: This command provides the offset to a Memory Descriptor List 366 366 IN[0] - Task handle. Handle of the task to start ··· 369 369 IN[3] - Buffer ID 370 370 IN[4] - Total buffer length 371 371 ReturnCode - One of the ERR_DE_... */ 372 - #define CX18_CPU_DE_SET_MDL (CPU_CMD_MASK_DE | 0x0005) 372 + #define CX18_CPU_DE_SET_MDL (CPU_CMD_MASK_DE | 0x0005) 373 373 374 374 /* Description: This command requests return of all current Memory 375 375 Descriptor Lists to the driver 376 376 IN[0] - Task handle. Handle of the task to start 377 377 ReturnCode - One of the ERR_DE_... */ 378 - #define CX18_CPU_DE_RELEASE_MDL (CPU_CMD_MASK_DE | 0x0006) 378 + #define CX18_CPU_DE_RELEASE_MDL (CPU_CMD_MASK_DE | 0x0006) 379 379 380 380 /* Description: This command signals the cpu that the dat buffer has been 381 381 consumed and ready for re-use.
+1 -1
drivers/media/pci/cx23885/cimax2.c
··· 54 54 #define NETUP_CI_CTL 0x04 55 55 #define NETUP_CI_RD 1 56 56 57 - #define NETUP_IRQ_DETAM 0x1 57 + #define NETUP_IRQ_DETAM 0x1 58 58 #define NETUP_IRQ_IRQAM 0x4 59 59 60 60 static unsigned int ci_dbg;
+1 -1
drivers/media/pci/cx23885/cx23885-video.c
··· 1146 1146 static struct video_device cx23885_video_template = { 1147 1147 .name = "cx23885-video", 1148 1148 .fops = &video_fops, 1149 - .ioctl_ops = &video_ioctl_ops, 1149 + .ioctl_ops = &video_ioctl_ops, 1150 1150 .tvnorms = CX23885_NORMS, 1151 1151 }; 1152 1152
+2 -2
drivers/media/pci/cx23885/cx23885.h
··· 357 357 358 358 struct cx23885_dev { 359 359 atomic_t refcount; 360 - struct v4l2_device v4l2_dev; 360 + struct v4l2_device v4l2_dev; 361 361 struct v4l2_ctrl_handler ctrl_handler; 362 362 363 363 /* pci stuff */ ··· 407 407 unsigned int tuner_bus; 408 408 unsigned int radio_type; 409 409 unsigned char radio_addr; 410 - struct v4l2_subdev *sd_cx25840; 410 + struct v4l2_subdev *sd_cx25840; 411 411 struct work_struct cx25840_work; 412 412 413 413 /* Infrared */
+1 -1
drivers/media/pci/cx23885/cx23888-ir.c
··· 29 29 module_param(ir_888_debug, int, 0644); 30 30 MODULE_PARM_DESC(ir_888_debug, "enable debug messages [CX23888 IR controller]"); 31 31 32 - #define CX23888_IR_REG_BASE 0x170000 32 + #define CX23888_IR_REG_BASE 0x170000 33 33 /* 34 34 * These CX23888 register offsets have a straightforward one to one mapping 35 35 * to the CX23885 register offsets of 0x200 through 0x218
+63 -63
drivers/media/pci/ivtv/ivtv-cards.h
··· 22 22 #define IVTV_CARDS_H 23 23 24 24 /* Supported cards */ 25 - #define IVTV_CARD_PVR_250 0 /* WinTV PVR 250 */ 26 - #define IVTV_CARD_PVR_350 1 /* encoder, decoder, tv-out */ 27 - #define IVTV_CARD_PVR_150 2 /* WinTV PVR 150 and PVR 500 (really just two 25 + #define IVTV_CARD_PVR_250 0 /* WinTV PVR 250 */ 26 + #define IVTV_CARD_PVR_350 1 /* encoder, decoder, tv-out */ 27 + #define IVTV_CARD_PVR_150 2 /* WinTV PVR 150 and PVR 500 (really just two 28 28 PVR150s on one PCI board) */ 29 - #define IVTV_CARD_M179 3 /* AVerMedia M179 (encoder only) */ 30 - #define IVTV_CARD_MPG600 4 /* Kuroutoshikou ITVC16-STVLP/YUAN MPG600, encoder only */ 31 - #define IVTV_CARD_MPG160 5 /* Kuroutoshikou ITVC15-STVLP/YUAN MPG160 29 + #define IVTV_CARD_M179 3 /* AVerMedia M179 (encoder only) */ 30 + #define IVTV_CARD_MPG600 4 /* Kuroutoshikou ITVC16-STVLP/YUAN MPG600, encoder only */ 31 + #define IVTV_CARD_MPG160 5 /* Kuroutoshikou ITVC15-STVLP/YUAN MPG160 32 32 cx23415 based, but does not have tv-out */ 33 - #define IVTV_CARD_PG600 6 /* YUAN PG600/DIAMONDMM PVR-550 based on the CX Falcon 2 */ 34 - #define IVTV_CARD_AVC2410 7 /* Adaptec AVC-2410 */ 35 - #define IVTV_CARD_AVC2010 8 /* Adaptec AVD-2010 (No Tuner) */ 36 - #define IVTV_CARD_TG5000TV 9 /* NAGASE TRANSGEAR 5000TV, encoder only */ 33 + #define IVTV_CARD_PG600 6 /* YUAN PG600/DIAMONDMM PVR-550 based on the CX Falcon 2 */ 34 + #define IVTV_CARD_AVC2410 7 /* Adaptec AVC-2410 */ 35 + #define IVTV_CARD_AVC2010 8 /* Adaptec AVD-2010 (No Tuner) */ 36 + #define IVTV_CARD_TG5000TV 9 /* NAGASE TRANSGEAR 5000TV, encoder only */ 37 37 #define IVTV_CARD_VA2000MAX_SNT6 10 /* VA2000MAX-STN6 */ 38 - #define IVTV_CARD_CX23416GYC 11 /* Kuroutoshikou CX23416GYC-STVLP (Yuan MPG600GR OEM) */ 39 - #define IVTV_CARD_GV_MVPRX 12 /* I/O Data GV-MVP/RX, RX2, RX2W */ 40 - #define IVTV_CARD_GV_MVPRX2E 13 /* I/O Data GV-MVP/RX2E */ 38 + #define IVTV_CARD_CX23416GYC 11 /* Kuroutoshikou CX23416GYC-STVLP (Yuan MPG600GR OEM) */ 39 + #define IVTV_CARD_GV_MVPRX 12 /* I/O Data GV-MVP/RX, RX2, RX2W */ 40 + #define IVTV_CARD_GV_MVPRX2E 13 /* I/O Data GV-MVP/RX2E */ 41 41 #define IVTV_CARD_GOTVIEW_PCI_DVD 14 /* GotView PCI DVD */ 42 42 #define IVTV_CARD_GOTVIEW_PCI_DVD2 15 /* GotView PCI DVD2 */ 43 43 #define IVTV_CARD_YUAN_MPC622 16 /* Yuan MPC622 miniPCI */ 44 - #define IVTV_CARD_DCTMTVP1 17 /* DIGITAL COWBOY DCT-MTVP1 */ 44 + #define IVTV_CARD_DCTMTVP1 17 /* DIGITAL COWBOY DCT-MTVP1 */ 45 45 #define IVTV_CARD_PG600V2 18 /* Yuan PG600V2/GotView PCI DVD Lite */ 46 46 #define IVTV_CARD_CLUB3D 19 /* Club3D ZAP-TV1x01 */ 47 47 #define IVTV_CARD_AVERTV_MCE116 20 /* AVerTV MCE 116 Plus */ ··· 52 52 #define IVTV_CARD_BUFFALO_MV5L 25 /* Buffalo PC-MV5L/PCI card */ 53 53 #define IVTV_CARD_AVER_ULTRA1500MCE 26 /* AVerMedia UltraTV 1500 MCE */ 54 54 #define IVTV_CARD_KIKYOU 27 /* Sony VAIO Giga Pocket (ENX Kikyou) */ 55 - #define IVTV_CARD_LAST 27 55 + #define IVTV_CARD_LAST 27 56 56 57 57 /* Variants of existing cards but with the same PCI IDs. The driver 58 58 detects these based on other device information. ··· 61 61 must be adjusted accordingly. */ 62 62 63 63 /* PVR-350 V1 (uses saa7114) */ 64 - #define IVTV_CARD_PVR_350_V1 (IVTV_CARD_LAST+1) 64 + #define IVTV_CARD_PVR_350_V1 (IVTV_CARD_LAST+1) 65 65 /* 2 variants of Kuroutoshikou CX23416GYC-STVLP (Yuan MPG600GR OEM) */ 66 66 #define IVTV_CARD_CX23416GYC_NOGR (IVTV_CARD_LAST+2) 67 67 #define IVTV_CARD_CX23416GYC_NOGRYCS (IVTV_CARD_LAST+3) ··· 72 72 #define PCI_DEVICE_ID_IVTV16 0x0016 73 73 74 74 /* subsystem vendor ID */ 75 - #define IVTV_PCI_ID_HAUPPAUGE 0x0070 76 - #define IVTV_PCI_ID_HAUPPAUGE_ALT1 0x0270 77 - #define IVTV_PCI_ID_HAUPPAUGE_ALT2 0x4070 78 - #define IVTV_PCI_ID_ADAPTEC 0x9005 79 - #define IVTV_PCI_ID_ASUSTEK 0x1043 80 - #define IVTV_PCI_ID_AVERMEDIA 0x1461 75 + #define IVTV_PCI_ID_HAUPPAUGE 0x0070 76 + #define IVTV_PCI_ID_HAUPPAUGE_ALT1 0x0270 77 + #define IVTV_PCI_ID_HAUPPAUGE_ALT2 0x4070 78 + #define IVTV_PCI_ID_ADAPTEC 0x9005 79 + #define IVTV_PCI_ID_ASUSTEK 0x1043 80 + #define IVTV_PCI_ID_AVERMEDIA 0x1461 81 81 #define IVTV_PCI_ID_YUAN1 0x12ab 82 - #define IVTV_PCI_ID_YUAN2 0xff01 83 - #define IVTV_PCI_ID_YUAN3 0xffab 84 - #define IVTV_PCI_ID_YUAN4 0xfbab 85 - #define IVTV_PCI_ID_DIAMONDMM 0xff92 86 - #define IVTV_PCI_ID_IODATA 0x10fc 87 - #define IVTV_PCI_ID_MELCO 0x1154 82 + #define IVTV_PCI_ID_YUAN2 0xff01 83 + #define IVTV_PCI_ID_YUAN3 0xffab 84 + #define IVTV_PCI_ID_YUAN4 0xfbab 85 + #define IVTV_PCI_ID_DIAMONDMM 0xff92 86 + #define IVTV_PCI_ID_IODATA 0x10fc 87 + #define IVTV_PCI_ID_MELCO 0x1154 88 88 #define IVTV_PCI_ID_GOTVIEW1 0xffac 89 - #define IVTV_PCI_ID_GOTVIEW2 0xffad 90 - #define IVTV_PCI_ID_SONY 0x104d 89 + #define IVTV_PCI_ID_GOTVIEW2 0xffad 90 + #define IVTV_PCI_ID_SONY 0x104d 91 91 92 92 /* hardware flags, no gaps allowed */ 93 93 #define IVTV_HW_CX25840 (1 << 0) ··· 122 122 123 123 /* video inputs */ 124 124 #define IVTV_CARD_INPUT_VID_TUNER 1 125 - #define IVTV_CARD_INPUT_SVIDEO1 2 126 - #define IVTV_CARD_INPUT_SVIDEO2 3 127 - #define IVTV_CARD_INPUT_COMPOSITE1 4 128 - #define IVTV_CARD_INPUT_COMPOSITE2 5 129 - #define IVTV_CARD_INPUT_COMPOSITE3 6 125 + #define IVTV_CARD_INPUT_SVIDEO1 2 126 + #define IVTV_CARD_INPUT_SVIDEO2 3 127 + #define IVTV_CARD_INPUT_COMPOSITE1 4 128 + #define IVTV_CARD_INPUT_COMPOSITE2 5 129 + #define IVTV_CARD_INPUT_COMPOSITE3 6 130 130 131 131 /* audio inputs */ 132 132 #define IVTV_CARD_INPUT_AUD_TUNER 1 133 - #define IVTV_CARD_INPUT_LINE_IN1 2 134 - #define IVTV_CARD_INPUT_LINE_IN2 3 133 + #define IVTV_CARD_INPUT_LINE_IN1 2 134 + #define IVTV_CARD_INPUT_LINE_IN2 3 135 135 136 136 #define IVTV_CARD_MAX_VIDEO_INPUTS 6 137 137 #define IVTV_CARD_MAX_AUDIO_INPUTS 3 138 - #define IVTV_CARD_MAX_TUNERS 3 138 + #define IVTV_CARD_MAX_TUNERS 3 139 139 140 140 /* SAA71XX HW inputs */ 141 141 #define IVTV_SAA71XX_COMPOSITE0 0 ··· 172 172 V4L2_CAP_SLICED_VBI_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_OVERLAY) 173 173 174 174 struct ivtv_card_video_input { 175 - u8 video_type; /* video input type */ 175 + u8 video_type; /* video input type */ 176 176 u8 audio_index; /* index in ivtv_card_audio_input array */ 177 177 u16 video_input; /* hardware video input */ 178 178 }; ··· 199 199 200 200 /* The mask is the set of bits used by the operation */ 201 201 202 - struct ivtv_gpio_init { /* set initial GPIO DIR and OUT values */ 203 - u16 direction; /* DIR setting. Leave to 0 if no init is needed */ 202 + struct ivtv_gpio_init { /* set initial GPIO DIR and OUT values */ 203 + u16 direction; /* DIR setting. Leave to 0 if no init is needed */ 204 204 u16 initial_value; 205 205 }; 206 206 207 - struct ivtv_gpio_video_input { /* select tuner/line in input */ 208 - u16 mask; /* leave to 0 if not supported */ 207 + struct ivtv_gpio_video_input { /* select tuner/line in input */ 208 + u16 mask; /* leave to 0 if not supported */ 209 209 u16 tuner; 210 210 u16 composite; 211 211 u16 svideo; 212 212 }; 213 213 214 - struct ivtv_gpio_audio_input { /* select tuner/line in input */ 215 - u16 mask; /* leave to 0 if not supported */ 214 + struct ivtv_gpio_audio_input { /* select tuner/line in input */ 215 + u16 mask; /* leave to 0 if not supported */ 216 216 u16 tuner; 217 217 u16 linein; 218 218 u16 radio; 219 219 }; 220 220 221 221 struct ivtv_gpio_audio_mute { 222 - u16 mask; /* leave to 0 if not supported */ 222 + u16 mask; /* leave to 0 if not supported */ 223 223 u16 mute; /* set this value to mute, 0 to unmute */ 224 224 }; 225 225 226 226 struct ivtv_gpio_audio_mode { 227 - u16 mask; /* leave to 0 if not supported */ 228 - u16 mono; /* set audio to mono */ 229 - u16 stereo; /* set audio to stereo */ 227 + u16 mask; /* leave to 0 if not supported */ 228 + u16 mono; /* set audio to mono */ 229 + u16 stereo; /* set audio to stereo */ 230 230 u16 lang1; /* set audio to the first language */ 231 231 u16 lang2; /* set audio to the second language */ 232 - u16 both; /* both languages are output */ 232 + u16 both; /* both languages are output */ 233 233 }; 234 234 235 235 struct ivtv_gpio_audio_freq { 236 - u16 mask; /* leave to 0 if not supported */ 236 + u16 mask; /* leave to 0 if not supported */ 237 237 u16 f32000; 238 238 u16 f44100; 239 239 u16 f48000; 240 240 }; 241 241 242 242 struct ivtv_gpio_audio_detect { 243 - u16 mask; /* leave to 0 if not supported */ 244 - u16 stereo; /* if the input matches this value then 243 + u16 mask; /* leave to 0 if not supported */ 244 + u16 stereo; /* if the input matches this value then 245 245 stereo is detected */ 246 246 }; 247 247 248 248 struct ivtv_card_tuner { 249 - v4l2_std_id std; /* standard for which the tuner is suitable */ 250 - int tuner; /* tuner ID (from tuner.h) */ 249 + v4l2_std_id std; /* standard for which the tuner is suitable */ 250 + int tuner; /* tuner ID (from tuner.h) */ 251 251 }; 252 252 253 253 struct ivtv_card_tuner_i2c { ··· 272 272 struct ivtv_card_audio_input radio_input; 273 273 int nof_outputs; 274 274 const struct ivtv_card_output *video_outputs; 275 - u8 gr_config; /* config byte for the ghost reduction device */ 276 - u8 xceive_pin; /* XCeive tuner GPIO reset pin */ 275 + u8 gr_config; /* config byte for the ghost reduction device */ 276 + u8 xceive_pin; /* XCeive tuner GPIO reset pin */ 277 277 278 278 /* GPIO card-specific settings */ 279 - struct ivtv_gpio_init gpio_init; 279 + struct ivtv_gpio_init gpio_init; 280 280 struct ivtv_gpio_video_input gpio_video_input; 281 - struct ivtv_gpio_audio_input gpio_audio_input; 282 - struct ivtv_gpio_audio_mute gpio_audio_mute; 283 - struct ivtv_gpio_audio_mode gpio_audio_mode; 284 - struct ivtv_gpio_audio_freq gpio_audio_freq; 285 - struct ivtv_gpio_audio_detect gpio_audio_detect; 281 + struct ivtv_gpio_audio_input gpio_audio_input; 282 + struct ivtv_gpio_audio_mute gpio_audio_mute; 283 + struct ivtv_gpio_audio_mode gpio_audio_mode; 284 + struct ivtv_gpio_audio_freq gpio_audio_freq; 285 + struct ivtv_gpio_audio_detect gpio_audio_detect; 286 286 287 287 struct ivtv_card_tuner tuners[IVTV_CARD_MAX_TUNERS]; 288 288 struct ivtv_card_tuner_i2c *i2c;
+51 -51
drivers/media/pci/ivtv/ivtv-driver.h
··· 76 76 #define IVTV_ENCODER_SIZE 0x00800000 /* Total size is 0x01000000, but only first half is used */ 77 77 #define IVTV_DECODER_OFFSET 0x01000000 78 78 #define IVTV_DECODER_SIZE 0x00800000 /* Total size is 0x01000000, but only first half is used */ 79 - #define IVTV_REG_OFFSET 0x02000000 79 + #define IVTV_REG_OFFSET 0x02000000 80 80 #define IVTV_REG_SIZE 0x00010000 81 81 82 82 /* Maximum ivtv driver instances. Some people have a huge number of ··· 97 97 #define IVTV_DMA_SG_OSD_ENT (2883584/PAGE_SIZE) /* sg entities */ 98 98 99 99 /* DMA Registers */ 100 - #define IVTV_REG_DMAXFER (0x0000) 101 - #define IVTV_REG_DMASTATUS (0x0004) 102 - #define IVTV_REG_DECDMAADDR (0x0008) 103 - #define IVTV_REG_ENCDMAADDR (0x000c) 104 - #define IVTV_REG_DMACONTROL (0x0010) 105 - #define IVTV_REG_IRQSTATUS (0x0040) 106 - #define IVTV_REG_IRQMASK (0x0048) 100 + #define IVTV_REG_DMAXFER (0x0000) 101 + #define IVTV_REG_DMASTATUS (0x0004) 102 + #define IVTV_REG_DECDMAADDR (0x0008) 103 + #define IVTV_REG_ENCDMAADDR (0x000c) 104 + #define IVTV_REG_DMACONTROL (0x0010) 105 + #define IVTV_REG_IRQSTATUS (0x0040) 106 + #define IVTV_REG_IRQMASK (0x0048) 107 107 108 108 /* Setup Registers */ 109 - #define IVTV_REG_ENC_SDRAM_REFRESH (0x07F8) 110 - #define IVTV_REG_ENC_SDRAM_PRECHARGE (0x07FC) 111 - #define IVTV_REG_DEC_SDRAM_REFRESH (0x08F8) 112 - #define IVTV_REG_DEC_SDRAM_PRECHARGE (0x08FC) 113 - #define IVTV_REG_VDM (0x2800) 114 - #define IVTV_REG_AO (0x2D00) 115 - #define IVTV_REG_BYTEFLUSH (0x2D24) 116 - #define IVTV_REG_SPU (0x9050) 117 - #define IVTV_REG_HW_BLOCKS (0x9054) 118 - #define IVTV_REG_VPU (0x9058) 119 - #define IVTV_REG_APU (0xA064) 109 + #define IVTV_REG_ENC_SDRAM_REFRESH (0x07F8) 110 + #define IVTV_REG_ENC_SDRAM_PRECHARGE (0x07FC) 111 + #define IVTV_REG_DEC_SDRAM_REFRESH (0x08F8) 112 + #define IVTV_REG_DEC_SDRAM_PRECHARGE (0x08FC) 113 + #define IVTV_REG_VDM (0x2800) 114 + #define IVTV_REG_AO (0x2D00) 115 + #define IVTV_REG_BYTEFLUSH (0x2D24) 116 + #define IVTV_REG_SPU (0x9050) 117 + #define IVTV_REG_HW_BLOCKS (0x9054) 118 + #define IVTV_REG_VPU (0x9058) 119 + #define IVTV_REG_APU (0xA064) 120 120 121 121 /* Other registers */ 122 122 #define IVTV_REG_DEC_LINE_FIELD (0x28C0) ··· 158 158 159 159 #define IVTV_DEBUG_HIGH_VOL(x, type, fmt, args...) \ 160 160 do { \ 161 - if (((x) & ivtv_debug) && (ivtv_debug & IVTV_DBGFLG_HIGHVOL)) \ 161 + if (((x) & ivtv_debug) && (ivtv_debug & IVTV_DBGFLG_HIGHVOL)) \ 162 162 v4l2_info(&itv->v4l2_dev, " " type ": " fmt , ##args); \ 163 163 } while (0) 164 164 #define IVTV_DEBUG_HI_WARN(fmt, args...) IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_WARN, "warn", fmt , ## args) ··· 226 226 /* per-stream, s_flags */ 227 227 #define IVTV_F_S_DMA_PENDING 0 /* this stream has pending DMA */ 228 228 #define IVTV_F_S_DMA_HAS_VBI 1 /* the current DMA request also requests VBI data */ 229 - #define IVTV_F_S_NEEDS_DATA 2 /* this decoding stream needs more data */ 229 + #define IVTV_F_S_NEEDS_DATA 2 /* this decoding stream needs more data */ 230 230 231 - #define IVTV_F_S_CLAIMED 3 /* this stream is claimed */ 231 + #define IVTV_F_S_CLAIMED 3 /* this stream is claimed */ 232 232 #define IVTV_F_S_STREAMING 4 /* the fw is decoding/encoding this stream */ 233 233 #define IVTV_F_S_INTERNAL_USE 5 /* this stream is used internally (sliced VBI processing) */ 234 234 #define IVTV_F_S_PASSTHROUGH 6 /* this stream is in passthrough mode */ ··· 239 239 #define IVTV_F_S_PIO_HAS_VBI 1 /* the current PIO request also requests VBI data */ 240 240 241 241 /* per-ivtv, i_flags */ 242 - #define IVTV_F_I_DMA 0 /* DMA in progress */ 243 - #define IVTV_F_I_UDMA 1 /* UDMA in progress */ 244 - #define IVTV_F_I_UDMA_PENDING 2 /* UDMA pending */ 245 - #define IVTV_F_I_SPEED_CHANGE 3 /* a speed change is in progress */ 246 - #define IVTV_F_I_EOS 4 /* end of encoder stream reached */ 247 - #define IVTV_F_I_RADIO_USER 5 /* the radio tuner is selected */ 248 - #define IVTV_F_I_DIG_RST 6 /* reset digitizer */ 249 - #define IVTV_F_I_DEC_YUV 7 /* YUV instead of MPG is being decoded */ 250 - #define IVTV_F_I_UPDATE_CC 9 /* CC should be updated */ 251 - #define IVTV_F_I_UPDATE_WSS 10 /* WSS should be updated */ 252 - #define IVTV_F_I_UPDATE_VPS 11 /* VPS should be updated */ 253 - #define IVTV_F_I_DECODING_YUV 12 /* this stream is YUV frame decoding */ 254 - #define IVTV_F_I_ENC_PAUSED 13 /* the encoder is paused */ 255 - #define IVTV_F_I_VALID_DEC_TIMINGS 14 /* last_dec_timing is valid */ 256 - #define IVTV_F_I_HAVE_WORK 15 /* used in the interrupt handler: there is work to be done */ 242 + #define IVTV_F_I_DMA 0 /* DMA in progress */ 243 + #define IVTV_F_I_UDMA 1 /* UDMA in progress */ 244 + #define IVTV_F_I_UDMA_PENDING 2 /* UDMA pending */ 245 + #define IVTV_F_I_SPEED_CHANGE 3 /* a speed change is in progress */ 246 + #define IVTV_F_I_EOS 4 /* end of encoder stream reached */ 247 + #define IVTV_F_I_RADIO_USER 5 /* the radio tuner is selected */ 248 + #define IVTV_F_I_DIG_RST 6 /* reset digitizer */ 249 + #define IVTV_F_I_DEC_YUV 7 /* YUV instead of MPG is being decoded */ 250 + #define IVTV_F_I_UPDATE_CC 9 /* CC should be updated */ 251 + #define IVTV_F_I_UPDATE_WSS 10 /* WSS should be updated */ 252 + #define IVTV_F_I_UPDATE_VPS 11 /* VPS should be updated */ 253 + #define IVTV_F_I_DECODING_YUV 12 /* this stream is YUV frame decoding */ 254 + #define IVTV_F_I_ENC_PAUSED 13 /* the encoder is paused */ 255 + #define IVTV_F_I_VALID_DEC_TIMINGS 14 /* last_dec_timing is valid */ 256 + #define IVTV_F_I_HAVE_WORK 15 /* used in the interrupt handler: there is work to be done */ 257 257 #define IVTV_F_I_WORK_HANDLER_VBI 16 /* there is work to be done for VBI */ 258 258 #define IVTV_F_I_WORK_HANDLER_YUV 17 /* there is work to be done for YUV */ 259 259 #define IVTV_F_I_WORK_HANDLER_PIO 18 /* there is work to be done for PIO */ 260 260 #define IVTV_F_I_PIO 19 /* PIO in progress */ 261 - #define IVTV_F_I_DEC_PAUSED 20 /* the decoder is paused */ 262 - #define IVTV_F_I_INITED 21 /* set after first open */ 263 - #define IVTV_F_I_FAILED 22 /* set if first open failed */ 261 + #define IVTV_F_I_DEC_PAUSED 20 /* the decoder is paused */ 262 + #define IVTV_F_I_INITED 21 /* set after first open */ 263 + #define IVTV_F_I_FAILED 22 /* set if first open failed */ 264 264 #define IVTV_F_I_WORK_HANDLER_PCM 23 /* there is work to be done for PCM */ 265 265 266 266 /* Event notifications */ 267 267 #define IVTV_F_I_EV_DEC_STOPPED 28 /* decoder stopped event */ 268 - #define IVTV_F_I_EV_VSYNC 29 /* VSYNC event */ 269 - #define IVTV_F_I_EV_VSYNC_FIELD 30 /* VSYNC event field (0 = first, 1 = second field) */ 270 - #define IVTV_F_I_EV_VSYNC_ENABLED 31 /* VSYNC event enabled */ 268 + #define IVTV_F_I_EV_VSYNC 29 /* VSYNC event */ 269 + #define IVTV_F_I_EV_VSYNC_FIELD 30 /* VSYNC event field (0 = first, 1 = second field) */ 270 + #define IVTV_F_I_EV_VSYNC_ENABLED 31 /* VSYNC event enabled */ 271 271 272 272 /* Scatter-Gather array element, used in DMA transfers */ 273 273 struct ivtv_sg_element { ··· 330 330 /* These first four fields are always set, even if the stream 331 331 is not actually created. */ 332 332 struct video_device vdev; /* vdev.v4l2_dev is NULL if there is no device */ 333 - struct ivtv *itv; /* for ease of use */ 333 + struct ivtv *itv; /* for ease of use */ 334 334 const char *name; /* name of the stream */ 335 335 int type; /* stream type */ 336 336 u32 caps; /* V4L2 capabilities */ 337 337 338 338 struct v4l2_fh *fh; /* pointer to the streaming filehandle */ 339 - spinlock_t qlock; /* locks access to the queues */ 339 + spinlock_t qlock; /* locks access to the queues */ 340 340 unsigned long s_flags; /* status flags, see above */ 341 341 int dma; /* can be PCI_DMA_TODEVICE, PCI_DMA_FROMDEVICE or PCI_DMA_NONE */ 342 342 u32 pending_offset; ··· 564 564 565 565 /* Raw VBI compatibility hack */ 566 566 567 - u32 frame; /* frame counter hack needed for backwards compatibility 567 + u32 frame; /* frame counter hack needed for backwards compatibility 568 568 of old VBI software */ 569 569 570 570 /* Sliced VBI output data */ ··· 620 620 u8 nof_inputs; /* number of video inputs */ 621 621 u8 nof_audio_inputs; /* number of audio inputs */ 622 622 u32 v4l2_cap; /* V4L2 capabilities of card */ 623 - u32 hw_flags; /* hardware description of the board */ 623 + u32 hw_flags; /* hardware description of the board */ 624 624 v4l2_std_id tuner_std; /* the norm of the card's tuner (fixed) */ 625 625 struct v4l2_subdev *sd_video; /* controlling video decoder subdev */ 626 626 struct v4l2_subdev *sd_audio; /* controlling audio subdev */ ··· 629 629 volatile void __iomem *enc_mem; /* pointer to mapped encoder memory */ 630 630 volatile void __iomem *dec_mem; /* pointer to mapped decoder memory */ 631 631 volatile void __iomem *reg_mem; /* pointer to mapped registers */ 632 - struct ivtv_options options; /* user options */ 632 + struct ivtv_options options; /* user options */ 633 633 634 634 struct v4l2_device v4l2_dev; 635 635 struct cx2341x_handler cxhdl; ··· 668 668 669 669 /* Streams */ 670 670 int stream_buf_size[IVTV_MAX_STREAMS]; /* stream buffer size */ 671 - struct ivtv_stream streams[IVTV_MAX_STREAMS]; /* stream data */ 671 + struct ivtv_stream streams[IVTV_MAX_STREAMS]; /* stream data */ 672 672 atomic_t capturing; /* count number of active capture streams */ 673 673 atomic_t decoding; /* count number of active decoding streams */ 674 674 ··· 704 704 /* Mailbox */ 705 705 struct ivtv_mailbox_data enc_mbox; /* encoder mailboxes */ 706 706 struct ivtv_mailbox_data dec_mbox; /* decoder mailboxes */ 707 - struct ivtv_api_cache api_cache[256]; /* cached API commands */ 707 + struct ivtv_api_cache api_cache[256]; /* cached API commands */ 708 708 709 709 710 710 /* I2C */ ··· 828 828 829 829 /* Call the specified callback for all subdevs matching hw (if 0, then 830 830 match them all). Ignore any errors. */ 831 - #define ivtv_call_hw(itv, hw, o, f, args...) \ 831 + #define ivtv_call_hw(itv, hw, o, f, args...) \ 832 832 v4l2_device_mask_call_all(&(itv)->v4l2_dev, hw, o, f, ##args) 833 833 834 834 #define ivtv_call_all(itv, o, f, args...) ivtv_call_hw(itv, 0, o, f , ##args)
+17 -17
drivers/media/pci/ivtv/ivtv-firmware.c
··· 28 28 #include <linux/firmware.h> 29 29 #include <media/i2c/saa7127.h> 30 30 31 - #define IVTV_MASK_SPU_ENABLE 0xFFFFFFFE 32 - #define IVTV_MASK_VPU_ENABLE15 0xFFFFFFF6 33 - #define IVTV_MASK_VPU_ENABLE16 0xFFFFFFFB 34 - #define IVTV_CMD_VDM_STOP 0x00000000 35 - #define IVTV_CMD_AO_STOP 0x00000005 36 - #define IVTV_CMD_APU_PING 0x00000000 37 - #define IVTV_CMD_VPU_STOP15 0xFFFFFFFE 38 - #define IVTV_CMD_VPU_STOP16 0xFFFFFFEE 39 - #define IVTV_CMD_HW_BLOCKS_RST 0xFFFFFFFF 40 - #define IVTV_CMD_SPU_STOP 0x00000001 41 - #define IVTV_CMD_SDRAM_PRECHARGE_INIT 0x0000001A 42 - #define IVTV_CMD_SDRAM_REFRESH_INIT 0x80000640 43 - #define IVTV_SDRAM_SLEEPTIME 600 31 + #define IVTV_MASK_SPU_ENABLE 0xFFFFFFFE 32 + #define IVTV_MASK_VPU_ENABLE15 0xFFFFFFF6 33 + #define IVTV_MASK_VPU_ENABLE16 0xFFFFFFFB 34 + #define IVTV_CMD_VDM_STOP 0x00000000 35 + #define IVTV_CMD_AO_STOP 0x00000005 36 + #define IVTV_CMD_APU_PING 0x00000000 37 + #define IVTV_CMD_VPU_STOP15 0xFFFFFFFE 38 + #define IVTV_CMD_VPU_STOP16 0xFFFFFFEE 39 + #define IVTV_CMD_HW_BLOCKS_RST 0xFFFFFFFF 40 + #define IVTV_CMD_SPU_STOP 0x00000001 41 + #define IVTV_CMD_SDRAM_PRECHARGE_INIT 0x0000001A 42 + #define IVTV_CMD_SDRAM_REFRESH_INIT 0x80000640 43 + #define IVTV_SDRAM_SLEEPTIME 600 44 44 45 - #define IVTV_DECODE_INIT_MPEG_FILENAME "v4l-cx2341x-init.mpg" 46 - #define IVTV_DECODE_INIT_MPEG_SIZE (152*1024) 45 + #define IVTV_DECODE_INIT_MPEG_FILENAME "v4l-cx2341x-init.mpg" 46 + #define IVTV_DECODE_INIT_MPEG_SIZE (152*1024) 47 47 48 48 /* Encoder/decoder firmware sizes */ 49 - #define IVTV_FW_ENC_SIZE (376836) 50 - #define IVTV_FW_DEC_SIZE (256*1024) 49 + #define IVTV_FW_ENC_SIZE (376836) 50 + #define IVTV_FW_DEC_SIZE (256*1024) 51 51 52 52 static int load_fw_direct(const char *fn, volatile u8 __iomem *mem, struct ivtv *itv, long size) 53 53 {
+13 -13
drivers/media/pci/ivtv/ivtv-i2c.c
··· 76 76 77 77 #define IVTV_CS53L32A_I2C_ADDR 0x11 78 78 #define IVTV_M52790_I2C_ADDR 0x48 79 - #define IVTV_CX25840_I2C_ADDR 0x44 80 - #define IVTV_SAA7115_I2C_ADDR 0x21 81 - #define IVTV_SAA7127_I2C_ADDR 0x44 82 - #define IVTV_SAA717x_I2C_ADDR 0x21 83 - #define IVTV_MSP3400_I2C_ADDR 0x40 84 - #define IVTV_HAUPPAUGE_I2C_ADDR 0x50 85 - #define IVTV_WM8739_I2C_ADDR 0x1a 79 + #define IVTV_CX25840_I2C_ADDR 0x44 80 + #define IVTV_SAA7115_I2C_ADDR 0x21 81 + #define IVTV_SAA7127_I2C_ADDR 0x44 82 + #define IVTV_SAA717x_I2C_ADDR 0x21 83 + #define IVTV_MSP3400_I2C_ADDR 0x40 84 + #define IVTV_HAUPPAUGE_I2C_ADDR 0x50 85 + #define IVTV_WM8739_I2C_ADDR 0x1a 86 86 #define IVTV_WM8775_I2C_ADDR 0x1b 87 87 #define IVTV_TEA5767_I2C_ADDR 0x60 88 - #define IVTV_UPD64031A_I2C_ADDR 0x12 89 - #define IVTV_UPD64083_I2C_ADDR 0x5c 90 - #define IVTV_VP27SMPX_I2C_ADDR 0x5b 91 - #define IVTV_M52790_I2C_ADDR 0x48 88 + #define IVTV_UPD64031A_I2C_ADDR 0x12 89 + #define IVTV_UPD64083_I2C_ADDR 0x5c 90 + #define IVTV_VP27SMPX_I2C_ADDR 0x5b 91 + #define IVTV_M52790_I2C_ADDR 0x48 92 92 #define IVTV_AVERMEDIA_IR_RX_I2C_ADDR 0x40 93 - #define IVTV_HAUP_EXT_IR_RX_I2C_ADDR 0x1a 94 - #define IVTV_HAUP_INT_IR_RX_I2C_ADDR 0x18 93 + #define IVTV_HAUP_EXT_IR_RX_I2C_ADDR 0x1a 94 + #define IVTV_HAUP_INT_IR_RX_I2C_ADDR 0x18 95 95 #define IVTV_Z8F0811_IR_TX_I2C_ADDR 0x70 96 96 #define IVTV_Z8F0811_IR_RX_I2C_ADDR 0x71 97 97 #define IVTV_ADAPTEC_IR_ADDR 0x6b
+37 -37
drivers/media/pci/ivtv/ivtv-ioctl.c
··· 1884 1884 } 1885 1885 1886 1886 static const struct v4l2_ioctl_ops ivtv_ioctl_ops = { 1887 - .vidioc_querycap = ivtv_querycap, 1888 - .vidioc_s_audio = ivtv_s_audio, 1889 - .vidioc_g_audio = ivtv_g_audio, 1890 - .vidioc_enumaudio = ivtv_enumaudio, 1891 - .vidioc_s_audout = ivtv_s_audout, 1892 - .vidioc_g_audout = ivtv_g_audout, 1893 - .vidioc_enum_input = ivtv_enum_input, 1894 - .vidioc_enum_output = ivtv_enum_output, 1895 - .vidioc_enumaudout = ivtv_enumaudout, 1896 - .vidioc_cropcap = ivtv_cropcap, 1887 + .vidioc_querycap = ivtv_querycap, 1888 + .vidioc_s_audio = ivtv_s_audio, 1889 + .vidioc_g_audio = ivtv_g_audio, 1890 + .vidioc_enumaudio = ivtv_enumaudio, 1891 + .vidioc_s_audout = ivtv_s_audout, 1892 + .vidioc_g_audout = ivtv_g_audout, 1893 + .vidioc_enum_input = ivtv_enum_input, 1894 + .vidioc_enum_output = ivtv_enum_output, 1895 + .vidioc_enumaudout = ivtv_enumaudout, 1896 + .vidioc_cropcap = ivtv_cropcap, 1897 1897 .vidioc_s_selection = ivtv_s_selection, 1898 1898 .vidioc_g_selection = ivtv_g_selection, 1899 - .vidioc_g_input = ivtv_g_input, 1900 - .vidioc_s_input = ivtv_s_input, 1901 - .vidioc_g_output = ivtv_g_output, 1902 - .vidioc_s_output = ivtv_s_output, 1903 - .vidioc_g_frequency = ivtv_g_frequency, 1904 - .vidioc_s_frequency = ivtv_s_frequency, 1905 - .vidioc_s_tuner = ivtv_s_tuner, 1906 - .vidioc_g_tuner = ivtv_g_tuner, 1907 - .vidioc_g_enc_index = ivtv_g_enc_index, 1899 + .vidioc_g_input = ivtv_g_input, 1900 + .vidioc_s_input = ivtv_s_input, 1901 + .vidioc_g_output = ivtv_g_output, 1902 + .vidioc_s_output = ivtv_s_output, 1903 + .vidioc_g_frequency = ivtv_g_frequency, 1904 + .vidioc_s_frequency = ivtv_s_frequency, 1905 + .vidioc_s_tuner = ivtv_s_tuner, 1906 + .vidioc_g_tuner = ivtv_g_tuner, 1907 + .vidioc_g_enc_index = ivtv_g_enc_index, 1908 1908 .vidioc_g_fbuf = ivtv_g_fbuf, 1909 1909 .vidioc_s_fbuf = ivtv_s_fbuf, 1910 - .vidioc_g_std = ivtv_g_std, 1911 - .vidioc_s_std = ivtv_s_std, 1910 + .vidioc_g_std = ivtv_g_std, 1911 + .vidioc_s_std = ivtv_s_std, 1912 1912 .vidioc_overlay = ivtv_overlay, 1913 1913 .vidioc_log_status = ivtv_log_status, 1914 - .vidioc_enum_fmt_vid_cap = ivtv_enum_fmt_vid_cap, 1915 - .vidioc_encoder_cmd = ivtv_encoder_cmd, 1916 - .vidioc_try_encoder_cmd = ivtv_try_encoder_cmd, 1914 + .vidioc_enum_fmt_vid_cap = ivtv_enum_fmt_vid_cap, 1915 + .vidioc_encoder_cmd = ivtv_encoder_cmd, 1916 + .vidioc_try_encoder_cmd = ivtv_try_encoder_cmd, 1917 1917 .vidioc_decoder_cmd = ivtv_decoder_cmd, 1918 1918 .vidioc_try_decoder_cmd = ivtv_try_decoder_cmd, 1919 - .vidioc_enum_fmt_vid_out = ivtv_enum_fmt_vid_out, 1920 - .vidioc_g_fmt_vid_cap = ivtv_g_fmt_vid_cap, 1919 + .vidioc_enum_fmt_vid_out = ivtv_enum_fmt_vid_out, 1920 + .vidioc_g_fmt_vid_cap = ivtv_g_fmt_vid_cap, 1921 1921 .vidioc_g_fmt_vbi_cap = ivtv_g_fmt_vbi_cap, 1922 1922 .vidioc_g_fmt_sliced_vbi_cap = ivtv_g_fmt_sliced_vbi_cap, 1923 1923 .vidioc_g_fmt_vid_out = ivtv_g_fmt_vid_out, 1924 1924 .vidioc_g_fmt_vid_out_overlay = ivtv_g_fmt_vid_out_overlay, 1925 1925 .vidioc_g_fmt_sliced_vbi_out = ivtv_g_fmt_sliced_vbi_out, 1926 - .vidioc_s_fmt_vid_cap = ivtv_s_fmt_vid_cap, 1927 - .vidioc_s_fmt_vbi_cap = ivtv_s_fmt_vbi_cap, 1926 + .vidioc_s_fmt_vid_cap = ivtv_s_fmt_vid_cap, 1927 + .vidioc_s_fmt_vbi_cap = ivtv_s_fmt_vbi_cap, 1928 1928 .vidioc_s_fmt_sliced_vbi_cap = ivtv_s_fmt_sliced_vbi_cap, 1929 1929 .vidioc_s_fmt_vid_out = ivtv_s_fmt_vid_out, 1930 1930 .vidioc_s_fmt_vid_out_overlay = ivtv_s_fmt_vid_out_overlay, 1931 1931 .vidioc_s_fmt_sliced_vbi_out = ivtv_s_fmt_sliced_vbi_out, 1932 - .vidioc_try_fmt_vid_cap = ivtv_try_fmt_vid_cap, 1932 + .vidioc_try_fmt_vid_cap = ivtv_try_fmt_vid_cap, 1933 1933 .vidioc_try_fmt_vbi_cap = ivtv_try_fmt_vbi_cap, 1934 1934 .vidioc_try_fmt_sliced_vbi_cap = ivtv_try_fmt_sliced_vbi_cap, 1935 - .vidioc_try_fmt_vid_out = ivtv_try_fmt_vid_out, 1935 + .vidioc_try_fmt_vid_out = ivtv_try_fmt_vid_out, 1936 1936 .vidioc_try_fmt_vid_out_overlay = ivtv_try_fmt_vid_out_overlay, 1937 - .vidioc_try_fmt_sliced_vbi_out = ivtv_try_fmt_sliced_vbi_out, 1938 - .vidioc_g_sliced_vbi_cap = ivtv_g_sliced_vbi_cap, 1937 + .vidioc_try_fmt_sliced_vbi_out = ivtv_try_fmt_sliced_vbi_out, 1938 + .vidioc_g_sliced_vbi_cap = ivtv_g_sliced_vbi_cap, 1939 1939 #ifdef CONFIG_VIDEO_ADV_DEBUG 1940 - .vidioc_g_register = ivtv_g_register, 1941 - .vidioc_s_register = ivtv_s_register, 1940 + .vidioc_g_register = ivtv_g_register, 1941 + .vidioc_s_register = ivtv_s_register, 1942 1942 #endif 1943 - .vidioc_default = ivtv_default, 1944 - .vidioc_subscribe_event = ivtv_subscribe_event, 1945 - .vidioc_unsubscribe_event = v4l2_event_unsubscribe, 1943 + .vidioc_default = ivtv_default, 1944 + .vidioc_subscribe_event = ivtv_subscribe_event, 1945 + .vidioc_unsubscribe_event = v4l2_event_unsubscribe, 1946 1946 }; 1947 1947 1948 1948 void ivtv_set_funcs(struct video_device *vdev)
+91 -91
drivers/media/pci/ivtv/ivtv-mailbox.c
··· 28 28 #define IVTV_MBOX_FIRMWARE_DONE 0x00000004 29 29 #define IVTV_MBOX_DRIVER_DONE 0x00000002 30 30 #define IVTV_MBOX_DRIVER_BUSY 0x00000001 31 - #define IVTV_MBOX_FREE 0x00000000 31 + #define IVTV_MBOX_FREE 0x00000000 32 32 33 33 /* Firmware mailbox standard timeout */ 34 - #define IVTV_API_STD_TIMEOUT 0x02000000 34 + #define IVTV_API_STD_TIMEOUT 0x02000000 35 35 36 - #define API_CACHE (1 << 0) /* Allow the command to be stored in the cache */ 37 - #define API_RESULT (1 << 1) /* Allow 1 second for this cmd to end */ 36 + #define API_CACHE (1 << 0) /* Allow the command to be stored in the cache */ 37 + #define API_RESULT (1 << 1) /* Allow 1 second for this cmd to end */ 38 38 #define API_FAST_RESULT (3 << 1) /* Allow 0.1 second for this cmd to end */ 39 - #define API_DMA (1 << 3) /* DMA mailbox, has special handling */ 40 - #define API_HIGH_VOL (1 << 5) /* High volume command (i.e. called during encoding or decoding) */ 41 - #define API_NO_WAIT_MB (1 << 4) /* Command may not wait for a free mailbox */ 39 + #define API_DMA (1 << 3) /* DMA mailbox, has special handling */ 40 + #define API_HIGH_VOL (1 << 5) /* High volume command (i.e. called during encoding or decoding) */ 41 + #define API_NO_WAIT_MB (1 << 4) /* Command may not wait for a free mailbox */ 42 42 #define API_NO_WAIT_RES (1 << 5) /* Command may not wait for the result */ 43 43 #define API_NO_POLL (1 << 6) /* Avoid pointless polling */ 44 44 45 45 struct ivtv_api_info { 46 46 int flags; /* Flags, see above */ 47 - const char *name; /* The name of the command */ 47 + const char *name; /* The name of the command */ 48 48 }; 49 49 50 50 #define API_ENTRY(x, f) [x] = { (f), #x } 51 51 52 52 static const struct ivtv_api_info api_info[256] = { 53 53 /* MPEG encoder API */ 54 - API_ENTRY(CX2341X_ENC_PING_FW, API_FAST_RESULT), 55 - API_ENTRY(CX2341X_ENC_START_CAPTURE, API_RESULT | API_NO_POLL), 56 - API_ENTRY(CX2341X_ENC_STOP_CAPTURE, API_RESULT), 57 - API_ENTRY(CX2341X_ENC_SET_AUDIO_ID, API_CACHE), 58 - API_ENTRY(CX2341X_ENC_SET_VIDEO_ID, API_CACHE), 59 - API_ENTRY(CX2341X_ENC_SET_PCR_ID, API_CACHE), 60 - API_ENTRY(CX2341X_ENC_SET_FRAME_RATE, API_CACHE), 61 - API_ENTRY(CX2341X_ENC_SET_FRAME_SIZE, API_CACHE), 62 - API_ENTRY(CX2341X_ENC_SET_BIT_RATE, API_CACHE), 63 - API_ENTRY(CX2341X_ENC_SET_GOP_PROPERTIES, API_CACHE), 64 - API_ENTRY(CX2341X_ENC_SET_ASPECT_RATIO, API_CACHE), 65 - API_ENTRY(CX2341X_ENC_SET_DNR_FILTER_MODE, API_CACHE), 66 - API_ENTRY(CX2341X_ENC_SET_DNR_FILTER_PROPS, API_CACHE), 67 - API_ENTRY(CX2341X_ENC_SET_CORING_LEVELS, API_CACHE), 68 - API_ENTRY(CX2341X_ENC_SET_SPATIAL_FILTER_TYPE, API_CACHE), 69 - API_ENTRY(CX2341X_ENC_SET_VBI_LINE, API_RESULT), 70 - API_ENTRY(CX2341X_ENC_SET_STREAM_TYPE, API_CACHE), 71 - API_ENTRY(CX2341X_ENC_SET_OUTPUT_PORT, API_CACHE), 72 - API_ENTRY(CX2341X_ENC_SET_AUDIO_PROPERTIES, API_CACHE), 73 - API_ENTRY(CX2341X_ENC_HALT_FW, API_FAST_RESULT), 74 - API_ENTRY(CX2341X_ENC_GET_VERSION, API_FAST_RESULT), 75 - API_ENTRY(CX2341X_ENC_SET_GOP_CLOSURE, API_CACHE), 76 - API_ENTRY(CX2341X_ENC_GET_SEQ_END, API_RESULT), 77 - API_ENTRY(CX2341X_ENC_SET_PGM_INDEX_INFO, API_FAST_RESULT), 78 - API_ENTRY(CX2341X_ENC_SET_VBI_CONFIG, API_RESULT), 79 - API_ENTRY(CX2341X_ENC_SET_DMA_BLOCK_SIZE, API_CACHE), 80 - API_ENTRY(CX2341X_ENC_GET_PREV_DMA_INFO_MB_10, API_FAST_RESULT), 81 - API_ENTRY(CX2341X_ENC_GET_PREV_DMA_INFO_MB_9, API_FAST_RESULT), 82 - API_ENTRY(CX2341X_ENC_SCHED_DMA_TO_HOST, API_DMA | API_HIGH_VOL), 83 - API_ENTRY(CX2341X_ENC_INITIALIZE_INPUT, API_RESULT), 84 - API_ENTRY(CX2341X_ENC_SET_FRAME_DROP_RATE, API_CACHE), 85 - API_ENTRY(CX2341X_ENC_PAUSE_ENCODER, API_RESULT), 86 - API_ENTRY(CX2341X_ENC_REFRESH_INPUT, API_NO_WAIT_MB | API_HIGH_VOL), 87 - API_ENTRY(CX2341X_ENC_SET_COPYRIGHT, API_CACHE), 88 - API_ENTRY(CX2341X_ENC_SET_EVENT_NOTIFICATION, API_RESULT), 89 - API_ENTRY(CX2341X_ENC_SET_NUM_VSYNC_LINES, API_CACHE), 90 - API_ENTRY(CX2341X_ENC_SET_PLACEHOLDER, API_CACHE), 91 - API_ENTRY(CX2341X_ENC_MUTE_VIDEO, API_RESULT), 92 - API_ENTRY(CX2341X_ENC_MUTE_AUDIO, API_RESULT), 54 + API_ENTRY(CX2341X_ENC_PING_FW, API_FAST_RESULT), 55 + API_ENTRY(CX2341X_ENC_START_CAPTURE, API_RESULT | API_NO_POLL), 56 + API_ENTRY(CX2341X_ENC_STOP_CAPTURE, API_RESULT), 57 + API_ENTRY(CX2341X_ENC_SET_AUDIO_ID, API_CACHE), 58 + API_ENTRY(CX2341X_ENC_SET_VIDEO_ID, API_CACHE), 59 + API_ENTRY(CX2341X_ENC_SET_PCR_ID, API_CACHE), 60 + API_ENTRY(CX2341X_ENC_SET_FRAME_RATE, API_CACHE), 61 + API_ENTRY(CX2341X_ENC_SET_FRAME_SIZE, API_CACHE), 62 + API_ENTRY(CX2341X_ENC_SET_BIT_RATE, API_CACHE), 63 + API_ENTRY(CX2341X_ENC_SET_GOP_PROPERTIES, API_CACHE), 64 + API_ENTRY(CX2341X_ENC_SET_ASPECT_RATIO, API_CACHE), 65 + API_ENTRY(CX2341X_ENC_SET_DNR_FILTER_MODE, API_CACHE), 66 + API_ENTRY(CX2341X_ENC_SET_DNR_FILTER_PROPS, API_CACHE), 67 + API_ENTRY(CX2341X_ENC_SET_CORING_LEVELS, API_CACHE), 68 + API_ENTRY(CX2341X_ENC_SET_SPATIAL_FILTER_TYPE, API_CACHE), 69 + API_ENTRY(CX2341X_ENC_SET_VBI_LINE, API_RESULT), 70 + API_ENTRY(CX2341X_ENC_SET_STREAM_TYPE, API_CACHE), 71 + API_ENTRY(CX2341X_ENC_SET_OUTPUT_PORT, API_CACHE), 72 + API_ENTRY(CX2341X_ENC_SET_AUDIO_PROPERTIES, API_CACHE), 73 + API_ENTRY(CX2341X_ENC_HALT_FW, API_FAST_RESULT), 74 + API_ENTRY(CX2341X_ENC_GET_VERSION, API_FAST_RESULT), 75 + API_ENTRY(CX2341X_ENC_SET_GOP_CLOSURE, API_CACHE), 76 + API_ENTRY(CX2341X_ENC_GET_SEQ_END, API_RESULT), 77 + API_ENTRY(CX2341X_ENC_SET_PGM_INDEX_INFO, API_FAST_RESULT), 78 + API_ENTRY(CX2341X_ENC_SET_VBI_CONFIG, API_RESULT), 79 + API_ENTRY(CX2341X_ENC_SET_DMA_BLOCK_SIZE, API_CACHE), 80 + API_ENTRY(CX2341X_ENC_GET_PREV_DMA_INFO_MB_10, API_FAST_RESULT), 81 + API_ENTRY(CX2341X_ENC_GET_PREV_DMA_INFO_MB_9, API_FAST_RESULT), 82 + API_ENTRY(CX2341X_ENC_SCHED_DMA_TO_HOST, API_DMA | API_HIGH_VOL), 83 + API_ENTRY(CX2341X_ENC_INITIALIZE_INPUT, API_RESULT), 84 + API_ENTRY(CX2341X_ENC_SET_FRAME_DROP_RATE, API_CACHE), 85 + API_ENTRY(CX2341X_ENC_PAUSE_ENCODER, API_RESULT), 86 + API_ENTRY(CX2341X_ENC_REFRESH_INPUT, API_NO_WAIT_MB | API_HIGH_VOL), 87 + API_ENTRY(CX2341X_ENC_SET_COPYRIGHT, API_CACHE), 88 + API_ENTRY(CX2341X_ENC_SET_EVENT_NOTIFICATION, API_RESULT), 89 + API_ENTRY(CX2341X_ENC_SET_NUM_VSYNC_LINES, API_CACHE), 90 + API_ENTRY(CX2341X_ENC_SET_PLACEHOLDER, API_CACHE), 91 + API_ENTRY(CX2341X_ENC_MUTE_VIDEO, API_RESULT), 92 + API_ENTRY(CX2341X_ENC_MUTE_AUDIO, API_RESULT), 93 93 API_ENTRY(CX2341X_ENC_SET_VERT_CROP_LINE, API_FAST_RESULT), 94 - API_ENTRY(CX2341X_ENC_MISC, API_FAST_RESULT), 94 + API_ENTRY(CX2341X_ENC_MISC, API_FAST_RESULT), 95 95 /* Obsolete PULLDOWN API command */ 96 - API_ENTRY(0xb1, API_CACHE), 96 + API_ENTRY(0xb1, API_CACHE), 97 97 98 98 /* MPEG decoder API */ 99 - API_ENTRY(CX2341X_DEC_PING_FW, API_FAST_RESULT), 100 - API_ENTRY(CX2341X_DEC_START_PLAYBACK, API_RESULT | API_NO_POLL), 101 - API_ENTRY(CX2341X_DEC_STOP_PLAYBACK, API_RESULT), 102 - API_ENTRY(CX2341X_DEC_SET_PLAYBACK_SPEED, API_RESULT), 103 - API_ENTRY(CX2341X_DEC_STEP_VIDEO, API_RESULT), 104 - API_ENTRY(CX2341X_DEC_SET_DMA_BLOCK_SIZE, API_CACHE), 105 - API_ENTRY(CX2341X_DEC_GET_XFER_INFO, API_FAST_RESULT), 106 - API_ENTRY(CX2341X_DEC_GET_DMA_STATUS, API_FAST_RESULT), 107 - API_ENTRY(CX2341X_DEC_SCHED_DMA_FROM_HOST, API_DMA | API_HIGH_VOL), 108 - API_ENTRY(CX2341X_DEC_PAUSE_PLAYBACK, API_RESULT), 109 - API_ENTRY(CX2341X_DEC_HALT_FW, API_FAST_RESULT), 110 - API_ENTRY(CX2341X_DEC_SET_STANDARD, API_CACHE), 111 - API_ENTRY(CX2341X_DEC_GET_VERSION, API_FAST_RESULT), 112 - API_ENTRY(CX2341X_DEC_SET_STREAM_INPUT, API_CACHE), 113 - API_ENTRY(CX2341X_DEC_GET_TIMING_INFO, API_RESULT /*| API_NO_WAIT_RES*/), 114 - API_ENTRY(CX2341X_DEC_SET_AUDIO_MODE, API_CACHE), 115 - API_ENTRY(CX2341X_DEC_SET_EVENT_NOTIFICATION, API_RESULT), 116 - API_ENTRY(CX2341X_DEC_SET_DISPLAY_BUFFERS, API_CACHE), 117 - API_ENTRY(CX2341X_DEC_EXTRACT_VBI, API_RESULT), 118 - API_ENTRY(CX2341X_DEC_SET_DECODER_SOURCE, API_FAST_RESULT), 119 - API_ENTRY(CX2341X_DEC_SET_PREBUFFERING, API_CACHE), 99 + API_ENTRY(CX2341X_DEC_PING_FW, API_FAST_RESULT), 100 + API_ENTRY(CX2341X_DEC_START_PLAYBACK, API_RESULT | API_NO_POLL), 101 + API_ENTRY(CX2341X_DEC_STOP_PLAYBACK, API_RESULT), 102 + API_ENTRY(CX2341X_DEC_SET_PLAYBACK_SPEED, API_RESULT), 103 + API_ENTRY(CX2341X_DEC_STEP_VIDEO, API_RESULT), 104 + API_ENTRY(CX2341X_DEC_SET_DMA_BLOCK_SIZE, API_CACHE), 105 + API_ENTRY(CX2341X_DEC_GET_XFER_INFO, API_FAST_RESULT), 106 + API_ENTRY(CX2341X_DEC_GET_DMA_STATUS, API_FAST_RESULT), 107 + API_ENTRY(CX2341X_DEC_SCHED_DMA_FROM_HOST, API_DMA | API_HIGH_VOL), 108 + API_ENTRY(CX2341X_DEC_PAUSE_PLAYBACK, API_RESULT), 109 + API_ENTRY(CX2341X_DEC_HALT_FW, API_FAST_RESULT), 110 + API_ENTRY(CX2341X_DEC_SET_STANDARD, API_CACHE), 111 + API_ENTRY(CX2341X_DEC_GET_VERSION, API_FAST_RESULT), 112 + API_ENTRY(CX2341X_DEC_SET_STREAM_INPUT, API_CACHE), 113 + API_ENTRY(CX2341X_DEC_GET_TIMING_INFO, API_RESULT /*| API_NO_WAIT_RES*/), 114 + API_ENTRY(CX2341X_DEC_SET_AUDIO_MODE, API_CACHE), 115 + API_ENTRY(CX2341X_DEC_SET_EVENT_NOTIFICATION, API_RESULT), 116 + API_ENTRY(CX2341X_DEC_SET_DISPLAY_BUFFERS, API_CACHE), 117 + API_ENTRY(CX2341X_DEC_EXTRACT_VBI, API_RESULT), 118 + API_ENTRY(CX2341X_DEC_SET_DECODER_SOURCE, API_FAST_RESULT), 119 + API_ENTRY(CX2341X_DEC_SET_PREBUFFERING, API_CACHE), 120 120 121 121 /* OSD API */ 122 - API_ENTRY(CX2341X_OSD_GET_FRAMEBUFFER, API_FAST_RESULT), 123 - API_ENTRY(CX2341X_OSD_GET_PIXEL_FORMAT, API_FAST_RESULT), 124 - API_ENTRY(CX2341X_OSD_SET_PIXEL_FORMAT, API_CACHE), 125 - API_ENTRY(CX2341X_OSD_GET_STATE, API_FAST_RESULT), 126 - API_ENTRY(CX2341X_OSD_SET_STATE, API_CACHE), 127 - API_ENTRY(CX2341X_OSD_GET_OSD_COORDS, API_FAST_RESULT), 128 - API_ENTRY(CX2341X_OSD_SET_OSD_COORDS, API_CACHE), 129 - API_ENTRY(CX2341X_OSD_GET_SCREEN_COORDS, API_FAST_RESULT), 130 - API_ENTRY(CX2341X_OSD_SET_SCREEN_COORDS, API_CACHE), 131 - API_ENTRY(CX2341X_OSD_GET_GLOBAL_ALPHA, API_FAST_RESULT), 132 - API_ENTRY(CX2341X_OSD_SET_GLOBAL_ALPHA, API_CACHE), 133 - API_ENTRY(CX2341X_OSD_SET_BLEND_COORDS, API_CACHE), 134 - API_ENTRY(CX2341X_OSD_GET_FLICKER_STATE, API_FAST_RESULT), 135 - API_ENTRY(CX2341X_OSD_SET_FLICKER_STATE, API_CACHE), 136 - API_ENTRY(CX2341X_OSD_BLT_COPY, API_RESULT), 137 - API_ENTRY(CX2341X_OSD_BLT_FILL, API_RESULT), 138 - API_ENTRY(CX2341X_OSD_BLT_TEXT, API_RESULT), 139 - API_ENTRY(CX2341X_OSD_SET_FRAMEBUFFER_WINDOW, API_CACHE), 140 - API_ENTRY(CX2341X_OSD_SET_CHROMA_KEY, API_CACHE), 141 - API_ENTRY(CX2341X_OSD_GET_ALPHA_CONTENT_INDEX, API_FAST_RESULT), 142 - API_ENTRY(CX2341X_OSD_SET_ALPHA_CONTENT_INDEX, API_CACHE) 122 + API_ENTRY(CX2341X_OSD_GET_FRAMEBUFFER, API_FAST_RESULT), 123 + API_ENTRY(CX2341X_OSD_GET_PIXEL_FORMAT, API_FAST_RESULT), 124 + API_ENTRY(CX2341X_OSD_SET_PIXEL_FORMAT, API_CACHE), 125 + API_ENTRY(CX2341X_OSD_GET_STATE, API_FAST_RESULT), 126 + API_ENTRY(CX2341X_OSD_SET_STATE, API_CACHE), 127 + API_ENTRY(CX2341X_OSD_GET_OSD_COORDS, API_FAST_RESULT), 128 + API_ENTRY(CX2341X_OSD_SET_OSD_COORDS, API_CACHE), 129 + API_ENTRY(CX2341X_OSD_GET_SCREEN_COORDS, API_FAST_RESULT), 130 + API_ENTRY(CX2341X_OSD_SET_SCREEN_COORDS, API_CACHE), 131 + API_ENTRY(CX2341X_OSD_GET_GLOBAL_ALPHA, API_FAST_RESULT), 132 + API_ENTRY(CX2341X_OSD_SET_GLOBAL_ALPHA, API_CACHE), 133 + API_ENTRY(CX2341X_OSD_SET_BLEND_COORDS, API_CACHE), 134 + API_ENTRY(CX2341X_OSD_GET_FLICKER_STATE, API_FAST_RESULT), 135 + API_ENTRY(CX2341X_OSD_SET_FLICKER_STATE, API_CACHE), 136 + API_ENTRY(CX2341X_OSD_BLT_COPY, API_RESULT), 137 + API_ENTRY(CX2341X_OSD_BLT_FILL, API_RESULT), 138 + API_ENTRY(CX2341X_OSD_BLT_TEXT, API_RESULT), 139 + API_ENTRY(CX2341X_OSD_SET_FRAMEBUFFER_WINDOW, API_CACHE), 140 + API_ENTRY(CX2341X_OSD_SET_CHROMA_KEY, API_CACHE), 141 + API_ENTRY(CX2341X_OSD_GET_ALPHA_CONTENT_INDEX, API_FAST_RESULT), 142 + API_ENTRY(CX2341X_OSD_SET_ALPHA_CONTENT_INDEX, API_CACHE) 143 143 }; 144 144 145 145 static int try_mailbox(struct ivtv *itv, struct ivtv_mailbox_data *mbdata, int mb)
+3 -3
drivers/media/pci/mantis/mantis_reg.h
··· 166 166 #define MANTIS_CARD_PLUGOUT (0x01 << 0) 167 167 168 168 #define MANTIS_GPIF_BRADDR 0xa0 169 - #define MANTIS_GPIF_PCMCIAREG (0x01 << 27) 170 - #define MANTIS_GPIF_PCMCIAIOM (0x01 << 26) 169 + #define MANTIS_GPIF_PCMCIAREG (0x01 << 27) 170 + #define MANTIS_GPIF_PCMCIAIOM (0x01 << 26) 171 171 #define MANTIS_GPIF_BR_ADDR (0xfffffff << 0) 172 172 173 173 #define MANTIS_GPIF_BRBYTES 0xa4 174 - #define MANTIS_GPIF_BRCNT (0xfff << 0) 174 + #define MANTIS_GPIF_BRCNT (0xfff << 0) 175 175 176 176 #define MANTIS_PCMCIA_RESET 0xa8 177 177 #define MANTIS_PCMCIA_RSTVAL (0xff << 0)
+105 -105
drivers/media/pci/mantis/mantis_vp1041.c
··· 47 47 /* 0x0000000b, *//* SYSREG */ 48 48 { STB0899_DEV_ID , 0x30 }, 49 49 { STB0899_DISCNTRL1 , 0x32 }, 50 - { STB0899_DISCNTRL2 , 0x80 }, 51 - { STB0899_DISRX_ST0 , 0x04 }, 52 - { STB0899_DISRX_ST1 , 0x00 }, 53 - { STB0899_DISPARITY , 0x00 }, 50 + { STB0899_DISCNTRL2 , 0x80 }, 51 + { STB0899_DISRX_ST0 , 0x04 }, 52 + { STB0899_DISRX_ST1 , 0x00 }, 53 + { STB0899_DISPARITY , 0x00 }, 54 54 { STB0899_DISSTATUS , 0x20 }, 55 - { STB0899_DISF22 , 0x99 }, 56 - { STB0899_DISF22RX , 0xa8 }, 55 + { STB0899_DISF22 , 0x99 }, 56 + { STB0899_DISF22RX , 0xa8 }, 57 57 /* SYSREG ? */ 58 - { STB0899_ACRPRESC , 0x11 }, 59 - { STB0899_ACRDIV1 , 0x0a }, 60 - { STB0899_ACRDIV2 , 0x05 }, 61 - { STB0899_DACR1 , 0x00 }, 62 - { STB0899_DACR2 , 0x00 }, 63 - { STB0899_OUTCFG , 0x00 }, 64 - { STB0899_MODECFG , 0x00 }, 58 + { STB0899_ACRPRESC , 0x11 }, 59 + { STB0899_ACRDIV1 , 0x0a }, 60 + { STB0899_ACRDIV2 , 0x05 }, 61 + { STB0899_DACR1 , 0x00 }, 62 + { STB0899_DACR2 , 0x00 }, 63 + { STB0899_OUTCFG , 0x00 }, 64 + { STB0899_MODECFG , 0x00 }, 65 65 { STB0899_IRQSTATUS_3 , 0xfe }, 66 66 { STB0899_IRQSTATUS_2 , 0x03 }, 67 67 { STB0899_IRQSTATUS_1 , 0x7c }, 68 68 { STB0899_IRQSTATUS_0 , 0xf4 }, 69 - { STB0899_IRQMSK_3 , 0xf3 }, 70 - { STB0899_IRQMSK_2 , 0xfc }, 71 - { STB0899_IRQMSK_1 , 0xff }, 69 + { STB0899_IRQMSK_3 , 0xf3 }, 70 + { STB0899_IRQMSK_2 , 0xfc }, 71 + { STB0899_IRQMSK_1 , 0xff }, 72 72 { STB0899_IRQMSK_0 , 0xff }, 73 73 { STB0899_IRQCFG , 0x00 }, 74 - { STB0899_I2CCFG , 0x88 }, 75 - { STB0899_I2CRPT , 0x58 }, 74 + { STB0899_I2CCFG , 0x88 }, 75 + { STB0899_I2CRPT , 0x58 }, 76 76 { STB0899_IOPVALUE5 , 0x00 }, 77 77 { STB0899_IOPVALUE4 , 0x33 }, 78 78 { STB0899_IOPVALUE3 , 0x6d }, 79 79 { STB0899_IOPVALUE2 , 0x90 }, 80 80 { STB0899_IOPVALUE1 , 0x60 }, 81 81 { STB0899_IOPVALUE0 , 0x00 }, 82 - { STB0899_GPIO00CFG , 0x82 }, 83 - { STB0899_GPIO01CFG , 0x82 }, 84 - { STB0899_GPIO02CFG , 0x82 }, 85 - { STB0899_GPIO03CFG , 0x82 }, 86 - { STB0899_GPIO04CFG , 0x82 }, 87 - { STB0899_GPIO05CFG , 0x82 }, 88 - { STB0899_GPIO06CFG , 0x82 }, 89 - { STB0899_GPIO07CFG , 0x82 }, 90 - { STB0899_GPIO08CFG , 0x82 }, 91 - { STB0899_GPIO09CFG , 0x82 }, 92 - { STB0899_GPIO10CFG , 0x82 }, 93 - { STB0899_GPIO11CFG , 0x82 }, 94 - { STB0899_GPIO12CFG , 0x82 }, 95 - { STB0899_GPIO13CFG , 0x82 }, 96 - { STB0899_GPIO14CFG , 0x82 }, 97 - { STB0899_GPIO15CFG , 0x82 }, 98 - { STB0899_GPIO16CFG , 0x82 }, 99 - { STB0899_GPIO17CFG , 0x82 }, 100 - { STB0899_GPIO18CFG , 0x82 }, 101 - { STB0899_GPIO19CFG , 0x82 }, 102 - { STB0899_GPIO20CFG , 0x82 }, 103 - { STB0899_SDATCFG , 0xb8 }, 104 - { STB0899_SCLTCFG , 0xba }, 105 - { STB0899_AGCRFCFG , 0x1c }, /* 0x11 */ 106 - { STB0899_GPIO22 , 0x82 }, /* AGCBB2CFG */ 107 - { STB0899_GPIO21 , 0x91 }, /* AGCBB1CFG */ 108 - { STB0899_DIRCLKCFG , 0x82 }, 109 - { STB0899_CLKOUT27CFG , 0x7e }, 110 - { STB0899_STDBYCFG , 0x82 }, 111 - { STB0899_CS0CFG , 0x82 }, 112 - { STB0899_CS1CFG , 0x82 }, 113 - { STB0899_DISEQCOCFG , 0x20 }, 82 + { STB0899_GPIO00CFG , 0x82 }, 83 + { STB0899_GPIO01CFG , 0x82 }, 84 + { STB0899_GPIO02CFG , 0x82 }, 85 + { STB0899_GPIO03CFG , 0x82 }, 86 + { STB0899_GPIO04CFG , 0x82 }, 87 + { STB0899_GPIO05CFG , 0x82 }, 88 + { STB0899_GPIO06CFG , 0x82 }, 89 + { STB0899_GPIO07CFG , 0x82 }, 90 + { STB0899_GPIO08CFG , 0x82 }, 91 + { STB0899_GPIO09CFG , 0x82 }, 92 + { STB0899_GPIO10CFG , 0x82 }, 93 + { STB0899_GPIO11CFG , 0x82 }, 94 + { STB0899_GPIO12CFG , 0x82 }, 95 + { STB0899_GPIO13CFG , 0x82 }, 96 + { STB0899_GPIO14CFG , 0x82 }, 97 + { STB0899_GPIO15CFG , 0x82 }, 98 + { STB0899_GPIO16CFG , 0x82 }, 99 + { STB0899_GPIO17CFG , 0x82 }, 100 + { STB0899_GPIO18CFG , 0x82 }, 101 + { STB0899_GPIO19CFG , 0x82 }, 102 + { STB0899_GPIO20CFG , 0x82 }, 103 + { STB0899_SDATCFG , 0xb8 }, 104 + { STB0899_SCLTCFG , 0xba }, 105 + { STB0899_AGCRFCFG , 0x1c }, /* 0x11 */ 106 + { STB0899_GPIO22 , 0x82 }, /* AGCBB2CFG */ 107 + { STB0899_GPIO21 , 0x91 }, /* AGCBB1CFG */ 108 + { STB0899_DIRCLKCFG , 0x82 }, 109 + { STB0899_CLKOUT27CFG , 0x7e }, 110 + { STB0899_STDBYCFG , 0x82 }, 111 + { STB0899_CS0CFG , 0x82 }, 112 + { STB0899_CS1CFG , 0x82 }, 113 + { STB0899_DISEQCOCFG , 0x20 }, 114 114 { STB0899_GPIO32CFG , 0x82 }, 115 115 { STB0899_GPIO33CFG , 0x82 }, 116 116 { STB0899_GPIO34CFG , 0x82 }, ··· 119 119 { STB0899_GPIO37CFG , 0x82 }, 120 120 { STB0899_GPIO38CFG , 0x82 }, 121 121 { STB0899_GPIO39CFG , 0x82 }, 122 - { STB0899_NCOARSE , 0x17 }, /* 0x15 = 27 Mhz Clock, F/3 = 198MHz, F/6 = 99MHz */ 123 - { STB0899_SYNTCTRL , 0x02 }, /* 0x00 = CLK from CLKI, 0x02 = CLK from XTALI */ 124 - { STB0899_FILTCTRL , 0x00 }, 125 - { STB0899_SYSCTRL , 0x01 }, 126 - { STB0899_STOPCLK1 , 0x20 }, 127 - { STB0899_STOPCLK2 , 0x00 }, 122 + { STB0899_NCOARSE , 0x17 }, /* 0x15 = 27 Mhz Clock, F/3 = 198MHz, F/6 = 99MHz */ 123 + { STB0899_SYNTCTRL , 0x02 }, /* 0x00 = CLK from CLKI, 0x02 = CLK from XTALI */ 124 + { STB0899_FILTCTRL , 0x00 }, 125 + { STB0899_SYSCTRL , 0x01 }, 126 + { STB0899_STOPCLK1 , 0x20 }, 127 + { STB0899_STOPCLK2 , 0x00 }, 128 128 { STB0899_INTBUFSTATUS , 0x00 }, 129 - { STB0899_INTBUFCTRL , 0x0a }, 129 + { STB0899_INTBUFCTRL , 0x0a }, 130 130 { 0xffff , 0xff }, 131 131 }; 132 132 133 133 static const struct stb0899_s1_reg vp1041_stb0899_s1_init_3[] = { 134 - { STB0899_DEMOD , 0x00 }, 135 - { STB0899_RCOMPC , 0xc9 }, 136 - { STB0899_AGC1CN , 0x01 }, 137 - { STB0899_AGC1REF , 0x10 }, 134 + { STB0899_DEMOD , 0x00 }, 135 + { STB0899_RCOMPC , 0xc9 }, 136 + { STB0899_AGC1CN , 0x01 }, 137 + { STB0899_AGC1REF , 0x10 }, 138 138 { STB0899_RTC , 0x23 }, 139 - { STB0899_TMGCFG , 0x4e }, 140 - { STB0899_AGC2REF , 0x34 }, 141 - { STB0899_TLSR , 0x84 }, 142 - { STB0899_CFD , 0xf7 }, 139 + { STB0899_TMGCFG , 0x4e }, 140 + { STB0899_AGC2REF , 0x34 }, 141 + { STB0899_TLSR , 0x84 }, 142 + { STB0899_CFD , 0xf7 }, 143 143 { STB0899_ACLC , 0x87 }, 144 - { STB0899_BCLC , 0x94 }, 145 - { STB0899_EQON , 0x41 }, 146 - { STB0899_LDT , 0xf1 }, 147 - { STB0899_LDT2 , 0xe3 }, 148 - { STB0899_EQUALREF , 0xb4 }, 149 - { STB0899_TMGRAMP , 0x10 }, 150 - { STB0899_TMGTHD , 0x30 }, 144 + { STB0899_BCLC , 0x94 }, 145 + { STB0899_EQON , 0x41 }, 146 + { STB0899_LDT , 0xf1 }, 147 + { STB0899_LDT2 , 0xe3 }, 148 + { STB0899_EQUALREF , 0xb4 }, 149 + { STB0899_TMGRAMP , 0x10 }, 150 + { STB0899_TMGTHD , 0x30 }, 151 151 { STB0899_IDCCOMP , 0xfd }, 152 152 { STB0899_QDCCOMP , 0xff }, 153 153 { STB0899_POWERI , 0x0c }, ··· 166 166 { STB0899_NIRL , 0x80 }, 167 167 { STB0899_ISYMB , 0x1d }, 168 168 { STB0899_QSYMB , 0xa6 }, 169 - { STB0899_SFRH , 0x2f }, 170 - { STB0899_SFRM , 0x68 }, 171 - { STB0899_SFRL , 0x40 }, 172 - { STB0899_SFRUPH , 0x2f }, 173 - { STB0899_SFRUPM , 0x68 }, 174 - { STB0899_SFRUPL , 0x40 }, 169 + { STB0899_SFRH , 0x2f }, 170 + { STB0899_SFRM , 0x68 }, 171 + { STB0899_SFRL , 0x40 }, 172 + { STB0899_SFRUPH , 0x2f }, 173 + { STB0899_SFRUPM , 0x68 }, 174 + { STB0899_SFRUPL , 0x40 }, 175 175 { STB0899_EQUAI1 , 0x02 }, 176 176 { STB0899_EQUAQ1 , 0xff }, 177 177 { STB0899_EQUAI2 , 0x04 }, ··· 183 183 { STB0899_EQUAI5 , 0x08 }, 184 184 { STB0899_EQUAQ5 , 0xf5 }, 185 185 { STB0899_DSTATUS2 , 0x00 }, 186 - { STB0899_VSTATUS , 0x00 }, 186 + { STB0899_VSTATUS , 0x00 }, 187 187 { STB0899_VERROR , 0x86 }, 188 188 { STB0899_IQSWAP , 0x2a }, 189 189 { STB0899_ECNT1M , 0x00 }, ··· 192 192 { STB0899_ECNT2L , 0x00 }, 193 193 { STB0899_ECNT3M , 0x0a }, 194 194 { STB0899_ECNT3L , 0xad }, 195 - { STB0899_FECAUTO1 , 0x06 }, 195 + { STB0899_FECAUTO1 , 0x06 }, 196 196 { STB0899_FECM , 0x01 }, 197 - { STB0899_VTH12 , 0xb0 }, 198 - { STB0899_VTH23 , 0x7a }, 197 + { STB0899_VTH12 , 0xb0 }, 198 + { STB0899_VTH23 , 0x7a }, 199 199 { STB0899_VTH34 , 0x58 }, 200 - { STB0899_VTH56 , 0x38 }, 201 - { STB0899_VTH67 , 0x34 }, 202 - { STB0899_VTH78 , 0x24 }, 203 - { STB0899_PRVIT , 0xff }, 204 - { STB0899_VITSYNC , 0x19 }, 205 - { STB0899_RSULC , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */ 206 - { STB0899_TSULC , 0x42 }, 207 - { STB0899_RSLLC , 0x41 }, 200 + { STB0899_VTH56 , 0x38 }, 201 + { STB0899_VTH67 , 0x34 }, 202 + { STB0899_VTH78 , 0x24 }, 203 + { STB0899_PRVIT , 0xff }, 204 + { STB0899_VITSYNC , 0x19 }, 205 + { STB0899_RSULC , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */ 206 + { STB0899_TSULC , 0x42 }, 207 + { STB0899_RSLLC , 0x41 }, 208 208 { STB0899_TSLPL , 0x12 }, 209 - { STB0899_TSCFGH , 0x0c }, 210 - { STB0899_TSCFGM , 0x00 }, 211 - { STB0899_TSCFGL , 0x00 }, 209 + { STB0899_TSCFGH , 0x0c }, 210 + { STB0899_TSCFGM , 0x00 }, 211 + { STB0899_TSCFGL , 0x00 }, 212 212 { STB0899_TSOUT , 0x69 }, /* 0x0d for CAM */ 213 - { STB0899_RSSYNCDEL , 0x00 }, 214 - { STB0899_TSINHDELH , 0x02 }, 213 + { STB0899_RSSYNCDEL , 0x00 }, 214 + { STB0899_TSINHDELH , 0x02 }, 215 215 { STB0899_TSINHDELM , 0x00 }, 216 216 { STB0899_TSINHDELL , 0x00 }, 217 217 { STB0899_TSLLSTKM , 0x1b }, ··· 222 222 { STB0899_PCKLENLL , 0xcc }, 223 223 { STB0899_RSPCKLEN , 0xbd }, 224 224 { STB0899_TSSTATUS , 0x90 }, 225 - { STB0899_ERRCTRL1 , 0xb6 }, 226 - { STB0899_ERRCTRL2 , 0x95 }, 227 - { STB0899_ERRCTRL3 , 0x8d }, 225 + { STB0899_ERRCTRL1 , 0xb6 }, 226 + { STB0899_ERRCTRL2 , 0x95 }, 227 + { STB0899_ERRCTRL3 , 0x8d }, 228 228 { STB0899_DMONMSK1 , 0x27 }, 229 229 { STB0899_DMONMSK0 , 0x03 }, 230 - { STB0899_DEMAPVIT , 0x5c }, 230 + { STB0899_DEMAPVIT , 0x5c }, 231 231 { STB0899_PLPARM , 0x19 }, 232 - { STB0899_PDELCTRL , 0x48 }, 233 - { STB0899_PDELCTRL2 , 0x00 }, 234 - { STB0899_BBHCTRL1 , 0x00 }, 235 - { STB0899_BBHCTRL2 , 0x00 }, 236 - { STB0899_HYSTTHRESH , 0x77 }, 232 + { STB0899_PDELCTRL , 0x48 }, 233 + { STB0899_PDELCTRL2 , 0x00 }, 234 + { STB0899_BBHCTRL1 , 0x00 }, 235 + { STB0899_BBHCTRL2 , 0x00 }, 236 + { STB0899_HYSTTHRESH , 0x77 }, 237 237 { STB0899_MATCSTM , 0x00 }, 238 238 { STB0899_MATCSTL , 0x00 }, 239 239 { STB0899_UPLCSTM , 0x00 }, ··· 270 270 .init_s2_fec = stb0899_s2_init_4, 271 271 .init_tst = stb0899_s1_init_5, 272 272 273 - .demod_address = 0x68, /* 0xd0 >> 1 */ 273 + .demod_address = 0x68, /* 0xd0 >> 1 */ 274 274 275 275 .xtal_freq = 27000000, 276 276 .inversion = IQ_SWAP_ON,
+1 -1
drivers/media/pci/meye/meye.c
··· 1536 1536 static const struct video_device meye_template = { 1537 1537 .name = "meye", 1538 1538 .fops = &meye_fops, 1539 - .ioctl_ops = &meye_ioctl_ops, 1539 + .ioctl_ops = &meye_ioctl_ops, 1540 1540 .release = video_device_release_empty, 1541 1541 }; 1542 1542
+32 -32
drivers/media/pci/saa7134/saa7134-cards.c
··· 323 323 .radio_type = UNSET, 324 324 .tuner_addr = ADDR_UNSET, 325 325 .radio_addr = ADDR_UNSET, 326 - .empress_addr = 0x20, 326 + .empress_addr = 0x20, 327 327 328 328 .inputs = {{ 329 329 .type = SAA7134_INPUT_COMPOSITE1, ··· 454 454 .radio_type = UNSET, 455 455 .tuner_addr = ADDR_UNSET, 456 456 .radio_addr = ADDR_UNSET, 457 - .empress_addr = 0x20, 457 + .empress_addr = 0x20, 458 458 .tda9887_conf = TDA9887_PRESENT, 459 459 .gpiomask = 0x820000, 460 460 .inputs = {{ ··· 849 849 .radio_type = UNSET, 850 850 .tuner_addr = ADDR_UNSET, 851 851 .radio_addr = ADDR_UNSET, 852 - .empress_addr = 0x20, 852 + .empress_addr = 0x20, 853 853 .inputs = {{ 854 854 .type = SAA7134_INPUT_COMPOSITE1, 855 855 .vmux = 4, ··· 1006 1006 .radio_type = UNSET, 1007 1007 .tuner_addr = ADDR_UNSET, 1008 1008 .radio_addr = ADDR_UNSET, 1009 - .empress_addr = 0x20, 1009 + .empress_addr = 0x20, 1010 1010 .inputs = {{ 1011 1011 .type = SAA7134_INPUT_COMPOSITE1, 1012 1012 .vmux = 1, ··· 1767 1767 .radio_type = UNSET, 1768 1768 .tuner_addr = ADDR_UNSET, 1769 1769 .radio_addr = ADDR_UNSET, 1770 - .rds_addr = 0x10, 1770 + .rds_addr = 0x10, 1771 1771 .tda9887_conf = TDA9887_PRESENT, 1772 1772 .inputs = {{ 1773 1773 .type = SAA7134_INPUT_TV, ··· 2412 2412 .radio_type = UNSET, 2413 2413 .tuner_addr = ADDR_UNSET, 2414 2414 .radio_addr = ADDR_UNSET, 2415 - .empress_addr = 0x21, 2415 + .empress_addr = 0x21, 2416 2416 .inputs = {{ 2417 2417 .type = SAA7134_INPUT_COMPOSITE0, 2418 2418 .vmux = 0, ··· 3978 3978 [SAA7134_BOARD_BEHOLD_407] = { 3979 3979 /* Beholder Intl. Ltd. 2008 */ 3980 3980 /*Dmitry Belimov <d.belimov@gmail.com> */ 3981 - .name = "Beholder BeholdTV 407", 3982 - .audio_clock = 0x00187de7, 3983 - .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, 3984 - .radio_type = UNSET, 3985 - .tuner_addr = ADDR_UNSET, 3986 - .radio_addr = ADDR_UNSET, 3987 - .tda9887_conf = TDA9887_PRESENT, 3981 + .name = "Beholder BeholdTV 407", 3982 + .audio_clock = 0x00187de7, 3983 + .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, 3984 + .radio_type = UNSET, 3985 + .tuner_addr = ADDR_UNSET, 3986 + .radio_addr = ADDR_UNSET, 3987 + .tda9887_conf = TDA9887_PRESENT, 3988 3988 .gpiomask = 0x00008000, 3989 3989 .inputs = {{ 3990 3990 .type = SAA7134_INPUT_SVIDEO, ··· 4006 4006 [SAA7134_BOARD_BEHOLD_407FM] = { 4007 4007 /* Beholder Intl. Ltd. 2008 */ 4008 4008 /*Dmitry Belimov <d.belimov@gmail.com> */ 4009 - .name = "Beholder BeholdTV 407 FM", 4010 - .audio_clock = 0x00187de7, 4011 - .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, 4012 - .radio_type = UNSET, 4013 - .tuner_addr = ADDR_UNSET, 4014 - .radio_addr = ADDR_UNSET, 4015 - .tda9887_conf = TDA9887_PRESENT, 4009 + .name = "Beholder BeholdTV 407 FM", 4010 + .audio_clock = 0x00187de7, 4011 + .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, 4012 + .radio_type = UNSET, 4013 + .tuner_addr = ADDR_UNSET, 4014 + .radio_addr = ADDR_UNSET, 4015 + .tda9887_conf = TDA9887_PRESENT, 4016 4016 .gpiomask = 0x00008000, 4017 4017 .inputs = {{ 4018 4018 .type = SAA7134_INPUT_SVIDEO, ··· 4103 4103 .radio_type = UNSET, 4104 4104 .tuner_addr = ADDR_UNSET, 4105 4105 .radio_addr = ADDR_UNSET, 4106 - .rds_addr = 0x10, 4106 + .rds_addr = 0x10, 4107 4107 .tda9887_conf = TDA9887_PRESENT, 4108 4108 .gpiomask = 0x00008000, 4109 4109 .inputs = {{ ··· 4166 4166 .radio_type = UNSET, 4167 4167 .tuner_addr = ADDR_UNSET, 4168 4168 .radio_addr = ADDR_UNSET, 4169 - .rds_addr = 0x10, 4169 + .rds_addr = 0x10, 4170 4170 .tda9887_conf = TDA9887_PRESENT, 4171 4171 .gpiomask = 0x00008000, 4172 4172 .inputs = {{ ··· 4196 4196 .radio_type = UNSET, 4197 4197 .tuner_addr = ADDR_UNSET, 4198 4198 .radio_addr = ADDR_UNSET, 4199 - .rds_addr = 0x10, 4199 + .rds_addr = 0x10, 4200 4200 .tda9887_conf = TDA9887_PRESENT, 4201 4201 .gpiomask = 0x00008000, 4202 4202 .inputs = {{ ··· 4366 4366 .radio_type = UNSET, 4367 4367 .tuner_addr = ADDR_UNSET, 4368 4368 .radio_addr = ADDR_UNSET, 4369 - .rds_addr = 0x10, 4369 + .rds_addr = 0x10, 4370 4370 .tda9887_conf = TDA9887_PRESENT, 4371 4371 .inputs = {{ 4372 4372 .type = SAA7134_INPUT_TV, ··· 4394 4394 .radio_type = UNSET, 4395 4395 .tuner_addr = ADDR_UNSET, 4396 4396 .radio_addr = ADDR_UNSET, 4397 - .rds_addr = 0x10, 4397 + .rds_addr = 0x10, 4398 4398 .tda9887_conf = TDA9887_PRESENT, 4399 4399 .inputs = {{ 4400 4400 .type = SAA7134_INPUT_TV, ··· 4422 4422 .radio_type = UNSET, 4423 4423 .tuner_addr = ADDR_UNSET, 4424 4424 .radio_addr = ADDR_UNSET, 4425 - .rds_addr = 0x10, 4425 + .rds_addr = 0x10, 4426 4426 .tda9887_conf = TDA9887_PRESENT, 4427 4427 .inputs = {{ 4428 4428 .type = SAA7134_INPUT_TV, ··· 4450 4450 .radio_type = UNSET, 4451 4451 .tuner_addr = ADDR_UNSET, 4452 4452 .radio_addr = ADDR_UNSET, 4453 - .rds_addr = 0x10, 4453 + .rds_addr = 0x10, 4454 4454 .tda9887_conf = TDA9887_PRESENT, 4455 4455 .inputs = {{ 4456 4456 .type = SAA7134_INPUT_TV, ··· 4481 4481 .radio_type = UNSET, 4482 4482 .tuner_addr = ADDR_UNSET, 4483 4483 .radio_addr = ADDR_UNSET, 4484 - .empress_addr = 0x20, 4484 + .empress_addr = 0x20, 4485 4485 .tda9887_conf = TDA9887_PRESENT, 4486 4486 .inputs = { { 4487 4487 .type = SAA7134_INPUT_TV, ··· 4517 4517 .radio_type = UNSET, 4518 4518 .tuner_addr = ADDR_UNSET, 4519 4519 .radio_addr = ADDR_UNSET, 4520 - .empress_addr = 0x20, 4520 + .empress_addr = 0x20, 4521 4521 .tda9887_conf = TDA9887_PRESENT, 4522 4522 .inputs = { { 4523 4523 .type = SAA7134_INPUT_TV, ··· 4554 4554 .radio_type = UNSET, 4555 4555 .tuner_addr = ADDR_UNSET, 4556 4556 .radio_addr = ADDR_UNSET, 4557 - .rds_addr = 0x10, 4558 - .empress_addr = 0x20, 4557 + .rds_addr = 0x10, 4558 + .empress_addr = 0x20, 4559 4559 .tda9887_conf = TDA9887_PRESENT, 4560 4560 .inputs = { { 4561 4561 .type = SAA7134_INPUT_TV, ··· 5297 5297 .radio_type = UNSET, 5298 5298 .tuner_addr = ADDR_UNSET, 5299 5299 .radio_addr = ADDR_UNSET, 5300 - .rds_addr = 0x10, 5300 + .rds_addr = 0x10, 5301 5301 .tda9887_conf = TDA9887_PRESENT, 5302 5302 .gpiomask = 0x00008000, 5303 5303 .inputs = {{
+2 -2
drivers/media/pci/saa7134/saa7134-dvb.c
··· 1389 1389 if (configure_tda827x_fe(dev, &lifeview_trio_config, 1390 1390 &tda827x_cfg_0) < 0) 1391 1391 goto detach_frontend; 1392 - } else { /* satellite */ 1392 + } else { /* satellite */ 1393 1393 fe0->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, &dev->i2c_adap); 1394 1394 if (fe0->dvb.frontend) { 1395 1395 if (dvb_attach(tda826x_attach, fe0->dvb.frontend, 0x63, ··· 1659 1659 if (configure_tda827x_fe(dev, &asus_tiger_3in1_config, 1660 1660 &tda827x_cfg_2) < 0) 1661 1661 goto detach_frontend; 1662 - } else { /* satellite */ 1662 + } else { /* satellite */ 1663 1663 fe0->dvb.frontend = dvb_attach(tda10086_attach, 1664 1664 &flydvbs, &dev->i2c_adap); 1665 1665 if (fe0->dvb.frontend) {
+2 -2
drivers/media/pci/saa7134/saa7134-video.c
··· 2043 2043 struct video_device saa7134_video_template = { 2044 2044 .name = "saa7134-video", 2045 2045 .fops = &video_fops, 2046 - .ioctl_ops = &video_ioctl_ops, 2046 + .ioctl_ops = &video_ioctl_ops, 2047 2047 .tvnorms = SAA7134_NORMS, 2048 2048 }; 2049 2049 2050 2050 struct video_device saa7134_radio_template = { 2051 2051 .name = "saa7134-radio", 2052 2052 .fops = &radio_fops, 2053 - .ioctl_ops = &radio_ioctl_ops, 2053 + .ioctl_ops = &radio_ioctl_ops, 2054 2054 }; 2055 2055 2056 2056 static const struct v4l2_ctrl_ops saa7134_ctrl_ops = {
+4 -4
drivers/media/pci/saa7134/saa7134.h
··· 261 261 #define SAA7134_BOARD_SABRENT_TV_PCB05 115 262 262 #define SAA7134_BOARD_10MOONSTVMASTER3 116 263 263 #define SAA7134_BOARD_AVERMEDIA_SUPER_007 117 264 - #define SAA7134_BOARD_BEHOLD_401 118 265 - #define SAA7134_BOARD_BEHOLD_403 119 264 + #define SAA7134_BOARD_BEHOLD_401 118 265 + #define SAA7134_BOARD_BEHOLD_403 119 266 266 #define SAA7134_BOARD_BEHOLD_403FM 120 267 267 #define SAA7134_BOARD_BEHOLD_405 121 268 268 #define SAA7134_BOARD_BEHOLD_405FM 122 ··· 581 581 /* config info */ 582 582 unsigned int board; 583 583 unsigned int tuner_type; 584 - unsigned int radio_type; 584 + unsigned int radio_type; 585 585 unsigned char tuner_addr; 586 586 unsigned char radio_addr; 587 587 ··· 592 592 struct i2c_adapter i2c_adap; 593 593 struct i2c_client i2c_client; 594 594 unsigned char eedata[256]; 595 - int has_rds; 595 + int has_rds; 596 596 597 597 /* video overlay */ 598 598 struct v4l2_framebuffer ovbuf;
+11 -11
drivers/media/pci/saa7146/hexium_gemini.c
··· 70 70 struct video_device video_dev; 71 71 struct i2c_adapter i2c_adapter; 72 72 73 - int cur_input; /* current input */ 74 - v4l2_std_id cur_std; /* current standard */ 73 + int cur_input; /* current input */ 74 + v4l2_std_id cur_std; /* current standard */ 75 75 }; 76 76 77 77 /* Samsung KS0127B decoder default registers */ ··· 138 138 are currently *not* supported*/ 139 139 static struct saa7146_standard hexium_standards[] = { 140 140 { 141 - .name = "PAL", .id = V4L2_STD_PAL, 142 - .v_offset = 28, .v_field = 288, 143 - .h_offset = 1, .h_pixels = 680, 141 + .name = "PAL", .id = V4L2_STD_PAL, 142 + .v_offset = 28, .v_field = 288, 143 + .h_offset = 1, .h_pixels = 680, 144 144 .v_max_out = 576, .h_max_out = 768, 145 145 }, { 146 - .name = "NTSC", .id = V4L2_STD_NTSC, 147 - .v_offset = 28, .v_field = 240, 148 - .h_offset = 1, .h_pixels = 640, 146 + .name = "NTSC", .id = V4L2_STD_NTSC, 147 + .v_offset = 28, .v_field = 240, 148 + .h_offset = 1, .h_pixels = 640, 149 149 .v_max_out = 480, .h_max_out = 640, 150 150 }, { 151 - .name = "SECAM", .id = V4L2_STD_SECAM, 152 - .v_offset = 28, .v_field = 288, 153 - .h_offset = 1, .h_pixels = 720, 151 + .name = "SECAM", .id = V4L2_STD_SECAM, 152 + .v_offset = 28, .v_field = 288, 153 + .h_offset = 1, .h_pixels = 720, 154 154 .v_max_out = 576, .h_max_out = 768, 155 155 } 156 156 };
+9 -9
drivers/media/pci/saa7146/hexium_orion.c
··· 188 188 189 189 static struct saa7146_standard hexium_standards[] = { 190 190 { 191 - .name = "PAL", .id = V4L2_STD_PAL, 192 - .v_offset = 16, .v_field = 288, 193 - .h_offset = 1, .h_pixels = 680, 191 + .name = "PAL", .id = V4L2_STD_PAL, 192 + .v_offset = 16, .v_field = 288, 193 + .h_offset = 1, .h_pixels = 680, 194 194 .v_max_out = 576, .h_max_out = 768, 195 195 }, { 196 - .name = "NTSC", .id = V4L2_STD_NTSC, 197 - .v_offset = 16, .v_field = 240, 198 - .h_offset = 1, .h_pixels = 640, 196 + .name = "NTSC", .id = V4L2_STD_NTSC, 197 + .v_offset = 16, .v_field = 240, 198 + .h_offset = 1, .h_pixels = 640, 199 199 .v_max_out = 480, .h_max_out = 640, 200 200 }, { 201 - .name = "SECAM", .id = V4L2_STD_SECAM, 202 - .v_offset = 16, .v_field = 288, 203 - .h_offset = 1, .h_pixels = 720, 201 + .name = "SECAM", .id = V4L2_STD_SECAM, 202 + .v_offset = 16, .v_field = 288, 203 + .h_offset = 1, .h_pixels = 720, 204 204 .v_max_out = 576, .h_max_out = 768, 205 205 } 206 206 };
+12 -12
drivers/media/pci/saa7146/mxb.c
··· 793 793 794 794 static struct saa7146_standard standard[] = { 795 795 { 796 - .name = "PAL-BG", .id = V4L2_STD_PAL_BG, 797 - .v_offset = 0x17, .v_field = 288, 798 - .h_offset = 0x14, .h_pixels = 680, 796 + .name = "PAL-BG", .id = V4L2_STD_PAL_BG, 797 + .v_offset = 0x17, .v_field = 288, 798 + .h_offset = 0x14, .h_pixels = 680, 799 799 .v_max_out = 576, .h_max_out = 768, 800 800 }, { 801 - .name = "PAL-I", .id = V4L2_STD_PAL_I, 802 - .v_offset = 0x17, .v_field = 288, 803 - .h_offset = 0x14, .h_pixels = 680, 801 + .name = "PAL-I", .id = V4L2_STD_PAL_I, 802 + .v_offset = 0x17, .v_field = 288, 803 + .h_offset = 0x14, .h_pixels = 680, 804 804 .v_max_out = 576, .h_max_out = 768, 805 805 }, { 806 - .name = "NTSC", .id = V4L2_STD_NTSC, 807 - .v_offset = 0x16, .v_field = 240, 808 - .h_offset = 0x06, .h_pixels = 708, 806 + .name = "NTSC", .id = V4L2_STD_NTSC, 807 + .v_offset = 0x16, .v_field = 240, 808 + .h_offset = 0x06, .h_pixels = 708, 809 809 .v_max_out = 480, .h_max_out = 640, 810 810 }, { 811 - .name = "SECAM", .id = V4L2_STD_SECAM, 812 - .v_offset = 0x14, .v_field = 288, 813 - .h_offset = 0x14, .h_pixels = 720, 811 + .name = "SECAM", .id = V4L2_STD_SECAM, 812 + .v_offset = 0x14, .v_field = 288, 813 + .h_offset = 0x14, .h_pixels = 720, 814 814 .v_max_out = 576, .h_max_out = 768, 815 815 } 816 816 };
+1 -1
drivers/media/pci/ttpci/av7110.h
··· 52 52 enum {AV_PES_STREAM, PS_STREAM, TS_STREAM, PES_STREAM}; 53 53 54 54 enum av7110_video_mode { 55 - AV7110_VIDEO_MODE_PAL = 0, 55 + AV7110_VIDEO_MODE_PAL = 0, 56 56 AV7110_VIDEO_MODE_NTSC = 1 57 57 }; 58 58
+3 -3
drivers/media/pci/ttpci/budget-av.c
··· 1181 1181 #define SUBID_DVBS_KNC1_PLUS 0x0011 1182 1182 #define SUBID_DVBS_TYPHOON 0x4f56 1183 1183 #define SUBID_DVBS_CINERGY1200 0x1154 1184 - #define SUBID_DVBS_CYNERGY1200N 0x1155 1184 + #define SUBID_DVBS_CYNERGY1200N 0x1155 1185 1185 #define SUBID_DVBS_TV_STAR 0x0014 1186 1186 #define SUBID_DVBS_TV_STAR_PLUS_X4 0x0015 1187 1187 #define SUBID_DVBS_TV_STAR_CI 0x0016 1188 1188 #define SUBID_DVBS2_KNC1 0x0018 1189 1189 #define SUBID_DVBS2_KNC1_OEM 0x0019 1190 - #define SUBID_DVBS_EASYWATCH_1 0x001a 1191 - #define SUBID_DVBS_EASYWATCH_2 0x001b 1190 + #define SUBID_DVBS_EASYWATCH_1 0x001a 1191 + #define SUBID_DVBS_EASYWATCH_2 0x001b 1192 1192 #define SUBID_DVBS2_EASYWATCH 0x001d 1193 1193 #define SUBID_DVBS_EASYWATCH 0x001e 1194 1194
+105 -105
drivers/media/pci/ttpci/budget-ci.c
··· 1050 1050 1051 1051 { STB0899_DEV_ID , 0x81 }, 1052 1052 { STB0899_DISCNTRL1 , 0x32 }, 1053 - { STB0899_DISCNTRL2 , 0x80 }, 1054 - { STB0899_DISRX_ST0 , 0x04 }, 1055 - { STB0899_DISRX_ST1 , 0x00 }, 1056 - { STB0899_DISPARITY , 0x00 }, 1053 + { STB0899_DISCNTRL2 , 0x80 }, 1054 + { STB0899_DISRX_ST0 , 0x04 }, 1055 + { STB0899_DISRX_ST1 , 0x00 }, 1056 + { STB0899_DISPARITY , 0x00 }, 1057 1057 { STB0899_DISSTATUS , 0x20 }, 1058 - { STB0899_DISF22 , 0x8c }, 1059 - { STB0899_DISF22RX , 0x9a }, 1058 + { STB0899_DISF22 , 0x8c }, 1059 + { STB0899_DISF22RX , 0x9a }, 1060 1060 { STB0899_SYSREG , 0x0b }, 1061 - { STB0899_ACRPRESC , 0x11 }, 1062 - { STB0899_ACRDIV1 , 0x0a }, 1063 - { STB0899_ACRDIV2 , 0x05 }, 1064 - { STB0899_DACR1 , 0x00 }, 1065 - { STB0899_DACR2 , 0x00 }, 1066 - { STB0899_OUTCFG , 0x00 }, 1067 - { STB0899_MODECFG , 0x00 }, 1061 + { STB0899_ACRPRESC , 0x11 }, 1062 + { STB0899_ACRDIV1 , 0x0a }, 1063 + { STB0899_ACRDIV2 , 0x05 }, 1064 + { STB0899_DACR1 , 0x00 }, 1065 + { STB0899_DACR2 , 0x00 }, 1066 + { STB0899_OUTCFG , 0x00 }, 1067 + { STB0899_MODECFG , 0x00 }, 1068 1068 { STB0899_IRQSTATUS_3 , 0x30 }, 1069 1069 { STB0899_IRQSTATUS_2 , 0x00 }, 1070 1070 { STB0899_IRQSTATUS_1 , 0x00 }, 1071 1071 { STB0899_IRQSTATUS_0 , 0x00 }, 1072 - { STB0899_IRQMSK_3 , 0xf3 }, 1073 - { STB0899_IRQMSK_2 , 0xfc }, 1074 - { STB0899_IRQMSK_1 , 0xff }, 1072 + { STB0899_IRQMSK_3 , 0xf3 }, 1073 + { STB0899_IRQMSK_2 , 0xfc }, 1074 + { STB0899_IRQMSK_1 , 0xff }, 1075 1075 { STB0899_IRQMSK_0 , 0xff }, 1076 1076 { STB0899_IRQCFG , 0x00 }, 1077 - { STB0899_I2CCFG , 0x88 }, 1078 - { STB0899_I2CRPT , 0x48 }, /* 12k Pullup, Repeater=16, Stop=disabled */ 1077 + { STB0899_I2CCFG , 0x88 }, 1078 + { STB0899_I2CRPT , 0x48 }, /* 12k Pullup, Repeater=16, Stop=disabled */ 1079 1079 { STB0899_IOPVALUE5 , 0x00 }, 1080 1080 { STB0899_IOPVALUE4 , 0x20 }, 1081 1081 { STB0899_IOPVALUE3 , 0xc9 }, 1082 1082 { STB0899_IOPVALUE2 , 0x90 }, 1083 1083 { STB0899_IOPVALUE1 , 0x40 }, 1084 1084 { STB0899_IOPVALUE0 , 0x00 }, 1085 - { STB0899_GPIO00CFG , 0x82 }, 1086 - { STB0899_GPIO01CFG , 0x82 }, 1087 - { STB0899_GPIO02CFG , 0x82 }, 1088 - { STB0899_GPIO03CFG , 0x82 }, 1089 - { STB0899_GPIO04CFG , 0x82 }, 1090 - { STB0899_GPIO05CFG , 0x82 }, 1091 - { STB0899_GPIO06CFG , 0x82 }, 1092 - { STB0899_GPIO07CFG , 0x82 }, 1093 - { STB0899_GPIO08CFG , 0x82 }, 1094 - { STB0899_GPIO09CFG , 0x82 }, 1095 - { STB0899_GPIO10CFG , 0x82 }, 1096 - { STB0899_GPIO11CFG , 0x82 }, 1097 - { STB0899_GPIO12CFG , 0x82 }, 1098 - { STB0899_GPIO13CFG , 0x82 }, 1099 - { STB0899_GPIO14CFG , 0x82 }, 1100 - { STB0899_GPIO15CFG , 0x82 }, 1101 - { STB0899_GPIO16CFG , 0x82 }, 1102 - { STB0899_GPIO17CFG , 0x82 }, 1103 - { STB0899_GPIO18CFG , 0x82 }, 1104 - { STB0899_GPIO19CFG , 0x82 }, 1105 - { STB0899_GPIO20CFG , 0x82 }, 1106 - { STB0899_SDATCFG , 0xb8 }, 1107 - { STB0899_SCLTCFG , 0xba }, 1108 - { STB0899_AGCRFCFG , 0x1c }, /* 0x11 */ 1109 - { STB0899_GPIO22 , 0x82 }, /* AGCBB2CFG */ 1110 - { STB0899_GPIO21 , 0x91 }, /* AGCBB1CFG */ 1111 - { STB0899_DIRCLKCFG , 0x82 }, 1112 - { STB0899_CLKOUT27CFG , 0x7e }, 1113 - { STB0899_STDBYCFG , 0x82 }, 1114 - { STB0899_CS0CFG , 0x82 }, 1115 - { STB0899_CS1CFG , 0x82 }, 1116 - { STB0899_DISEQCOCFG , 0x20 }, 1085 + { STB0899_GPIO00CFG , 0x82 }, 1086 + { STB0899_GPIO01CFG , 0x82 }, 1087 + { STB0899_GPIO02CFG , 0x82 }, 1088 + { STB0899_GPIO03CFG , 0x82 }, 1089 + { STB0899_GPIO04CFG , 0x82 }, 1090 + { STB0899_GPIO05CFG , 0x82 }, 1091 + { STB0899_GPIO06CFG , 0x82 }, 1092 + { STB0899_GPIO07CFG , 0x82 }, 1093 + { STB0899_GPIO08CFG , 0x82 }, 1094 + { STB0899_GPIO09CFG , 0x82 }, 1095 + { STB0899_GPIO10CFG , 0x82 }, 1096 + { STB0899_GPIO11CFG , 0x82 }, 1097 + { STB0899_GPIO12CFG , 0x82 }, 1098 + { STB0899_GPIO13CFG , 0x82 }, 1099 + { STB0899_GPIO14CFG , 0x82 }, 1100 + { STB0899_GPIO15CFG , 0x82 }, 1101 + { STB0899_GPIO16CFG , 0x82 }, 1102 + { STB0899_GPIO17CFG , 0x82 }, 1103 + { STB0899_GPIO18CFG , 0x82 }, 1104 + { STB0899_GPIO19CFG , 0x82 }, 1105 + { STB0899_GPIO20CFG , 0x82 }, 1106 + { STB0899_SDATCFG , 0xb8 }, 1107 + { STB0899_SCLTCFG , 0xba }, 1108 + { STB0899_AGCRFCFG , 0x1c }, /* 0x11 */ 1109 + { STB0899_GPIO22 , 0x82 }, /* AGCBB2CFG */ 1110 + { STB0899_GPIO21 , 0x91 }, /* AGCBB1CFG */ 1111 + { STB0899_DIRCLKCFG , 0x82 }, 1112 + { STB0899_CLKOUT27CFG , 0x7e }, 1113 + { STB0899_STDBYCFG , 0x82 }, 1114 + { STB0899_CS0CFG , 0x82 }, 1115 + { STB0899_CS1CFG , 0x82 }, 1116 + { STB0899_DISEQCOCFG , 0x20 }, 1117 1117 { STB0899_GPIO32CFG , 0x82 }, 1118 1118 { STB0899_GPIO33CFG , 0x82 }, 1119 1119 { STB0899_GPIO34CFG , 0x82 }, ··· 1122 1122 { STB0899_GPIO37CFG , 0x82 }, 1123 1123 { STB0899_GPIO38CFG , 0x82 }, 1124 1124 { STB0899_GPIO39CFG , 0x82 }, 1125 - { STB0899_NCOARSE , 0x15 }, /* 0x15 = 27 Mhz Clock, F/3 = 198MHz, F/6 = 99MHz */ 1126 - { STB0899_SYNTCTRL , 0x02 }, /* 0x00 = CLK from CLKI, 0x02 = CLK from XTALI */ 1127 - { STB0899_FILTCTRL , 0x00 }, 1128 - { STB0899_SYSCTRL , 0x00 }, 1129 - { STB0899_STOPCLK1 , 0x20 }, 1130 - { STB0899_STOPCLK2 , 0x00 }, 1125 + { STB0899_NCOARSE , 0x15 }, /* 0x15 = 27 Mhz Clock, F/3 = 198MHz, F/6 = 99MHz */ 1126 + { STB0899_SYNTCTRL , 0x02 }, /* 0x00 = CLK from CLKI, 0x02 = CLK from XTALI */ 1127 + { STB0899_FILTCTRL , 0x00 }, 1128 + { STB0899_SYSCTRL , 0x00 }, 1129 + { STB0899_STOPCLK1 , 0x20 }, 1130 + { STB0899_STOPCLK2 , 0x00 }, 1131 1131 { STB0899_INTBUFSTATUS , 0x00 }, 1132 - { STB0899_INTBUFCTRL , 0x0a }, 1132 + { STB0899_INTBUFCTRL , 0x0a }, 1133 1133 { 0xffff , 0xff }, 1134 1134 }; 1135 1135 1136 1136 static const struct stb0899_s1_reg tt3200_stb0899_s1_init_3[] = { 1137 - { STB0899_DEMOD , 0x00 }, 1138 - { STB0899_RCOMPC , 0xc9 }, 1139 - { STB0899_AGC1CN , 0x41 }, 1140 - { STB0899_AGC1REF , 0x10 }, 1137 + { STB0899_DEMOD , 0x00 }, 1138 + { STB0899_RCOMPC , 0xc9 }, 1139 + { STB0899_AGC1CN , 0x41 }, 1140 + { STB0899_AGC1REF , 0x10 }, 1141 1141 { STB0899_RTC , 0x7a }, 1142 - { STB0899_TMGCFG , 0x4e }, 1143 - { STB0899_AGC2REF , 0x34 }, 1144 - { STB0899_TLSR , 0x84 }, 1145 - { STB0899_CFD , 0xc7 }, 1142 + { STB0899_TMGCFG , 0x4e }, 1143 + { STB0899_AGC2REF , 0x34 }, 1144 + { STB0899_TLSR , 0x84 }, 1145 + { STB0899_CFD , 0xc7 }, 1146 1146 { STB0899_ACLC , 0x87 }, 1147 - { STB0899_BCLC , 0x94 }, 1148 - { STB0899_EQON , 0x41 }, 1149 - { STB0899_LDT , 0xdd }, 1150 - { STB0899_LDT2 , 0xc9 }, 1151 - { STB0899_EQUALREF , 0xb4 }, 1152 - { STB0899_TMGRAMP , 0x10 }, 1153 - { STB0899_TMGTHD , 0x30 }, 1147 + { STB0899_BCLC , 0x94 }, 1148 + { STB0899_EQON , 0x41 }, 1149 + { STB0899_LDT , 0xdd }, 1150 + { STB0899_LDT2 , 0xc9 }, 1151 + { STB0899_EQUALREF , 0xb4 }, 1152 + { STB0899_TMGRAMP , 0x10 }, 1153 + { STB0899_TMGTHD , 0x30 }, 1154 1154 { STB0899_IDCCOMP , 0xfb }, 1155 1155 { STB0899_QDCCOMP , 0x03 }, 1156 1156 { STB0899_POWERI , 0x3b }, ··· 1169 1169 { STB0899_NIRL , 0x05 }, 1170 1170 { STB0899_ISYMB , 0x17 }, 1171 1171 { STB0899_QSYMB , 0xfa }, 1172 - { STB0899_SFRH , 0x2f }, 1173 - { STB0899_SFRM , 0x68 }, 1174 - { STB0899_SFRL , 0x40 }, 1175 - { STB0899_SFRUPH , 0x2f }, 1176 - { STB0899_SFRUPM , 0x68 }, 1177 - { STB0899_SFRUPL , 0x40 }, 1172 + { STB0899_SFRH , 0x2f }, 1173 + { STB0899_SFRM , 0x68 }, 1174 + { STB0899_SFRL , 0x40 }, 1175 + { STB0899_SFRUPH , 0x2f }, 1176 + { STB0899_SFRUPM , 0x68 }, 1177 + { STB0899_SFRUPL , 0x40 }, 1178 1178 { STB0899_EQUAI1 , 0xfd }, 1179 1179 { STB0899_EQUAQ1 , 0x04 }, 1180 1180 { STB0899_EQUAI2 , 0x0f }, ··· 1186 1186 { STB0899_EQUAI5 , 0xbd }, 1187 1187 { STB0899_EQUAQ5 , 0xf7 }, 1188 1188 { STB0899_DSTATUS2 , 0x00 }, 1189 - { STB0899_VSTATUS , 0x00 }, 1189 + { STB0899_VSTATUS , 0x00 }, 1190 1190 { STB0899_VERROR , 0xff }, 1191 1191 { STB0899_IQSWAP , 0x2a }, 1192 1192 { STB0899_ECNT1M , 0x00 }, ··· 1195 1195 { STB0899_ECNT2L , 0x00 }, 1196 1196 { STB0899_ECNT3M , 0x00 }, 1197 1197 { STB0899_ECNT3L , 0x00 }, 1198 - { STB0899_FECAUTO1 , 0x06 }, 1198 + { STB0899_FECAUTO1 , 0x06 }, 1199 1199 { STB0899_FECM , 0x01 }, 1200 - { STB0899_VTH12 , 0xf0 }, 1201 - { STB0899_VTH23 , 0xa0 }, 1200 + { STB0899_VTH12 , 0xf0 }, 1201 + { STB0899_VTH23 , 0xa0 }, 1202 1202 { STB0899_VTH34 , 0x78 }, 1203 - { STB0899_VTH56 , 0x4e }, 1204 - { STB0899_VTH67 , 0x48 }, 1205 - { STB0899_VTH78 , 0x38 }, 1206 - { STB0899_PRVIT , 0xff }, 1207 - { STB0899_VITSYNC , 0x19 }, 1208 - { STB0899_RSULC , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */ 1209 - { STB0899_TSULC , 0x42 }, 1210 - { STB0899_RSLLC , 0x40 }, 1203 + { STB0899_VTH56 , 0x4e }, 1204 + { STB0899_VTH67 , 0x48 }, 1205 + { STB0899_VTH78 , 0x38 }, 1206 + { STB0899_PRVIT , 0xff }, 1207 + { STB0899_VITSYNC , 0x19 }, 1208 + { STB0899_RSULC , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */ 1209 + { STB0899_TSULC , 0x42 }, 1210 + { STB0899_RSLLC , 0x40 }, 1211 1211 { STB0899_TSLPL , 0x12 }, 1212 - { STB0899_TSCFGH , 0x0c }, 1213 - { STB0899_TSCFGM , 0x00 }, 1214 - { STB0899_TSCFGL , 0x0c }, 1212 + { STB0899_TSCFGH , 0x0c }, 1213 + { STB0899_TSCFGM , 0x00 }, 1214 + { STB0899_TSCFGL , 0x0c }, 1215 1215 { STB0899_TSOUT , 0x4d }, /* 0x0d for CAM */ 1216 - { STB0899_RSSYNCDEL , 0x00 }, 1217 - { STB0899_TSINHDELH , 0x02 }, 1216 + { STB0899_RSSYNCDEL , 0x00 }, 1217 + { STB0899_TSINHDELH , 0x02 }, 1218 1218 { STB0899_TSINHDELM , 0x00 }, 1219 1219 { STB0899_TSINHDELL , 0x00 }, 1220 1220 { STB0899_TSLLSTKM , 0x00 }, ··· 1225 1225 { STB0899_PCKLENLL , 0xcc }, 1226 1226 { STB0899_RSPCKLEN , 0xcc }, 1227 1227 { STB0899_TSSTATUS , 0x80 }, 1228 - { STB0899_ERRCTRL1 , 0xb6 }, 1229 - { STB0899_ERRCTRL2 , 0x96 }, 1230 - { STB0899_ERRCTRL3 , 0x89 }, 1228 + { STB0899_ERRCTRL1 , 0xb6 }, 1229 + { STB0899_ERRCTRL2 , 0x96 }, 1230 + { STB0899_ERRCTRL3 , 0x89 }, 1231 1231 { STB0899_DMONMSK1 , 0x27 }, 1232 1232 { STB0899_DMONMSK0 , 0x03 }, 1233 - { STB0899_DEMAPVIT , 0x5c }, 1233 + { STB0899_DEMAPVIT , 0x5c }, 1234 1234 { STB0899_PLPARM , 0x1f }, 1235 - { STB0899_PDELCTRL , 0x48 }, 1236 - { STB0899_PDELCTRL2 , 0x00 }, 1237 - { STB0899_BBHCTRL1 , 0x00 }, 1238 - { STB0899_BBHCTRL2 , 0x00 }, 1239 - { STB0899_HYSTTHRESH , 0x77 }, 1235 + { STB0899_PDELCTRL , 0x48 }, 1236 + { STB0899_PDELCTRL2 , 0x00 }, 1237 + { STB0899_BBHCTRL1 , 0x00 }, 1238 + { STB0899_BBHCTRL2 , 0x00 }, 1239 + { STB0899_HYSTTHRESH , 0x77 }, 1240 1240 { STB0899_MATCSTM , 0x00 }, 1241 1241 { STB0899_MATCSTL , 0x00 }, 1242 1242 { STB0899_UPLCSTM , 0x00 }, ··· 1275 1275 1276 1276 .postproc = NULL, 1277 1277 1278 - .demod_address = 0x68, 1278 + .demod_address = 0x68, 1279 1279 1280 1280 .xtal_freq = 27000000, 1281 1281 .inversion = IQ_SWAP_ON,
+19 -19
drivers/media/pci/zoran/zoran_driver.c
··· 2792 2792 } 2793 2793 2794 2794 static const struct v4l2_ioctl_ops zoran_ioctl_ops = { 2795 - .vidioc_querycap = zoran_querycap, 2795 + .vidioc_querycap = zoran_querycap, 2796 2796 .vidioc_s_selection = zoran_s_selection, 2797 2797 .vidioc_g_selection = zoran_g_selection, 2798 - .vidioc_enum_input = zoran_enum_input, 2799 - .vidioc_g_input = zoran_g_input, 2800 - .vidioc_s_input = zoran_s_input, 2801 - .vidioc_enum_output = zoran_enum_output, 2802 - .vidioc_g_output = zoran_g_output, 2803 - .vidioc_s_output = zoran_s_output, 2798 + .vidioc_enum_input = zoran_enum_input, 2799 + .vidioc_g_input = zoran_g_input, 2800 + .vidioc_s_input = zoran_s_input, 2801 + .vidioc_enum_output = zoran_enum_output, 2802 + .vidioc_g_output = zoran_g_output, 2803 + .vidioc_s_output = zoran_s_output, 2804 2804 .vidioc_g_fbuf = zoran_g_fbuf, 2805 2805 .vidioc_s_fbuf = zoran_s_fbuf, 2806 - .vidioc_g_std = zoran_g_std, 2807 - .vidioc_s_std = zoran_s_std, 2808 - .vidioc_g_jpegcomp = zoran_g_jpegcomp, 2809 - .vidioc_s_jpegcomp = zoran_s_jpegcomp, 2806 + .vidioc_g_std = zoran_g_std, 2807 + .vidioc_s_std = zoran_s_std, 2808 + .vidioc_g_jpegcomp = zoran_g_jpegcomp, 2809 + .vidioc_s_jpegcomp = zoran_s_jpegcomp, 2810 2810 .vidioc_overlay = zoran_overlay, 2811 2811 .vidioc_reqbufs = zoran_reqbufs, 2812 2812 .vidioc_querybuf = zoran_querybuf, ··· 2814 2814 .vidioc_dqbuf = zoran_dqbuf, 2815 2815 .vidioc_streamon = zoran_streamon, 2816 2816 .vidioc_streamoff = zoran_streamoff, 2817 - .vidioc_enum_fmt_vid_cap = zoran_enum_fmt_vid_cap, 2818 - .vidioc_enum_fmt_vid_out = zoran_enum_fmt_vid_out, 2819 - .vidioc_enum_fmt_vid_overlay = zoran_enum_fmt_vid_overlay, 2820 - .vidioc_g_fmt_vid_cap = zoran_g_fmt_vid_cap, 2817 + .vidioc_enum_fmt_vid_cap = zoran_enum_fmt_vid_cap, 2818 + .vidioc_enum_fmt_vid_out = zoran_enum_fmt_vid_out, 2819 + .vidioc_enum_fmt_vid_overlay = zoran_enum_fmt_vid_overlay, 2820 + .vidioc_g_fmt_vid_cap = zoran_g_fmt_vid_cap, 2821 2821 .vidioc_g_fmt_vid_out = zoran_g_fmt_vid_out, 2822 2822 .vidioc_g_fmt_vid_overlay = zoran_g_fmt_vid_overlay, 2823 - .vidioc_s_fmt_vid_cap = zoran_s_fmt_vid_cap, 2823 + .vidioc_s_fmt_vid_cap = zoran_s_fmt_vid_cap, 2824 2824 .vidioc_s_fmt_vid_out = zoran_s_fmt_vid_out, 2825 2825 .vidioc_s_fmt_vid_overlay = zoran_s_fmt_vid_overlay, 2826 - .vidioc_try_fmt_vid_cap = zoran_try_fmt_vid_cap, 2827 - .vidioc_try_fmt_vid_out = zoran_try_fmt_vid_out, 2828 - .vidioc_try_fmt_vid_overlay = zoran_try_fmt_vid_overlay, 2826 + .vidioc_try_fmt_vid_cap = zoran_try_fmt_vid_cap, 2827 + .vidioc_try_fmt_vid_out = zoran_try_fmt_vid_out, 2828 + .vidioc_try_fmt_vid_overlay = zoran_try_fmt_vid_overlay, 2829 2829 .vidioc_subscribe_event = v4l2_ctrl_subscribe_event, 2830 2830 .vidioc_unsubscribe_event = v4l2_event_unsubscribe, 2831 2831 };
+2 -2
drivers/media/pci/zoran/zr36057.h
··· 103 103 #define ZR36057_ICR_IntPinEn (1<<24) 104 104 105 105 #define ZR36057_I2CBR 0x044 /* I2C Bus Register */ 106 - #define ZR36057_I2CBR_SDA (1<<1) 107 - #define ZR36057_I2CBR_SCL (1<<0) 106 + #define ZR36057_I2CBR_SDA (1<<1) 107 + #define ZR36057_I2CBR_SCL (1<<0) 108 108 109 109 #define ZR36057_JMC 0x100 /* JPEG Mode and Control */ 110 110 #define ZR36057_JMC_JPG (1 << 31)
+7 -7
drivers/media/platform/Makefile
··· 23 23 obj-$(CONFIG_VIDEO_TI_CAL) += ti-vpe/ 24 24 25 25 obj-$(CONFIG_VIDEO_MX2_EMMAPRP) += mx2_emmaprp.o 26 - obj-$(CONFIG_VIDEO_CODA) += coda/ 26 + obj-$(CONFIG_VIDEO_CODA) += coda/ 27 27 28 28 obj-$(CONFIG_VIDEO_SH_VEU) += sh_veu.o 29 29 ··· 33 33 34 34 obj-$(CONFIG_VIDEO_MUX) += video-mux.o 35 35 36 - obj-$(CONFIG_VIDEO_S3C_CAMIF) += s3c-camif/ 37 - obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS) += exynos4-is/ 36 + obj-$(CONFIG_VIDEO_S3C_CAMIF) += s3c-camif/ 37 + obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS) += exynos4-is/ 38 38 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) += s5p-jpeg/ 39 39 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc/ 40 40 ··· 45 45 obj-$(CONFIG_VIDEO_STI_BDISP) += sti/bdisp/ 46 46 obj-$(CONFIG_VIDEO_STI_HVA) += sti/hva/ 47 47 obj-$(CONFIG_DVB_C8SECTPFE) += sti/c8sectpfe/ 48 - obj-$(CONFIG_VIDEO_STI_HDMI_CEC) += sti/cec/ 48 + obj-$(CONFIG_VIDEO_STI_HDMI_CEC) += sti/cec/ 49 49 50 50 obj-$(CONFIG_VIDEO_STI_DELTA) += sti/delta/ 51 51 52 52 obj-$(CONFIG_VIDEO_TEGRA_HDMI_CEC) += tegra-cec/ 53 53 54 - obj-y += stm32/ 54 + obj-y += stm32/ 55 55 56 56 obj-y += blackfin/ 57 57 ··· 62 62 obj-$(CONFIG_SOC_CAMERA) += soc_camera/ 63 63 64 64 obj-$(CONFIG_VIDEO_RCAR_DRIF) += rcar_drif.o 65 - obj-$(CONFIG_VIDEO_RENESAS_FCP) += rcar-fcp.o 65 + obj-$(CONFIG_VIDEO_RENESAS_FCP) += rcar-fcp.o 66 66 obj-$(CONFIG_VIDEO_RENESAS_FDP1) += rcar_fdp1.o 67 - obj-$(CONFIG_VIDEO_RENESAS_JPU) += rcar_jpu.o 67 + obj-$(CONFIG_VIDEO_RENESAS_JPU) += rcar_jpu.o 68 68 obj-$(CONFIG_VIDEO_RENESAS_VSP1) += vsp1/ 69 69 70 70 obj-$(CONFIG_VIDEO_ROCKCHIP_RGA) += rockchip/rga/
+25 -25
drivers/media/platform/arv.c
··· 56 56 57 57 #define VERSION "0.0.5" 58 58 59 - #define ar_inl(addr) inl((unsigned long)(addr)) 59 + #define ar_inl(addr) inl((unsigned long)(addr)) 60 60 #define ar_outl(val, addr) outl((unsigned long)(val), (unsigned long)(addr)) 61 61 62 62 extern struct cpuinfo_m32r boot_cpu_data; ··· 210 210 * ICU Setting (iic) 211 211 */ 212 212 /* I2C Setting */ 213 - ar_outl(0x0, PLDI2CCR); /* I2CCR Disable */ 214 - ar_outl(0x0300, PLDI2CMOD); /* I2CMOD ACK/8b-data/7b-addr/auto */ 213 + ar_outl(0x0, PLDI2CCR); /* I2CCR Disable */ 214 + ar_outl(0x0300, PLDI2CMOD); /* I2CMOD ACK/8b-data/7b-addr/auto */ 215 215 ar_outl(0x1, PLDI2CACK); /* I2CACK ACK */ 216 216 217 217 /* I2C CLK */ ··· 222 222 ar_outl(244, PLDI2CFREQ); /* BCLK = 50MHz */ 223 223 else 224 224 ar_outl(244, PLDI2CFREQ); /* default: BCLK = 50MHz */ 225 - ar_outl(0x1, PLDI2CCR); /* I2CCR Enable */ 225 + ar_outl(0x1, PLDI2CCR); /* I2CCR Enable */ 226 226 } 227 227 228 228 /************************************************************************** ··· 300 300 ar_outl(ARDATA32, M32R_DMA0CSA_PORTL); 301 301 ar_outl(ARDATA32, M32R_DMA0RSA_PORTL); 302 302 ar_outl(ar->line_buff, M32R_DMA0CDA_PORTL); /* destination addr. */ 303 - ar_outl(ar->line_buff, M32R_DMA0RDA_PORTL); /* reload address */ 304 - ar_outl(ar->line_bytes, M32R_DMA0CBCUT_PORTL); /* byte count (bytes) */ 305 - ar_outl(ar->line_bytes, M32R_DMA0RBCUT_PORTL); /* reload count (bytes) */ 303 + ar_outl(ar->line_buff, M32R_DMA0RDA_PORTL); /* reload address */ 304 + ar_outl(ar->line_bytes, M32R_DMA0CBCUT_PORTL); /* byte count (bytes) */ 305 + ar_outl(ar->line_bytes, M32R_DMA0RBCUT_PORTL); /* reload count (bytes) */ 306 306 307 307 /* 308 308 * Okay, kick AR LSI to invoke an interrupt ··· 364 364 365 365 /* 366 366 * convert YUV422 to YUV422P 367 - * +--------------------+ 367 + * +--------------------+ 368 368 * | Y0,Y1,... | 369 369 * | ..............Yn | 370 370 * +--------------------+ ··· 533 533 line_count = ar_inl(ARVHCOUNT); /* line number */ 534 534 if (ar->mode == AR_MODE_INTERLACE && ar->size == AR_SIZE_VGA) { 535 535 /* operations for interlace mode */ 536 - if (line_count < (AR_HEIGHT_VGA / 2)) /* even line */ 536 + if (line_count < (AR_HEIGHT_VGA / 2)) /* even line */ 537 537 line_number = (line_count << 1); 538 - else /* odd line */ 538 + else /* odd line */ 539 539 line_number = 540 540 (((line_count - (AR_HEIGHT_VGA / 2)) << 1) + 1); 541 541 } else { ··· 568 568 * if captured all line of a frame, disable AR interrupt 569 569 * and wake a process up. 570 570 */ 571 - if (line_number == (ar->height - 1)) { /* end of line */ 571 + if (line_number == (ar->height - 1)) { /* end of line */ 572 572 573 573 ar->start_capture = 0; 574 574 ··· 718 718 }; 719 719 720 720 static const struct v4l2_ioctl_ops ar_ioctl_ops = { 721 - .vidioc_querycap = ar_querycap, 722 - .vidioc_g_input = ar_g_input, 723 - .vidioc_s_input = ar_s_input, 724 - .vidioc_enum_input = ar_enum_input, 725 - .vidioc_enum_fmt_vid_cap = ar_enum_fmt_vid_cap, 726 - .vidioc_g_fmt_vid_cap = ar_g_fmt_vid_cap, 727 - .vidioc_s_fmt_vid_cap = ar_s_fmt_vid_cap, 728 - .vidioc_try_fmt_vid_cap = ar_try_fmt_vid_cap, 721 + .vidioc_querycap = ar_querycap, 722 + .vidioc_g_input = ar_g_input, 723 + .vidioc_s_input = ar_s_input, 724 + .vidioc_enum_input = ar_enum_input, 725 + .vidioc_enum_fmt_vid_cap = ar_enum_fmt_vid_cap, 726 + .vidioc_g_fmt_vid_cap = ar_g_fmt_vid_cap, 727 + .vidioc_s_fmt_vid_cap = ar_s_fmt_vid_cap, 728 + .vidioc_try_fmt_vid_cap = ar_try_fmt_vid_cap, 729 729 }; 730 730 731 731 #define ALIGN4(x) ((((int)(x)) & 0x3) == 0) ··· 776 776 video_set_drvdata(&ar->vdev, ar); 777 777 778 778 if (vga) { 779 - ar->width = AR_WIDTH_VGA; 780 - ar->height = AR_HEIGHT_VGA; 781 - ar->size = AR_SIZE_VGA; 779 + ar->width = AR_WIDTH_VGA; 780 + ar->height = AR_HEIGHT_VGA; 781 + ar->size = AR_SIZE_VGA; 782 782 ar->frame_bytes = AR_FRAME_BYTES_VGA; 783 783 ar->line_bytes = AR_LINE_BYTES_VGA; 784 784 if (vga_interlace) ··· 786 786 else 787 787 ar->mode = AR_MODE_NORMAL; 788 788 } else { 789 - ar->width = AR_WIDTH_QVGA; 790 - ar->height = AR_HEIGHT_QVGA; 791 - ar->size = AR_SIZE_QVGA; 789 + ar->width = AR_WIDTH_QVGA; 790 + ar->height = AR_HEIGHT_QVGA; 791 + ar->size = AR_SIZE_QVGA; 792 792 ar->frame_bytes = AR_FRAME_BYTES_QVGA; 793 793 ar->line_bytes = AR_LINE_BYTES_QVGA; 794 794 ar->mode = AR_MODE_INTERLACE;
+1 -1
drivers/media/platform/coda/coda_regs.h
··· 125 125 #define CODA9_MODE_ENCODE_H264 8 126 126 #define CODA9_MODE_ENCODE_MP4 11 127 127 #define CODA9_MODE_ENCODE_MJPG 13 128 - #define CODA_MODE_INVALID 0xffff 128 + #define CODA_MODE_INVALID 0xffff 129 129 #define CODA_REG_BIT_INT_ENABLE 0x170 130 130 #define CODA_INT_INTERRUPT_ENABLE (1 << 3) 131 131 #define CODA_REG_BIT_INT_REASON 0x174
+3 -3
drivers/media/platform/davinci/dm355_ccdc_regs.h
··· 107 107 #define CCDC_RAW_IP_MODE 0 108 108 #define CCDC_VDHDOUT_INPUT 0 109 109 #define CCDC_YCINSWP_RAW (0 << 4) 110 - #define CCDC_EXWEN_DISABLE 0 110 + #define CCDC_EXWEN_DISABLE 0 111 111 #define CCDC_DATAPOL_NORMAL 0 112 112 #define CCDC_CCDCFG_FIDMD_LATCH_VSYNC 0 113 113 #define CCDC_CCDCFG_FIDMD_NO_LATCH_VSYNC (1 << 6) ··· 152 152 #define CCDC_ALAW_GAMMA_WD_MASK 7 153 153 #define CCDC_REC656IF_BT656_EN 3 154 154 155 - #define CCDC_FMTCFG_FMTMODE_MASK 3 155 + #define CCDC_FMTCFG_FMTMODE_MASK 3 156 156 #define CCDC_FMTCFG_FMTMODE_SHIFT 1 157 157 #define CCDC_FMTCFG_LNUM_MASK 3 158 158 #define CCDC_FMTCFG_LNUM_SHIFT 4 ··· 196 196 #define CCDC_LATCH_ON_VSYNC_DISABLE (1 << 15) 197 197 #define CCDC_LATCH_ON_VSYNC_ENABLE (0 << 15) 198 198 #define CCDC_FPC_ENABLE (1 << 15) 199 - #define CCDC_FPC_FPC_NUM_MASK 0x7FFF 199 + #define CCDC_FPC_FPC_NUM_MASK 0x7FFF 200 200 #define CCDC_DATA_PACK_ENABLE (1 << 11) 201 201 #define CCDC_FMT_HORZ_FMTLNH_MASK 0x1FFF 202 202 #define CCDC_FMT_HORZ_FMTSPH_MASK 0x1FFF
+2 -2
drivers/media/platform/davinci/dm644x_ccdc_regs.h
··· 97 97 #define CCDC_LATCH_ON_VSYNC_DISABLE (1 << 15) 98 98 #define CCDC_FPC_ENABLE (1 << 15) 99 99 #define CCDC_FPC_DISABLE 0 100 - #define CCDC_FPC_FPC_NUM_MASK 0x7FFF 100 + #define CCDC_FPC_FPC_NUM_MASK 0x7FFF 101 101 #define CCDC_DATA_PACK_ENABLE (1 << 11) 102 102 #define CCDC_FMTCFG_VPIN_MASK 7 103 103 #define CCDC_FMTCFG_VPIN_SHIFT 12 ··· 143 143 #define CCDC_REC656IF_BT656_EN 3 144 144 #define CCDC_SYN_MODE_VD_POL_NEGATIVE (1 << 2) 145 145 #define CCDC_CCDCFG_Y8POS_SHIFT 11 146 - #define CCDC_CCDCFG_BW656_10BIT (1 << 5) 146 + #define CCDC_CCDCFG_BW656_10BIT (1 << 5) 147 147 #define CCDC_SDOFST_FIELD_INTERLEAVED 0x249 148 148 #define CCDC_NO_CULLING 0xffff00ff 149 149 #endif
+3 -3
drivers/media/platform/davinci/isif_regs.h
··· 35 35 #define LINCFG0 0x44 36 36 #define LINCFG1 0x48 37 37 #define CCOLP 0x4c 38 - #define CRGAIN 0x50 38 + #define CRGAIN 0x50 39 39 #define CGRGAIN 0x54 40 40 #define CGBGAIN 0x58 41 41 #define CBGAIN 0x5c ··· 46 46 #define VDINT0 0x70 47 47 #define VDINT1 0x74 48 48 #define VDINT2 0x78 49 - #define MISC 0x7c 49 + #define MISC 0x7c 50 50 #define CGAMMAWD 0x80 51 51 #define REC656IF 0x84 52 52 #define CCDCFG 0x88 ··· 191 191 #define ISIF_VD_POL_SHIFT 2 192 192 #define ISIF_DATAPOL_NORMAL 0 193 193 #define ISIF_DATAPOL_SHIFT 6 194 - #define ISIF_EXWEN_DISABLE 0 194 + #define ISIF_EXWEN_DISABLE 0 195 195 #define ISIF_EXWEN_SHIFT 5 196 196 #define ISIF_FRM_FMT_SHIFT 7 197 197 #define ISIF_DATASFT_SHIFT 8
+1 -1
drivers/media/platform/davinci/vpfe_capture.c
··· 1794 1794 vfd->fops = &vpfe_fops; 1795 1795 vfd->ioctl_ops = &vpfe_ioctl_ops; 1796 1796 vfd->tvnorms = 0; 1797 - vfd->v4l2_dev = &vpfe_dev->v4l2_dev; 1797 + vfd->v4l2_dev = &vpfe_dev->v4l2_dev; 1798 1798 snprintf(vfd->name, sizeof(vfd->name), 1799 1799 "%s_V%d.%d.%d", 1800 1800 CAPTURE_DRV_NAME,
+2 -2
drivers/media/platform/davinci/vpif.h
··· 226 226 (VPIF_INT_BOTH << VPIF_CH1_INT_CTRL_SHIFT)), VPIF_CH1_CTRL)) 227 227 228 228 /* enabled interrupt on both the fields on vpid_ch0_ctrl register */ 229 - #define channel2_intr_assert() (regw((regr(VPIF_CH2_CTRL)|\ 229 + #define channel2_intr_assert() (regw((regr(VPIF_CH2_CTRL)|\ 230 230 (VPIF_INT_BOTH << VPIF_CH2_INT_CTRL_SHIFT)), VPIF_CH2_CTRL)) 231 231 232 232 /* enabled interrupt on both the fields on vpid_ch1_ctrl register */ 233 - #define channel3_intr_assert() (regw((regr(VPIF_CH3_CTRL)|\ 233 + #define channel3_intr_assert() (regw((regr(VPIF_CH3_CTRL)|\ 234 234 (VPIF_INT_BOTH << VPIF_CH3_INT_CTRL_SHIFT)), VPIF_CH3_CTRL)) 235 235 236 236 #define VPIF_CH_FID_MASK (0x20)
+5 -5
drivers/media/platform/davinci/vpss.c
··· 59 59 #define DM365_ISP5_INTSEL1 0x10 60 60 #define DM365_ISP5_INTSEL2 0x14 61 61 #define DM365_ISP5_INTSEL3 0x18 62 - #define DM365_ISP5_CCDCMUX 0x20 63 - #define DM365_ISP5_PG_FRAME_SIZE 0x28 64 - #define DM365_VPBE_CLK_CTRL 0x00 62 + #define DM365_ISP5_CCDCMUX 0x20 63 + #define DM365_ISP5_PG_FRAME_SIZE 0x28 64 + #define DM365_VPBE_CLK_CTRL 0x00 65 65 66 66 #define VPSS_CLK_CTRL 0x01c40044 67 67 #define VPSS_CLK_CTRL_VENCCLKEN BIT(3) ··· 78 78 #define DM365_ISP5_INTSEL3_DEFAULT 0x00000015 79 79 80 80 /* masks and shifts for DM365*/ 81 - #define DM365_CCDC_PG_VD_POL_SHIFT 0 82 - #define DM365_CCDC_PG_HD_POL_SHIFT 1 81 + #define DM365_CCDC_PG_VD_POL_SHIFT 0 82 + #define DM365_CCDC_PG_HD_POL_SHIFT 1 83 83 84 84 #define CCD_SRC_SEL_MASK (BIT_MASK(5) | BIT_MASK(4)) 85 85 #define CCD_SRC_SEL_SHIFT 4
+1 -1
drivers/media/platform/exynos4-is/fimc-core.c
··· 1246 1246 .driver = { 1247 1247 .of_match_table = fimc_of_match, 1248 1248 .name = FIMC_DRIVER_NAME, 1249 - .pm = &fimc_pm_ops, 1249 + .pm = &fimc_pm_ops, 1250 1250 } 1251 1251 }; 1252 1252
+6 -6
drivers/media/platform/m2m-deinterlace.c
··· 384 384 * 4 possible field conversions are possible at the moment: 385 385 * V4L2_FIELD_SEQ_TB --> V4L2_FIELD_INTERLACED_TB: 386 386 * two separate fields in the same input buffer are interlaced 387 - * in the output buffer using weaving. Top field comes first. 387 + * in the output buffer using weaving. Top field comes first. 388 388 * V4L2_FIELD_SEQ_TB --> V4L2_FIELD_NONE: 389 - * top field from the input buffer is copied to the output buffer 390 - * using line doubling. Bottom field from the input buffer is discarded. 389 + * top field from the input buffer is copied to the output buffer 390 + * using line doubling. Bottom field from the input buffer is discarded. 391 391 * V4L2_FIELD_SEQ_BT --> V4L2_FIELD_INTERLACED_BT: 392 392 * two separate fields in the same input buffer are interlaced 393 - * in the output buffer using weaving. Bottom field comes first. 393 + * in the output buffer using weaving. Bottom field comes first. 394 394 * V4L2_FIELD_SEQ_BT --> V4L2_FIELD_NONE: 395 - * bottom field from the input buffer is copied to the output buffer 396 - * using line doubling. Top field from the input buffer is discarded. 395 + * bottom field from the input buffer is copied to the output buffer 396 + * using line doubling. Top field from the input buffer is discarded. 397 397 */ 398 398 switch (dst_q_data->fmt->fourcc) { 399 399 case V4L2_PIX_FMT_YUV420:
+6 -6
drivers/media/platform/omap/omap_vout.c
··· 1774 1774 } 1775 1775 1776 1776 static const struct v4l2_ioctl_ops vout_ioctl_ops = { 1777 - .vidioc_querycap = vidioc_querycap, 1778 - .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out, 1777 + .vidioc_querycap = vidioc_querycap, 1778 + .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out, 1779 1779 .vidioc_g_fmt_vid_out = vidioc_g_fmt_vid_out, 1780 1780 .vidioc_try_fmt_vid_out = vidioc_try_fmt_vid_out, 1781 1781 .vidioc_s_fmt_vid_out = vidioc_s_fmt_vid_out, ··· 1795 1795 }; 1796 1796 1797 1797 static const struct v4l2_file_operations omap_vout_fops = { 1798 - .owner = THIS_MODULE, 1798 + .owner = THIS_MODULE, 1799 1799 .poll = omap_vout_poll, 1800 1800 .unlocked_ioctl = video_ioctl2, 1801 - .mmap = omap_vout_mmap, 1802 - .open = omap_vout_open, 1803 - .release = omap_vout_release, 1801 + .mmap = omap_vout_mmap, 1802 + .open = omap_vout_open, 1803 + .release = omap_vout_release, 1804 1804 }; 1805 1805 1806 1806 /* Init functions used during driver initialization */
+1 -1
drivers/media/platform/sh_vou.c
··· 1181 1181 1182 1182 /* sh_vou display ioctl operations */ 1183 1183 static const struct v4l2_ioctl_ops sh_vou_ioctl_ops = { 1184 - .vidioc_querycap = sh_vou_querycap, 1184 + .vidioc_querycap = sh_vou_querycap, 1185 1185 .vidioc_enum_fmt_vid_out = sh_vou_enum_fmt_vid_out, 1186 1186 .vidioc_g_fmt_vid_out = sh_vou_g_fmt_vid_out, 1187 1187 .vidioc_s_fmt_vid_out = sh_vou_s_fmt_vid_out,
+1 -1
drivers/media/radio/radio-aimslab.c
··· 26 26 * Fully tested with the Keene USB FM Transmitter and the v4l2-compliance tool. 27 27 */ 28 28 29 - #include <linux/module.h> /* Modules */ 29 + #include <linux/module.h> /* Modules */ 30 30 #include <linux/init.h> /* Initdata */ 31 31 #include <linux/ioport.h> /* request_region */ 32 32 #include <linux/delay.h> /* msleep */
+1 -1
drivers/media/radio/radio-aztech.c
··· 15 15 * Fully tested with the Keene USB FM Transmitter and the v4l2-compliance tool. 16 16 */ 17 17 18 - #include <linux/module.h> /* Modules */ 18 + #include <linux/module.h> /* Modules */ 19 19 #include <linux/init.h> /* Initdata */ 20 20 #include <linux/ioport.h> /* request_region */ 21 21 #include <linux/delay.h> /* udelay */
+2 -2
drivers/media/radio/radio-cadet.c
··· 30 30 * Changed API to V4L2 31 31 */ 32 32 33 - #include <linux/module.h> /* Modules */ 33 + #include <linux/module.h> /* Modules */ 34 34 #include <linux/init.h> /* Initdata */ 35 35 #include <linux/ioport.h> /* request_region */ 36 36 #include <linux/delay.h> /* udelay */ ··· 503 503 static const struct v4l2_file_operations cadet_fops = { 504 504 .owner = THIS_MODULE, 505 505 .open = cadet_open, 506 - .release = cadet_release, 506 + .release = cadet_release, 507 507 .read = cadet_read, 508 508 .unlocked_ioctl = video_ioctl2, 509 509 .poll = cadet_poll,
+4 -4
drivers/media/radio/radio-gemtek.c
··· 22 22 * Fully tested with the Keene USB FM Transmitter and the v4l2-compliance tool. 23 23 */ 24 24 25 - #include <linux/module.h> /* Modules */ 25 + #include <linux/module.h> /* Modules */ 26 26 #include <linux/init.h> /* Initdata */ 27 27 #include <linux/ioport.h> /* request_region */ 28 28 #include <linux/delay.h> /* udelay */ ··· 102 102 u32 bu2614data; 103 103 }; 104 104 105 - #define BU2614_FREQ_BITS 16 /* D0..D15, Frequency data */ 105 + #define BU2614_FREQ_BITS 16 /* D0..D15, Frequency data */ 106 106 #define BU2614_PORT_BITS 3 /* P0..P2, Output port control data */ 107 - #define BU2614_VOID_BITS 4 /* unused */ 107 + #define BU2614_VOID_BITS 4 /* unused */ 108 108 #define BU2614_FMES_BITS 1 /* CT, Frequency measurement beginning data */ 109 109 #define BU2614_STDF_BITS 3 /* R0..R2, Standard frequency data */ 110 110 #define BU2614_SWIN_BITS 1 /* S, Switch between FMIN / AMIN */ ··· 113 113 #define BU2614_FMUN_BITS 1 /* GT, Frequency measurement time & unlock */ 114 114 #define BU2614_TEST_BITS 1 /* TS, Test data is input */ 115 115 116 - #define BU2614_FREQ_SHIFT 0 116 + #define BU2614_FREQ_SHIFT 0 117 117 #define BU2614_PORT_SHIFT (BU2614_FREQ_BITS + BU2614_FREQ_SHIFT) 118 118 #define BU2614_VOID_SHIFT (BU2614_PORT_BITS + BU2614_PORT_SHIFT) 119 119 #define BU2614_FMES_SHIFT (BU2614_VOID_BITS + BU2614_VOID_SHIFT)
+1 -1
drivers/media/radio/radio-rtrack2.c
··· 12 12 * Fully tested with actual hardware and the v4l2-compliance tool. 13 13 */ 14 14 15 - #include <linux/module.h> /* Modules */ 15 + #include <linux/module.h> /* Modules */ 16 16 #include <linux/init.h> /* Initdata */ 17 17 #include <linux/ioport.h> /* request_region */ 18 18 #include <linux/delay.h> /* udelay */
+2 -2
drivers/media/radio/radio-sf16fmi.c
··· 17 17 */ 18 18 19 19 #include <linux/kernel.h> /* __setup */ 20 - #include <linux/module.h> /* Modules */ 20 + #include <linux/module.h> /* Modules */ 21 21 #include <linux/init.h> /* Initdata */ 22 22 #include <linux/ioport.h> /* request_region */ 23 23 #include <linux/delay.h> /* udelay */ ··· 110 110 val = fmi->mute ? 0x00 : 0x08; /* mute/unmute */ 111 111 outb(val, fmi->io); 112 112 outb(val | 0x10, fmi->io); 113 - msleep(143); /* was schedule_timeout(HZ/7) */ 113 + msleep(143); /* was schedule_timeout(HZ/7) */ 114 114 res = (int)inb(fmi->io + 1); 115 115 outb(val, fmi->io); 116 116
+1 -1
drivers/media/radio/radio-sf16fmr2.c
··· 7 7 */ 8 8 9 9 #include <linux/delay.h> 10 - #include <linux/module.h> /* Modules */ 10 + #include <linux/module.h> /* Modules */ 11 11 #include <linux/init.h> /* Initdata */ 12 12 #include <linux/slab.h> 13 13 #include <linux/ioport.h> /* request_region */
+1 -1
drivers/media/radio/radio-tea5764.c
··· 417 417 static const struct video_device tea5764_radio_template = { 418 418 .name = "TEA5764 FM-Radio", 419 419 .fops = &tea5764_fops, 420 - .ioctl_ops = &tea5764_ioctl_ops, 420 + .ioctl_ops = &tea5764_ioctl_ops, 421 421 .release = video_device_release_empty, 422 422 }; 423 423
+3 -3
drivers/media/radio/radio-terratec.c
··· 20 20 * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org> 21 21 */ 22 22 23 - #include <linux/module.h> /* Modules */ 23 + #include <linux/module.h> /* Modules */ 24 24 #include <linux/init.h> /* Initdata */ 25 25 #include <linux/ioport.h> /* request_region */ 26 26 #include <linux/videodev2.h> /* kernel radio structs */ ··· 45 45 module_param(radio_nr, int, 0444); 46 46 MODULE_PARM_DESC(radio_nr, "Radio device number"); 47 47 48 - #define WRT_DIS 0x00 48 + #define WRT_DIS 0x00 49 49 #define CLK_OFF 0x00 50 50 #define IIC_DATA 0x01 51 51 #define IIC_CLK 0x02 52 52 #define DATA 0x04 53 - #define CLK_ON 0x08 53 + #define CLK_ON 0x08 54 54 #define WRT_EN 0x10 55 55 56 56 static struct radio_isa_card *terratec_alloc(void)
+1 -1
drivers/media/radio/tea575x.c
··· 498 498 }; 499 499 500 500 static const struct video_device tea575x_radio = { 501 - .ioctl_ops = &tea575x_ioctl_ops, 501 + .ioctl_ops = &tea575x_ioctl_ops, 502 502 .release = video_device_release_empty, 503 503 }; 504 504
+3 -3
drivers/media/rc/keymaps/rc-behold-columbus.c
··· 30 30 31 31 /* 0x01 0x02 0x03 0x0D * 32 32 * 1 2 3 Stereo * 33 - * * 33 + * * 34 34 * 0x04 0x05 0x06 0x19 * 35 35 * 4 5 6 Snapshot * 36 - * * 36 + * * 37 37 * 0x07 0x08 0x09 0x10 * 38 - * 7 8 9 Zoom * 38 + * 7 8 9 Zoom * 39 39 * */ 40 40 { 0x01, KEY_1 }, 41 41 { 0x02, KEY_2 },
+1 -1
drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c
··· 37 37 { 0x60, KEY_CHANNELDOWN}, /* CHANNELDOWN */ 38 38 { 0x61, KEY_LAST}, /* LAST CHANNEL (RECALL) */ 39 39 40 - { 0x72, KEY_VIDEO}, /* INPUT MODES (TV/FM) */ 40 + { 0x72, KEY_VIDEO}, /* INPUT MODES (TV/FM) */ 41 41 42 42 { 0x70, KEY_POWER2}, /* TV ON/OFF */ 43 43
+3 -3
drivers/media/tuners/mxl5005s.c
··· 1677 1677 u8 AGC_Mode, /* AGC Mode - Dual AGC: 0, Single AGC: 1 */ 1678 1678 u16 TOP, /* 0: Dual AGC; Value: take over point */ 1679 1679 u16 IF_OUT_LOAD, /* IF Out Load Resistor (200 / 300 Ohms) */ 1680 - u8 CLOCK_OUT, /* 0: turn off clk out; 1: turn on clock out */ 1680 + u8 CLOCK_OUT, /* 0: turn off clk out; 1: turn on clock out */ 1681 1681 u8 DIV_OUT, /* 0: Div-1; 1: Div-4 */ 1682 - u8 CAPSELECT, /* 0: disable On-Chip pulling cap; 1: enable */ 1683 - u8 EN_RSSI, /* 0: disable RSSI; 1: enable RSSI */ 1682 + u8 CAPSELECT, /* 0: disable On-Chip pulling cap; 1: enable */ 1683 + u8 EN_RSSI, /* 0: disable RSSI; 1: enable RSSI */ 1684 1684 1685 1685 /* Modulation Type; */ 1686 1686 /* 0 - Default; 1 - DVB-T; 2 - ATSC; 3 - QAM; 4 - Analog Cable */
+1 -1
drivers/media/tuners/tda827x.h
··· 36 36 37 37 /* interface to tda829x driver */ 38 38 enum tda8290_lna config; 39 - int switch_addr; 39 + int switch_addr; 40 40 41 41 void (*agcf)(struct dvb_frontend *fe); 42 42 };
+2 -2
drivers/media/tuners/tda9887.c
··· 31 31 struct tuner_i2c_props i2c_props; 32 32 struct list_head hybrid_tuner_instance_list; 33 33 34 - unsigned char data[4]; 34 + unsigned char data[4]; 35 35 unsigned int config; 36 36 unsigned int mode; 37 37 unsigned int audmode; ··· 94 94 #define cAudioGain6 0x80 // bit c7 95 95 96 96 #define cTopMask 0x1f // bit c0:4 97 - #define cTopDefault 0x10 // bit c0:4 97 + #define cTopDefault 0x10 // bit c0:4 98 98 99 99 //// third reg (e) 100 100 #define cAudioIF_4_5 0x00 // bit e0:1
+1 -1
drivers/media/tuners/tuner-simple.c
··· 53 53 /* tv tuner system standard selection for Philips FQ1216ME 54 54 this value takes the low bits of control byte 2 55 55 from datasheet "1999 Nov 16" (supersedes "1999 Mar 23") 56 - standard BG DK I L L` 56 + standard BG DK I L L` 57 57 picture carrier 38.90 38.90 38.90 38.90 33.95 58 58 colour 34.47 34.47 34.47 34.47 38.38 59 59 sound 1 33.40 32.40 32.90 32.40 40.45
+3 -3
drivers/media/tuners/tuner-xc2028.c
··· 87 87 v4l2_std_id std_req; 88 88 __u16 int_freq; 89 89 unsigned int scode_table; 90 - int scode_nr; 90 + int scode_nr; 91 91 }; 92 92 93 93 enum xc2028_state { ··· 137 137 ibuf, isize); \ 138 138 if (isize != _rc) \ 139 139 tuner_err("i2c input error: rc = %d (should be %d)\n", \ 140 - _rc, (int)isize); \ 140 + _rc, (int)isize); \ 141 141 if (priv->ctrl.msleep) \ 142 142 msleep(priv->ctrl.msleep); \ 143 143 _rc; \ ··· 172 172 return 0; 173 173 } 174 174 175 - #define dump_firm_type(t) dump_firm_type_and_int_freq(t, 0) 175 + #define dump_firm_type(t) dump_firm_type_and_int_freq(t, 0) 176 176 static void dump_firm_type_and_int_freq(unsigned int type, u16 int_freq) 177 177 { 178 178 if (type & BASE)
+1 -1
drivers/media/tuners/tuner-xc2028.h
··· 48 48 49 49 struct xc2028_config { 50 50 struct i2c_adapter *i2c_adap; 51 - u8 i2c_addr; 51 + u8 i2c_addr; 52 52 struct xc2028_ctrl *ctrl; 53 53 }; 54 54
+1 -1
drivers/media/usb/au0828/au0828-cards.h
··· 17 17 18 18 #define AU0828_BOARD_UNKNOWN 0 19 19 #define AU0828_BOARD_HAUPPAUGE_HVR950Q 1 20 - #define AU0828_BOARD_HAUPPAUGE_HVR850 2 20 + #define AU0828_BOARD_HAUPPAUGE_HVR850 2 21 21 #define AU0828_BOARD_DVICO_FUSIONHDTV7 3 22 22 #define AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL 4 23 23 #define AU0828_BOARD_HAUPPAUGE_WOODBURY 5
+1 -1
drivers/media/usb/au0828/au0828-video.c
··· 1797 1797 static const struct video_device au0828_video_template = { 1798 1798 .fops = &au0828_v4l_fops, 1799 1799 .release = video_device_release_empty, 1800 - .ioctl_ops = &video_ioctl_ops, 1800 + .ioctl_ops = &video_ioctl_ops, 1801 1801 .tvnorms = V4L2_STD_NTSC_M | V4L2_STD_PAL_M, 1802 1802 }; 1803 1803
+3 -3
drivers/media/usb/au0828/au0828.h
··· 190 190 struct i2c_adapter i2c_adap; 191 191 struct i2c_algorithm i2c_algo; 192 192 struct i2c_client i2c_client; 193 - u32 i2c_rc; 193 + u32 i2c_rc; 194 194 195 195 /* Digital */ 196 196 struct au0828_dvb dvb; ··· 293 293 /* ----------------------------------------------------------- */ 294 294 #define au0828_read(dev, reg) au0828_readreg(dev, reg) 295 295 #define au0828_write(dev, reg, value) au0828_writereg(dev, reg, value) 296 - #define au0828_andor(dev, reg, mask, value) \ 297 - au0828_writereg(dev, reg, \ 296 + #define au0828_andor(dev, reg, mask, value) \ 297 + au0828_writereg(dev, reg, \ 298 298 (au0828_readreg(dev, reg) & ~(mask)) | ((value) & (mask))) 299 299 300 300 #define au0828_set(dev, reg, bit) au0828_andor(dev, (reg), (bit), (bit))
+7 -7
drivers/media/usb/cpia2/cpia2_usb.c
··· 33 33 34 34 static int frame_sizes[] = { 35 35 0, // USBIF_CMDONLY 36 - 0, // USBIF_BULK 37 - 128, // USBIF_ISO_1 38 - 384, // USBIF_ISO_2 39 - 640, // USBIF_ISO_3 40 - 768, // USBIF_ISO_4 41 - 896, // USBIF_ISO_5 42 - 1023, // USBIF_ISO_6 36 + 0, // USBIF_BULK 37 + 128, // USBIF_ISO_1 38 + 384, // USBIF_ISO_2 39 + 640, // USBIF_ISO_3 40 + 768, // USBIF_ISO_4 41 + 896, // USBIF_ISO_5 42 + 1023, // USBIF_ISO_6 43 43 }; 44 44 45 45 #define FRAMES_PER_DESC 10
+3 -3
drivers/media/usb/cx231xx/cx231xx-audio.c
··· 404 404 } 405 405 406 406 static const struct snd_pcm_hardware snd_cx231xx_hw_capture = { 407 - .info = SNDRV_PCM_INFO_BLOCK_TRANSFER | 408 - SNDRV_PCM_INFO_MMAP | 409 - SNDRV_PCM_INFO_INTERLEAVED | 407 + .info = SNDRV_PCM_INFO_BLOCK_TRANSFER | 408 + SNDRV_PCM_INFO_MMAP | 409 + SNDRV_PCM_INFO_INTERLEAVED | 410 410 SNDRV_PCM_INFO_MMAP_VALID, 411 411 412 412 .formats = SNDRV_PCM_FMTBIT_S16_LE,
+1 -1
drivers/media/usb/cx231xx/cx231xx-avcore.c
··· 2168 2168 } 2169 2169 2170 2170 /****************************************************************************** 2171 - * I 2 S - B L O C K C O N T R O L functions * 2171 + * I 2 S - B L O C K C O N T R O L functions * 2172 2172 ******************************************************************************/ 2173 2173 int cx231xx_i2s_blk_initialize(struct cx231xx *dev) 2174 2174 {
+1 -1
drivers/media/usb/cx231xx/cx231xx-core.c
··· 56 56 dev->name, __func__ , ##arg); } while (0) 57 57 58 58 /***************************************************************** 59 - * Device control list functions * 59 + * Device control list functions * 60 60 ******************************************************************/ 61 61 62 62 LIST_HEAD(cx231xx_devlist);
+1 -1
drivers/media/usb/cx231xx/cx231xx-i2c.c
··· 51 51 if (i2c_debug >= lvl) { \ 52 52 printk(KERN_DEBUG "%s at %s: " fmt, \ 53 53 dev->name, __func__ , ##args); \ 54 - } \ 54 + } \ 55 55 } while (0) 56 56 57 57 static inline int get_real_i2c_port(struct cx231xx *dev, int bus_nr)
+1 -1
drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h
··· 144 144 #define SOURCE_EXTERNAL 0x8 145 145 #define SOURCE_TS_BDA 0x10 146 146 #define SOURCE_TS_ENCODE 0x20 147 - #define SOURCE_TS_EXTERNAL 0x40 147 + #define SOURCE_TS_EXTERNAL 0x40 148 148 149 149 /*************************************************************************** 150 150 * interface information define *
+10 -10
drivers/media/usb/cx231xx/cx231xx-reg.h
··· 1433 1433 #define FLD_AC97_SHUTDOWN 0x00000001 1434 1434 1435 1435 /* Cx231xx redefine */ 1436 - #define QPSK_IAGC_CTL1 0x94c 1437 - #define QPSK_IAGC_CTL2 0x950 1438 - #define QPSK_FEPR_FREQ 0x954 1439 - #define QPSK_BTL_CTL1 0x958 1440 - #define QPSK_BTL_CTL2 0x95c 1441 - #define QPSK_CTL_CTL1 0x960 1442 - #define QPSK_CTL_CTL2 0x964 1443 - #define QPSK_MF_FAGC_CTL 0x968 1444 - #define QPSK_EQ_CTL 0x96c 1445 - #define QPSK_LOCK_CTL 0x970 1436 + #define QPSK_IAGC_CTL1 0x94c 1437 + #define QPSK_IAGC_CTL2 0x950 1438 + #define QPSK_FEPR_FREQ 0x954 1439 + #define QPSK_BTL_CTL1 0x958 1440 + #define QPSK_BTL_CTL2 0x95c 1441 + #define QPSK_CTL_CTL1 0x960 1442 + #define QPSK_CTL_CTL2 0x964 1443 + #define QPSK_MF_FAGC_CTL 0x968 1444 + #define QPSK_EQ_CTL 0x96c 1445 + #define QPSK_LOCK_CTL 0x970 1446 1446 1447 1447 /*****************************************************************************/ 1448 1448 #define FM1_DFT_CTL 0x9a8
+108 -108
drivers/media/usb/dvb-usb/az6027.c
··· 36 36 /* 0x0000000b, SYSREG */ 37 37 { STB0899_DEV_ID , 0x30 }, 38 38 { STB0899_DISCNTRL1 , 0x32 }, 39 - { STB0899_DISCNTRL2 , 0x80 }, 40 - { STB0899_DISRX_ST0 , 0x04 }, 41 - { STB0899_DISRX_ST1 , 0x00 }, 42 - { STB0899_DISPARITY , 0x00 }, 39 + { STB0899_DISCNTRL2 , 0x80 }, 40 + { STB0899_DISRX_ST0 , 0x04 }, 41 + { STB0899_DISRX_ST1 , 0x00 }, 42 + { STB0899_DISPARITY , 0x00 }, 43 43 { STB0899_DISSTATUS , 0x20 }, 44 - { STB0899_DISF22 , 0x99 }, 45 - { STB0899_DISF22RX , 0xa8 }, 44 + { STB0899_DISF22 , 0x99 }, 45 + { STB0899_DISF22RX , 0xa8 }, 46 46 /* SYSREG ? */ 47 - { STB0899_ACRPRESC , 0x11 }, 48 - { STB0899_ACRDIV1 , 0x0a }, 49 - { STB0899_ACRDIV2 , 0x05 }, 50 - { STB0899_DACR1 , 0x00 }, 51 - { STB0899_DACR2 , 0x00 }, 52 - { STB0899_OUTCFG , 0x00 }, 53 - { STB0899_MODECFG , 0x00 }, 47 + { STB0899_ACRPRESC , 0x11 }, 48 + { STB0899_ACRDIV1 , 0x0a }, 49 + { STB0899_ACRDIV2 , 0x05 }, 50 + { STB0899_DACR1 , 0x00 }, 51 + { STB0899_DACR2 , 0x00 }, 52 + { STB0899_OUTCFG , 0x00 }, 53 + { STB0899_MODECFG , 0x00 }, 54 54 { STB0899_IRQSTATUS_3 , 0xfe }, 55 55 { STB0899_IRQSTATUS_2 , 0x03 }, 56 56 { STB0899_IRQSTATUS_1 , 0x7c }, 57 57 { STB0899_IRQSTATUS_0 , 0xf4 }, 58 - { STB0899_IRQMSK_3 , 0xf3 }, 59 - { STB0899_IRQMSK_2 , 0xfc }, 60 - { STB0899_IRQMSK_1 , 0xff }, 58 + { STB0899_IRQMSK_3 , 0xf3 }, 59 + { STB0899_IRQMSK_2 , 0xfc }, 60 + { STB0899_IRQMSK_1 , 0xff }, 61 61 { STB0899_IRQMSK_0 , 0xff }, 62 62 { STB0899_IRQCFG , 0x00 }, 63 - { STB0899_I2CCFG , 0x88 }, 64 - { STB0899_I2CRPT , 0x58 }, 63 + { STB0899_I2CCFG , 0x88 }, 64 + { STB0899_I2CRPT , 0x58 }, 65 65 { STB0899_IOPVALUE5 , 0x00 }, 66 66 { STB0899_IOPVALUE4 , 0x33 }, 67 67 { STB0899_IOPVALUE3 , 0x6d }, 68 68 { STB0899_IOPVALUE2 , 0x90 }, 69 69 { STB0899_IOPVALUE1 , 0x60 }, 70 70 { STB0899_IOPVALUE0 , 0x00 }, 71 - { STB0899_GPIO00CFG , 0x82 }, 72 - { STB0899_GPIO01CFG , 0x82 }, 73 - { STB0899_GPIO02CFG , 0x82 }, 74 - { STB0899_GPIO03CFG , 0x82 }, 75 - { STB0899_GPIO04CFG , 0x82 }, 76 - { STB0899_GPIO05CFG , 0x82 }, 77 - { STB0899_GPIO06CFG , 0x82 }, 78 - { STB0899_GPIO07CFG , 0x82 }, 79 - { STB0899_GPIO08CFG , 0x82 }, 80 - { STB0899_GPIO09CFG , 0x82 }, 81 - { STB0899_GPIO10CFG , 0x82 }, 82 - { STB0899_GPIO11CFG , 0x82 }, 83 - { STB0899_GPIO12CFG , 0x82 }, 84 - { STB0899_GPIO13CFG , 0x82 }, 85 - { STB0899_GPIO14CFG , 0x82 }, 86 - { STB0899_GPIO15CFG , 0x82 }, 87 - { STB0899_GPIO16CFG , 0x82 }, 88 - { STB0899_GPIO17CFG , 0x82 }, 89 - { STB0899_GPIO18CFG , 0x82 }, 90 - { STB0899_GPIO19CFG , 0x82 }, 91 - { STB0899_GPIO20CFG , 0x82 }, 92 - { STB0899_SDATCFG , 0xb8 }, 93 - { STB0899_SCLTCFG , 0xba }, 94 - { STB0899_AGCRFCFG , 0x1c }, /* 0x11 */ 95 - { STB0899_GPIO22 , 0x82 }, /* AGCBB2CFG */ 96 - { STB0899_GPIO21 , 0x91 }, /* AGCBB1CFG */ 97 - { STB0899_DIRCLKCFG , 0x82 }, 98 - { STB0899_CLKOUT27CFG , 0x7e }, 99 - { STB0899_STDBYCFG , 0x82 }, 100 - { STB0899_CS0CFG , 0x82 }, 101 - { STB0899_CS1CFG , 0x82 }, 102 - { STB0899_DISEQCOCFG , 0x20 }, 71 + { STB0899_GPIO00CFG , 0x82 }, 72 + { STB0899_GPIO01CFG , 0x82 }, 73 + { STB0899_GPIO02CFG , 0x82 }, 74 + { STB0899_GPIO03CFG , 0x82 }, 75 + { STB0899_GPIO04CFG , 0x82 }, 76 + { STB0899_GPIO05CFG , 0x82 }, 77 + { STB0899_GPIO06CFG , 0x82 }, 78 + { STB0899_GPIO07CFG , 0x82 }, 79 + { STB0899_GPIO08CFG , 0x82 }, 80 + { STB0899_GPIO09CFG , 0x82 }, 81 + { STB0899_GPIO10CFG , 0x82 }, 82 + { STB0899_GPIO11CFG , 0x82 }, 83 + { STB0899_GPIO12CFG , 0x82 }, 84 + { STB0899_GPIO13CFG , 0x82 }, 85 + { STB0899_GPIO14CFG , 0x82 }, 86 + { STB0899_GPIO15CFG , 0x82 }, 87 + { STB0899_GPIO16CFG , 0x82 }, 88 + { STB0899_GPIO17CFG , 0x82 }, 89 + { STB0899_GPIO18CFG , 0x82 }, 90 + { STB0899_GPIO19CFG , 0x82 }, 91 + { STB0899_GPIO20CFG , 0x82 }, 92 + { STB0899_SDATCFG , 0xb8 }, 93 + { STB0899_SCLTCFG , 0xba }, 94 + { STB0899_AGCRFCFG , 0x1c }, /* 0x11 */ 95 + { STB0899_GPIO22 , 0x82 }, /* AGCBB2CFG */ 96 + { STB0899_GPIO21 , 0x91 }, /* AGCBB1CFG */ 97 + { STB0899_DIRCLKCFG , 0x82 }, 98 + { STB0899_CLKOUT27CFG , 0x7e }, 99 + { STB0899_STDBYCFG , 0x82 }, 100 + { STB0899_CS0CFG , 0x82 }, 101 + { STB0899_CS1CFG , 0x82 }, 102 + { STB0899_DISEQCOCFG , 0x20 }, 103 103 { STB0899_GPIO32CFG , 0x82 }, 104 104 { STB0899_GPIO33CFG , 0x82 }, 105 105 { STB0899_GPIO34CFG , 0x82 }, ··· 108 108 { STB0899_GPIO37CFG , 0x82 }, 109 109 { STB0899_GPIO38CFG , 0x82 }, 110 110 { STB0899_GPIO39CFG , 0x82 }, 111 - { STB0899_NCOARSE , 0x17 }, /* 0x15 = 27 Mhz Clock, F/3 = 198MHz, F/6 = 99MHz */ 112 - { STB0899_SYNTCTRL , 0x02 }, /* 0x00 = CLK from CLKI, 0x02 = CLK from XTALI */ 113 - { STB0899_FILTCTRL , 0x00 }, 114 - { STB0899_SYSCTRL , 0x01 }, 115 - { STB0899_STOPCLK1 , 0x20 }, 116 - { STB0899_STOPCLK2 , 0x00 }, 111 + { STB0899_NCOARSE , 0x17 }, /* 0x15 = 27 Mhz Clock, F/3 = 198MHz, F/6 = 99MHz */ 112 + { STB0899_SYNTCTRL , 0x02 }, /* 0x00 = CLK from CLKI, 0x02 = CLK from XTALI */ 113 + { STB0899_FILTCTRL , 0x00 }, 114 + { STB0899_SYSCTRL , 0x01 }, 115 + { STB0899_STOPCLK1 , 0x20 }, 116 + { STB0899_STOPCLK2 , 0x00 }, 117 117 { STB0899_INTBUFSTATUS , 0x00 }, 118 - { STB0899_INTBUFCTRL , 0x0a }, 118 + { STB0899_INTBUFCTRL , 0x0a }, 119 119 { 0xffff , 0xff }, 120 120 }; 121 121 122 122 static const struct stb0899_s1_reg az6027_stb0899_s1_init_3[] = { 123 - { STB0899_DEMOD , 0x00 }, 124 - { STB0899_RCOMPC , 0xc9 }, 125 - { STB0899_AGC1CN , 0x01 }, 126 - { STB0899_AGC1REF , 0x10 }, 123 + { STB0899_DEMOD , 0x00 }, 124 + { STB0899_RCOMPC , 0xc9 }, 125 + { STB0899_AGC1CN , 0x01 }, 126 + { STB0899_AGC1REF , 0x10 }, 127 127 { STB0899_RTC , 0x23 }, 128 - { STB0899_TMGCFG , 0x4e }, 129 - { STB0899_AGC2REF , 0x34 }, 130 - { STB0899_TLSR , 0x84 }, 131 - { STB0899_CFD , 0xf7 }, 128 + { STB0899_TMGCFG , 0x4e }, 129 + { STB0899_AGC2REF , 0x34 }, 130 + { STB0899_TLSR , 0x84 }, 131 + { STB0899_CFD , 0xf7 }, 132 132 { STB0899_ACLC , 0x87 }, 133 - { STB0899_BCLC , 0x94 }, 134 - { STB0899_EQON , 0x41 }, 135 - { STB0899_LDT , 0xf1 }, 136 - { STB0899_LDT2 , 0xe3 }, 137 - { STB0899_EQUALREF , 0xb4 }, 138 - { STB0899_TMGRAMP , 0x10 }, 139 - { STB0899_TMGTHD , 0x30 }, 133 + { STB0899_BCLC , 0x94 }, 134 + { STB0899_EQON , 0x41 }, 135 + { STB0899_LDT , 0xf1 }, 136 + { STB0899_LDT2 , 0xe3 }, 137 + { STB0899_EQUALREF , 0xb4 }, 138 + { STB0899_TMGRAMP , 0x10 }, 139 + { STB0899_TMGTHD , 0x30 }, 140 140 { STB0899_IDCCOMP , 0xfd }, 141 141 { STB0899_QDCCOMP , 0xff }, 142 142 { STB0899_POWERI , 0x0c }, ··· 155 155 { STB0899_NIRL , 0x80 }, 156 156 { STB0899_ISYMB , 0x1d }, 157 157 { STB0899_QSYMB , 0xa6 }, 158 - { STB0899_SFRH , 0x2f }, 159 - { STB0899_SFRM , 0x68 }, 160 - { STB0899_SFRL , 0x40 }, 161 - { STB0899_SFRUPH , 0x2f }, 162 - { STB0899_SFRUPM , 0x68 }, 163 - { STB0899_SFRUPL , 0x40 }, 158 + { STB0899_SFRH , 0x2f }, 159 + { STB0899_SFRM , 0x68 }, 160 + { STB0899_SFRL , 0x40 }, 161 + { STB0899_SFRUPH , 0x2f }, 162 + { STB0899_SFRUPM , 0x68 }, 163 + { STB0899_SFRUPL , 0x40 }, 164 164 { STB0899_EQUAI1 , 0x02 }, 165 165 { STB0899_EQUAQ1 , 0xff }, 166 166 { STB0899_EQUAI2 , 0x04 }, ··· 172 172 { STB0899_EQUAI5 , 0x08 }, 173 173 { STB0899_EQUAQ5 , 0xf5 }, 174 174 { STB0899_DSTATUS2 , 0x00 }, 175 - { STB0899_VSTATUS , 0x00 }, 175 + { STB0899_VSTATUS , 0x00 }, 176 176 { STB0899_VERROR , 0x86 }, 177 177 { STB0899_IQSWAP , 0x2a }, 178 178 { STB0899_ECNT1M , 0x00 }, ··· 181 181 { STB0899_ECNT2L , 0x00 }, 182 182 { STB0899_ECNT3M , 0x0a }, 183 183 { STB0899_ECNT3L , 0xad }, 184 - { STB0899_FECAUTO1 , 0x06 }, 184 + { STB0899_FECAUTO1 , 0x06 }, 185 185 { STB0899_FECM , 0x01 }, 186 - { STB0899_VTH12 , 0xb0 }, 187 - { STB0899_VTH23 , 0x7a }, 186 + { STB0899_VTH12 , 0xb0 }, 187 + { STB0899_VTH23 , 0x7a }, 188 188 { STB0899_VTH34 , 0x58 }, 189 - { STB0899_VTH56 , 0x38 }, 190 - { STB0899_VTH67 , 0x34 }, 191 - { STB0899_VTH78 , 0x24 }, 192 - { STB0899_PRVIT , 0xff }, 193 - { STB0899_VITSYNC , 0x19 }, 194 - { STB0899_RSULC , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */ 195 - { STB0899_TSULC , 0x42 }, 196 - { STB0899_RSLLC , 0x41 }, 189 + { STB0899_VTH56 , 0x38 }, 190 + { STB0899_VTH67 , 0x34 }, 191 + { STB0899_VTH78 , 0x24 }, 192 + { STB0899_PRVIT , 0xff }, 193 + { STB0899_VITSYNC , 0x19 }, 194 + { STB0899_RSULC , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */ 195 + { STB0899_TSULC , 0x42 }, 196 + { STB0899_RSLLC , 0x41 }, 197 197 { STB0899_TSLPL , 0x12 }, 198 - { STB0899_TSCFGH , 0x0c }, 199 - { STB0899_TSCFGM , 0x00 }, 200 - { STB0899_TSCFGL , 0x00 }, 198 + { STB0899_TSCFGH , 0x0c }, 199 + { STB0899_TSCFGM , 0x00 }, 200 + { STB0899_TSCFGL , 0x00 }, 201 201 { STB0899_TSOUT , 0x69 }, /* 0x0d for CAM */ 202 - { STB0899_RSSYNCDEL , 0x00 }, 203 - { STB0899_TSINHDELH , 0x02 }, 202 + { STB0899_RSSYNCDEL , 0x00 }, 203 + { STB0899_TSINHDELH , 0x02 }, 204 204 { STB0899_TSINHDELM , 0x00 }, 205 205 { STB0899_TSINHDELL , 0x00 }, 206 206 { STB0899_TSLLSTKM , 0x1b }, ··· 211 211 { STB0899_PCKLENLL , 0xcc }, 212 212 { STB0899_RSPCKLEN , 0xbd }, 213 213 { STB0899_TSSTATUS , 0x90 }, 214 - { STB0899_ERRCTRL1 , 0xb6 }, 215 - { STB0899_ERRCTRL2 , 0x95 }, 216 - { STB0899_ERRCTRL3 , 0x8d }, 214 + { STB0899_ERRCTRL1 , 0xb6 }, 215 + { STB0899_ERRCTRL2 , 0x95 }, 216 + { STB0899_ERRCTRL3 , 0x8d }, 217 217 { STB0899_DMONMSK1 , 0x27 }, 218 218 { STB0899_DMONMSK0 , 0x03 }, 219 - { STB0899_DEMAPVIT , 0x5c }, 219 + { STB0899_DEMAPVIT , 0x5c }, 220 220 { STB0899_PLPARM , 0x19 }, 221 - { STB0899_PDELCTRL , 0x48 }, 222 - { STB0899_PDELCTRL2 , 0x00 }, 223 - { STB0899_BBHCTRL1 , 0x00 }, 224 - { STB0899_BBHCTRL2 , 0x00 }, 225 - { STB0899_HYSTTHRESH , 0x77 }, 221 + { STB0899_PDELCTRL , 0x48 }, 222 + { STB0899_PDELCTRL2 , 0x00 }, 223 + { STB0899_BBHCTRL1 , 0x00 }, 224 + { STB0899_BBHCTRL2 , 0x00 }, 225 + { STB0899_HYSTTHRESH , 0x77 }, 226 226 { STB0899_MATCSTM , 0x00 }, 227 227 { STB0899_MATCSTL , 0x00 }, 228 228 { STB0899_UPLCSTM , 0x00 }, ··· 261 261 .init_s2_fec = stb0899_s2_init_4, 262 262 .init_tst = stb0899_s1_init_5, 263 263 264 - .demod_address = 0xd0, /* 0x68, 0xd0 >> 1 */ 264 + .demod_address = 0xd0, /* 0x68, 0xd0 >> 1 */ 265 265 266 266 .xtal_freq = 27000000, 267 267 .inversion = IQ_SWAP_ON, ··· 1181 1181 /* usb specific object needed to register this driver with the usb subsystem */ 1182 1182 static struct usb_driver az6027_usb_driver = { 1183 1183 .name = "dvb_usb_az6027", 1184 - .probe = az6027_usb_probe, 1185 - .disconnect = az6027_usb_disconnect, 1186 - .id_table = az6027_usb_table, 1184 + .probe = az6027_usb_probe, 1185 + .disconnect = az6027_usb_disconnect, 1186 + .id_table = az6027_usb_table, 1187 1187 }; 1188 1188 1189 1189 module_usb_driver(az6027_usb_driver);
+1 -1
drivers/media/usb/gspca/stv06xx/stv06xx.c
··· 579 579 580 580 /* -- module initialisation -- */ 581 581 static const struct usb_device_id device_table[] = { 582 - {USB_DEVICE(0x046d, 0x0840), .driver_info = BRIDGE_STV600 }, /* QuickCam Express */ 582 + {USB_DEVICE(0x046d, 0x0840), .driver_info = BRIDGE_STV600 }, /* QuickCam Express */ 583 583 {USB_DEVICE(0x046d, 0x0850), .driver_info = BRIDGE_STV610 }, /* LEGO cam / QuickCam Web */ 584 584 {USB_DEVICE(0x046d, 0x0870), .driver_info = BRIDGE_STV602 }, /* Dexxa WebCam USB */ 585 585 {USB_DEVICE(0x046D, 0x08F0), .driver_info = BRIDGE_ST6422 }, /* QuickCam Messenger */
+13 -13
drivers/media/usb/hdpvr/hdpvr-video.c
··· 941 941 return 0; 942 942 case V4L2_CID_MPEG_VIDEO_ENCODING: 943 943 return 0; 944 - /* case V4L2_CID_MPEG_VIDEO_B_FRAMES: */ 945 - /* if (ctrl->value == 0 && !(opt->gop_mode & 0x2)) { */ 946 - /* opt->gop_mode |= 0x2; */ 947 - /* hdpvr_config_call(dev, CTRL_GOP_MODE_VALUE, */ 948 - /* opt->gop_mode); */ 949 - /* } */ 950 - /* if (ctrl->value == 128 && opt->gop_mode & 0x2) { */ 951 - /* opt->gop_mode &= ~0x2; */ 952 - /* hdpvr_config_call(dev, CTRL_GOP_MODE_VALUE, */ 953 - /* opt->gop_mode); */ 954 - /* } */ 955 - /* break; */ 944 + /* case V4L2_CID_MPEG_VIDEO_B_FRAMES: */ 945 + /* if (ctrl->value == 0 && !(opt->gop_mode & 0x2)) { */ 946 + /* opt->gop_mode |= 0x2; */ 947 + /* hdpvr_config_call(dev, CTRL_GOP_MODE_VALUE, */ 948 + /* opt->gop_mode); */ 949 + /* } */ 950 + /* if (ctrl->value == 128 && opt->gop_mode & 0x2) { */ 951 + /* opt->gop_mode &= ~0x2; */ 952 + /* hdpvr_config_call(dev, CTRL_GOP_MODE_VALUE, */ 953 + /* opt->gop_mode); */ 954 + /* } */ 955 + /* break; */ 956 956 case V4L2_CID_MPEG_VIDEO_BITRATE_MODE: { 957 957 uint peak_bitrate = dev->video_bitrate_peak->val / 100000; 958 958 uint bitrate = dev->video_bitrate->val / 100000; ··· 1154 1154 static const struct video_device hdpvr_video_template = { 1155 1155 .fops = &hdpvr_fops, 1156 1156 .release = hdpvr_device_release, 1157 - .ioctl_ops = &hdpvr_ioctl_ops, 1157 + .ioctl_ops = &hdpvr_ioctl_ops, 1158 1158 .tvnorms = V4L2_STD_ALL, 1159 1159 }; 1160 1160
+8 -8
drivers/media/usb/hdpvr/hdpvr.h
··· 232 232 233 233 234 234 /* :0 s 38 d3 0000 0000 0001 1 = 00 */ 235 - /* ret = usb_control_msg(dev->udev, */ 236 - /* usb_sndctrlpipe(dev->udev, 0), */ 237 - /* 0xd3, 0x38, */ 238 - /* 0, 0, */ 239 - /* "\0", 1, */ 240 - /* 1000); */ 235 + /* ret = usb_control_msg(dev->udev, */ 236 + /* usb_sndctrlpipe(dev->udev, 0), */ 237 + /* 0xd3, 0x38, */ 238 + /* 0, 0, */ 239 + /* "\0", 1, */ 240 + /* 1000); */ 241 241 242 - /* info("control request returned %d", ret); */ 243 - /* msleep(5000); */ 242 + /* info("control request returned %d", ret); */ 243 + /* msleep(5000); */ 244 244 245 245 246 246 /* :0 s b8 81 1400 0003 0005 5 <
+3 -3
drivers/media/usb/pwc/pwc.h
··· 50 50 51 51 /* Version block */ 52 52 #define PWC_VERSION "10.0.15" 53 - #define PWC_NAME "pwc" 53 + #define PWC_NAME "pwc" 54 54 #define PFX PWC_NAME ": " 55 55 56 56 ··· 120 120 #define MAX_ISO_BUFS 3 121 121 #define ISO_FRAMES_PER_DESC 10 122 122 #define ISO_MAX_FRAME_SIZE 960 123 - #define ISO_BUFFER_SIZE (ISO_FRAMES_PER_DESC * ISO_MAX_FRAME_SIZE) 123 + #define ISO_BUFFER_SIZE (ISO_FRAMES_PER_DESC * ISO_MAX_FRAME_SIZE) 124 124 125 125 /* Maximum size after decompression is 640x480 YUV data, 1.5 * 640 * 480 */ 126 - #define PWC_FRAME_SIZE (460800 + TOUCAM_HEADER_SIZE + TOUCAM_TRAILER_SIZE) 126 + #define PWC_FRAME_SIZE (460800 + TOUCAM_HEADER_SIZE + TOUCAM_TRAILER_SIZE) 127 127 128 128 /* Absolute minimum and maximum number of buffers available for mmap() */ 129 129 #define MIN_FRAMES 2
+1 -1
drivers/media/usb/siano/smsusb.c
··· 61 61 struct usb_device *udev; 62 62 struct smscore_device_t *coredev; 63 63 64 - struct smsusb_urb_t surbs[MAX_URBS]; 64 + struct smsusb_urb_t surbs[MAX_URBS]; 65 65 66 66 int response_alignment; 67 67 int buffer_size;
+1 -1
drivers/media/usb/stk1160/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 - stk1160-y := stk1160-core.o \ 2 + stk1160-y := stk1160-core.o \ 3 3 stk1160-v4l.o \ 4 4 stk1160-video.o \ 5 5 stk1160-i2c.o \
+22 -22
drivers/media/usb/stkwebcam/stk-sensor.c
··· 397 397 /* V4L2_PIX_FMT_UYVY */ 398 398 static struct regval ov_fmt_uyvy[] = { 399 399 {REG_TSLB, TSLB_YLAST|0x08 }, 400 - { 0x4f, 0x80 }, /* "matrix coefficient 1" */ 401 - { 0x50, 0x80 }, /* "matrix coefficient 2" */ 400 + { 0x4f, 0x80 }, /* "matrix coefficient 1" */ 401 + { 0x50, 0x80 }, /* "matrix coefficient 2" */ 402 402 { 0x51, 0 }, /* vb */ 403 - { 0x52, 0x22 }, /* "matrix coefficient 4" */ 404 - { 0x53, 0x5e }, /* "matrix coefficient 5" */ 405 - { 0x54, 0x80 }, /* "matrix coefficient 6" */ 403 + { 0x52, 0x22 }, /* "matrix coefficient 4" */ 404 + { 0x53, 0x5e }, /* "matrix coefficient 5" */ 405 + { 0x54, 0x80 }, /* "matrix coefficient 6" */ 406 406 {REG_COM13, COM13_UVSAT|COM13_CMATRIX}, 407 407 {REG_COM15, COM15_R00FF }, 408 408 {0xff, 0xff}, /* END MARKER */ ··· 410 410 /* V4L2_PIX_FMT_YUYV */ 411 411 static struct regval ov_fmt_yuyv[] = { 412 412 {REG_TSLB, 0 }, 413 - { 0x4f, 0x80 }, /* "matrix coefficient 1" */ 414 - { 0x50, 0x80 }, /* "matrix coefficient 2" */ 413 + { 0x4f, 0x80 }, /* "matrix coefficient 1" */ 414 + { 0x50, 0x80 }, /* "matrix coefficient 2" */ 415 415 { 0x51, 0 }, /* vb */ 416 - { 0x52, 0x22 }, /* "matrix coefficient 4" */ 417 - { 0x53, 0x5e }, /* "matrix coefficient 5" */ 418 - { 0x54, 0x80 }, /* "matrix coefficient 6" */ 416 + { 0x52, 0x22 }, /* "matrix coefficient 4" */ 417 + { 0x53, 0x5e }, /* "matrix coefficient 5" */ 418 + { 0x54, 0x80 }, /* "matrix coefficient 6" */ 419 419 {REG_COM13, COM13_UVSAT|COM13_CMATRIX}, 420 420 {REG_COM15, COM15_R00FF }, 421 421 {0xff, 0xff}, /* END MARKER */ ··· 426 426 { REG_RGB444, 0 }, /* No RGB444 please */ 427 427 {REG_TSLB, 0x00}, 428 428 { REG_COM1, 0x0 }, 429 - { REG_COM9, 0x38 }, /* 16x gain ceiling; 0x8 is reserved bit */ 430 - { 0x4f, 0xb3 }, /* "matrix coefficient 1" */ 431 - { 0x50, 0xb3 }, /* "matrix coefficient 2" */ 429 + { REG_COM9, 0x38 }, /* 16x gain ceiling; 0x8 is reserved bit */ 430 + { 0x4f, 0xb3 }, /* "matrix coefficient 1" */ 431 + { 0x50, 0xb3 }, /* "matrix coefficient 2" */ 432 432 { 0x51, 0 }, /* vb */ 433 - { 0x52, 0x3d }, /* "matrix coefficient 4" */ 434 - { 0x53, 0xa7 }, /* "matrix coefficient 5" */ 435 - { 0x54, 0xe4 }, /* "matrix coefficient 6" */ 433 + { 0x52, 0x3d }, /* "matrix coefficient 4" */ 434 + { 0x53, 0xa7 }, /* "matrix coefficient 5" */ 435 + { 0x54, 0xe4 }, /* "matrix coefficient 6" */ 436 436 { REG_COM13, COM13_GAMMA }, 437 437 { REG_COM15, COM15_RGB565|COM15_R00FF }, 438 438 { 0xff, 0xff }, ··· 443 443 { REG_RGB444, 0 }, /* No RGB444 please */ 444 444 {REG_TSLB, TSLB_BYTEORD }, 445 445 { REG_COM1, 0x0 }, 446 - { REG_COM9, 0x38 }, /* 16x gain ceiling; 0x8 is reserved bit */ 447 - { 0x4f, 0xb3 }, /* "matrix coefficient 1" */ 448 - { 0x50, 0xb3 }, /* "matrix coefficient 2" */ 446 + { REG_COM9, 0x38 }, /* 16x gain ceiling; 0x8 is reserved bit */ 447 + { 0x4f, 0xb3 }, /* "matrix coefficient 1" */ 448 + { 0x50, 0xb3 }, /* "matrix coefficient 2" */ 449 449 { 0x51, 0 }, /* vb */ 450 - { 0x52, 0x3d }, /* "matrix coefficient 4" */ 451 - { 0x53, 0xa7 }, /* "matrix coefficient 5" */ 452 - { 0x54, 0xe4 }, /* "matrix coefficient 6" */ 450 + { 0x52, 0x3d }, /* "matrix coefficient 4" */ 451 + { 0x53, 0xa7 }, /* "matrix coefficient 5" */ 452 + { 0x54, 0xe4 }, /* "matrix coefficient 6" */ 453 453 { REG_COM13, COM13_GAMMA }, 454 454 { REG_COM15, COM15_RGB565|COM15_R00FF }, 455 455 { 0xff, 0xff },
+7 -7
drivers/media/usb/uvc/uvc_driver.c
··· 963 963 * Size of this descriptor, in bytes: 24+p+n*2 964 964 * ---------------------------------------------------------- 965 965 * 23+p+n bmControlsType N Bitmap 966 - * Individual bits in the set are defined: 967 - * 0: Absolute 968 - * 1: Relative 966 + * Individual bits in the set are defined: 967 + * 0: Absolute 968 + * 1: Relative 969 969 * 970 - * This bitset is mapped exactly the same as bmControls. 970 + * This bitset is mapped exactly the same as bmControls. 971 971 * ---------------------------------------------------------- 972 972 * 23+p+n*2 bReserved 1 Boolean 973 973 * ---------------------------------------------------------- ··· 2481 2481 .bInterfaceClass = USB_CLASS_VIDEO, 2482 2482 .bInterfaceSubClass = 1, 2483 2483 .bInterfaceProtocol = 0, 2484 - .driver_info = (kernel_ulong_t)&uvc_quirk_probe_def }, 2484 + .driver_info = (kernel_ulong_t)&uvc_quirk_probe_def }, 2485 2485 /* Dell SP2008WFP Monitor */ 2486 2486 { .match_flags = USB_DEVICE_ID_MATCH_DEVICE 2487 2487 | USB_DEVICE_ID_MATCH_INT_INFO, ··· 2490 2490 .bInterfaceClass = USB_CLASS_VIDEO, 2491 2491 .bInterfaceSubClass = 1, 2492 2492 .bInterfaceProtocol = 0, 2493 - .driver_info = (kernel_ulong_t)&uvc_quirk_probe_def }, 2493 + .driver_info = (kernel_ulong_t)&uvc_quirk_probe_def }, 2494 2494 /* Dell Alienware X51 */ 2495 2495 { .match_flags = USB_DEVICE_ID_MATCH_DEVICE 2496 2496 | USB_DEVICE_ID_MATCH_INT_INFO, ··· 2526 2526 .bInterfaceClass = USB_CLASS_VIDEO, 2527 2527 .bInterfaceSubClass = 1, 2528 2528 .bInterfaceProtocol = 0, 2529 - .driver_info = UVC_QUIRK_INFO(UVC_QUIRK_PROBE_MINMAX 2529 + .driver_info = UVC_QUIRK_INFO(UVC_QUIRK_PROBE_MINMAX 2530 2530 | UVC_QUIRK_BUILTIN_ISIGHT) }, 2531 2531 /* Apple Built-In iSight via iBridge */ 2532 2532 { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
+5 -5
drivers/media/usb/uvc/uvc_isight.c
··· 27 27 * 28 28 * Offset Size (bytes) Description 29 29 * ------------------------------------------------------------------ 30 - * 0x00 1 Header length 31 - * 0x01 1 Flags (UVC-compliant) 32 - * 0x02 4 Always equal to '11223344' 33 - * 0x06 8 Always equal to 'deadbeefdeadface' 34 - * 0x0e 16 Unknown 30 + * 0x00 1 Header length 31 + * 0x01 1 Flags (UVC-compliant) 32 + * 0x02 4 Always equal to '11223344' 33 + * 0x06 8 Always equal to 'deadbeefdeadface' 34 + * 0x0e 16 Unknown 35 35 * 36 36 * The header can be prefixed by an optional, unknown-purpose byte. 37 37 */
+3 -3
drivers/media/v4l2-core/v4l2-compat-ioctl32.c
··· 33 33 34 34 struct v4l2_clip32 { 35 35 struct v4l2_rect c; 36 - compat_caddr_t next; 36 + compat_caddr_t next; 37 37 }; 38 38 39 39 struct v4l2_window32 { ··· 582 582 struct v4l2_framebuffer32 { 583 583 __u32 capability; 584 584 __u32 flags; 585 - compat_caddr_t base; 585 + compat_caddr_t base; 586 586 struct { 587 587 __u32 width; 588 588 __u32 height; ··· 857 857 #define VIDIOC_ENUMINPUT32 _IOWR('V', 26, struct v4l2_input32) 858 858 #define VIDIOC_G_EDID32 _IOWR('V', 40, struct v4l2_edid32) 859 859 #define VIDIOC_S_EDID32 _IOWR('V', 41, struct v4l2_edid32) 860 - #define VIDIOC_TRY_FMT32 _IOWR('V', 64, struct v4l2_format32) 860 + #define VIDIOC_TRY_FMT32 _IOWR('V', 64, struct v4l2_format32) 861 861 #define VIDIOC_G_EXT_CTRLS32 _IOWR('V', 71, struct v4l2_ext_controls32) 862 862 #define VIDIOC_S_EXT_CTRLS32 _IOWR('V', 72, struct v4l2_ext_controls32) 863 863 #define VIDIOC_TRY_EXT_CTRLS32 _IOWR('V', 73, struct v4l2_ext_controls32)
+31 -31
drivers/media/v4l2-core/v4l2-ioctl.c
··· 46 46 }; 47 47 48 48 static const struct std_descr standards[] = { 49 - { V4L2_STD_NTSC, "NTSC" }, 50 - { V4L2_STD_NTSC_M, "NTSC-M" }, 51 - { V4L2_STD_NTSC_M_JP, "NTSC-M-JP" }, 49 + { V4L2_STD_NTSC, "NTSC" }, 50 + { V4L2_STD_NTSC_M, "NTSC-M" }, 51 + { V4L2_STD_NTSC_M_JP, "NTSC-M-JP" }, 52 52 { V4L2_STD_NTSC_M_KR, "NTSC-M-KR" }, 53 - { V4L2_STD_NTSC_443, "NTSC-443" }, 54 - { V4L2_STD_PAL, "PAL" }, 55 - { V4L2_STD_PAL_BG, "PAL-BG" }, 56 - { V4L2_STD_PAL_B, "PAL-B" }, 57 - { V4L2_STD_PAL_B1, "PAL-B1" }, 58 - { V4L2_STD_PAL_G, "PAL-G" }, 59 - { V4L2_STD_PAL_H, "PAL-H" }, 60 - { V4L2_STD_PAL_I, "PAL-I" }, 61 - { V4L2_STD_PAL_DK, "PAL-DK" }, 62 - { V4L2_STD_PAL_D, "PAL-D" }, 63 - { V4L2_STD_PAL_D1, "PAL-D1" }, 64 - { V4L2_STD_PAL_K, "PAL-K" }, 65 - { V4L2_STD_PAL_M, "PAL-M" }, 66 - { V4L2_STD_PAL_N, "PAL-N" }, 67 - { V4L2_STD_PAL_Nc, "PAL-Nc" }, 68 - { V4L2_STD_PAL_60, "PAL-60" }, 69 - { V4L2_STD_SECAM, "SECAM" }, 70 - { V4L2_STD_SECAM_B, "SECAM-B" }, 71 - { V4L2_STD_SECAM_G, "SECAM-G" }, 72 - { V4L2_STD_SECAM_H, "SECAM-H" }, 73 - { V4L2_STD_SECAM_DK, "SECAM-DK" }, 74 - { V4L2_STD_SECAM_D, "SECAM-D" }, 75 - { V4L2_STD_SECAM_K, "SECAM-K" }, 76 - { V4L2_STD_SECAM_K1, "SECAM-K1" }, 77 - { V4L2_STD_SECAM_L, "SECAM-L" }, 78 - { V4L2_STD_SECAM_LC, "SECAM-Lc" }, 79 - { 0, "Unknown" } 53 + { V4L2_STD_NTSC_443, "NTSC-443" }, 54 + { V4L2_STD_PAL, "PAL" }, 55 + { V4L2_STD_PAL_BG, "PAL-BG" }, 56 + { V4L2_STD_PAL_B, "PAL-B" }, 57 + { V4L2_STD_PAL_B1, "PAL-B1" }, 58 + { V4L2_STD_PAL_G, "PAL-G" }, 59 + { V4L2_STD_PAL_H, "PAL-H" }, 60 + { V4L2_STD_PAL_I, "PAL-I" }, 61 + { V4L2_STD_PAL_DK, "PAL-DK" }, 62 + { V4L2_STD_PAL_D, "PAL-D" }, 63 + { V4L2_STD_PAL_D1, "PAL-D1" }, 64 + { V4L2_STD_PAL_K, "PAL-K" }, 65 + { V4L2_STD_PAL_M, "PAL-M" }, 66 + { V4L2_STD_PAL_N, "PAL-N" }, 67 + { V4L2_STD_PAL_Nc, "PAL-Nc" }, 68 + { V4L2_STD_PAL_60, "PAL-60" }, 69 + { V4L2_STD_SECAM, "SECAM" }, 70 + { V4L2_STD_SECAM_B, "SECAM-B" }, 71 + { V4L2_STD_SECAM_G, "SECAM-G" }, 72 + { V4L2_STD_SECAM_H, "SECAM-H" }, 73 + { V4L2_STD_SECAM_DK, "SECAM-DK" }, 74 + { V4L2_STD_SECAM_D, "SECAM-D" }, 75 + { V4L2_STD_SECAM_K, "SECAM-K" }, 76 + { V4L2_STD_SECAM_K1, "SECAM-K1" }, 77 + { V4L2_STD_SECAM_L, "SECAM-L" }, 78 + { V4L2_STD_SECAM_LC, "SECAM-Lc" }, 79 + { 0, "Unknown" } 80 80 }; 81 81 82 82 /* video4linux standard ID conversion to standard name ··· 2544 2544 #define INFO_FL_CLEAR(v4l2_struct, field) \ 2545 2545 ((offsetof(struct v4l2_struct, field) + \ 2546 2546 sizeof(((struct v4l2_struct *)0)->field)) << 16) 2547 - #define INFO_FL_CLEAR_MASK (_IOC_SIZEMASK << 16) 2547 + #define INFO_FL_CLEAR_MASK (_IOC_SIZEMASK << 16) 2548 2548 2549 2549 #define IOCTL_INFO_STD(_ioctl, _vidioc, _debug, _flags) \ 2550 2550 [_IOC_NR(_ioctl)] = { \
+72 -72
include/media/drv-intf/cx2341x.h
··· 29 29 30 30 enum cx2341x_cap { 31 31 CX2341X_CAP_HAS_SLICED_VBI = 1 << 0, 32 - CX2341X_CAP_HAS_TS = 1 << 1, 33 - CX2341X_CAP_HAS_AC3 = 1 << 2, 32 + CX2341X_CAP_HAS_TS = 1 << 1, 33 + CX2341X_CAP_HAS_AC3 = 1 << 2, 34 34 }; 35 35 36 36 struct cx2341x_mpeg_params { ··· 204 204 /* Firmware API commands */ 205 205 206 206 /* MPEG decoder API, specific to the cx23415 */ 207 - #define CX2341X_DEC_PING_FW 0x00 208 - #define CX2341X_DEC_START_PLAYBACK 0x01 209 - #define CX2341X_DEC_STOP_PLAYBACK 0x02 210 - #define CX2341X_DEC_SET_PLAYBACK_SPEED 0x03 211 - #define CX2341X_DEC_STEP_VIDEO 0x05 212 - #define CX2341X_DEC_SET_DMA_BLOCK_SIZE 0x08 207 + #define CX2341X_DEC_PING_FW 0x00 208 + #define CX2341X_DEC_START_PLAYBACK 0x01 209 + #define CX2341X_DEC_STOP_PLAYBACK 0x02 210 + #define CX2341X_DEC_SET_PLAYBACK_SPEED 0x03 211 + #define CX2341X_DEC_STEP_VIDEO 0x05 212 + #define CX2341X_DEC_SET_DMA_BLOCK_SIZE 0x08 213 213 #define CX2341X_DEC_GET_XFER_INFO 0x09 214 214 #define CX2341X_DEC_GET_DMA_STATUS 0x0a 215 215 #define CX2341X_DEC_SCHED_DMA_FROM_HOST 0x0b 216 - #define CX2341X_DEC_PAUSE_PLAYBACK 0x0d 217 - #define CX2341X_DEC_HALT_FW 0x0e 218 - #define CX2341X_DEC_SET_STANDARD 0x10 216 + #define CX2341X_DEC_PAUSE_PLAYBACK 0x0d 217 + #define CX2341X_DEC_HALT_FW 0x0e 218 + #define CX2341X_DEC_SET_STANDARD 0x10 219 219 #define CX2341X_DEC_GET_VERSION 0x11 220 - #define CX2341X_DEC_SET_STREAM_INPUT 0x14 221 - #define CX2341X_DEC_GET_TIMING_INFO 0x15 222 - #define CX2341X_DEC_SET_AUDIO_MODE 0x16 220 + #define CX2341X_DEC_SET_STREAM_INPUT 0x14 221 + #define CX2341X_DEC_GET_TIMING_INFO 0x15 222 + #define CX2341X_DEC_SET_AUDIO_MODE 0x16 223 223 #define CX2341X_DEC_SET_EVENT_NOTIFICATION 0x17 224 224 #define CX2341X_DEC_SET_DISPLAY_BUFFERS 0x18 225 - #define CX2341X_DEC_EXTRACT_VBI 0x19 226 - #define CX2341X_DEC_SET_DECODER_SOURCE 0x1a 225 + #define CX2341X_DEC_EXTRACT_VBI 0x19 226 + #define CX2341X_DEC_SET_DECODER_SOURCE 0x1a 227 227 #define CX2341X_DEC_SET_PREBUFFERING 0x1e 228 228 229 229 /* MPEG encoder API */ 230 - #define CX2341X_ENC_PING_FW 0x80 231 - #define CX2341X_ENC_START_CAPTURE 0x81 232 - #define CX2341X_ENC_STOP_CAPTURE 0x82 233 - #define CX2341X_ENC_SET_AUDIO_ID 0x89 234 - #define CX2341X_ENC_SET_VIDEO_ID 0x8b 235 - #define CX2341X_ENC_SET_PCR_ID 0x8d 236 - #define CX2341X_ENC_SET_FRAME_RATE 0x8f 237 - #define CX2341X_ENC_SET_FRAME_SIZE 0x91 238 - #define CX2341X_ENC_SET_BIT_RATE 0x95 239 - #define CX2341X_ENC_SET_GOP_PROPERTIES 0x97 240 - #define CX2341X_ENC_SET_ASPECT_RATIO 0x99 241 - #define CX2341X_ENC_SET_DNR_FILTER_MODE 0x9b 242 - #define CX2341X_ENC_SET_DNR_FILTER_PROPS 0x9d 243 - #define CX2341X_ENC_SET_CORING_LEVELS 0x9f 244 - #define CX2341X_ENC_SET_SPATIAL_FILTER_TYPE 0xa1 245 - #define CX2341X_ENC_SET_VBI_LINE 0xb7 246 - #define CX2341X_ENC_SET_STREAM_TYPE 0xb9 247 - #define CX2341X_ENC_SET_OUTPUT_PORT 0xbb 248 - #define CX2341X_ENC_SET_AUDIO_PROPERTIES 0xbd 249 - #define CX2341X_ENC_HALT_FW 0xc3 230 + #define CX2341X_ENC_PING_FW 0x80 231 + #define CX2341X_ENC_START_CAPTURE 0x81 232 + #define CX2341X_ENC_STOP_CAPTURE 0x82 233 + #define CX2341X_ENC_SET_AUDIO_ID 0x89 234 + #define CX2341X_ENC_SET_VIDEO_ID 0x8b 235 + #define CX2341X_ENC_SET_PCR_ID 0x8d 236 + #define CX2341X_ENC_SET_FRAME_RATE 0x8f 237 + #define CX2341X_ENC_SET_FRAME_SIZE 0x91 238 + #define CX2341X_ENC_SET_BIT_RATE 0x95 239 + #define CX2341X_ENC_SET_GOP_PROPERTIES 0x97 240 + #define CX2341X_ENC_SET_ASPECT_RATIO 0x99 241 + #define CX2341X_ENC_SET_DNR_FILTER_MODE 0x9b 242 + #define CX2341X_ENC_SET_DNR_FILTER_PROPS 0x9d 243 + #define CX2341X_ENC_SET_CORING_LEVELS 0x9f 244 + #define CX2341X_ENC_SET_SPATIAL_FILTER_TYPE 0xa1 245 + #define CX2341X_ENC_SET_VBI_LINE 0xb7 246 + #define CX2341X_ENC_SET_STREAM_TYPE 0xb9 247 + #define CX2341X_ENC_SET_OUTPUT_PORT 0xbb 248 + #define CX2341X_ENC_SET_AUDIO_PROPERTIES 0xbd 249 + #define CX2341X_ENC_HALT_FW 0xc3 250 250 #define CX2341X_ENC_GET_VERSION 0xc4 251 - #define CX2341X_ENC_SET_GOP_CLOSURE 0xc5 252 - #define CX2341X_ENC_GET_SEQ_END 0xc6 253 - #define CX2341X_ENC_SET_PGM_INDEX_INFO 0xc7 251 + #define CX2341X_ENC_SET_GOP_CLOSURE 0xc5 252 + #define CX2341X_ENC_GET_SEQ_END 0xc6 253 + #define CX2341X_ENC_SET_PGM_INDEX_INFO 0xc7 254 254 #define CX2341X_ENC_SET_VBI_CONFIG 0xc8 255 - #define CX2341X_ENC_SET_DMA_BLOCK_SIZE 0xc9 255 + #define CX2341X_ENC_SET_DMA_BLOCK_SIZE 0xc9 256 256 #define CX2341X_ENC_GET_PREV_DMA_INFO_MB_10 0xca 257 257 #define CX2341X_ENC_GET_PREV_DMA_INFO_MB_9 0xcb 258 - #define CX2341X_ENC_SCHED_DMA_TO_HOST 0xcc 259 - #define CX2341X_ENC_INITIALIZE_INPUT 0xcd 260 - #define CX2341X_ENC_SET_FRAME_DROP_RATE 0xd0 261 - #define CX2341X_ENC_PAUSE_ENCODER 0xd2 262 - #define CX2341X_ENC_REFRESH_INPUT 0xd3 258 + #define CX2341X_ENC_SCHED_DMA_TO_HOST 0xcc 259 + #define CX2341X_ENC_INITIALIZE_INPUT 0xcd 260 + #define CX2341X_ENC_SET_FRAME_DROP_RATE 0xd0 261 + #define CX2341X_ENC_PAUSE_ENCODER 0xd2 262 + #define CX2341X_ENC_REFRESH_INPUT 0xd3 263 263 #define CX2341X_ENC_SET_COPYRIGHT 0xd4 264 - #define CX2341X_ENC_SET_EVENT_NOTIFICATION 0xd5 265 - #define CX2341X_ENC_SET_NUM_VSYNC_LINES 0xd6 266 - #define CX2341X_ENC_SET_PLACEHOLDER 0xd7 267 - #define CX2341X_ENC_MUTE_VIDEO 0xd9 268 - #define CX2341X_ENC_MUTE_AUDIO 0xda 264 + #define CX2341X_ENC_SET_EVENT_NOTIFICATION 0xd5 265 + #define CX2341X_ENC_SET_NUM_VSYNC_LINES 0xd6 266 + #define CX2341X_ENC_SET_PLACEHOLDER 0xd7 267 + #define CX2341X_ENC_MUTE_VIDEO 0xd9 268 + #define CX2341X_ENC_MUTE_AUDIO 0xda 269 269 #define CX2341X_ENC_SET_VERT_CROP_LINE 0xdb 270 - #define CX2341X_ENC_MISC 0xdc 270 + #define CX2341X_ENC_MISC 0xdc 271 271 272 272 /* OSD API, specific to the cx23415 */ 273 - #define CX2341X_OSD_GET_FRAMEBUFFER 0x41 274 - #define CX2341X_OSD_GET_PIXEL_FORMAT 0x42 275 - #define CX2341X_OSD_SET_PIXEL_FORMAT 0x43 276 - #define CX2341X_OSD_GET_STATE 0x44 277 - #define CX2341X_OSD_SET_STATE 0x45 278 - #define CX2341X_OSD_GET_OSD_COORDS 0x46 279 - #define CX2341X_OSD_SET_OSD_COORDS 0x47 280 - #define CX2341X_OSD_GET_SCREEN_COORDS 0x48 281 - #define CX2341X_OSD_SET_SCREEN_COORDS 0x49 282 - #define CX2341X_OSD_GET_GLOBAL_ALPHA 0x4a 283 - #define CX2341X_OSD_SET_GLOBAL_ALPHA 0x4b 284 - #define CX2341X_OSD_SET_BLEND_COORDS 0x4c 285 - #define CX2341X_OSD_GET_FLICKER_STATE 0x4f 286 - #define CX2341X_OSD_SET_FLICKER_STATE 0x50 287 - #define CX2341X_OSD_BLT_COPY 0x52 288 - #define CX2341X_OSD_BLT_FILL 0x53 289 - #define CX2341X_OSD_BLT_TEXT 0x54 290 - #define CX2341X_OSD_SET_FRAMEBUFFER_WINDOW 0x56 291 - #define CX2341X_OSD_SET_CHROMA_KEY 0x60 292 - #define CX2341X_OSD_GET_ALPHA_CONTENT_INDEX 0x61 293 - #define CX2341X_OSD_SET_ALPHA_CONTENT_INDEX 0x62 273 + #define CX2341X_OSD_GET_FRAMEBUFFER 0x41 274 + #define CX2341X_OSD_GET_PIXEL_FORMAT 0x42 275 + #define CX2341X_OSD_SET_PIXEL_FORMAT 0x43 276 + #define CX2341X_OSD_GET_STATE 0x44 277 + #define CX2341X_OSD_SET_STATE 0x45 278 + #define CX2341X_OSD_GET_OSD_COORDS 0x46 279 + #define CX2341X_OSD_SET_OSD_COORDS 0x47 280 + #define CX2341X_OSD_GET_SCREEN_COORDS 0x48 281 + #define CX2341X_OSD_SET_SCREEN_COORDS 0x49 282 + #define CX2341X_OSD_GET_GLOBAL_ALPHA 0x4a 283 + #define CX2341X_OSD_SET_GLOBAL_ALPHA 0x4b 284 + #define CX2341X_OSD_SET_BLEND_COORDS 0x4c 285 + #define CX2341X_OSD_GET_FLICKER_STATE 0x4f 286 + #define CX2341X_OSD_SET_FLICKER_STATE 0x50 287 + #define CX2341X_OSD_BLT_COPY 0x52 288 + #define CX2341X_OSD_BLT_FILL 0x53 289 + #define CX2341X_OSD_BLT_TEXT 0x54 290 + #define CX2341X_OSD_SET_FRAMEBUFFER_WINDOW 0x56 291 + #define CX2341X_OSD_SET_CHROMA_KEY 0x60 292 + #define CX2341X_OSD_GET_ALPHA_CONTENT_INDEX 0x61 293 + #define CX2341X_OSD_SET_ALPHA_CONTENT_INDEX 0x62 294 294 295 295 #endif /* CX2341X_H */
+31 -31
include/media/drv-intf/msp3400.h
··· 80 80 */ 81 81 82 82 /* SCART input to DSP selection */ 83 - #define MSP_IN_SCART1 0 /* Pin SC1_IN */ 84 - #define MSP_IN_SCART2 1 /* Pin SC2_IN */ 85 - #define MSP_IN_SCART3 2 /* Pin SC3_IN */ 86 - #define MSP_IN_SCART4 3 /* Pin SC4_IN */ 87 - #define MSP_IN_MONO 6 /* Pin MONO_IN */ 88 - #define MSP_IN_MUTE 7 /* Mute DSP input */ 89 - #define MSP_SCART_TO_DSP(in) (in) 83 + #define MSP_IN_SCART1 0 /* Pin SC1_IN */ 84 + #define MSP_IN_SCART2 1 /* Pin SC2_IN */ 85 + #define MSP_IN_SCART3 2 /* Pin SC3_IN */ 86 + #define MSP_IN_SCART4 3 /* Pin SC4_IN */ 87 + #define MSP_IN_MONO 6 /* Pin MONO_IN */ 88 + #define MSP_IN_MUTE 7 /* Mute DSP input */ 89 + #define MSP_SCART_TO_DSP(in) (in) 90 90 /* Tuner input to demodulator and DSP selection */ 91 - #define MSP_IN_TUNER1 0 /* Analog Sound IF input pin ANA_IN1 */ 92 - #define MSP_IN_TUNER2 1 /* Analog Sound IF input pin ANA_IN2 */ 93 - #define MSP_TUNER_TO_DSP(in) ((in) << 3) 91 + #define MSP_IN_TUNER1 0 /* Analog Sound IF input pin ANA_IN1 */ 92 + #define MSP_IN_TUNER2 1 /* Analog Sound IF input pin ANA_IN2 */ 93 + #define MSP_TUNER_TO_DSP(in) ((in) << 3) 94 94 95 95 /* The msp has up to 5 DSP outputs, each output can independently select 96 96 a DSP input. ··· 109 109 DSP. This is currently not implemented. Also not implemented is the 110 110 multi-channel capable I2S3 input of the 44x0G. If someone can demonstrate 111 111 a need for one of those features then additional support can be added. */ 112 - #define MSP_DSP_IN_TUNER 0 /* Tuner DSP input */ 113 - #define MSP_DSP_IN_SCART 2 /* SCART DSP input */ 114 - #define MSP_DSP_IN_I2S1 5 /* I2S1 DSP input */ 115 - #define MSP_DSP_IN_I2S2 6 /* I2S2 DSP input */ 116 - #define MSP_DSP_IN_I2S3 7 /* I2S3 DSP input */ 117 - #define MSP_DSP_IN_MAIN_AVC 11 /* MAIN AVC processed DSP input */ 118 - #define MSP_DSP_IN_MAIN 12 /* MAIN DSP input */ 119 - #define MSP_DSP_IN_AUX 13 /* AUX DSP input */ 120 - #define MSP_DSP_TO_MAIN(in) ((in) << 4) 121 - #define MSP_DSP_TO_AUX(in) ((in) << 8) 122 - #define MSP_DSP_TO_SCART1(in) ((in) << 12) 123 - #define MSP_DSP_TO_SCART2(in) ((in) << 16) 124 - #define MSP_DSP_TO_I2S(in) ((in) << 20) 112 + #define MSP_DSP_IN_TUNER 0 /* Tuner DSP input */ 113 + #define MSP_DSP_IN_SCART 2 /* SCART DSP input */ 114 + #define MSP_DSP_IN_I2S1 5 /* I2S1 DSP input */ 115 + #define MSP_DSP_IN_I2S2 6 /* I2S2 DSP input */ 116 + #define MSP_DSP_IN_I2S3 7 /* I2S3 DSP input */ 117 + #define MSP_DSP_IN_MAIN_AVC 11 /* MAIN AVC processed DSP input */ 118 + #define MSP_DSP_IN_MAIN 12 /* MAIN DSP input */ 119 + #define MSP_DSP_IN_AUX 13 /* AUX DSP input */ 120 + #define MSP_DSP_TO_MAIN(in) ((in) << 4) 121 + #define MSP_DSP_TO_AUX(in) ((in) << 8) 122 + #define MSP_DSP_TO_SCART1(in) ((in) << 12) 123 + #define MSP_DSP_TO_SCART2(in) ((in) << 16) 124 + #define MSP_DSP_TO_I2S(in) ((in) << 20) 125 125 126 126 /* Output SCART select: the SCART outputs can select which input 127 127 to use. */ 128 - #define MSP_SC_IN_SCART1 0 /* SCART1 input, bypassing the DSP */ 129 - #define MSP_SC_IN_SCART2 1 /* SCART2 input, bypassing the DSP */ 130 - #define MSP_SC_IN_SCART3 2 /* SCART3 input, bypassing the DSP */ 131 - #define MSP_SC_IN_SCART4 3 /* SCART4 input, bypassing the DSP */ 132 - #define MSP_SC_IN_DSP_SCART1 4 /* DSP SCART1 input */ 133 - #define MSP_SC_IN_DSP_SCART2 5 /* DSP SCART2 input */ 134 - #define MSP_SC_IN_MONO 6 /* MONO input, bypassing the DSP */ 135 - #define MSP_SC_IN_MUTE 7 /* MUTE output */ 128 + #define MSP_SC_IN_SCART1 0 /* SCART1 input, bypassing the DSP */ 129 + #define MSP_SC_IN_SCART2 1 /* SCART2 input, bypassing the DSP */ 130 + #define MSP_SC_IN_SCART3 2 /* SCART3 input, bypassing the DSP */ 131 + #define MSP_SC_IN_SCART4 3 /* SCART4 input, bypassing the DSP */ 132 + #define MSP_SC_IN_DSP_SCART1 4 /* DSP SCART1 input */ 133 + #define MSP_SC_IN_DSP_SCART2 5 /* DSP SCART2 input */ 134 + #define MSP_SC_IN_MONO 6 /* MONO input, bypassing the DSP */ 135 + #define MSP_SC_IN_MUTE 7 /* MUTE output */ 136 136 #define MSP_SC_TO_SCART1(in) (in) 137 137 #define MSP_SC_TO_SCART2(in) ((in) << 4) 138 138
+1 -1
include/media/drv-intf/saa7146.h
··· 118 118 { 119 119 struct module *module; 120 120 121 - struct v4l2_device v4l2_dev; 121 + struct v4l2_device v4l2_dev; 122 122 struct v4l2_ctrl_handler ctrl_handler; 123 123 124 124 /* different device locks */
+2 -2
include/media/i2c/bt819.h
··· 30 30 31 31 Note: these ioctls that internal to the kernel and are never called 32 32 from userspace. */ 33 - #define BT819_FIFO_RESET_LOW _IO('b', 0) 34 - #define BT819_FIFO_RESET_HIGH _IO('b', 1) 33 + #define BT819_FIFO_RESET_LOW _IO('b', 0) 34 + #define BT819_FIFO_RESET_HIGH _IO('b', 1) 35 35 36 36 #endif
+26 -26
include/media/i2c/m52790.h
··· 23 23 24 24 /* Input routing switch 1 */ 25 25 26 - #define M52790_SW1_IN_MASK 0x0003 27 - #define M52790_SW1_IN_TUNER 0x0000 28 - #define M52790_SW1_IN_V2 0x0001 29 - #define M52790_SW1_IN_V3 0x0002 30 - #define M52790_SW1_IN_V4 0x0003 26 + #define M52790_SW1_IN_MASK 0x0003 27 + #define M52790_SW1_IN_TUNER 0x0000 28 + #define M52790_SW1_IN_V2 0x0001 29 + #define M52790_SW1_IN_V3 0x0002 30 + #define M52790_SW1_IN_V4 0x0003 31 31 32 32 /* Selects component input instead of composite */ 33 - #define M52790_SW1_YCMIX 0x0004 33 + #define M52790_SW1_YCMIX 0x0004 34 34 35 35 36 36 /* Input routing switch 2 */ 37 37 38 - #define M52790_SW2_IN_MASK 0x0300 39 - #define M52790_SW2_IN_TUNER 0x0000 40 - #define M52790_SW2_IN_V2 0x0100 41 - #define M52790_SW2_IN_V3 0x0200 42 - #define M52790_SW2_IN_V4 0x0300 38 + #define M52790_SW2_IN_MASK 0x0300 39 + #define M52790_SW2_IN_TUNER 0x0000 40 + #define M52790_SW2_IN_V2 0x0100 41 + #define M52790_SW2_IN_V3 0x0200 42 + #define M52790_SW2_IN_V4 0x0300 43 43 44 44 /* Selects component input instead of composite */ 45 - #define M52790_SW2_YCMIX 0x0400 45 + #define M52790_SW2_YCMIX 0x0400 46 46 47 47 48 48 /* Output routing switch 1 */ 49 49 50 50 /* Enable 6dB amplifier for composite out */ 51 - #define M52790_SW1_V_AMP 0x0008 51 + #define M52790_SW1_V_AMP 0x0008 52 52 53 53 /* Enable 6dB amplifier for component out */ 54 - #define M52790_SW1_YC_AMP 0x0010 54 + #define M52790_SW1_YC_AMP 0x0010 55 55 56 56 /* Audio output mode */ 57 - #define M52790_SW1_AUDIO_MASK 0x00c0 58 - #define M52790_SW1_AUDIO_MUTE 0x0000 59 - #define M52790_SW1_AUDIO_R 0x0040 60 - #define M52790_SW1_AUDIO_L 0x0080 57 + #define M52790_SW1_AUDIO_MASK 0x00c0 58 + #define M52790_SW1_AUDIO_MUTE 0x0000 59 + #define M52790_SW1_AUDIO_R 0x0040 60 + #define M52790_SW1_AUDIO_L 0x0080 61 61 #define M52790_SW1_AUDIO_STEREO 0x00c0 62 62 63 63 64 64 /* Output routing switch 2 */ 65 65 66 66 /* Enable 6dB amplifier for composite out */ 67 - #define M52790_SW2_V_AMP 0x0800 67 + #define M52790_SW2_V_AMP 0x0800 68 68 69 69 /* Enable 6dB amplifier for component out */ 70 - #define M52790_SW2_YC_AMP 0x1000 70 + #define M52790_SW2_YC_AMP 0x1000 71 71 72 72 /* Audio output mode */ 73 - #define M52790_SW2_AUDIO_MASK 0xc000 74 - #define M52790_SW2_AUDIO_MUTE 0x0000 75 - #define M52790_SW2_AUDIO_R 0x4000 76 - #define M52790_SW2_AUDIO_L 0x8000 73 + #define M52790_SW2_AUDIO_MASK 0xc000 74 + #define M52790_SW2_AUDIO_MUTE 0x0000 75 + #define M52790_SW2_AUDIO_R 0x4000 76 + #define M52790_SW2_AUDIO_L 0x8000 77 77 #define M52790_SW2_AUDIO_STEREO 0xc000 78 78 79 79 ··· 83 83 #define M52790_IN_V3 (M52790_SW1_IN_V3 | M52790_SW2_IN_V3) 84 84 #define M52790_IN_V4 (M52790_SW1_IN_V4 | M52790_SW2_IN_V4) 85 85 86 - #define M52790_OUT_STEREO (M52790_SW1_AUDIO_STEREO | \ 86 + #define M52790_OUT_STEREO (M52790_SW1_AUDIO_STEREO | \ 87 87 M52790_SW2_AUDIO_STEREO) 88 - #define M52790_OUT_AMP_STEREO (M52790_SW1_AUDIO_STEREO | \ 88 + #define M52790_OUT_AMP_STEREO (M52790_SW1_AUDIO_STEREO | \ 89 89 M52790_SW1_V_AMP | \ 90 90 M52790_SW2_AUDIO_STEREO | \ 91 91 M52790_SW2_V_AMP)
+6 -6
include/media/i2c/saa7115.h
··· 36 36 #define SAA7115_SVIDEO3 9 37 37 38 38 /* outputs */ 39 - #define SAA7115_IPORT_ON 1 40 - #define SAA7115_IPORT_OFF 0 39 + #define SAA7115_IPORT_ON 1 40 + #define SAA7115_IPORT_OFF 0 41 41 42 42 /* SAA7111 specific outputs. */ 43 - #define SAA7111_VBI_BYPASS 2 43 + #define SAA7111_VBI_BYPASS 2 44 44 #define SAA7111_FMT_YUV422 0x00 45 - #define SAA7111_FMT_RGB 0x40 46 - #define SAA7111_FMT_CCIR 0x80 47 - #define SAA7111_FMT_YUV411 0xc0 45 + #define SAA7111_FMT_RGB 0x40 46 + #define SAA7111_FMT_CCIR 0x80 47 + #define SAA7111_FMT_YUV411 0xc0 48 48 49 49 /* config flags */ 50 50 /*
+3 -3
include/media/i2c/upd64031a.h
··· 18 18 #define _UPD64031A_H_ 19 19 20 20 /* Ghost reduction modes */ 21 - #define UPD64031A_GR_ON 0 22 - #define UPD64031A_GR_OFF 1 23 - #define UPD64031A_GR_THROUGH 3 21 + #define UPD64031A_GR_ON 0 22 + #define UPD64031A_GR_OFF 1 23 + #define UPD64031A_GR_THROUGH 3 24 24 25 25 /* Direct 3D/YCS Connection */ 26 26 #define UPD64031A_3DYCS_DISABLE (0 << 2)
+4 -4
include/media/v4l2-common.h
··· 50 50 /* These three macros assume that the debug level is set with a module 51 51 parameter called 'debug'. */ 52 52 #define v4l_dbg(level, debug, client, fmt, arg...) \ 53 - do { \ 53 + do { \ 54 54 if (debug >= (level)) \ 55 55 v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \ 56 56 } while (0) ··· 80 80 /* These three macros assume that the debug level is set with a module 81 81 parameter called 'debug'. */ 82 82 #define v4l2_dbg(level, debug, dev, fmt, arg...) \ 83 - do { \ 83 + do { \ 84 84 if (debug >= (level)) \ 85 - v4l2_printk(KERN_DEBUG, dev, fmt , ## arg); \ 85 + v4l2_printk(KERN_DEBUG, dev, fmt , ## arg); \ 86 86 } while (0) 87 87 88 88 /** ··· 266 266 }; 267 267 #define TUNER_SET_CONFIG _IOW('d', 92, struct v4l2_priv_tun_config) 268 268 269 - #define VIDIOC_INT_RESET _IOW ('d', 102, u32) 269 + #define VIDIOC_INT_RESET _IOW ('d', 102, u32) 270 270 271 271 /* ------------------------------------------------------------------------- */ 272 272
+10 -10
include/uapi/linux/dvb/video.h
··· 83 83 #define VIDEO_CMD_CONTINUE (3) 84 84 85 85 /* Flags for VIDEO_CMD_FREEZE */ 86 - #define VIDEO_CMD_FREEZE_TO_BLACK (1 << 0) 86 + #define VIDEO_CMD_FREEZE_TO_BLACK (1 << 0) 87 87 88 88 /* Flags for VIDEO_CMD_STOP */ 89 - #define VIDEO_CMD_STOP_TO_BLACK (1 << 0) 90 - #define VIDEO_CMD_STOP_IMMEDIATELY (1 << 1) 89 + #define VIDEO_CMD_STOP_TO_BLACK (1 << 0) 90 + #define VIDEO_CMD_STOP_IMMEDIATELY (1 << 1) 91 91 92 92 /* Play input formats: */ 93 93 /* The decoder has no special format requirements */ ··· 124 124 /* FIELD_UNKNOWN can be used if the hardware does not know whether 125 125 the Vsync is for an odd, even or progressive (i.e. non-interlaced) 126 126 field. */ 127 - #define VIDEO_VSYNC_FIELD_UNKNOWN (0) 128 - #define VIDEO_VSYNC_FIELD_ODD (1) 127 + #define VIDEO_VSYNC_FIELD_UNKNOWN (0) 128 + #define VIDEO_VSYNC_FIELD_ODD (1) 129 129 #define VIDEO_VSYNC_FIELD_EVEN (2) 130 130 #define VIDEO_VSYNC_FIELD_PROGRESSIVE (3) 131 131 ··· 133 133 __s32 type; 134 134 #define VIDEO_EVENT_SIZE_CHANGED 1 135 135 #define VIDEO_EVENT_FRAME_RATE_CHANGED 2 136 - #define VIDEO_EVENT_DECODER_STOPPED 3 137 - #define VIDEO_EVENT_VSYNC 4 136 + #define VIDEO_EVENT_DECODER_STOPPED 3 137 + #define VIDEO_EVENT_VSYNC 4 138 138 /* unused, make sure to use atomic time for y2038 if it ever gets used */ 139 139 long timestamp; 140 140 union { ··· 268 268 #define VIDEO_GET_PTS _IOR('o', 57, __u64) 269 269 270 270 /* Read the number of displayed frames since the decoder was started */ 271 - #define VIDEO_GET_FRAME_COUNT _IOR('o', 58, __u64) 271 + #define VIDEO_GET_FRAME_COUNT _IOR('o', 58, __u64) 272 272 273 - #define VIDEO_COMMAND _IOWR('o', 59, struct video_command) 274 - #define VIDEO_TRY_COMMAND _IOWR('o', 60, struct video_command) 273 + #define VIDEO_COMMAND _IOWR('o', 59, struct video_command) 274 + #define VIDEO_TRY_COMMAND _IOWR('o', 60, struct video_command) 275 275 276 276 #endif /* _UAPI_DVBVIDEO_H_ */
+48 -48
include/uapi/linux/v4l2-controls.h
··· 67 67 /* User-class control IDs */ 68 68 69 69 #define V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) 70 - #define V4L2_CID_USER_BASE V4L2_CID_BASE 71 - #define V4L2_CID_USER_CLASS (V4L2_CTRL_CLASS_USER | 1) 70 + #define V4L2_CID_USER_BASE V4L2_CID_BASE 71 + #define V4L2_CID_USER_CLASS (V4L2_CTRL_CLASS_USER | 1) 72 72 #define V4L2_CID_BRIGHTNESS (V4L2_CID_BASE+0) 73 73 #define V4L2_CID_CONTRAST (V4L2_CID_BASE+1) 74 74 #define V4L2_CID_SATURATION (V4L2_CID_BASE+2) ··· 102 102 #define V4L2_CID_HUE_AUTO (V4L2_CID_BASE+25) 103 103 #define V4L2_CID_WHITE_BALANCE_TEMPERATURE (V4L2_CID_BASE+26) 104 104 #define V4L2_CID_SHARPNESS (V4L2_CID_BASE+27) 105 - #define V4L2_CID_BACKLIGHT_COMPENSATION (V4L2_CID_BASE+28) 105 + #define V4L2_CID_BACKLIGHT_COMPENSATION (V4L2_CID_BASE+28) 106 106 #define V4L2_CID_CHROMA_AGC (V4L2_CID_BASE+29) 107 107 #define V4L2_CID_COLOR_KILLER (V4L2_CID_BASE+30) 108 108 #define V4L2_CID_COLORFX (V4L2_CID_BASE+31) ··· 194 194 /* The MPEG controls are applicable to all codec controls 195 195 * and the 'MPEG' part of the define is historical */ 196 196 197 - #define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) 198 - #define V4L2_CID_MPEG_CLASS (V4L2_CTRL_CLASS_MPEG | 1) 197 + #define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) 198 + #define V4L2_CID_MPEG_CLASS (V4L2_CTRL_CLASS_MPEG | 1) 199 199 200 200 /* MPEG streams, specific to multiplexed streams */ 201 - #define V4L2_CID_MPEG_STREAM_TYPE (V4L2_CID_MPEG_BASE+0) 201 + #define V4L2_CID_MPEG_STREAM_TYPE (V4L2_CID_MPEG_BASE+0) 202 202 enum v4l2_mpeg_stream_type { 203 203 V4L2_MPEG_STREAM_TYPE_MPEG2_PS = 0, /* MPEG-2 program stream */ 204 204 V4L2_MPEG_STREAM_TYPE_MPEG2_TS = 1, /* MPEG-2 transport stream */ ··· 207 207 V4L2_MPEG_STREAM_TYPE_MPEG1_VCD = 4, /* MPEG-1 VCD-compatible stream */ 208 208 V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */ 209 209 }; 210 - #define V4L2_CID_MPEG_STREAM_PID_PMT (V4L2_CID_MPEG_BASE+1) 211 - #define V4L2_CID_MPEG_STREAM_PID_AUDIO (V4L2_CID_MPEG_BASE+2) 212 - #define V4L2_CID_MPEG_STREAM_PID_VIDEO (V4L2_CID_MPEG_BASE+3) 213 - #define V4L2_CID_MPEG_STREAM_PID_PCR (V4L2_CID_MPEG_BASE+4) 214 - #define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO (V4L2_CID_MPEG_BASE+5) 215 - #define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO (V4L2_CID_MPEG_BASE+6) 216 - #define V4L2_CID_MPEG_STREAM_VBI_FMT (V4L2_CID_MPEG_BASE+7) 210 + #define V4L2_CID_MPEG_STREAM_PID_PMT (V4L2_CID_MPEG_BASE+1) 211 + #define V4L2_CID_MPEG_STREAM_PID_AUDIO (V4L2_CID_MPEG_BASE+2) 212 + #define V4L2_CID_MPEG_STREAM_PID_VIDEO (V4L2_CID_MPEG_BASE+3) 213 + #define V4L2_CID_MPEG_STREAM_PID_PCR (V4L2_CID_MPEG_BASE+4) 214 + #define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO (V4L2_CID_MPEG_BASE+5) 215 + #define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO (V4L2_CID_MPEG_BASE+6) 216 + #define V4L2_CID_MPEG_STREAM_VBI_FMT (V4L2_CID_MPEG_BASE+7) 217 217 enum v4l2_mpeg_stream_vbi_fmt { 218 218 V4L2_MPEG_STREAM_VBI_FMT_NONE = 0, /* No VBI in the MPEG stream */ 219 219 V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1, /* VBI in private packets, IVTV format */ 220 220 }; 221 221 222 222 /* MPEG audio controls specific to multiplexed streams */ 223 - #define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ (V4L2_CID_MPEG_BASE+100) 223 + #define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ (V4L2_CID_MPEG_BASE+100) 224 224 enum v4l2_mpeg_audio_sampling_freq { 225 225 V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0, 226 226 V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1, 227 227 V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2, 228 228 }; 229 - #define V4L2_CID_MPEG_AUDIO_ENCODING (V4L2_CID_MPEG_BASE+101) 229 + #define V4L2_CID_MPEG_AUDIO_ENCODING (V4L2_CID_MPEG_BASE+101) 230 230 enum v4l2_mpeg_audio_encoding { 231 231 V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0, 232 232 V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1, ··· 234 234 V4L2_MPEG_AUDIO_ENCODING_AAC = 3, 235 235 V4L2_MPEG_AUDIO_ENCODING_AC3 = 4, 236 236 }; 237 - #define V4L2_CID_MPEG_AUDIO_L1_BITRATE (V4L2_CID_MPEG_BASE+102) 237 + #define V4L2_CID_MPEG_AUDIO_L1_BITRATE (V4L2_CID_MPEG_BASE+102) 238 238 enum v4l2_mpeg_audio_l1_bitrate { 239 239 V4L2_MPEG_AUDIO_L1_BITRATE_32K = 0, 240 240 V4L2_MPEG_AUDIO_L1_BITRATE_64K = 1, ··· 251 251 V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12, 252 252 V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13, 253 253 }; 254 - #define V4L2_CID_MPEG_AUDIO_L2_BITRATE (V4L2_CID_MPEG_BASE+103) 254 + #define V4L2_CID_MPEG_AUDIO_L2_BITRATE (V4L2_CID_MPEG_BASE+103) 255 255 enum v4l2_mpeg_audio_l2_bitrate { 256 256 V4L2_MPEG_AUDIO_L2_BITRATE_32K = 0, 257 257 V4L2_MPEG_AUDIO_L2_BITRATE_48K = 1, ··· 268 268 V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12, 269 269 V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13, 270 270 }; 271 - #define V4L2_CID_MPEG_AUDIO_L3_BITRATE (V4L2_CID_MPEG_BASE+104) 271 + #define V4L2_CID_MPEG_AUDIO_L3_BITRATE (V4L2_CID_MPEG_BASE+104) 272 272 enum v4l2_mpeg_audio_l3_bitrate { 273 273 V4L2_MPEG_AUDIO_L3_BITRATE_32K = 0, 274 274 V4L2_MPEG_AUDIO_L3_BITRATE_40K = 1, ··· 285 285 V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12, 286 286 V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13, 287 287 }; 288 - #define V4L2_CID_MPEG_AUDIO_MODE (V4L2_CID_MPEG_BASE+105) 288 + #define V4L2_CID_MPEG_AUDIO_MODE (V4L2_CID_MPEG_BASE+105) 289 289 enum v4l2_mpeg_audio_mode { 290 290 V4L2_MPEG_AUDIO_MODE_STEREO = 0, 291 291 V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1, 292 292 V4L2_MPEG_AUDIO_MODE_DUAL = 2, 293 293 V4L2_MPEG_AUDIO_MODE_MONO = 3, 294 294 }; 295 - #define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION (V4L2_CID_MPEG_BASE+106) 295 + #define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION (V4L2_CID_MPEG_BASE+106) 296 296 enum v4l2_mpeg_audio_mode_extension { 297 297 V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4 = 0, 298 298 V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8 = 1, 299 299 V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2, 300 300 V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3, 301 301 }; 302 - #define V4L2_CID_MPEG_AUDIO_EMPHASIS (V4L2_CID_MPEG_BASE+107) 302 + #define V4L2_CID_MPEG_AUDIO_EMPHASIS (V4L2_CID_MPEG_BASE+107) 303 303 enum v4l2_mpeg_audio_emphasis { 304 304 V4L2_MPEG_AUDIO_EMPHASIS_NONE = 0, 305 305 V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1, 306 306 V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17 = 2, 307 307 }; 308 - #define V4L2_CID_MPEG_AUDIO_CRC (V4L2_CID_MPEG_BASE+108) 308 + #define V4L2_CID_MPEG_AUDIO_CRC (V4L2_CID_MPEG_BASE+108) 309 309 enum v4l2_mpeg_audio_crc { 310 310 V4L2_MPEG_AUDIO_CRC_NONE = 0, 311 311 V4L2_MPEG_AUDIO_CRC_CRC16 = 1, 312 312 }; 313 - #define V4L2_CID_MPEG_AUDIO_MUTE (V4L2_CID_MPEG_BASE+109) 313 + #define V4L2_CID_MPEG_AUDIO_MUTE (V4L2_CID_MPEG_BASE+109) 314 314 #define V4L2_CID_MPEG_AUDIO_AAC_BITRATE (V4L2_CID_MPEG_BASE+110) 315 315 #define V4L2_CID_MPEG_AUDIO_AC3_BITRATE (V4L2_CID_MPEG_BASE+111) 316 316 enum v4l2_mpeg_audio_ac3_bitrate { ··· 346 346 #define V4L2_CID_MPEG_AUDIO_DEC_MULTILINGUAL_PLAYBACK (V4L2_CID_MPEG_BASE+113) 347 347 348 348 /* MPEG video controls specific to multiplexed streams */ 349 - #define V4L2_CID_MPEG_VIDEO_ENCODING (V4L2_CID_MPEG_BASE+200) 349 + #define V4L2_CID_MPEG_VIDEO_ENCODING (V4L2_CID_MPEG_BASE+200) 350 350 enum v4l2_mpeg_video_encoding { 351 351 V4L2_MPEG_VIDEO_ENCODING_MPEG_1 = 0, 352 352 V4L2_MPEG_VIDEO_ENCODING_MPEG_2 = 1, 353 353 V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2, 354 354 }; 355 - #define V4L2_CID_MPEG_VIDEO_ASPECT (V4L2_CID_MPEG_BASE+201) 355 + #define V4L2_CID_MPEG_VIDEO_ASPECT (V4L2_CID_MPEG_BASE+201) 356 356 enum v4l2_mpeg_video_aspect { 357 357 V4L2_MPEG_VIDEO_ASPECT_1x1 = 0, 358 358 V4L2_MPEG_VIDEO_ASPECT_4x3 = 1, 359 359 V4L2_MPEG_VIDEO_ASPECT_16x9 = 2, 360 360 V4L2_MPEG_VIDEO_ASPECT_221x100 = 3, 361 361 }; 362 - #define V4L2_CID_MPEG_VIDEO_B_FRAMES (V4L2_CID_MPEG_BASE+202) 363 - #define V4L2_CID_MPEG_VIDEO_GOP_SIZE (V4L2_CID_MPEG_BASE+203) 364 - #define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE (V4L2_CID_MPEG_BASE+204) 365 - #define V4L2_CID_MPEG_VIDEO_PULLDOWN (V4L2_CID_MPEG_BASE+205) 366 - #define V4L2_CID_MPEG_VIDEO_BITRATE_MODE (V4L2_CID_MPEG_BASE+206) 362 + #define V4L2_CID_MPEG_VIDEO_B_FRAMES (V4L2_CID_MPEG_BASE+202) 363 + #define V4L2_CID_MPEG_VIDEO_GOP_SIZE (V4L2_CID_MPEG_BASE+203) 364 + #define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE (V4L2_CID_MPEG_BASE+204) 365 + #define V4L2_CID_MPEG_VIDEO_PULLDOWN (V4L2_CID_MPEG_BASE+205) 366 + #define V4L2_CID_MPEG_VIDEO_BITRATE_MODE (V4L2_CID_MPEG_BASE+206) 367 367 enum v4l2_mpeg_video_bitrate_mode { 368 368 V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0, 369 369 V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1, 370 370 }; 371 - #define V4L2_CID_MPEG_VIDEO_BITRATE (V4L2_CID_MPEG_BASE+207) 372 - #define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK (V4L2_CID_MPEG_BASE+208) 371 + #define V4L2_CID_MPEG_VIDEO_BITRATE (V4L2_CID_MPEG_BASE+207) 372 + #define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK (V4L2_CID_MPEG_BASE+208) 373 373 #define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209) 374 - #define V4L2_CID_MPEG_VIDEO_MUTE (V4L2_CID_MPEG_BASE+210) 375 - #define V4L2_CID_MPEG_VIDEO_MUTE_YUV (V4L2_CID_MPEG_BASE+211) 374 + #define V4L2_CID_MPEG_VIDEO_MUTE (V4L2_CID_MPEG_BASE+210) 375 + #define V4L2_CID_MPEG_VIDEO_MUTE_YUV (V4L2_CID_MPEG_BASE+211) 376 376 #define V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE (V4L2_CID_MPEG_BASE+212) 377 377 #define V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER (V4L2_CID_MPEG_BASE+213) 378 378 #define V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB (V4L2_CID_MPEG_BASE+214) ··· 590 590 #define V4L2_CID_MPEG_VIDEO_VPX_PROFILE (V4L2_CID_MPEG_BASE+511) 591 591 592 592 /* MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */ 593 - #define V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) 594 - #define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+0) 593 + #define V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) 594 + #define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+0) 595 595 enum v4l2_mpeg_cx2341x_video_spatial_filter_mode { 596 596 V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0, 597 597 V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO = 1, 598 598 }; 599 - #define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+1) 600 - #define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+2) 599 + #define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+1) 600 + #define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+2) 601 601 enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type { 602 602 V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF = 0, 603 603 V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR = 1, ··· 605 605 V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE = 3, 606 606 V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4, 607 607 }; 608 - #define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+3) 608 + #define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+3) 609 609 enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type { 610 610 V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF = 0, 611 611 V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1, 612 612 }; 613 - #define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+4) 613 + #define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+4) 614 614 enum v4l2_mpeg_cx2341x_video_temporal_filter_mode { 615 615 V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0, 616 616 V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO = 1, 617 617 }; 618 - #define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+5) 619 - #define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+6) 618 + #define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+5) 619 + #define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+6) 620 620 enum v4l2_mpeg_cx2341x_video_median_filter_type { 621 621 V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF = 0, 622 622 V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR = 1, ··· 624 624 V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3, 625 625 V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG = 4, 626 626 }; 627 - #define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+7) 628 - #define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+8) 627 + #define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+7) 628 + #define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+8) 629 629 #define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+9) 630 - #define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+10) 631 - #define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS (V4L2_CID_MPEG_CX2341X_BASE+11) 630 + #define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+10) 631 + #define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS (V4L2_CID_MPEG_CX2341X_BASE+11) 632 632 633 633 /* MPEG-class control IDs specific to the Samsung MFC 5.1 driver as defined by V4L2 */ 634 634 #define V4L2_CID_MPEG_MFC51_BASE (V4L2_CTRL_CLASS_MPEG | 0x1100) ··· 660 660 661 661 /* Camera class control IDs */ 662 662 663 - #define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x900) 664 - #define V4L2_CID_CAMERA_CLASS (V4L2_CTRL_CLASS_CAMERA | 1) 663 + #define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x900) 664 + #define V4L2_CID_CAMERA_CLASS (V4L2_CTRL_CLASS_CAMERA | 1) 665 665 666 666 #define V4L2_CID_EXPOSURE_AUTO (V4L2_CID_CAMERA_CLASS_BASE+1) 667 667 enum v4l2_exposure_auto_type {
+28 -28
include/uapi/linux/videodev2.h
··· 107 107 transmitted first */ 108 108 }; 109 109 #define V4L2_FIELD_HAS_TOP(field) \ 110 - ((field) == V4L2_FIELD_TOP ||\ 110 + ((field) == V4L2_FIELD_TOP ||\ 111 111 (field) == V4L2_FIELD_INTERLACED ||\ 112 112 (field) == V4L2_FIELD_INTERLACED_TB ||\ 113 113 (field) == V4L2_FIELD_INTERLACED_BT ||\ 114 114 (field) == V4L2_FIELD_SEQ_TB ||\ 115 115 (field) == V4L2_FIELD_SEQ_BT) 116 116 #define V4L2_FIELD_HAS_BOTTOM(field) \ 117 - ((field) == V4L2_FIELD_BOTTOM ||\ 117 + ((field) == V4L2_FIELD_BOTTOM ||\ 118 118 (field) == V4L2_FIELD_INTERLACED ||\ 119 119 (field) == V4L2_FIELD_INTERLACED_TB ||\ 120 120 (field) == V4L2_FIELD_INTERLACED_BT ||\ ··· 467 467 * V I D E O I M A G E F O R M A T 468 468 */ 469 469 struct v4l2_pix_format { 470 - __u32 width; 470 + __u32 width; 471 471 __u32 height; 472 472 __u32 pixelformat; 473 473 __u32 field; /* enum v4l2_field */ 474 - __u32 bytesperline; /* for padding, zero if unused */ 475 - __u32 sizeimage; 474 + __u32 bytesperline; /* for padding, zero if unused */ 475 + __u32 sizeimage; 476 476 __u32 colorspace; /* enum v4l2_colorspace */ 477 477 __u32 priv; /* private data, depends on pixelformat */ 478 478 __u32 flags; /* format flags (V4L2_PIX_FMT_FLAG_*) */ ··· 1173 1173 V4L2_STD_NTSC_M_JP |\ 1174 1174 V4L2_STD_NTSC_M_KR) 1175 1175 /* Secam macros */ 1176 - #define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\ 1176 + #define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\ 1177 1177 V4L2_STD_SECAM_K |\ 1178 1178 V4L2_STD_SECAM_K1) 1179 1179 /* All Secam Standards */ ··· 1254 1254 }; 1255 1255 1256 1256 /* 1257 - * D V B T T I M I N G S 1257 + * D V B T T I M I N G S 1258 1258 */ 1259 1259 1260 1260 /** struct v4l2_bt_timings - BT.656/BT.1120 timing data ··· 1595 1595 struct v4l2_ext_control *controls; 1596 1596 }; 1597 1597 1598 - #define V4L2_CTRL_ID_MASK (0x0fffffff) 1598 + #define V4L2_CTRL_ID_MASK (0x0fffffff) 1599 1599 #ifndef __KERNEL__ 1600 1600 #define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL) 1601 1601 #endif ··· 1667 1667 /* Control flags */ 1668 1668 #define V4L2_CTRL_FLAG_DISABLED 0x0001 1669 1669 #define V4L2_CTRL_FLAG_GRABBED 0x0002 1670 - #define V4L2_CTRL_FLAG_READ_ONLY 0x0004 1671 - #define V4L2_CTRL_FLAG_UPDATE 0x0008 1672 - #define V4L2_CTRL_FLAG_INACTIVE 0x0010 1673 - #define V4L2_CTRL_FLAG_SLIDER 0x0020 1674 - #define V4L2_CTRL_FLAG_WRITE_ONLY 0x0040 1670 + #define V4L2_CTRL_FLAG_READ_ONLY 0x0004 1671 + #define V4L2_CTRL_FLAG_UPDATE 0x0008 1672 + #define V4L2_CTRL_FLAG_INACTIVE 0x0010 1673 + #define V4L2_CTRL_FLAG_SLIDER 0x0020 1674 + #define V4L2_CTRL_FLAG_WRITE_ONLY 0x0040 1675 1675 #define V4L2_CTRL_FLAG_VOLATILE 0x0080 1676 1676 #define V4L2_CTRL_FLAG_HAS_PAYLOAD 0x0100 1677 1677 #define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE 0x0200 ··· 1785 1785 */ 1786 1786 1787 1787 struct v4l2_rds_data { 1788 - __u8 lsb; 1789 - __u8 msb; 1790 - __u8 block; 1788 + __u8 lsb; 1789 + __u8 msb; 1790 + __u8 block; 1791 1791 } __attribute__ ((packed)); 1792 1792 1793 - #define V4L2_RDS_BLOCK_MSK 0x7 1794 - #define V4L2_RDS_BLOCK_A 0 1795 - #define V4L2_RDS_BLOCK_B 1 1796 - #define V4L2_RDS_BLOCK_C 2 1797 - #define V4L2_RDS_BLOCK_D 3 1798 - #define V4L2_RDS_BLOCK_C_ALT 4 1799 - #define V4L2_RDS_BLOCK_INVALID 7 1793 + #define V4L2_RDS_BLOCK_MSK 0x7 1794 + #define V4L2_RDS_BLOCK_A 0 1795 + #define V4L2_RDS_BLOCK_B 1 1796 + #define V4L2_RDS_BLOCK_C 2 1797 + #define V4L2_RDS_BLOCK_D 3 1798 + #define V4L2_RDS_BLOCK_C_ALT 4 1799 + #define V4L2_RDS_BLOCK_INVALID 7 1800 1800 1801 1801 #define V4L2_RDS_BLOCK_CORRECTED 0x40 1802 - #define V4L2_RDS_BLOCK_ERROR 0x80 1802 + #define V4L2_RDS_BLOCK_ERROR 0x80 1803 1803 1804 1804 /* 1805 1805 * A U D I O ··· 2355 2355 #define VIDIOC_S_CROP _IOW('V', 60, struct v4l2_crop) 2356 2356 #define VIDIOC_G_JPEGCOMP _IOR('V', 61, struct v4l2_jpegcompression) 2357 2357 #define VIDIOC_S_JPEGCOMP _IOW('V', 62, struct v4l2_jpegcompression) 2358 - #define VIDIOC_QUERYSTD _IOR('V', 63, v4l2_std_id) 2359 - #define VIDIOC_TRY_FMT _IOWR('V', 64, struct v4l2_format) 2358 + #define VIDIOC_QUERYSTD _IOR('V', 63, v4l2_std_id) 2359 + #define VIDIOC_TRY_FMT _IOWR('V', 64, struct v4l2_format) 2360 2360 #define VIDIOC_ENUMAUDIO _IOWR('V', 65, struct v4l2_audio) 2361 2361 #define VIDIOC_ENUMAUDOUT _IOWR('V', 66, struct v4l2_audioout) 2362 2362 #define VIDIOC_G_PRIORITY _IOR('V', 67, __u32) /* enum v4l2_priority */ ··· 2377 2377 * Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined. 2378 2378 * You must be root to use these ioctls. Never use these in applications! 2379 2379 */ 2380 - #define VIDIOC_DBG_S_REGISTER _IOW('V', 79, struct v4l2_dbg_register) 2381 - #define VIDIOC_DBG_G_REGISTER _IOWR('V', 80, struct v4l2_dbg_register) 2380 + #define VIDIOC_DBG_S_REGISTER _IOW('V', 79, struct v4l2_dbg_register) 2381 + #define VIDIOC_DBG_G_REGISTER _IOWR('V', 80, struct v4l2_dbg_register) 2382 2382 2383 2383 #define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek) 2384 2384 #define VIDIOC_S_DV_TIMINGS _IOWR('V', 87, struct v4l2_dv_timings)