···932932 * Used by DRX_CTRL_LOAD_UCODE and DRX_CTRL_VERIFY_UCODE933933 */934934struct drxu_code_info {935935- char *mc_file;935935+ char *mc_file;936936};937937938938/*
···8282 * 1. POWER ON/OFF (index 0)8383 * 2. FE_HAS_LOCK/LOCK_LOSS (index 1)8484 *8585- * @gpio = one of the above listed GPIO's8585+ * @gpio = one of the above listed GPIO's8686 * @level = output state: pulled up or low8787 */8888struct stb0899_postproc {
···243243244244 u8 tun1_maddress;245245 int tuner1_adc;246246- int tuner1_type;246246+ int tuner1_type;247247248248 /* IQ from the tuner1 to the demod */249249 enum stv0900_iq_inversion tun1_iq_inv;
···12631263static int set_v4lstd(struct i2c_client *client)12641264{12651265 struct cx25840_state *state = to_state(i2c_get_clientdata(client));12661266- u8 fmt = 0; /* zero is autodetect */12661266+ u8 fmt = 0; /* zero is autodetect */12671267 u8 pal_m = 0;1268126812691269 /* First tests should be against specific std */
···349349 * NOTE:350350 * lirc_i2c maps the pv951 code as:351351 * addr = 0x61D6352352- * cmd = bit_reverse (b)352352+ * cmd = bit_reverse (b)353353 * So, it seems that this device uses NEC extended354354 * I decided to not fix the table, due to two reasons:355355- * 1) Without the actual device, this is only a guess;356356- * 2) As the addr is not reported via I2C, nor can be changed,357357- * the device is bound to the vendor-provided RC.355355+ * 1) Without the actual device, this is only a guess;356356+ * 2) As the addr is not reported via I2C, nor can be changed,357357+ * the device is bound to the vendor-provided RC.358358 */359359360360 *protocol = RC_PROTO_UNKNOWN;
+2-2
drivers/media/pci/bt8xx/bttv.h
···165165#define BTTV_BOARD_PV_M4900 0x8b166166#define BTTV_BOARD_OSPREY440 0x8c167167#define BTTV_BOARD_ASOUND_SKYEYE 0x8d168168-#define BTTV_BOARD_SABRENT_TVFM 0x8e168168+#define BTTV_BOARD_SABRENT_TVFM 0x8e169169#define BTTV_BOARD_HAUPPAUGE_IMPACTVCB 0x8f170170#define BTTV_BOARD_MACHTV_MAGICTV 0x90171171#define BTTV_BOARD_SSAI_SECURITY 0x91···265265 * that they are changed to octal. One should not use hex number, macros, or266266 * anything else with this macro. Just use plain integers from 0 to 3.267267 */268268-#define _MUXSELf(a) 0##a << 30268268+#define _MUXSELf(a) 0##a << 30269269#define _MUXSELe(a, b...) 0##a << 28 | _MUXSELf(b)270270#define _MUXSELd(a, b...) 0##a << 26 | _MUXSELe(b)271271#define _MUXSELc(a, b...) 0##a << 24 | _MUXSELd(b)
+3-3
drivers/media/pci/bt8xx/bttvp.h
···141141 bool rc5_gpio; /* Is RC5 legacy GPIO enabled? */142142 u32 last_bit; /* last raw bit seen */143143 u32 code; /* raw code under construction */144144- ktime_t base_time; /* time of last seen code */144144+ ktime_t base_time; /* time of last seen code */145145 bool active; /* building raw code */146146};147147···400400 int i2c_state, i2c_rc;401401 int i2c_done;402402 wait_queue_head_t i2c_queue;403403- struct v4l2_subdev *sd_msp34xx;404404- struct v4l2_subdev *sd_tvaudio;403403+ struct v4l2_subdev *sd_msp34xx;404404+ struct v4l2_subdev *sd_tvaudio;405405 struct v4l2_subdev *sd_tda7432;406406407407 /* video4linux (1) */
+1-1
drivers/media/pci/cx18/cx18-alsa-pcm.c
···4141#define dprintk(fmt, arg...) do { \4242 if (pcm_debug) \4343 printk(KERN_INFO "cx18-alsa-pcm %s: " fmt, \4444- __func__, ##arg); \4444+ __func__, ##arg); \4545 } while (0)46464747static const struct snd_pcm_hardware snd_cx18_hw_capture = {
+1-1
drivers/media/pci/cx18/cx18-av-audio.c
···3131 * would ideally be:3232 *3333 * NTSC Color subcarrier freq * 8 =3434- * 4.5 MHz/286 * 455/2 * 8 = 28.63636363... MHz3434+ * 4.5 MHz/286 * 455/2 * 8 = 28.63636363... MHz3535 *3636 * The accidents of history and rationale that explain from where this3737 * combination of magic numbers originate can be found in:
+9-9
drivers/media/pci/cx18/cx18-av-core.c
···236236 */237237 cx18_av_and_or4(cx, CXADEC_AFE_CTRL, 0xFF000000, 0x00005D00);238238239239-/* if(dwEnable && dw3DCombAvailable) { */240240-/* CxDevWrReg(CXADEC_SRC_COMB_CFG, 0x7728021F); */239239+/* if(dwEnable && dw3DCombAvailable) { */240240+/* CxDevWrReg(CXADEC_SRC_COMB_CFG, 0x7728021F); */241241/* } else { */242242-/* CxDevWrReg(CXADEC_SRC_COMB_CFG, 0x6628021F); */242242+/* CxDevWrReg(CXADEC_SRC_COMB_CFG, 0x6628021F); */243243/* } */244244 cx18_av_write4(cx, CXADEC_SRC_COMB_CFG, 0x6628021F);245245 default_volume = cx18_av_read(cx, 0x8d4);···319319 * vblank656: half lines after line 625/mid-313 of blanked video320320 * vblank: half lines, after line 5/317, of blanked video321321 * vactive: half lines of active video +322322- * 5 half lines after the end of active video322322+ * 5 half lines after the end of active video323323 *324324 * As far as I can tell:325325 * vblank656 starts counting from the falling edge of the first326326- * vsync pulse (start of line 1 or mid-313)326326+ * vsync pulse (start of line 1 or mid-313)327327 * vblank starts counting from the after the 5 vsync pulses and328328- * 5 or 4 equalization pulses (start of line 6 or 318)328328+ * 5 or 4 equalization pulses (start of line 6 or 318)329329 *330330 * For 625 line systems the driver will extract VBI information331331 * from lines 6-23 and lines 318-335 (but the slicer can only···395395 *396396 * As far as I can tell:397397 * vblank656 starts counting from the falling edge of the first398398- * vsync pulse (start of line 4 or mid-266)398398+ * vsync pulse (start of line 4 or mid-266)399399 * vblank starts counting from the after the 6 vsync pulses and400400- * 6 or 5 equalization pulses (start of line 10 or 272)400400+ * 6 or 5 equalization pulses (start of line 10 or 272)401401 *402402 * For 525 line systems the driver will extract VBI information403403 * from lines 10-21 and lines 273-284.···851851 struct cx18_av_state *state = to_cx18_av_state(sd);852852 struct cx18 *cx = v4l2_get_subdevdata(sd);853853854854- u8 fmt = 0; /* zero is autodetect */854854+ u8 fmt = 0; /* zero is autodetect */855855 u8 pal_m = 0;856856857857 if (state->radio == 0 && state->std == norm)
···29293030/* video inputs */3131#define CX18_CARD_INPUT_VID_TUNER 13232-#define CX18_CARD_INPUT_SVIDEO1 23333-#define CX18_CARD_INPUT_SVIDEO2 33434-#define CX18_CARD_INPUT_COMPOSITE1 43535-#define CX18_CARD_INPUT_COMPOSITE2 53636-#define CX18_CARD_INPUT_COMPONENT1 63232+#define CX18_CARD_INPUT_SVIDEO1 23333+#define CX18_CARD_INPUT_SVIDEO2 33434+#define CX18_CARD_INPUT_COMPOSITE1 43535+#define CX18_CARD_INPUT_COMPOSITE2 53636+#define CX18_CARD_INPUT_COMPONENT1 637373838/* audio inputs */3939#define CX18_CARD_INPUT_AUD_TUNER 14040-#define CX18_CARD_INPUT_LINE_IN1 24141-#define CX18_CARD_INPUT_LINE_IN2 34040+#define CX18_CARD_INPUT_LINE_IN1 24141+#define CX18_CARD_INPUT_LINE_IN2 342424343#define CX18_CARD_MAX_VIDEO_INPUTS 64444#define CX18_CARD_MAX_AUDIO_INPUTS 34545-#define CX18_CARD_MAX_TUNERS 24545+#define CX18_CARD_MAX_TUNERS 246464747/* V4L2 capability aliases */4848#define CX18_CAP_ENCODER (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER | \···5151 V4L2_CAP_SLICED_VBI_CAPTURE)52525353struct cx18_card_video_input {5454- u8 video_type; /* video input type */5454+ u8 video_type; /* video input type */5555 u8 audio_index; /* index in cx18_card_audio_input array */5656 u32 video_input; /* hardware video input */5757};···7474/* The mask is the set of bits used by the operation */75757676struct cx18_gpio_init { /* set initial GPIO DIR and OUT values */7777- u32 direction; /* DIR setting. Leave to 0 if no init is needed */7777+ u32 direction; /* DIR setting. Leave to 0 if no init is needed */7878 u32 initial_value;7979};8080···8686 u32 ir_reset_mask; /* GPIO to reset the Zilog Z8F0811 IR contoller */8787};88888989-struct cx18_gpio_audio_input { /* select tuner/line in input */9090- u32 mask; /* leave to 0 if not supported */8989+struct cx18_gpio_audio_input { /* select tuner/line in input */9090+ u32 mask; /* leave to 0 if not supported */9191 u32 tuner;9292 u32 linein;9393 u32 radio;9494};95959696struct cx18_card_tuner {9797- v4l2_std_id std; /* standard for which the tuner is suitable */9898- int tuner; /* tuner ID (from tuner.h) */9797+ v4l2_std_id std; /* standard for which the tuner is suitable */9898+ int tuner; /* tuner ID (from tuner.h) */9999};100100101101struct cx18_card_tuner_i2c {···128128 struct cx18_card_audio_input radio_input;129129130130 /* GPIO card-specific settings */131131- u8 xceive_pin; /* XCeive tuner GPIO reset pin */132132- struct cx18_gpio_init gpio_init;131131+ u8 xceive_pin; /* XCeive tuner GPIO reset pin */132132+ struct cx18_gpio_init gpio_init;133133 struct cx18_gpio_i2c_slave_reset gpio_i2c_slave_reset;134134 struct cx18_gpio_audio_input gpio_audio_input;135135
+23-23
drivers/media/pci/cx18/cx18-driver.h
···7575/* Supported cards */7676#define CX18_CARD_HVR_1600_ESMT 0 /* Hauppauge HVR 1600 (ESMT memory) */7777#define CX18_CARD_HVR_1600_SAMSUNG 1 /* Hauppauge HVR 1600 (Samsung memory) */7878-#define CX18_CARD_COMPRO_H900 2 /* Compro VideoMate H900 */7979-#define CX18_CARD_YUAN_MPC718 3 /* Yuan MPC718 */7878+#define CX18_CARD_COMPRO_H900 2 /* Compro VideoMate H900 */7979+#define CX18_CARD_YUAN_MPC718 3 /* Yuan MPC718 */8080#define CX18_CARD_CNXT_RAPTOR_PAL 4 /* Conexant Raptor PAL */8181#define CX18_CARD_TOSHIBA_QOSMIO_DVBT 5 /* Toshiba Qosmio Interal DVB-T/Analog*/8282#define CX18_CARD_LEADTEK_PVR2100 6 /* Leadtek WinFast PVR2100 */···9999#define PCI_DEVICE_ID_CX23418 0x5b7a100100101101/* subsystem vendor ID */102102-#define CX18_PCI_ID_HAUPPAUGE 0x0070103103-#define CX18_PCI_ID_COMPRO 0x185b104104-#define CX18_PCI_ID_YUAN 0x12ab102102+#define CX18_PCI_ID_HAUPPAUGE 0x0070103103+#define CX18_PCI_ID_COMPRO 0x185b104104+#define CX18_PCI_ID_YUAN 0x12ab105105#define CX18_PCI_ID_CONEXANT 0x14f1106106#define CX18_PCI_ID_TOSHIBA 0x1179107107#define CX18_PCI_ID_LEADTEK 0x107D···260260#define CX18_F_M_NEED_SWAP 0 /* mdl buffer data must be endianness swapped */261261262262/* per-stream, s_flags */263263-#define CX18_F_S_CLAIMED 3 /* this stream is claimed */263263+#define CX18_F_S_CLAIMED 3 /* this stream is claimed */264264#define CX18_F_S_STREAMING 4 /* the fw is decoding/encoding this stream */265265#define CX18_F_S_INTERNAL_USE 5 /* this stream is used internally (sliced VBI processing) */266266#define CX18_F_S_STREAMOFF 7 /* signal end of stream EOS */···268268#define CX18_F_S_STOPPING 9 /* telling the fw to stop capturing */269269270270/* per-cx18, i_flags */271271-#define CX18_F_I_LOADED_FW 0 /* Loaded firmware 1st time */272272-#define CX18_F_I_EOS 4 /* End of encoder stream */273273-#define CX18_F_I_RADIO_USER 5 /* radio tuner is selected */274274-#define CX18_F_I_ENC_PAUSED 13 /* the encoder is paused */275275-#define CX18_F_I_INITED 21 /* set after first open */276276-#define CX18_F_I_FAILED 22 /* set if first open failed */271271+#define CX18_F_I_LOADED_FW 0 /* Loaded firmware 1st time */272272+#define CX18_F_I_EOS 4 /* End of encoder stream */273273+#define CX18_F_I_RADIO_USER 5 /* radio tuner is selected */274274+#define CX18_F_I_ENC_PAUSED 13 /* the encoder is paused */275275+#define CX18_F_I_INITED 21 /* set after first open */276276+#define CX18_F_I_FAILED 22 /* set if first open failed */277277278278/* These are the VBI types as they appear in the embedded VBI private packets. */279279#define CX18_SLICED_TYPE_TELETEXT_B (1)···370370 is not actually created. */371371 struct video_device video_dev; /* v4l2_dev is NULL when stream not created */372372 struct cx18_dvb *dvb; /* DVB / Digital Transport */373373- struct cx18 *cx; /* for ease of use */373373+ struct cx18 *cx; /* for ease of use */374374 const char *name; /* name of the stream */375375 int type; /* stream type */376376 u32 handle; /* task handle */···525525 * into the MPEG PS stream.526526 *527527 * In each sliced_mpeg_data[] buffer is:528528- * 16 byte MPEG-2 PS Program Pack Header529529- * 16 byte MPEG-2 Private Stream 1 PES Header530530- * 4 byte magic number: "itv0" or "ITV0"531531- * 4 byte first field line mask, if "itv0"532532- * 4 byte second field line mask, if "itv0"533533- * 36 lines, if "ITV0"; or <36 lines, if "itv0"; of sliced VBI data528528+ * 16 byte MPEG-2 PS Program Pack Header529529+ * 16 byte MPEG-2 Private Stream 1 PES Header530530+ * 4 byte magic number: "itv0" or "ITV0"531531+ * 4 byte first field line mask, if "itv0"532532+ * 4 byte second field line mask, if "itv0"533533+ * 36 lines, if "ITV0"; or <36 lines, if "itv0"; of sliced VBI data534534 *535535- * Each line in the payload is535535+ * Each line in the payload is536536 * 1 byte line header derived from the SDID (WSS, CC, VPS, etc.)537537 * 42 bytes of line data538538 *···583583 u8 nof_inputs; /* number of video inputs */584584 u8 nof_audio_inputs; /* number of audio inputs */585585 u32 v4l2_cap; /* V4L2 capabilities of card */586586- u32 hw_flags; /* Hardware description of the board */586586+ u32 hw_flags; /* Hardware description of the board */587587 unsigned int free_mdl_idx;588588 struct cx18_scb __iomem *scb; /* pointer to SCB */589589 struct mutex epu2apu_mb_lock; /* protect driver to chip mailbox in SCB*/···602602 u32 dualwatch_stereo_mode;603603604604 struct mutex serialize_lock; /* mutex used to serialize open/close/start/stop/ioctl operations */605605- struct cx18_options options; /* User options */605605+ struct cx18_options options; /* User options */606606 int stream_buffers[CX18_MAX_STREAMS]; /* # of buffers for each stream */607607 int stream_buf_size[CX18_MAX_STREAMS]; /* Stream buffer size */608608- struct cx18_stream streams[CX18_MAX_STREAMS]; /* Stream data */608608+ struct cx18_stream streams[CX18_MAX_STREAMS]; /* Stream data */609609 struct snd_cx18_card *alsa; /* ALSA interface for PCM capture stream */610610 void (*pcm_announce_callback)(struct snd_cx18_card *card, u8 *pcm_data,611611 size_t num_bytes);
···19192020#include <media/drv-intf/cx2341x.h>21212222-#define MGR_CMD_MASK 0x400000002222+#define MGR_CMD_MASK 0x400000002323/* The MSB of the command code indicates that this is the completion of a2424 command */2525-#define MGR_CMD_MASK_ACK (MGR_CMD_MASK | 0x80000000)2525+#define MGR_CMD_MASK_ACK (MGR_CMD_MASK | 0x80000000)26262727/* Description: This command creates a new instance of a certain task2828 IN[0] - Task ID. This is one of the XPU_CMD_MASK_YYY where XPU is···3030 OUT[0] - Task handle. This handle is passed along with commands to3131 dispatch to the right instance of the task3232 ReturnCode - One of the ERR_SYS_... */3333-#define CX18_CREATE_TASK (MGR_CMD_MASK | 0x0001)3333+#define CX18_CREATE_TASK (MGR_CMD_MASK | 0x0001)34343535/* Description: This command destroys an instance of a task3636 IN[0] - Task handle. Hanlde of the task to destroy3737 ReturnCode - One of the ERR_SYS_... */3838-#define CX18_DESTROY_TASK (MGR_CMD_MASK | 0x0002)3838+#define CX18_DESTROY_TASK (MGR_CMD_MASK | 0x0002)39394040/* All commands for CPU have the following mask set */4141-#define CPU_CMD_MASK 0x200000004242-#define CPU_CMD_MASK_DEBUG (CPU_CMD_MASK | 0x00000000)4343-#define CPU_CMD_MASK_ACK (CPU_CMD_MASK | 0x80000000)4444-#define CPU_CMD_MASK_CAPTURE (CPU_CMD_MASK | 0x00020000)4545-#define CPU_CMD_MASK_TS (CPU_CMD_MASK | 0x00040000)4141+#define CPU_CMD_MASK 0x200000004242+#define CPU_CMD_MASK_DEBUG (CPU_CMD_MASK | 0x00000000)4343+#define CPU_CMD_MASK_ACK (CPU_CMD_MASK | 0x80000000)4444+#define CPU_CMD_MASK_CAPTURE (CPU_CMD_MASK | 0x00020000)4545+#define CPU_CMD_MASK_TS (CPU_CMD_MASK | 0x00040000)46464747-#define EPU_CMD_MASK 0x020000004848-#define EPU_CMD_MASK_DEBUG (EPU_CMD_MASK | 0x000000)4949-#define EPU_CMD_MASK_DE (EPU_CMD_MASK | 0x040000)4747+#define EPU_CMD_MASK 0x020000004848+#define EPU_CMD_MASK_DEBUG (EPU_CMD_MASK | 0x000000)4949+#define EPU_CMD_MASK_DE (EPU_CMD_MASK | 0x040000)50505151-#define APU_CMD_MASK 0x100000005252-#define APU_CMD_MASK_ACK (APU_CMD_MASK | 0x80000000)5151+#define APU_CMD_MASK 0x100000005252+#define APU_CMD_MASK_ACK (APU_CMD_MASK | 0x80000000)53535454#define CX18_APU_ENCODING_METHOD_MPEG (0 << 28)5555#define CX18_APU_ENCODING_METHOD_AC3 (1 << 28)···67676868/* Description: Command APU to reset the AI6969 ReturnCode - ??? */7070-#define CX18_APU_RESETAI (APU_CMD_MASK | 0x05)7070+#define CX18_APU_RESETAI (APU_CMD_MASK | 0x05)71717272/* Description: This command indicates that a Memory Descriptor List has been7373 filled with the requested channel type···7575 IN[1] - Offset of the MDL_ACK from the beginning of the local DDR.7676 IN[2] - Number of CNXT_MDL_ACK structures in the array pointed to by IN[1]7777 ReturnCode - One of the ERR_DE_... */7878-#define CX18_EPU_DMA_DONE (EPU_CMD_MASK_DE | 0x0001)7878+#define CX18_EPU_DMA_DONE (EPU_CMD_MASK_DE | 0x0001)79798080/* Something interesting happened8181 IN[0] - A value to log8282 IN[1] - An offset of a string in the MiniMe memory;8383 0/zero/NULL means "I have nothing to say" */8484-#define CX18_EPU_DEBUG (EPU_CMD_MASK_DEBUG | 0x0003)8484+#define CX18_EPU_DEBUG (EPU_CMD_MASK_DEBUG | 0x0003)85858686/* Reads memory/registers (32-bit)8787 IN[0] - Address···9191/* Description: This command starts streaming with the set channel type9292 IN[0] - Task handle. Handle of the task to start9393 ReturnCode - One of the ERR_CAPTURE_... */9494-#define CX18_CPU_CAPTURE_START (CPU_CMD_MASK_CAPTURE | 0x0002)9494+#define CX18_CPU_CAPTURE_START (CPU_CMD_MASK_CAPTURE | 0x0002)95959696/* Description: This command stops streaming with the set channel type9797 IN[0] - Task handle. Handle of the task to stop9898 IN[1] - 0 = stop at end of GOP, 1 = stop at end of frame (MPEG only)9999 ReturnCode - One of the ERR_CAPTURE_... */100100-#define CX18_CPU_CAPTURE_STOP (CPU_CMD_MASK_CAPTURE | 0x0003)100100+#define CX18_CPU_CAPTURE_STOP (CPU_CMD_MASK_CAPTURE | 0x0003)101101102102/* Description: This command pauses streaming with the set channel type103103 IN[0] - Task handle. Handle of the task to pause104104 ReturnCode - One of the ERR_CAPTURE_... */105105-#define CX18_CPU_CAPTURE_PAUSE (CPU_CMD_MASK_CAPTURE | 0x0007)105105+#define CX18_CPU_CAPTURE_PAUSE (CPU_CMD_MASK_CAPTURE | 0x0007)106106107107/* Description: This command resumes streaming with the set channel type108108 IN[0] - Task handle. Handle of the task to resume109109 ReturnCode - One of the ERR_CAPTURE_... */110110-#define CX18_CPU_CAPTURE_RESUME (CPU_CMD_MASK_CAPTURE | 0x0008)110110+#define CX18_CPU_CAPTURE_RESUME (CPU_CMD_MASK_CAPTURE | 0x0008)111111112112-#define CAPTURE_CHANNEL_TYPE_NONE 0113113-#define CAPTURE_CHANNEL_TYPE_MPEG 1114114-#define CAPTURE_CHANNEL_TYPE_INDEX 2115115-#define CAPTURE_CHANNEL_TYPE_YUV 3116116-#define CAPTURE_CHANNEL_TYPE_PCM 4117117-#define CAPTURE_CHANNEL_TYPE_VBI 5112112+#define CAPTURE_CHANNEL_TYPE_NONE 0113113+#define CAPTURE_CHANNEL_TYPE_MPEG 1114114+#define CAPTURE_CHANNEL_TYPE_INDEX 2115115+#define CAPTURE_CHANNEL_TYPE_YUV 3116116+#define CAPTURE_CHANNEL_TYPE_PCM 4117117+#define CAPTURE_CHANNEL_TYPE_VBI 5118118#define CAPTURE_CHANNEL_TYPE_SLICED_VBI 6119119#define CAPTURE_CHANNEL_TYPE_TS 7120120-#define CAPTURE_CHANNEL_TYPE_MAX 15120120+#define CAPTURE_CHANNEL_TYPE_MAX 15121121122122/* Description: This command sets the channel type. This can only be done123123 when stopped.124124 IN[0] - Task handle. Handle of the task to start125125 IN[1] - Channel Type. See Below.126126 ReturnCode - One of the ERR_CAPTURE_... */127127-#define CX18_CPU_SET_CHANNEL_TYPE (CPU_CMD_MASK_CAPTURE + 1)127127+#define CX18_CPU_SET_CHANNEL_TYPE (CPU_CMD_MASK_CAPTURE + 1)128128129129/* Description: Set stream output type130130 IN[0] - task handle. Handle of the task to start···140140 IN[4] - reserved141141 IN[5] - frame rate, 0 - 29.97f/s, 1 - 25f/s142142 ReturnCode - One of the ERR_CAPTURE_... */143143-#define CX18_CPU_SET_VIDEO_IN (CPU_CMD_MASK_CAPTURE | 0x0004)143143+#define CX18_CPU_SET_VIDEO_IN (CPU_CMD_MASK_CAPTURE | 0x0004)144144145145/* Description: Set video frame rate146146 IN[0] - task handle. Handle of the task to start···149149 IN[3] - video peak rate150150 IN[4] - system mux rate151151 ReturnCode - One of the ERR_CAPTURE_... */152152-#define CX18_CPU_SET_VIDEO_RATE (CPU_CMD_MASK_CAPTURE | 0x0005)152152+#define CX18_CPU_SET_VIDEO_RATE (CPU_CMD_MASK_CAPTURE | 0x0005)153153154154/* Description: Set video output resolution155155 IN[0] - task handle···166166 3 = horizontal/vertical, 4 = diagonal167167 IN[3] - strength, temporal 0 - 31, spatial 0 - 15168168 ReturnCode - One of the ERR_CAPTURE_... */169169-#define CX18_CPU_SET_FILTER_PARAM (CPU_CMD_MASK_CAPTURE | 0x0009)169169+#define CX18_CPU_SET_FILTER_PARAM (CPU_CMD_MASK_CAPTURE | 0x0009)170170171171/* Description: This command set spatial filter type172172 IN[0] - Task handle.···174174 3 = 2D H/V separable, 4 = 2D symmetric non-separable175175 IN[2] - chroma type: 0 - disable, 1 = 1D horizontal176176 ReturnCode - One of the ERR_CAPTURE_... */177177-#define CX18_CPU_SET_SPATIAL_FILTER_TYPE (CPU_CMD_MASK_CAPTURE | 0x000C)177177+#define CX18_CPU_SET_SPATIAL_FILTER_TYPE (CPU_CMD_MASK_CAPTURE | 0x000C)178178179179/* Description: This command set coring levels for median filter180180 IN[0] - Task handle.···183183 IN[3] - chroma_high184184 IN[4] - chroma_low185185 ReturnCode - One of the ERR_CAPTURE_... */186186-#define CX18_CPU_SET_MEDIAN_CORING (CPU_CMD_MASK_CAPTURE | 0x000E)186186+#define CX18_CPU_SET_MEDIAN_CORING (CPU_CMD_MASK_CAPTURE | 0x000E)187187188188/* Description: This command set the picture type mask for index file189189 IN[0] - Task handle (ignored by firmware)190190- IN[1] - 0 = disable index file output190190+ IN[1] - 0 = disable index file output191191 1 = output I picture192192 2 = P picture193193 4 = B picture194194 other = illegal */195195-#define CX18_CPU_SET_INDEXTABLE (CPU_CMD_MASK_CAPTURE | 0x0010)195195+#define CX18_CPU_SET_INDEXTABLE (CPU_CMD_MASK_CAPTURE | 0x0010)196196197197/* Description: Set audio parameters198198 IN[0] - task handle. Handle of the task to start···218218/* Description: Set stream output type219219 IN[0] - task handle. Handle of the task to start220220 IN[1] - subType221221- SET_INITIAL_SCR 1221221+ SET_INITIAL_SCR 1222222 SET_QUALITY_MODE 2223223 SET_VIM_PROTECT_MODE 3224224 SET_PTS_CORRECTION 4···311311 bit 0: output user data, 1 - enable312312 bit 1: output private stream, 1 - enable313313 bit 2: mux option, 0 - in GOP, 1 - in picture314314- bit[7:0] private stream ID314314+ bit[7:0] private stream ID315315 IN[5] - insertion period while mux option is in picture316316 ReturnCode - VBI data offset */317317#define CX18_CPU_SET_SLICED_VBI_PARAM (CPU_CMD_MASK_CAPTURE | 0x0020)···344344#define CX18_CPU_SET_VFC_PARAM (CPU_CMD_MASK_CAPTURE | 0x0023)345345346346/* Below is the list of commands related to the data exchange */347347-#define CPU_CMD_MASK_DE (CPU_CMD_MASK | 0x040000)347347+#define CPU_CMD_MASK_DE (CPU_CMD_MASK | 0x040000)348348349349/* Description: This command provides the physical base address of the local350350 DDR as viewed by EPU351351 IN[0] - Physical offset where EPU has the local DDR mapped352352 ReturnCode - One of the ERR_DE_... */353353-#define CPU_CMD_DE_SetBase (CPU_CMD_MASK_DE | 0x0001)353353+#define CPU_CMD_DE_SetBase (CPU_CMD_MASK_DE | 0x0001)354354355355/* Description: This command provides the offsets in the device memory where356356 the 2 cx18_mdl_ack blocks reside···360360 IN[2] - Offset of the second cx18_mdl_ack from the beginning of the361361 local DDR.362362 ReturnCode - One of the ERR_DE_... */363363-#define CX18_CPU_DE_SET_MDL_ACK (CPU_CMD_MASK_DE | 0x0002)363363+#define CX18_CPU_DE_SET_MDL_ACK (CPU_CMD_MASK_DE | 0x0002)364364365365/* Description: This command provides the offset to a Memory Descriptor List366366 IN[0] - Task handle. Handle of the task to start···369369 IN[3] - Buffer ID370370 IN[4] - Total buffer length371371 ReturnCode - One of the ERR_DE_... */372372-#define CX18_CPU_DE_SET_MDL (CPU_CMD_MASK_DE | 0x0005)372372+#define CX18_CPU_DE_SET_MDL (CPU_CMD_MASK_DE | 0x0005)373373374374/* Description: This command requests return of all current Memory375375 Descriptor Lists to the driver376376 IN[0] - Task handle. Handle of the task to start377377 ReturnCode - One of the ERR_DE_... */378378-#define CX18_CPU_DE_RELEASE_MDL (CPU_CMD_MASK_DE | 0x0006)378378+#define CX18_CPU_DE_RELEASE_MDL (CPU_CMD_MASK_DE | 0x0006)379379380380/* Description: This command signals the cpu that the dat buffer has been381381 consumed and ready for re-use.
···2929module_param(ir_888_debug, int, 0644);3030MODULE_PARM_DESC(ir_888_debug, "enable debug messages [CX23888 IR controller]");31313232-#define CX23888_IR_REG_BASE 0x1700003232+#define CX23888_IR_REG_BASE 0x1700003333/*3434 * These CX23888 register offsets have a straightforward one to one mapping3535 * to the CX23885 register offsets of 0x200 through 0x218
+63-63
drivers/media/pci/ivtv/ivtv-cards.h
···2222#define IVTV_CARDS_H23232424/* Supported cards */2525-#define IVTV_CARD_PVR_250 0 /* WinTV PVR 250 */2626-#define IVTV_CARD_PVR_350 1 /* encoder, decoder, tv-out */2727-#define IVTV_CARD_PVR_150 2 /* WinTV PVR 150 and PVR 500 (really just two2525+#define IVTV_CARD_PVR_250 0 /* WinTV PVR 250 */2626+#define IVTV_CARD_PVR_350 1 /* encoder, decoder, tv-out */2727+#define IVTV_CARD_PVR_150 2 /* WinTV PVR 150 and PVR 500 (really just two2828 PVR150s on one PCI board) */2929-#define IVTV_CARD_M179 3 /* AVerMedia M179 (encoder only) */3030-#define IVTV_CARD_MPG600 4 /* Kuroutoshikou ITVC16-STVLP/YUAN MPG600, encoder only */3131-#define IVTV_CARD_MPG160 5 /* Kuroutoshikou ITVC15-STVLP/YUAN MPG1602929+#define IVTV_CARD_M179 3 /* AVerMedia M179 (encoder only) */3030+#define IVTV_CARD_MPG600 4 /* Kuroutoshikou ITVC16-STVLP/YUAN MPG600, encoder only */3131+#define IVTV_CARD_MPG160 5 /* Kuroutoshikou ITVC15-STVLP/YUAN MPG1603232 cx23415 based, but does not have tv-out */3333-#define IVTV_CARD_PG600 6 /* YUAN PG600/DIAMONDMM PVR-550 based on the CX Falcon 2 */3434-#define IVTV_CARD_AVC2410 7 /* Adaptec AVC-2410 */3535-#define IVTV_CARD_AVC2010 8 /* Adaptec AVD-2010 (No Tuner) */3636-#define IVTV_CARD_TG5000TV 9 /* NAGASE TRANSGEAR 5000TV, encoder only */3333+#define IVTV_CARD_PG600 6 /* YUAN PG600/DIAMONDMM PVR-550 based on the CX Falcon 2 */3434+#define IVTV_CARD_AVC2410 7 /* Adaptec AVC-2410 */3535+#define IVTV_CARD_AVC2010 8 /* Adaptec AVD-2010 (No Tuner) */3636+#define IVTV_CARD_TG5000TV 9 /* NAGASE TRANSGEAR 5000TV, encoder only */3737#define IVTV_CARD_VA2000MAX_SNT6 10 /* VA2000MAX-STN6 */3838-#define IVTV_CARD_CX23416GYC 11 /* Kuroutoshikou CX23416GYC-STVLP (Yuan MPG600GR OEM) */3939-#define IVTV_CARD_GV_MVPRX 12 /* I/O Data GV-MVP/RX, RX2, RX2W */4040-#define IVTV_CARD_GV_MVPRX2E 13 /* I/O Data GV-MVP/RX2E */3838+#define IVTV_CARD_CX23416GYC 11 /* Kuroutoshikou CX23416GYC-STVLP (Yuan MPG600GR OEM) */3939+#define IVTV_CARD_GV_MVPRX 12 /* I/O Data GV-MVP/RX, RX2, RX2W */4040+#define IVTV_CARD_GV_MVPRX2E 13 /* I/O Data GV-MVP/RX2E */4141#define IVTV_CARD_GOTVIEW_PCI_DVD 14 /* GotView PCI DVD */4242#define IVTV_CARD_GOTVIEW_PCI_DVD2 15 /* GotView PCI DVD2 */4343#define IVTV_CARD_YUAN_MPC622 16 /* Yuan MPC622 miniPCI */4444-#define IVTV_CARD_DCTMTVP1 17 /* DIGITAL COWBOY DCT-MTVP1 */4444+#define IVTV_CARD_DCTMTVP1 17 /* DIGITAL COWBOY DCT-MTVP1 */4545#define IVTV_CARD_PG600V2 18 /* Yuan PG600V2/GotView PCI DVD Lite */4646#define IVTV_CARD_CLUB3D 19 /* Club3D ZAP-TV1x01 */4747#define IVTV_CARD_AVERTV_MCE116 20 /* AVerTV MCE 116 Plus */···5252#define IVTV_CARD_BUFFALO_MV5L 25 /* Buffalo PC-MV5L/PCI card */5353#define IVTV_CARD_AVER_ULTRA1500MCE 26 /* AVerMedia UltraTV 1500 MCE */5454#define IVTV_CARD_KIKYOU 27 /* Sony VAIO Giga Pocket (ENX Kikyou) */5555-#define IVTV_CARD_LAST 275555+#define IVTV_CARD_LAST 2756565757/* Variants of existing cards but with the same PCI IDs. The driver5858 detects these based on other device information.···6161 must be adjusted accordingly. */62626363/* PVR-350 V1 (uses saa7114) */6464-#define IVTV_CARD_PVR_350_V1 (IVTV_CARD_LAST+1)6464+#define IVTV_CARD_PVR_350_V1 (IVTV_CARD_LAST+1)6565/* 2 variants of Kuroutoshikou CX23416GYC-STVLP (Yuan MPG600GR OEM) */6666#define IVTV_CARD_CX23416GYC_NOGR (IVTV_CARD_LAST+2)6767#define IVTV_CARD_CX23416GYC_NOGRYCS (IVTV_CARD_LAST+3)···7272#define PCI_DEVICE_ID_IVTV16 0x001673737474/* subsystem vendor ID */7575-#define IVTV_PCI_ID_HAUPPAUGE 0x00707676-#define IVTV_PCI_ID_HAUPPAUGE_ALT1 0x02707777-#define IVTV_PCI_ID_HAUPPAUGE_ALT2 0x40707878-#define IVTV_PCI_ID_ADAPTEC 0x90057979-#define IVTV_PCI_ID_ASUSTEK 0x10438080-#define IVTV_PCI_ID_AVERMEDIA 0x14617575+#define IVTV_PCI_ID_HAUPPAUGE 0x00707676+#define IVTV_PCI_ID_HAUPPAUGE_ALT1 0x02707777+#define IVTV_PCI_ID_HAUPPAUGE_ALT2 0x40707878+#define IVTV_PCI_ID_ADAPTEC 0x90057979+#define IVTV_PCI_ID_ASUSTEK 0x10438080+#define IVTV_PCI_ID_AVERMEDIA 0x14618181#define IVTV_PCI_ID_YUAN1 0x12ab8282-#define IVTV_PCI_ID_YUAN2 0xff018383-#define IVTV_PCI_ID_YUAN3 0xffab8484-#define IVTV_PCI_ID_YUAN4 0xfbab8585-#define IVTV_PCI_ID_DIAMONDMM 0xff928686-#define IVTV_PCI_ID_IODATA 0x10fc8787-#define IVTV_PCI_ID_MELCO 0x11548282+#define IVTV_PCI_ID_YUAN2 0xff018383+#define IVTV_PCI_ID_YUAN3 0xffab8484+#define IVTV_PCI_ID_YUAN4 0xfbab8585+#define IVTV_PCI_ID_DIAMONDMM 0xff928686+#define IVTV_PCI_ID_IODATA 0x10fc8787+#define IVTV_PCI_ID_MELCO 0x11548888#define IVTV_PCI_ID_GOTVIEW1 0xffac8989-#define IVTV_PCI_ID_GOTVIEW2 0xffad9090-#define IVTV_PCI_ID_SONY 0x104d8989+#define IVTV_PCI_ID_GOTVIEW2 0xffad9090+#define IVTV_PCI_ID_SONY 0x104d91919292/* hardware flags, no gaps allowed */9393#define IVTV_HW_CX25840 (1 << 0)···122122123123/* video inputs */124124#define IVTV_CARD_INPUT_VID_TUNER 1125125-#define IVTV_CARD_INPUT_SVIDEO1 2126126-#define IVTV_CARD_INPUT_SVIDEO2 3127127-#define IVTV_CARD_INPUT_COMPOSITE1 4128128-#define IVTV_CARD_INPUT_COMPOSITE2 5129129-#define IVTV_CARD_INPUT_COMPOSITE3 6125125+#define IVTV_CARD_INPUT_SVIDEO1 2126126+#define IVTV_CARD_INPUT_SVIDEO2 3127127+#define IVTV_CARD_INPUT_COMPOSITE1 4128128+#define IVTV_CARD_INPUT_COMPOSITE2 5129129+#define IVTV_CARD_INPUT_COMPOSITE3 6130130131131/* audio inputs */132132#define IVTV_CARD_INPUT_AUD_TUNER 1133133-#define IVTV_CARD_INPUT_LINE_IN1 2134134-#define IVTV_CARD_INPUT_LINE_IN2 3133133+#define IVTV_CARD_INPUT_LINE_IN1 2134134+#define IVTV_CARD_INPUT_LINE_IN2 3135135136136#define IVTV_CARD_MAX_VIDEO_INPUTS 6137137#define IVTV_CARD_MAX_AUDIO_INPUTS 3138138-#define IVTV_CARD_MAX_TUNERS 3138138+#define IVTV_CARD_MAX_TUNERS 3139139140140/* SAA71XX HW inputs */141141#define IVTV_SAA71XX_COMPOSITE0 0···172172 V4L2_CAP_SLICED_VBI_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_OVERLAY)173173174174struct ivtv_card_video_input {175175- u8 video_type; /* video input type */175175+ u8 video_type; /* video input type */176176 u8 audio_index; /* index in ivtv_card_audio_input array */177177 u16 video_input; /* hardware video input */178178};···199199200200/* The mask is the set of bits used by the operation */201201202202-struct ivtv_gpio_init { /* set initial GPIO DIR and OUT values */203203- u16 direction; /* DIR setting. Leave to 0 if no init is needed */202202+struct ivtv_gpio_init { /* set initial GPIO DIR and OUT values */203203+ u16 direction; /* DIR setting. Leave to 0 if no init is needed */204204 u16 initial_value;205205};206206207207-struct ivtv_gpio_video_input { /* select tuner/line in input */208208- u16 mask; /* leave to 0 if not supported */207207+struct ivtv_gpio_video_input { /* select tuner/line in input */208208+ u16 mask; /* leave to 0 if not supported */209209 u16 tuner;210210 u16 composite;211211 u16 svideo;212212};213213214214-struct ivtv_gpio_audio_input { /* select tuner/line in input */215215- u16 mask; /* leave to 0 if not supported */214214+struct ivtv_gpio_audio_input { /* select tuner/line in input */215215+ u16 mask; /* leave to 0 if not supported */216216 u16 tuner;217217 u16 linein;218218 u16 radio;219219};220220221221struct ivtv_gpio_audio_mute {222222- u16 mask; /* leave to 0 if not supported */222222+ u16 mask; /* leave to 0 if not supported */223223 u16 mute; /* set this value to mute, 0 to unmute */224224};225225226226struct ivtv_gpio_audio_mode {227227- u16 mask; /* leave to 0 if not supported */228228- u16 mono; /* set audio to mono */229229- u16 stereo; /* set audio to stereo */227227+ u16 mask; /* leave to 0 if not supported */228228+ u16 mono; /* set audio to mono */229229+ u16 stereo; /* set audio to stereo */230230 u16 lang1; /* set audio to the first language */231231 u16 lang2; /* set audio to the second language */232232- u16 both; /* both languages are output */232232+ u16 both; /* both languages are output */233233};234234235235struct ivtv_gpio_audio_freq {236236- u16 mask; /* leave to 0 if not supported */236236+ u16 mask; /* leave to 0 if not supported */237237 u16 f32000;238238 u16 f44100;239239 u16 f48000;240240};241241242242struct ivtv_gpio_audio_detect {243243- u16 mask; /* leave to 0 if not supported */244244- u16 stereo; /* if the input matches this value then243243+ u16 mask; /* leave to 0 if not supported */244244+ u16 stereo; /* if the input matches this value then245245 stereo is detected */246246};247247248248struct ivtv_card_tuner {249249- v4l2_std_id std; /* standard for which the tuner is suitable */250250- int tuner; /* tuner ID (from tuner.h) */249249+ v4l2_std_id std; /* standard for which the tuner is suitable */250250+ int tuner; /* tuner ID (from tuner.h) */251251};252252253253struct ivtv_card_tuner_i2c {···272272 struct ivtv_card_audio_input radio_input;273273 int nof_outputs;274274 const struct ivtv_card_output *video_outputs;275275- u8 gr_config; /* config byte for the ghost reduction device */276276- u8 xceive_pin; /* XCeive tuner GPIO reset pin */275275+ u8 gr_config; /* config byte for the ghost reduction device */276276+ u8 xceive_pin; /* XCeive tuner GPIO reset pin */277277278278 /* GPIO card-specific settings */279279- struct ivtv_gpio_init gpio_init;279279+ struct ivtv_gpio_init gpio_init;280280 struct ivtv_gpio_video_input gpio_video_input;281281- struct ivtv_gpio_audio_input gpio_audio_input;282282- struct ivtv_gpio_audio_mute gpio_audio_mute;283283- struct ivtv_gpio_audio_mode gpio_audio_mode;284284- struct ivtv_gpio_audio_freq gpio_audio_freq;285285- struct ivtv_gpio_audio_detect gpio_audio_detect;281281+ struct ivtv_gpio_audio_input gpio_audio_input;282282+ struct ivtv_gpio_audio_mute gpio_audio_mute;283283+ struct ivtv_gpio_audio_mode gpio_audio_mode;284284+ struct ivtv_gpio_audio_freq gpio_audio_freq;285285+ struct ivtv_gpio_audio_detect gpio_audio_detect;286286287287 struct ivtv_card_tuner tuners[IVTV_CARD_MAX_TUNERS];288288 struct ivtv_card_tuner_i2c *i2c;
+51-51
drivers/media/pci/ivtv/ivtv-driver.h
···7676#define IVTV_ENCODER_SIZE 0x00800000 /* Total size is 0x01000000, but only first half is used */7777#define IVTV_DECODER_OFFSET 0x010000007878#define IVTV_DECODER_SIZE 0x00800000 /* Total size is 0x01000000, but only first half is used */7979-#define IVTV_REG_OFFSET 0x020000007979+#define IVTV_REG_OFFSET 0x020000008080#define IVTV_REG_SIZE 0x0001000081818282/* Maximum ivtv driver instances. Some people have a huge number of···9797#define IVTV_DMA_SG_OSD_ENT (2883584/PAGE_SIZE) /* sg entities */98989999/* DMA Registers */100100-#define IVTV_REG_DMAXFER (0x0000)101101-#define IVTV_REG_DMASTATUS (0x0004)102102-#define IVTV_REG_DECDMAADDR (0x0008)103103-#define IVTV_REG_ENCDMAADDR (0x000c)104104-#define IVTV_REG_DMACONTROL (0x0010)105105-#define IVTV_REG_IRQSTATUS (0x0040)106106-#define IVTV_REG_IRQMASK (0x0048)100100+#define IVTV_REG_DMAXFER (0x0000)101101+#define IVTV_REG_DMASTATUS (0x0004)102102+#define IVTV_REG_DECDMAADDR (0x0008)103103+#define IVTV_REG_ENCDMAADDR (0x000c)104104+#define IVTV_REG_DMACONTROL (0x0010)105105+#define IVTV_REG_IRQSTATUS (0x0040)106106+#define IVTV_REG_IRQMASK (0x0048)107107108108/* Setup Registers */109109-#define IVTV_REG_ENC_SDRAM_REFRESH (0x07F8)110110-#define IVTV_REG_ENC_SDRAM_PRECHARGE (0x07FC)111111-#define IVTV_REG_DEC_SDRAM_REFRESH (0x08F8)112112-#define IVTV_REG_DEC_SDRAM_PRECHARGE (0x08FC)113113-#define IVTV_REG_VDM (0x2800)114114-#define IVTV_REG_AO (0x2D00)115115-#define IVTV_REG_BYTEFLUSH (0x2D24)116116-#define IVTV_REG_SPU (0x9050)117117-#define IVTV_REG_HW_BLOCKS (0x9054)118118-#define IVTV_REG_VPU (0x9058)119119-#define IVTV_REG_APU (0xA064)109109+#define IVTV_REG_ENC_SDRAM_REFRESH (0x07F8)110110+#define IVTV_REG_ENC_SDRAM_PRECHARGE (0x07FC)111111+#define IVTV_REG_DEC_SDRAM_REFRESH (0x08F8)112112+#define IVTV_REG_DEC_SDRAM_PRECHARGE (0x08FC)113113+#define IVTV_REG_VDM (0x2800)114114+#define IVTV_REG_AO (0x2D00)115115+#define IVTV_REG_BYTEFLUSH (0x2D24)116116+#define IVTV_REG_SPU (0x9050)117117+#define IVTV_REG_HW_BLOCKS (0x9054)118118+#define IVTV_REG_VPU (0x9058)119119+#define IVTV_REG_APU (0xA064)120120121121/* Other registers */122122#define IVTV_REG_DEC_LINE_FIELD (0x28C0)···158158159159#define IVTV_DEBUG_HIGH_VOL(x, type, fmt, args...) \160160 do { \161161- if (((x) & ivtv_debug) && (ivtv_debug & IVTV_DBGFLG_HIGHVOL)) \161161+ if (((x) & ivtv_debug) && (ivtv_debug & IVTV_DBGFLG_HIGHVOL)) \162162 v4l2_info(&itv->v4l2_dev, " " type ": " fmt , ##args); \163163 } while (0)164164#define IVTV_DEBUG_HI_WARN(fmt, args...) IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_WARN, "warn", fmt , ## args)···226226/* per-stream, s_flags */227227#define IVTV_F_S_DMA_PENDING 0 /* this stream has pending DMA */228228#define IVTV_F_S_DMA_HAS_VBI 1 /* the current DMA request also requests VBI data */229229-#define IVTV_F_S_NEEDS_DATA 2 /* this decoding stream needs more data */229229+#define IVTV_F_S_NEEDS_DATA 2 /* this decoding stream needs more data */230230231231-#define IVTV_F_S_CLAIMED 3 /* this stream is claimed */231231+#define IVTV_F_S_CLAIMED 3 /* this stream is claimed */232232#define IVTV_F_S_STREAMING 4 /* the fw is decoding/encoding this stream */233233#define IVTV_F_S_INTERNAL_USE 5 /* this stream is used internally (sliced VBI processing) */234234#define IVTV_F_S_PASSTHROUGH 6 /* this stream is in passthrough mode */···239239#define IVTV_F_S_PIO_HAS_VBI 1 /* the current PIO request also requests VBI data */240240241241/* per-ivtv, i_flags */242242-#define IVTV_F_I_DMA 0 /* DMA in progress */243243-#define IVTV_F_I_UDMA 1 /* UDMA in progress */244244-#define IVTV_F_I_UDMA_PENDING 2 /* UDMA pending */245245-#define IVTV_F_I_SPEED_CHANGE 3 /* a speed change is in progress */246246-#define IVTV_F_I_EOS 4 /* end of encoder stream reached */247247-#define IVTV_F_I_RADIO_USER 5 /* the radio tuner is selected */248248-#define IVTV_F_I_DIG_RST 6 /* reset digitizer */249249-#define IVTV_F_I_DEC_YUV 7 /* YUV instead of MPG is being decoded */250250-#define IVTV_F_I_UPDATE_CC 9 /* CC should be updated */251251-#define IVTV_F_I_UPDATE_WSS 10 /* WSS should be updated */252252-#define IVTV_F_I_UPDATE_VPS 11 /* VPS should be updated */253253-#define IVTV_F_I_DECODING_YUV 12 /* this stream is YUV frame decoding */254254-#define IVTV_F_I_ENC_PAUSED 13 /* the encoder is paused */255255-#define IVTV_F_I_VALID_DEC_TIMINGS 14 /* last_dec_timing is valid */256256-#define IVTV_F_I_HAVE_WORK 15 /* used in the interrupt handler: there is work to be done */242242+#define IVTV_F_I_DMA 0 /* DMA in progress */243243+#define IVTV_F_I_UDMA 1 /* UDMA in progress */244244+#define IVTV_F_I_UDMA_PENDING 2 /* UDMA pending */245245+#define IVTV_F_I_SPEED_CHANGE 3 /* a speed change is in progress */246246+#define IVTV_F_I_EOS 4 /* end of encoder stream reached */247247+#define IVTV_F_I_RADIO_USER 5 /* the radio tuner is selected */248248+#define IVTV_F_I_DIG_RST 6 /* reset digitizer */249249+#define IVTV_F_I_DEC_YUV 7 /* YUV instead of MPG is being decoded */250250+#define IVTV_F_I_UPDATE_CC 9 /* CC should be updated */251251+#define IVTV_F_I_UPDATE_WSS 10 /* WSS should be updated */252252+#define IVTV_F_I_UPDATE_VPS 11 /* VPS should be updated */253253+#define IVTV_F_I_DECODING_YUV 12 /* this stream is YUV frame decoding */254254+#define IVTV_F_I_ENC_PAUSED 13 /* the encoder is paused */255255+#define IVTV_F_I_VALID_DEC_TIMINGS 14 /* last_dec_timing is valid */256256+#define IVTV_F_I_HAVE_WORK 15 /* used in the interrupt handler: there is work to be done */257257#define IVTV_F_I_WORK_HANDLER_VBI 16 /* there is work to be done for VBI */258258#define IVTV_F_I_WORK_HANDLER_YUV 17 /* there is work to be done for YUV */259259#define IVTV_F_I_WORK_HANDLER_PIO 18 /* there is work to be done for PIO */260260#define IVTV_F_I_PIO 19 /* PIO in progress */261261-#define IVTV_F_I_DEC_PAUSED 20 /* the decoder is paused */262262-#define IVTV_F_I_INITED 21 /* set after first open */263263-#define IVTV_F_I_FAILED 22 /* set if first open failed */261261+#define IVTV_F_I_DEC_PAUSED 20 /* the decoder is paused */262262+#define IVTV_F_I_INITED 21 /* set after first open */263263+#define IVTV_F_I_FAILED 22 /* set if first open failed */264264#define IVTV_F_I_WORK_HANDLER_PCM 23 /* there is work to be done for PCM */265265266266/* Event notifications */267267#define IVTV_F_I_EV_DEC_STOPPED 28 /* decoder stopped event */268268-#define IVTV_F_I_EV_VSYNC 29 /* VSYNC event */269269-#define IVTV_F_I_EV_VSYNC_FIELD 30 /* VSYNC event field (0 = first, 1 = second field) */270270-#define IVTV_F_I_EV_VSYNC_ENABLED 31 /* VSYNC event enabled */268268+#define IVTV_F_I_EV_VSYNC 29 /* VSYNC event */269269+#define IVTV_F_I_EV_VSYNC_FIELD 30 /* VSYNC event field (0 = first, 1 = second field) */270270+#define IVTV_F_I_EV_VSYNC_ENABLED 31 /* VSYNC event enabled */271271272272/* Scatter-Gather array element, used in DMA transfers */273273struct ivtv_sg_element {···330330 /* These first four fields are always set, even if the stream331331 is not actually created. */332332 struct video_device vdev; /* vdev.v4l2_dev is NULL if there is no device */333333- struct ivtv *itv; /* for ease of use */333333+ struct ivtv *itv; /* for ease of use */334334 const char *name; /* name of the stream */335335 int type; /* stream type */336336 u32 caps; /* V4L2 capabilities */337337338338 struct v4l2_fh *fh; /* pointer to the streaming filehandle */339339- spinlock_t qlock; /* locks access to the queues */339339+ spinlock_t qlock; /* locks access to the queues */340340 unsigned long s_flags; /* status flags, see above */341341 int dma; /* can be PCI_DMA_TODEVICE, PCI_DMA_FROMDEVICE or PCI_DMA_NONE */342342 u32 pending_offset;···564564565565 /* Raw VBI compatibility hack */566566567567- u32 frame; /* frame counter hack needed for backwards compatibility567567+ u32 frame; /* frame counter hack needed for backwards compatibility568568 of old VBI software */569569570570 /* Sliced VBI output data */···620620 u8 nof_inputs; /* number of video inputs */621621 u8 nof_audio_inputs; /* number of audio inputs */622622 u32 v4l2_cap; /* V4L2 capabilities of card */623623- u32 hw_flags; /* hardware description of the board */623623+ u32 hw_flags; /* hardware description of the board */624624 v4l2_std_id tuner_std; /* the norm of the card's tuner (fixed) */625625 struct v4l2_subdev *sd_video; /* controlling video decoder subdev */626626 struct v4l2_subdev *sd_audio; /* controlling audio subdev */···629629 volatile void __iomem *enc_mem; /* pointer to mapped encoder memory */630630 volatile void __iomem *dec_mem; /* pointer to mapped decoder memory */631631 volatile void __iomem *reg_mem; /* pointer to mapped registers */632632- struct ivtv_options options; /* user options */632632+ struct ivtv_options options; /* user options */633633634634 struct v4l2_device v4l2_dev;635635 struct cx2341x_handler cxhdl;···668668669669 /* Streams */670670 int stream_buf_size[IVTV_MAX_STREAMS]; /* stream buffer size */671671- struct ivtv_stream streams[IVTV_MAX_STREAMS]; /* stream data */671671+ struct ivtv_stream streams[IVTV_MAX_STREAMS]; /* stream data */672672 atomic_t capturing; /* count number of active capture streams */673673 atomic_t decoding; /* count number of active decoding streams */674674···704704 /* Mailbox */705705 struct ivtv_mailbox_data enc_mbox; /* encoder mailboxes */706706 struct ivtv_mailbox_data dec_mbox; /* decoder mailboxes */707707- struct ivtv_api_cache api_cache[256]; /* cached API commands */707707+ struct ivtv_api_cache api_cache[256]; /* cached API commands */708708709709710710 /* I2C */···828828829829/* Call the specified callback for all subdevs matching hw (if 0, then830830 match them all). Ignore any errors. */831831-#define ivtv_call_hw(itv, hw, o, f, args...) \831831+#define ivtv_call_hw(itv, hw, o, f, args...) \832832 v4l2_device_mask_call_all(&(itv)->v4l2_dev, hw, o, f, ##args)833833834834#define ivtv_call_all(itv, o, f, args...) ivtv_call_hw(itv, 0, o, f , ##args)
···384384 * 4 possible field conversions are possible at the moment:385385 * V4L2_FIELD_SEQ_TB --> V4L2_FIELD_INTERLACED_TB:386386 * two separate fields in the same input buffer are interlaced387387- * in the output buffer using weaving. Top field comes first.387387+ * in the output buffer using weaving. Top field comes first.388388 * V4L2_FIELD_SEQ_TB --> V4L2_FIELD_NONE:389389- * top field from the input buffer is copied to the output buffer390390- * using line doubling. Bottom field from the input buffer is discarded.389389+ * top field from the input buffer is copied to the output buffer390390+ * using line doubling. Bottom field from the input buffer is discarded.391391 * V4L2_FIELD_SEQ_BT --> V4L2_FIELD_INTERLACED_BT:392392 * two separate fields in the same input buffer are interlaced393393- * in the output buffer using weaving. Bottom field comes first.393393+ * in the output buffer using weaving. Bottom field comes first.394394 * V4L2_FIELD_SEQ_BT --> V4L2_FIELD_NONE:395395- * bottom field from the input buffer is copied to the output buffer396396- * using line doubling. Top field from the input buffer is discarded.395395+ * bottom field from the input buffer is copied to the output buffer396396+ * using line doubling. Top field from the input buffer is discarded.397397 */398398 switch (dst_q_data->fmt->fourcc) {399399 case V4L2_PIX_FMT_YUV420:
···36363737 /* interface to tda829x driver */3838 enum tda8290_lna config;3939- int switch_addr;3939+ int switch_addr;40404141 void (*agcf)(struct dvb_frontend *fe);4242};
+2-2
drivers/media/tuners/tda9887.c
···3131 struct tuner_i2c_props i2c_props;3232 struct list_head hybrid_tuner_instance_list;33333434- unsigned char data[4];3434+ unsigned char data[4];3535 unsigned int config;3636 unsigned int mode;3737 unsigned int audmode;···9494#define cAudioGain6 0x80 // bit c795959696#define cTopMask 0x1f // bit c0:49797-#define cTopDefault 0x10 // bit c0:49797+#define cTopDefault 0x10 // bit c0:498989999//// third reg (e)100100#define cAudioIF_4_5 0x00 // bit e0:1
+1-1
drivers/media/tuners/tuner-simple.c
···5353/* tv tuner system standard selection for Philips FQ1216ME5454 this value takes the low bits of control byte 25555 from datasheet "1999 Nov 16" (supersedes "1999 Mar 23")5656- standard BG DK I L L`5656+ standard BG DK I L L`5757 picture carrier 38.90 38.90 38.90 38.90 33.955858 colour 34.47 34.47 34.47 34.47 38.385959 sound 1 33.40 32.40 32.90 32.40 40.45
+3-3
drivers/media/tuners/tuner-xc2028.c
···8787 v4l2_std_id std_req;8888 __u16 int_freq;8989 unsigned int scode_table;9090- int scode_nr;9090+ int scode_nr;9191};92929393enum xc2028_state {···137137 ibuf, isize); \138138 if (isize != _rc) \139139 tuner_err("i2c input error: rc = %d (should be %d)\n", \140140- _rc, (int)isize); \140140+ _rc, (int)isize); \141141 if (priv->ctrl.msleep) \142142 msleep(priv->ctrl.msleep); \143143 _rc; \···172172 return 0;173173}174174175175-#define dump_firm_type(t) dump_firm_type_and_int_freq(t, 0)175175+#define dump_firm_type(t) dump_firm_type_and_int_freq(t, 0)176176static void dump_firm_type_and_int_freq(unsigned int type, u16 int_freq)177177{178178 if (type & BASE)
···21682168}2169216921702170/******************************************************************************21712171- * I 2 S - B L O C K C O N T R O L functions *21712171+ * I 2 S - B L O C K C O N T R O L functions *21722172 ******************************************************************************/21732173int cx231xx_i2s_blk_initialize(struct cx231xx *dev)21742174{
+1-1
drivers/media/usb/cx231xx/cx231xx-core.c
···5656 dev->name, __func__ , ##arg); } while (0)57575858/*****************************************************************5959-* Device control list functions *5959+* Device control list functions *6060******************************************************************/61616262LIST_HEAD(cx231xx_devlist);
+1-1
drivers/media/usb/cx231xx/cx231xx-i2c.c
···5151 if (i2c_debug >= lvl) { \5252 printk(KERN_DEBUG "%s at %s: " fmt, \5353 dev->name, __func__ , ##args); \5454- } \5454+ } \5555} while (0)56565757static inline int get_real_i2c_port(struct cx231xx *dev, int bus_nr)
···30303131 Note: these ioctls that internal to the kernel and are never called3232 from userspace. */3333-#define BT819_FIFO_RESET_LOW _IO('b', 0)3434-#define BT819_FIFO_RESET_HIGH _IO('b', 1)3333+#define BT819_FIFO_RESET_LOW _IO('b', 0)3434+#define BT819_FIFO_RESET_HIGH _IO('b', 1)35353636#endif
···5050/* These three macros assume that the debug level is set with a module5151 parameter called 'debug'. */5252#define v4l_dbg(level, debug, client, fmt, arg...) \5353- do { \5353+ do { \5454 if (debug >= (level)) \5555 v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \5656 } while (0)···8080/* These three macros assume that the debug level is set with a module8181 parameter called 'debug'. */8282#define v4l2_dbg(level, debug, dev, fmt, arg...) \8383- do { \8383+ do { \8484 if (debug >= (level)) \8585- v4l2_printk(KERN_DEBUG, dev, fmt , ## arg); \8585+ v4l2_printk(KERN_DEBUG, dev, fmt , ## arg); \8686 } while (0)87878888/**···266266};267267#define TUNER_SET_CONFIG _IOW('d', 92, struct v4l2_priv_tun_config)268268269269-#define VIDIOC_INT_RESET _IOW ('d', 102, u32)269269+#define VIDIOC_INT_RESET _IOW ('d', 102, u32)270270271271/* ------------------------------------------------------------------------- */272272
+10-10
include/uapi/linux/dvb/video.h
···8383#define VIDEO_CMD_CONTINUE (3)84848585/* Flags for VIDEO_CMD_FREEZE */8686-#define VIDEO_CMD_FREEZE_TO_BLACK (1 << 0)8686+#define VIDEO_CMD_FREEZE_TO_BLACK (1 << 0)87878888/* Flags for VIDEO_CMD_STOP */8989-#define VIDEO_CMD_STOP_TO_BLACK (1 << 0)9090-#define VIDEO_CMD_STOP_IMMEDIATELY (1 << 1)8989+#define VIDEO_CMD_STOP_TO_BLACK (1 << 0)9090+#define VIDEO_CMD_STOP_IMMEDIATELY (1 << 1)91919292/* Play input formats: */9393/* The decoder has no special format requirements */···124124/* FIELD_UNKNOWN can be used if the hardware does not know whether125125 the Vsync is for an odd, even or progressive (i.e. non-interlaced)126126 field. */127127-#define VIDEO_VSYNC_FIELD_UNKNOWN (0)128128-#define VIDEO_VSYNC_FIELD_ODD (1)127127+#define VIDEO_VSYNC_FIELD_UNKNOWN (0)128128+#define VIDEO_VSYNC_FIELD_ODD (1)129129#define VIDEO_VSYNC_FIELD_EVEN (2)130130#define VIDEO_VSYNC_FIELD_PROGRESSIVE (3)131131···133133 __s32 type;134134#define VIDEO_EVENT_SIZE_CHANGED 1135135#define VIDEO_EVENT_FRAME_RATE_CHANGED 2136136-#define VIDEO_EVENT_DECODER_STOPPED 3137137-#define VIDEO_EVENT_VSYNC 4136136+#define VIDEO_EVENT_DECODER_STOPPED 3137137+#define VIDEO_EVENT_VSYNC 4138138 /* unused, make sure to use atomic time for y2038 if it ever gets used */139139 long timestamp;140140 union {···268268#define VIDEO_GET_PTS _IOR('o', 57, __u64)269269270270/* Read the number of displayed frames since the decoder was started */271271-#define VIDEO_GET_FRAME_COUNT _IOR('o', 58, __u64)271271+#define VIDEO_GET_FRAME_COUNT _IOR('o', 58, __u64)272272273273-#define VIDEO_COMMAND _IOWR('o', 59, struct video_command)274274-#define VIDEO_TRY_COMMAND _IOWR('o', 60, struct video_command)273273+#define VIDEO_COMMAND _IOWR('o', 59, struct video_command)274274+#define VIDEO_TRY_COMMAND _IOWR('o', 60, struct video_command)275275276276#endif /* _UAPI_DVBVIDEO_H_ */