media: replace all <spaces><tab> occurrences
authorMauro Carvalho Chehab <mchehab@s-opensource.com>
Thu, 4 Jan 2018 18:08:56 +0000 (13:08 -0500)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Thu, 4 Jan 2018 18:15:05 +0000 (13:15 -0500)
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>
135 files changed:
drivers/media/common/saa7146/saa7146_video.c
drivers/media/dvb-core/Makefile
drivers/media/dvb-frontends/au8522_priv.h
drivers/media/dvb-frontends/drx39xyj/drx_driver.h
drivers/media/dvb-frontends/stb0899_drv.c
drivers/media/dvb-frontends/stb0899_drv.h
drivers/media/dvb-frontends/stb0899_priv.h
drivers/media/dvb-frontends/stv0900_core.c
drivers/media/dvb-frontends/stv0900_init.h
drivers/media/dvb-frontends/stv0900_priv.h
drivers/media/dvb-frontends/stv090x.c
drivers/media/dvb-frontends/stv090x_priv.h
drivers/media/dvb-frontends/stv6110x.c
drivers/media/dvb-frontends/stv6110x_priv.h
drivers/media/dvb-frontends/tda10023.c
drivers/media/firewire/firedtv-avc.c
drivers/media/firewire/firedtv-fe.c
drivers/media/i2c/cx25840/cx25840-core.c
drivers/media/i2c/cx25840/cx25840-core.h
drivers/media/i2c/cx25840/cx25840-ir.c
drivers/media/i2c/ks0127.c
drivers/media/i2c/ov7670.c
drivers/media/i2c/saa6752hs.c
drivers/media/i2c/saa7115.c
drivers/media/i2c/saa7127.c
drivers/media/i2c/saa717x.c
drivers/media/i2c/ths7303.c
drivers/media/i2c/tvaudio.c
drivers/media/i2c/tvp7002_reg.h
drivers/media/i2c/vpx3220.c
drivers/media/pci/bt8xx/bttv-cards.c
drivers/media/pci/bt8xx/bttv-input.c
drivers/media/pci/bt8xx/bttv.h
drivers/media/pci/bt8xx/bttvp.h
drivers/media/pci/cx18/cx18-alsa-pcm.c
drivers/media/pci/cx18/cx18-av-audio.c
drivers/media/pci/cx18/cx18-av-core.c
drivers/media/pci/cx18/cx18-av-core.h
drivers/media/pci/cx18/cx18-cards.c
drivers/media/pci/cx18/cx18-cards.h
drivers/media/pci/cx18/cx18-driver.h
drivers/media/pci/cx18/cx18-firmware.c
drivers/media/pci/cx18/cx18-mailbox.c
drivers/media/pci/cx18/cx18-streams.c
drivers/media/pci/cx18/cx18-vbi.c
drivers/media/pci/cx18/cx23418.h
drivers/media/pci/cx23885/cimax2.c
drivers/media/pci/cx23885/cx23885-video.c
drivers/media/pci/cx23885/cx23885.h
drivers/media/pci/cx23885/cx23888-ir.c
drivers/media/pci/ivtv/ivtv-cards.h
drivers/media/pci/ivtv/ivtv-driver.h
drivers/media/pci/ivtv/ivtv-firmware.c
drivers/media/pci/ivtv/ivtv-i2c.c
drivers/media/pci/ivtv/ivtv-ioctl.c
drivers/media/pci/ivtv/ivtv-mailbox.c
drivers/media/pci/mantis/mantis_reg.h
drivers/media/pci/mantis/mantis_vp1041.c
drivers/media/pci/meye/meye.c
drivers/media/pci/saa7134/saa7134-cards.c
drivers/media/pci/saa7134/saa7134-dvb.c
drivers/media/pci/saa7134/saa7134-video.c
drivers/media/pci/saa7134/saa7134.h
drivers/media/pci/saa7146/hexium_gemini.c
drivers/media/pci/saa7146/hexium_orion.c
drivers/media/pci/saa7146/mxb.c
drivers/media/pci/ttpci/av7110.h
drivers/media/pci/ttpci/budget-av.c
drivers/media/pci/ttpci/budget-ci.c
drivers/media/pci/zoran/zoran_driver.c
drivers/media/pci/zoran/zr36057.h
drivers/media/platform/Makefile
drivers/media/platform/arv.c
drivers/media/platform/coda/coda_regs.h
drivers/media/platform/davinci/dm355_ccdc_regs.h
drivers/media/platform/davinci/dm644x_ccdc_regs.h
drivers/media/platform/davinci/isif_regs.h
drivers/media/platform/davinci/vpfe_capture.c
drivers/media/platform/davinci/vpif.h
drivers/media/platform/davinci/vpss.c
drivers/media/platform/exynos4-is/fimc-core.c
drivers/media/platform/m2m-deinterlace.c
drivers/media/platform/omap/omap_vout.c
drivers/media/platform/sh_vou.c
drivers/media/radio/radio-aimslab.c
drivers/media/radio/radio-aztech.c
drivers/media/radio/radio-cadet.c
drivers/media/radio/radio-gemtek.c
drivers/media/radio/radio-rtrack2.c
drivers/media/radio/radio-sf16fmi.c
drivers/media/radio/radio-sf16fmr2.c
drivers/media/radio/radio-tea5764.c
drivers/media/radio/radio-terratec.c
drivers/media/radio/tea575x.c
drivers/media/rc/keymaps/rc-behold-columbus.c
drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c
drivers/media/tuners/mxl5005s.c
drivers/media/tuners/tda827x.h
drivers/media/tuners/tda9887.c
drivers/media/tuners/tuner-simple.c
drivers/media/tuners/tuner-xc2028.c
drivers/media/tuners/tuner-xc2028.h
drivers/media/usb/au0828/au0828-cards.h
drivers/media/usb/au0828/au0828-video.c
drivers/media/usb/au0828/au0828.h
drivers/media/usb/cpia2/cpia2_usb.c
drivers/media/usb/cx231xx/cx231xx-audio.c
drivers/media/usb/cx231xx/cx231xx-avcore.c
drivers/media/usb/cx231xx/cx231xx-core.c
drivers/media/usb/cx231xx/cx231xx-i2c.c
drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h
drivers/media/usb/cx231xx/cx231xx-reg.h
drivers/media/usb/dvb-usb/az6027.c
drivers/media/usb/gspca/stv06xx/stv06xx.c
drivers/media/usb/hdpvr/hdpvr-video.c
drivers/media/usb/hdpvr/hdpvr.h
drivers/media/usb/pwc/pwc.h
drivers/media/usb/siano/smsusb.c
drivers/media/usb/stk1160/Makefile
drivers/media/usb/stkwebcam/stk-sensor.c
drivers/media/usb/uvc/uvc_driver.c
drivers/media/usb/uvc/uvc_isight.c
drivers/media/v4l2-core/v4l2-compat-ioctl32.c
drivers/media/v4l2-core/v4l2-ioctl.c
include/media/drv-intf/cx2341x.h
include/media/drv-intf/msp3400.h
include/media/drv-intf/saa7146.h
include/media/i2c/bt819.h
include/media/i2c/m52790.h
include/media/i2c/saa7115.h
include/media/i2c/upd64031a.h
include/media/v4l2-common.h
include/uapi/linux/dvb/video.h
include/uapi/linux/v4l2-controls.h
include/uapi/linux/videodev2.h

index 5dfc1f2..0dfa0c0 100644 (file)
@@ -1001,9 +1001,9 @@ const struct v4l2_ioctl_ops saa7146_video_ioctl_ops = {
        .vidioc_try_fmt_vid_overlay  = vidioc_try_fmt_vid_overlay,
        .vidioc_s_fmt_vid_overlay    = vidioc_s_fmt_vid_overlay,
 
-       .vidioc_overlay              = vidioc_overlay,
-       .vidioc_g_fbuf               = vidioc_g_fbuf,
-       .vidioc_s_fbuf               = vidioc_s_fbuf,
+       .vidioc_overlay              = vidioc_overlay,
+       .vidioc_g_fbuf               = vidioc_g_fbuf,
+       .vidioc_s_fbuf               = vidioc_s_fbuf,
        .vidioc_reqbufs              = vidioc_reqbufs,
        .vidioc_querybuf             = vidioc_querybuf,
        .vidioc_qbuf                 = vidioc_qbuf,
@@ -1012,7 +1012,7 @@ const struct v4l2_ioctl_ops saa7146_video_ioctl_ops = {
        .vidioc_s_std                = vidioc_s_std,
        .vidioc_streamon             = vidioc_streamon,
        .vidioc_streamoff            = vidioc_streamoff,
-       .vidioc_g_parm               = vidioc_g_parm,
+       .vidioc_g_parm               = vidioc_g_parm,
        .vidioc_subscribe_event      = v4l2_ctrl_subscribe_event,
        .vidioc_unsubscribe_event    = v4l2_event_unsubscribe,
 };
index 05827ee..3a105d8 100644 (file)
@@ -7,7 +7,7 @@ dvb-net-$(CONFIG_DVB_NET) := dvb_net.o
 dvb-vb2-$(CONFIG_DVB_MMSP) := dvb_vb2.o
 
 dvb-core-objs := dvbdev.o dmxdev.o dvb_demux.o                 \
-                dvb_ca_en50221.o dvb_frontend.o                \
+                dvb_ca_en50221.o dvb_frontend.o                \
                 $(dvb-net-y) dvb_ringbuffer.o $(dvb-vb2-y) dvb_math.o
 
 obj-$(CONFIG_DVB_CORE) += dvb-core.o
index f02dac9..2043c17 100644 (file)
@@ -99,7 +99,7 @@ int au8522_led_ctrl(struct au8522_state *state, int led);
 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H         0x0A5
 #define AU8522_AGC_CONTROL_RANGE_REG0A6H               0x0A6
 #define AU8522_SYSTEM_GAIN_CONTROL_REG0A7H             0x0A7
-#define AU8522_TUNER_AGC_RF_STOP_REG0A8H               0x0A8
+#define AU8522_TUNER_AGC_RF_STOP_REG0A8H               0x0A8
 #define AU8522_TUNER_AGC_RF_START_REG0A9H              0x0A9
 #define AU8522_TUNER_RF_AGC_DEFAULT_REG0AAH            0x0AA
 #define AU8522_TUNER_AGC_IF_STOP_REG0ABH               0x0AB
@@ -110,18 +110,18 @@ int au8522_led_ctrl(struct au8522_state *state, int led);
 
 /* Receiver registers */
 #define AU8522_FRMREGTHRD1_REG0B0H                     0x0B0
-#define AU8522_FRMREGAGC1H_REG0B1H                     0x0B1
-#define AU8522_FRMREGSHIFT1_REG0B2H                    0x0B2
-#define AU8522_TOREGAGC1_REG0B3H                       0x0B3
-#define AU8522_TOREGASHIFT1_REG0B4H                    0x0B4
+#define AU8522_FRMREGAGC1H_REG0B1H                     0x0B1
+#define AU8522_FRMREGSHIFT1_REG0B2H                    0x0B2
+#define AU8522_TOREGAGC1_REG0B3H                       0x0B3
+#define AU8522_TOREGASHIFT1_REG0B4H                    0x0B4
 #define AU8522_FRMREGBBH_REG0B5H                       0x0B5
-#define AU8522_FRMREGBBM_REG0B6H                       0x0B6
-#define AU8522_FRMREGBBL_REG0B7H                       0x0B7
+#define AU8522_FRMREGBBM_REG0B6H                       0x0B6
+#define AU8522_FRMREGBBL_REG0B7H                       0x0B7
 /* 0xB8 TO 0xD7 are the filter coefficients */
-#define AU8522_FRMREGTHRD2_REG0D8H                     0x0D8
-#define AU8522_FRMREGAGC2H_REG0D9H                     0x0D9
-#define AU8522_TOREGAGC2_REG0DAH                       0x0DA
-#define AU8522_TOREGSHIFT2_REG0DBH                     0x0DB
+#define AU8522_FRMREGTHRD2_REG0D8H                     0x0D8
+#define AU8522_FRMREGAGC2H_REG0D9H                     0x0D9
+#define AU8522_TOREGAGC2_REG0DAH                       0x0DA
+#define AU8522_TOREGSHIFT2_REG0DBH                     0x0DB
 #define AU8522_FRMREGPILOTH_REG0DCH                    0x0DC
 #define AU8522_FRMREGPILOTM_REG0DDH                    0x0DD
 #define AU8522_FRMREGPILOTL_REG0DEH                    0x0DE
@@ -134,9 +134,9 @@ int au8522_led_ctrl(struct au8522_state *state, int led);
 #define AU8522_CHIP_MODE_REG0FEH                       0x0FE
 
 /* I2C bus control registers */
-#define AU8522_I2C_CONTROL_REG0_REG090H                0x090
-#define AU8522_I2C_CONTROL_REG1_REG091H                0x091
-#define AU8522_I2C_STATUS_REG092H                      0x092
+#define AU8522_I2C_CONTROL_REG0_REG090H                        0x090
+#define AU8522_I2C_CONTROL_REG1_REG091H                        0x091
+#define AU8522_I2C_STATUS_REG092H                      0x092
 #define AU8522_I2C_WR_DATA0_REG093H                    0x093
 #define AU8522_I2C_WR_DATA1_REG094H                    0x094
 #define AU8522_I2C_WR_DATA2_REG095H                    0x095
@@ -156,48 +156,48 @@ int au8522_led_ctrl(struct au8522_state *state, int led);
 
 #define AU8522_ENA_USB_REG101H                         0x101
 
-#define AU8522_I2S_CTRL_0_REG110H                      0x110
-#define AU8522_I2S_CTRL_1_REG111H                      0x111
-#define AU8522_I2S_CTRL_2_REG112H                      0x112
+#define AU8522_I2S_CTRL_0_REG110H                      0x110
+#define AU8522_I2S_CTRL_1_REG111H                      0x111
+#define AU8522_I2S_CTRL_2_REG112H                      0x112
 
-#define AU8522_FRMREGFFECONTROL_REG121H                0x121
-#define AU8522_FRMREGDFECONTROL_REG122H                0x122
+#define AU8522_FRMREGFFECONTROL_REG121H                        0x121
+#define AU8522_FRMREGDFECONTROL_REG122H                        0x122
 
-#define AU8522_CARRFREQOFFSET0_REG201H                         0x201
+#define AU8522_CARRFREQOFFSET0_REG201H                 0x201
 #define AU8522_CARRFREQOFFSET1_REG202H                 0x202
 
 #define AU8522_DECIMATION_GAIN_REG21AH                 0x21A
-#define AU8522_FRMREGIFSLP_REG21BH                     0x21B
-#define AU8522_FRMREGTHRDL2_REG21CH                    0x21C
-#define AU8522_FRMREGSTEP3DB_REG21DH                   0x21D
+#define AU8522_FRMREGIFSLP_REG21BH                     0x21B
+#define AU8522_FRMREGTHRDL2_REG21CH                    0x21C
+#define AU8522_FRMREGSTEP3DB_REG21DH                   0x21D
 #define AU8522_DAGC_GAIN_ADJUSTMENT_REG21EH            0x21E
-#define AU8522_FRMREGPLLMODE_REG21FH                   0x21F
-#define AU8522_FRMREGCSTHRD_REG220H                    0x220
-#define AU8522_FRMREGCRLOCKDMAX_REG221H                0x221
-#define AU8522_FRMREGCRPERIODMASK_REG222H              0x222
-#define AU8522_FRMREGCRLOCK0THH_REG223H                0x223
-#define AU8522_FRMREGCRLOCK1THH_REG224H                0x224
-#define AU8522_FRMREGCRLOCK0THL_REG225H                0x225
-#define AU8522_FRMREGCRLOCK1THL_REG226H                0x226
+#define AU8522_FRMREGPLLMODE_REG21FH                   0x21F
+#define AU8522_FRMREGCSTHRD_REG220H                    0x220
+#define AU8522_FRMREGCRLOCKDMAX_REG221H                        0x221
+#define AU8522_FRMREGCRPERIODMASK_REG222H              0x222
+#define AU8522_FRMREGCRLOCK0THH_REG223H                        0x223
+#define AU8522_FRMREGCRLOCK1THH_REG224H                        0x224
+#define AU8522_FRMREGCRLOCK0THL_REG225H                        0x225
+#define AU8522_FRMREGCRLOCK1THL_REG226H                        0x226
 #define AU_FRMREGPLLACQPHASESCL_REG227H                        0x227
-#define AU8522_FRMREGFREQFBCTRL_REG228H                0x228
+#define AU8522_FRMREGFREQFBCTRL_REG228H                        0x228
 
 /* Analog TV Decoder */
 #define AU8522_TVDEC_STATUS_REG000H                    0x000
 #define AU8522_TVDEC_INT_STATUS_REG001H                        0x001
-#define AU8522_TVDEC_MACROVISION_STATUS_REG002H        0x002
+#define AU8522_TVDEC_MACROVISION_STATUS_REG002H                0x002
 #define AU8522_TVDEC_SHARPNESSREG009H                  0x009
 #define AU8522_TVDEC_BRIGHTNESS_REG00AH                        0x00A
 #define AU8522_TVDEC_CONTRAST_REG00BH                  0x00B
 #define AU8522_TVDEC_SATURATION_CB_REG00CH             0x00C
 #define AU8522_TVDEC_SATURATION_CR_REG00DH             0x00D
 #define AU8522_TVDEC_HUE_H_REG00EH                     0x00E
-#define AU8522_TVDEC_HUE_L_REG00FH                     0x00F
+#define AU8522_TVDEC_HUE_L_REG00FH                     0x00F
 #define AU8522_TVDEC_INT_MASK_REG010H                  0x010
 #define AU8522_VIDEO_MODE_REG011H                      0x011
 #define AU8522_TVDEC_PGA_REG012H                       0x012
 #define AU8522_TVDEC_COMB_MODE_REG015H                 0x015
-#define AU8522_REG016H                                 0x016
+#define AU8522_REG016H                                 0x016
 #define AU8522_TVDED_DBG_MODE_REG060H                  0x060
 #define AU8522_TVDEC_FORMAT_CTRL1_REG061H              0x061
 #define AU8522_TVDEC_FORMAT_CTRL2_REG062H              0x062
@@ -207,13 +207,13 @@ int au8522_led_ctrl(struct au8522_state *state, int led);
 #define AU8522_TVDEC_COMB_VDIF_THR2_REG066H            0x066
 #define AU8522_TVDEC_COMB_VDIF_THR3_REG067H            0x067
 #define AU8522_TVDEC_COMB_NOTCH_THR_REG068H            0x068
-#define AU8522_TVDEC_COMB_HDIF_THR1_REG069H            0x069
+#define AU8522_TVDEC_COMB_HDIF_THR1_REG069H            0x069
 #define AU8522_TVDEC_COMB_HDIF_THR2_REG06AH            0x06A
-#define AU8522_TVDEC_COMB_HDIF_THR3_REG06BH            0x06B
-#define AU8522_TVDEC_COMB_DCDIF_THR1_REG06CH           0x06C
-#define AU8522_TVDEC_COMB_DCDIF_THR2_REG06DH           0x06D
-#define AU8522_TVDEC_COMB_DCDIF_THR3_REG06EH           0x06E
-#define AU8522_TVDEC_UV_SEP_THR_REG06FH                0x06F
+#define AU8522_TVDEC_COMB_HDIF_THR3_REG06BH            0x06B
+#define AU8522_TVDEC_COMB_DCDIF_THR1_REG06CH           0x06C
+#define AU8522_TVDEC_COMB_DCDIF_THR2_REG06DH           0x06D
+#define AU8522_TVDEC_COMB_DCDIF_THR3_REG06EH           0x06E
+#define AU8522_TVDEC_UV_SEP_THR_REG06FH                        0x06F
 #define AU8522_TVDEC_COMB_DC_THR1_NTSC_REG070H         0x070
 #define AU8522_TVDEC_COMB_DC_THR2_NTSC_REG073H         0x073
 #define AU8522_TVDEC_DCAGC_CTRL_REG077H                        0x077
@@ -229,42 +229,42 @@ int au8522_led_ctrl(struct au8522_state *state, int led);
 
 #define AU8522_TVDEC_CHROMA_AGC_REG401H                0x401
 #define AU8522_TVDEC_CHROMA_SFT_REG402H                0x402
-#define AU8522_FILTER_COEF_R410                0x410
-#define AU8522_FILTER_COEF_R411                0x411
-#define AU8522_FILTER_COEF_R412                0x412
-#define AU8522_FILTER_COEF_R413                0x413
-#define AU8522_FILTER_COEF_R414                0x414
-#define AU8522_FILTER_COEF_R415                0x415
-#define AU8522_FILTER_COEF_R416                0x416
-#define AU8522_FILTER_COEF_R417                0x417
-#define AU8522_FILTER_COEF_R418                0x418
-#define AU8522_FILTER_COEF_R419                0x419
-#define AU8522_FILTER_COEF_R41A                0x41A
-#define AU8522_FILTER_COEF_R41B                0x41B
-#define AU8522_FILTER_COEF_R41C                0x41C
-#define AU8522_FILTER_COEF_R41D                0x41D
-#define AU8522_FILTER_COEF_R41E                0x41E
-#define AU8522_FILTER_COEF_R41F                0x41F
-#define AU8522_FILTER_COEF_R420                0x420
-#define AU8522_FILTER_COEF_R421                0x421
-#define AU8522_FILTER_COEF_R422                0x422
-#define AU8522_FILTER_COEF_R423                0x423
-#define AU8522_FILTER_COEF_R424                0x424
-#define AU8522_FILTER_COEF_R425                0x425
-#define AU8522_FILTER_COEF_R426                0x426
-#define AU8522_FILTER_COEF_R427                0x427
-#define AU8522_FILTER_COEF_R428                0x428
-#define AU8522_FILTER_COEF_R429                0x429
-#define AU8522_FILTER_COEF_R42A                0x42A
-#define AU8522_FILTER_COEF_R42B                0x42B
-#define AU8522_FILTER_COEF_R42C                0x42C
-#define AU8522_FILTER_COEF_R42D                0x42D
+#define AU8522_FILTER_COEF_R410                        0x410
+#define AU8522_FILTER_COEF_R411                        0x411
+#define AU8522_FILTER_COEF_R412                        0x412
+#define AU8522_FILTER_COEF_R413                        0x413
+#define AU8522_FILTER_COEF_R414                        0x414
+#define AU8522_FILTER_COEF_R415                        0x415
+#define AU8522_FILTER_COEF_R416                        0x416
+#define AU8522_FILTER_COEF_R417                        0x417
+#define AU8522_FILTER_COEF_R418                        0x418
+#define AU8522_FILTER_COEF_R419                        0x419
+#define AU8522_FILTER_COEF_R41A                        0x41A
+#define AU8522_FILTER_COEF_R41B                        0x41B
+#define AU8522_FILTER_COEF_R41C                        0x41C
+#define AU8522_FILTER_COEF_R41D                        0x41D
+#define AU8522_FILTER_COEF_R41E                        0x41E
+#define AU8522_FILTER_COEF_R41F                        0x41F
+#define AU8522_FILTER_COEF_R420                        0x420
+#define AU8522_FILTER_COEF_R421                        0x421
+#define AU8522_FILTER_COEF_R422                        0x422
+#define AU8522_FILTER_COEF_R423                        0x423
+#define AU8522_FILTER_COEF_R424                        0x424
+#define AU8522_FILTER_COEF_R425                        0x425
+#define AU8522_FILTER_COEF_R426                        0x426
+#define AU8522_FILTER_COEF_R427                        0x427
+#define AU8522_FILTER_COEF_R428                        0x428
+#define AU8522_FILTER_COEF_R429                        0x429
+#define AU8522_FILTER_COEF_R42A                        0x42A
+#define AU8522_FILTER_COEF_R42B                        0x42B
+#define AU8522_FILTER_COEF_R42C                        0x42C
+#define AU8522_FILTER_COEF_R42D                        0x42D
 
 /* VBI Control Registers */
-#define AU8522_TVDEC_VBI_RX_FIFO_CONTAIN_REG004H       0x004
-#define AU8522_TVDEC_VBI_TX_FIFO_CONTAIN_REG005H       0x005
-#define AU8522_TVDEC_VBI_RX_FIFO_READ_REG006H          0x006
-#define AU8522_TVDEC_VBI_FIFO_STATUS_REG007H           0x007
+#define AU8522_TVDEC_VBI_RX_FIFO_CONTAIN_REG004H       0x004
+#define AU8522_TVDEC_VBI_TX_FIFO_CONTAIN_REG005H       0x005
+#define AU8522_TVDEC_VBI_RX_FIFO_READ_REG006H          0x006
+#define AU8522_TVDEC_VBI_FIFO_STATUS_REG007H           0x007
 #define AU8522_TVDEC_VBI_CTRL_H_REG017H                        0x017
 #define AU8522_TVDEC_VBI_CTRL_L_REG018H                        0x018
 #define AU8522_TVDEC_VBI_USER_TOTAL_BITS_REG019H       0x019
@@ -272,10 +272,10 @@ int au8522_led_ctrl(struct au8522_state *state, int led);
 #define AU8522_TVDEC_VBI_USER_TUNIT_L_REG01BH          0x01B
 #define AU8522_TVDEC_VBI_USER_THRESH1_REG01CH          0x01C
 #define AU8522_TVDEC_VBI_USER_FRAME_PAT2_REG01EH       0x01E
-#define AU8522_TVDEC_VBI_USER_FRAME_PAT1_REG01FH       0x01F
-#define AU8522_TVDEC_VBI_USER_FRAME_PAT0_REG020H       0x020
-#define AU8522_TVDEC_VBI_USER_FRAME_MASK2_REG021H      0x021
-#define AU8522_TVDEC_VBI_USER_FRAME_MASK1_REG022H      0x022
+#define AU8522_TVDEC_VBI_USER_FRAME_PAT1_REG01FH       0x01F
+#define AU8522_TVDEC_VBI_USER_FRAME_PAT0_REG020H       0x020
+#define AU8522_TVDEC_VBI_USER_FRAME_MASK2_REG021H      0x021
+#define AU8522_TVDEC_VBI_USER_FRAME_MASK1_REG022H      0x022
 #define AU8522_TVDEC_VBI_USER_FRAME_MASK0_REG023H      0x023
 
 #define AU8522_REG071H                                 0x071
@@ -315,17 +315,17 @@ int au8522_led_ctrl(struct au8522_state *state, int led);
 #define AU8522_GPIO_DATA_REG0E2H                       0x0E2
 
 /* Audio Control Registers */
-#define AU8522_AUDIOAGC_REG0EEH                        0x0EE
-#define AU8522_AUDIO_STATUS_REG0F0H                    0x0F0
-#define AU8522_AUDIO_MODE_REG0F1H                      0x0F1
-#define AU8522_AUDIO_VOLUME_L_REG0F2H                  0x0F2
-#define AU8522_AUDIO_VOLUME_R_REG0F3H                  0x0F3
-#define AU8522_AUDIO_VOLUME_REG0F4H                    0x0F4
-#define AU8522_FRMREGAUPHASE_REG0F7H                   0x0F7
+#define AU8522_AUDIOAGC_REG0EEH                                0x0EE
+#define AU8522_AUDIO_STATUS_REG0F0H                    0x0F0
+#define AU8522_AUDIO_MODE_REG0F1H                      0x0F1
+#define AU8522_AUDIO_VOLUME_L_REG0F2H                  0x0F2
+#define AU8522_AUDIO_VOLUME_R_REG0F3H                  0x0F3
+#define AU8522_AUDIO_VOLUME_REG0F4H                    0x0F4
+#define AU8522_FRMREGAUPHASE_REG0F7H                   0x0F7
 #define AU8522_REG0F9H                                 0x0F9
 
-#define AU8522_AUDIOAGC2_REG605H                       0x605
-#define AU8522_AUDIOFREQ_REG606H                       0x606
+#define AU8522_AUDIOAGC2_REG605H                       0x605
+#define AU8522_AUDIOFREQ_REG606H                       0x606
 
 
 /**************************************************************/
@@ -356,53 +356,53 @@ int au8522_led_ctrl(struct au8522_state *state, int led);
 #define AU8522_TVDEC_FORMAT_CTRL2_REG062H_STD_PAL_M            0x02
 
 
-#define AU8522_INPUT_CONTROL_REG081H_ATSC                      0xC4
+#define AU8522_INPUT_CONTROL_REG081H_ATSC                      0xC4
 #define AU8522_INPUT_CONTROL_REG081H_ATVRF                     0xC4
 #define AU8522_INPUT_CONTROL_REG081H_ATVRF13                   0xC4
-#define AU8522_INPUT_CONTROL_REG081H_J83B64                    0xC4
-#define AU8522_INPUT_CONTROL_REG081H_J83B256                   0xC4
-#define AU8522_INPUT_CONTROL_REG081H_CVBS                      0x20
+#define AU8522_INPUT_CONTROL_REG081H_J83B64                    0xC4
+#define AU8522_INPUT_CONTROL_REG081H_J83B256                   0xC4
+#define AU8522_INPUT_CONTROL_REG081H_CVBS                      0x20
 #define AU8522_INPUT_CONTROL_REG081H_CVBS_CH1                  0xA2
 #define AU8522_INPUT_CONTROL_REG081H_CVBS_CH2                  0xA0
 #define AU8522_INPUT_CONTROL_REG081H_CVBS_CH3                  0x69
 #define AU8522_INPUT_CONTROL_REG081H_CVBS_CH4                  0x68
-#define AU8522_INPUT_CONTROL_REG081H_CVBS_CH4_SIF              0x28
+#define AU8522_INPUT_CONTROL_REG081H_CVBS_CH4_SIF              0x28
 /* CH1 AS Y,CH3 AS C */
-#define AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH13               0x23
+#define AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH13               0x23
 /* CH2 AS Y,CH4 AS C */
-#define AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH24               0x20
-#define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_ATSC               0x0C
-#define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_J83B64             0x09
-#define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_J83B256                    0x09
-#define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_CVBS               0x12
-#define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_ATVRF              0x1A
+#define AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH24               0x20
+#define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_ATSC               0x0C
+#define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_J83B64             0x09
+#define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_J83B256            0x09
+#define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_CVBS               0x12
+#define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_ATVRF              0x1A
 #define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_ATVRF13            0x1A
 #define AU8522_MODULE_CLOCK_CONTROL_REG0A3H_SVIDEO             0x02
 
 #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_CLEAR           0x00
 #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_SVIDEO          0x9C
-#define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_CVBS            0x9D
+#define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_CVBS            0x9D
 #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_ATSC            0xE8
-#define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_J83B256                 0xCA
-#define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_J83B64                  0xCA
-#define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_ATVRF                   0xDD
+#define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_J83B256         0xCA
+#define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_J83B64          0xCA
+#define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_ATVRF           0xDD
 #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_ATVRF13         0xDD
 #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_PAL             0xDD
 #define AU8522_SYSTEM_MODULE_CONTROL_0_REG0A4H_FM              0xDD
 
 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_ATSC            0x80
-#define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_J83B256                 0x80
-#define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_J83B64                  0x80
+#define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_J83B256         0x80
+#define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_J83B64          0x80
 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_DONGLE_ATSC     0x40
 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_DONGLE_J83B256  0x40
 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_DONGLE_J83B64   0x40
 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_DONGLE_CLEAR    0x00
 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_ATVRF           0x01
 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_ATVRF13         0x01
-#define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_SVIDEO                  0x04
+#define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_SVIDEO          0x04
 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_CVBS            0x01
-#define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_PWM                     0x03
-#define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_IIS             0x09
+#define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_PWM             0x03
+#define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_IIS             0x09
 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_PAL             0x01
 #define AU8522_SYSTEM_MODULE_CONTROL_1_REG0A5H_FM              0x01
 
index 855685b..1ec20ee 100644 (file)
@@ -932,7 +932,7 @@ STRUCTS
  * Used by DRX_CTRL_LOAD_UCODE and DRX_CTRL_VERIFY_UCODE
  */
 struct drxu_code_info {
-       char                    *mc_file;
+       char                    *mc_file;
 };
 
 /*
index 2c5427c..3c654ae 100644 (file)
@@ -1583,15 +1583,15 @@ static enum dvbfe_algo stb0899_frontend_algo(struct dvb_frontend *fe)
 static const struct dvb_frontend_ops stb0899_ops = {
        .delsys = { SYS_DVBS, SYS_DVBS2, SYS_DSS },
        .info = {
-               .name                   = "STB0899 Multistandard",
+               .name                   = "STB0899 Multistandard",
                .frequency_min          = 950000,
-               .frequency_max          = 2150000,
+               .frequency_max          = 2150000,
                .frequency_stepsize     = 0,
                .frequency_tolerance    = 0,
-               .symbol_rate_min        =  5000000,
-               .symbol_rate_max        = 45000000,
+               .symbol_rate_min        =  5000000,
+               .symbol_rate_max        = 45000000,
 
-               .caps                   = FE_CAN_INVERSION_AUTO |
+               .caps                   = FE_CAN_INVERSION_AUTO |
                                          FE_CAN_FEC_AUTO       |
                                          FE_CAN_2G_MODULATION  |
                                          FE_CAN_QPSK
index 6c285ae..f65f9a8 100644 (file)
@@ -82,7 +82,7 @@ enum stb0899_inversion {
  * 1. POWER ON/OFF             (index 0)
  * 2. FE_HAS_LOCK/LOCK_LOSS    (index 1)
  *
- * @gpio       = one of the above listed GPIO's
+ * @gpio       = one of the above listed GPIO's
  * @level      = output state: pulled up or low
  */
 struct stb0899_postproc {
index 86d140e..3285cd1 100644 (file)
@@ -252,7 +252,7 @@ extern int stb0899_write_s2reg(struct stb0899_state *state,
 extern int stb0899_i2c_gate_ctrl(struct dvb_frontend *fe, int enable);
 
 
-#define STB0899_READ_S2REG(DEVICE, REG)        (_stb0899_read_s2reg(state, DEVICE, STB0899_BASE_##REG, STB0899_OFF0_##REG))
+#define STB0899_READ_S2REG(DEVICE, REG)                (_stb0899_read_s2reg(state, DEVICE, STB0899_BASE_##REG, STB0899_OFF0_##REG))
 //#define STB0899_WRITE_S2REG(DEVICE, REG, DATA)       (_stb0899_write_s2reg(state, DEVICE, STB0899_BASE_##REG, STB0899_OFF0_##REG, DATA))
 
 /* stb0899_algo.c      */
index 0b73972..72f17b9 100644 (file)
@@ -1929,7 +1929,7 @@ struct dvb_frontend *stv0900_attach(const struct stv0900_config *config,
        switch (demod) {
        case 0:
        case 1:
-               init_params.dmd_ref_clk         = config->xtal;
+               init_params.dmd_ref_clk         = config->xtal;
                init_params.demod_mode          = config->demod_mode;
                init_params.rolloff             = STV0900_35;
                init_params.path1_ts_clock      = config->path1_mode;
index 4119414..550ef4a 100644 (file)
@@ -148,8 +148,8 @@ struct stv0900_short_frames_car_loop_optim_vs_mod {
 
 /* Cut 1.x Tracking carrier loop carrier QPSK 1/2 to 8PSK 9/10 long Frame */
 static const struct stv0900_car_loop_optim FE_STV0900_S2CarLoop[14] = {
-       /*Modcod                2MPon   2MPoff  5MPon   5MPoff  10MPon
-                               10MPoff 20MPon  20MPoff 30MPon  30MPoff */
+       /*Modcod                2MPon   2MPoff  5MPon   5MPoff  10MPon
+                               10MPoff 20MPon  20MPoff 30MPon  30MPoff */
        { STV0900_QPSK_12,      0x1C,   0x0D,   0x1B,   0x2C,   0x3A,
                                0x1C,   0x2A,   0x3B,   0x2A,   0x1B },
        { STV0900_QPSK_35,      0x2C,   0x0D,   0x2B,   0x2C,   0x3A,
@@ -176,15 +176,15 @@ static const struct stv0900_car_loop_optim FE_STV0900_S2CarLoop[14] = {
                                0x0B,   0x39,   0x1A,   0x19,   0x0A },
        { STV0900_8PSK_89,      0x3B,   0x3B,   0x0B,   0x2B,   0x2A,
                                0x0B,   0x39,   0x1A,   0x29,   0x39 },
-       { STV0900_8PSK_910,     0x3B,   0x3B,   0x0B,   0x2B,   0x2A,
+       { STV0900_8PSK_910,     0x3B,   0x3B,   0x0B,   0x2B,   0x2A,
                                0x0B,   0x39,   0x1A,   0x29,   0x39 }
 };
 
 
 /* Cut 2.0 Tracking carrier loop carrier QPSK 1/2 to 8PSK 9/10 long Frame */
 static const struct stv0900_car_loop_optim FE_STV0900_S2CarLoopCut20[14] = {
-       /* Modcod               2MPon   2MPoff  5MPon   5MPoff  10MPon
-                               10MPoff 20MPon  20MPoff 30MPon  30MPoff */
+       /* Modcod               2MPon   2MPoff  5MPon   5MPoff  10MPon
+                               10MPoff 20MPon  20MPoff 30MPon  30MPoff */
        { STV0900_QPSK_12,      0x1F,   0x3F,   0x1E,   0x3F,   0x3D,
                                0x1F,   0x3D,   0x3E,   0x3D,   0x1E },
        { STV0900_QPSK_35,      0x2F,   0x3F,   0x2E,   0x2F,   0x3D,
@@ -211,7 +211,7 @@ static const struct stv0900_car_loop_optim FE_STV0900_S2CarLoopCut20[14] = {
                                0x1e,   0x3c,   0x2d,   0x2c,   0x1d },
        { STV0900_8PSK_89,      0x3e,   0x3e,   0x1e,   0x2e,   0x3d,
                                0x1e,   0x0d,   0x2d,   0x3c,   0x1d },
-       { STV0900_8PSK_910,     0x3e,   0x3e,   0x1e,   0x2e,   0x3d,
+       { STV0900_8PSK_910,     0x3e,   0x3e,   0x1e,   0x2e,   0x3d,
                                0x1e,   0x1d,   0x2d,   0x0d,   0x1d },
 };
 
@@ -219,8 +219,8 @@ static const struct stv0900_car_loop_optim FE_STV0900_S2CarLoopCut20[14] = {
 
 /* Cut 2.0 Tracking carrier loop carrier 16APSK 2/3 to 32APSK 9/10 long Frame */
 static const struct stv0900_car_loop_optim FE_STV0900_S2APSKCarLoopCut20[11] = {
-       /* Modcod               2MPon   2MPoff  5MPon   5MPoff  10MPon
-                               10MPoff 20MPon  20MPoff 30MPon  30MPoff */
+       /* Modcod               2MPon   2MPoff  5MPon   5MPoff  10MPon
+                               10MPoff 20MPon  20MPoff 30MPon  30MPoff */
        { STV0900_16APSK_23,    0x0C,   0x0C,   0x0C,   0x0C,   0x1D,
                                0x0C,   0x3C,   0x0C,   0x2C,   0x0C },
        { STV0900_16APSK_34,    0x0C,   0x0C,   0x0C,   0x0C,   0x0E,
@@ -248,8 +248,8 @@ static const struct stv0900_car_loop_optim FE_STV0900_S2APSKCarLoopCut20[11] = {
 
 /* Cut 2.0 Tracking carrier loop carrier QPSK 1/4 to QPSK 2/5 long Frame */
 static const struct stv0900_car_loop_optim FE_STV0900_S2LowQPCarLoopCut20[3] = {
-       /* Modcod               2MPon   2MPoff  5MPon   5MPoff  10MPon
-                               10MPoff 20MPon  20MPoff 30MPon  30MPoff */
+       /* Modcod               2MPon   2MPoff  5MPon   5MPoff  10MPon
+                               10MPoff 20MPon  20MPoff 30MPon  30MPoff */
        { STV0900_QPSK_14,      0x0F,   0x3F,   0x0E,   0x3F,   0x2D,
                                0x2F,   0x2D,   0x1F,   0x3D,   0x3E },
        { STV0900_QPSK_13,      0x0F,   0x3F,   0x0E,   0x3F,   0x2D,
@@ -275,10 +275,10 @@ struct stv0900_short_frames_car_loop_optim FE_STV0900_S2ShortCarLoop[4] = {
 };
 
 static const struct stv0900_car_loop_optim FE_STV0900_S2CarLoopCut30[14] = {
-       /*Modcod                2MPon   2MPoff  5MPon   5MPoff  10MPon
-                               10MPoff 20MPon  20MPoff 30MPon  30MPoff */
+       /*Modcod                2MPon   2MPoff  5MPon   5MPoff  10MPon
+                               10MPoff 20MPon  20MPoff 30MPon  30MPoff */
        { STV0900_QPSK_12,      0x3C,   0x2C,   0x0C,   0x2C,   0x1B,
-                               0x2C,   0x1B,   0x1C,   0x0B,   0x3B },
+                               0x2C,   0x1B,   0x1C,   0x0B,   0x3B },
        { STV0900_QPSK_35,      0x0D,   0x0D,   0x0C,   0x0D,   0x1B,
                                0x3C,   0x1B,   0x1C,   0x0B,   0x3B },
        { STV0900_QPSK_23,      0x1D,   0x0D,   0x0C,   0x1D,   0x2B,
@@ -309,8 +309,8 @@ static      const struct stv0900_car_loop_optim FE_STV0900_S2CarLoopCut30[14] = {
 
 static const
 struct stv0900_car_loop_optim FE_STV0900_S2APSKCarLoopCut30[11] = {
-       /*Modcod                2MPon   2MPoff  5MPon   5MPoff  10MPon
-                               10MPoff 20MPon  20MPoff 30MPon  30MPoff */
+       /*Modcod                2MPon   2MPoff  5MPon   5MPoff  10MPon
+                               10MPoff 20MPon  20MPoff 30MPon  30MPoff */
        { STV0900_16APSK_23,    0x0A,   0x0A,   0x0A,   0x0A,   0x1A,
                                0x0A,   0x3A,   0x0A,   0x2A,   0x0A },
        { STV0900_16APSK_34,    0x0A,   0x0A,   0x0A,   0x0A,   0x0B,
@@ -337,8 +337,8 @@ struct stv0900_car_loop_optim FE_STV0900_S2APSKCarLoopCut30[11] = {
 
 static const
 struct stv0900_car_loop_optim FE_STV0900_S2LowQPCarLoopCut30[3] = {
-       /*Modcod                2MPon   2MPoff  5MPon   5MPoff  10MPon
-                               10MPoff 20MPon  20MPoff 30MPon  30MPoff*/
+       /*Modcod                2MPon   2MPoff  5MPon   5MPoff  10MPon
+                               10MPoff 20MPon  20MPoff 30MPon  30MPoff*/
        { STV0900_QPSK_14,      0x0C,   0x3C,   0x0B,   0x3C,   0x2A,
                                0x2C,   0x2A,   0x1C,   0x3A,   0x3B },
        { STV0900_QPSK_13,      0x0C,   0x3C,   0x0B,   0x3C,   0x2A,
index 7a95f95..d1fc06f 100644 (file)
@@ -243,7 +243,7 @@ struct stv0900_init_params{
 
        u8      tun1_maddress;
        int     tuner1_adc;
-       int     tuner1_type;
+       int     tuner1_type;
 
        /* IQ from the tuner1 to the demod */
        enum stv0900_iq_inversion       tun1_iq_inv;
index 20641bd..9133f65 100644 (file)
@@ -677,7 +677,7 @@ static struct stv090x_short_frame_crloop stv090x_s2_short_crl_cut20[] = {
 
 /* Cut 3.0 Short Frame Tracking CR Loop */
 static struct stv090x_short_frame_crloop stv090x_s2_short_crl_cut30[] = {
-       /* MODCOD         2M    5M    10M   20M   30M */
+       /* MODCOD         2M    5M    10M   20M   30M */
        { STV090x_QPSK,   0x2C, 0x2B, 0x0B, 0x0B, 0x3A },
        { STV090x_8PSK,   0x3B, 0x0B, 0x2A, 0x0A, 0x39 },
        { STV090x_16APSK, 0x1B, 0x1B, 0x1B, 0x3A, 0x2A },
@@ -701,7 +701,7 @@ static int stv090x_read_reg(struct stv090x_state *state, unsigned int reg)
        u8 buf;
 
        struct i2c_msg msg[] = {
-               { .addr = config->address, .flags       = 0,            .buf = b0,   .len = 2 },
+               { .addr = config->address, .flags       = 0,            .buf = b0,   .len = 2 },
                { .addr = config->address, .flags       = I2C_M_RD,     .buf = &buf, .len = 1 }
        };
 
@@ -4906,11 +4906,11 @@ static const struct dvb_frontend_ops stv090x_ops = {
        .info = {
                .name                   = "STV090x Multistandard",
                .frequency_min          = 950000,
-               .frequency_max          = 2150000,
+               .frequency_max          = 2150000,
                .frequency_stepsize     = 0,
                .frequency_tolerance    = 0,
-               .symbol_rate_min        = 1000000,
-               .symbol_rate_max        = 45000000,
+               .symbol_rate_min        = 1000000,
+               .symbol_rate_max        = 45000000,
                .caps                   = FE_CAN_INVERSION_AUTO |
                                          FE_CAN_FEC_AUTO       |
                                          FE_CAN_QPSK           |
@@ -4953,7 +4953,7 @@ struct dvb_frontend *stv090x_attach(struct stv090x_config *config,
        state->frontend.ops                     = stv090x_ops;
        state->frontend.demodulator_priv        = state;
        state->demod                            = demod;
-       state->demod_mode                       = config->demod_mode; /* Single or Dual mode */
+       state->demod_mode                       = config->demod_mode; /* Single or Dual mode */
        state->device                           = config->device;
        state->rolloff                          = STV090x_RO_35; /* default */
 
index 37c9f93..fdda218 100644 (file)
@@ -231,7 +231,7 @@ struct stv090x_tab {
 };
 
 struct stv090x_internal {
-       struct i2c_adapter      *i2c_adap;
+       struct i2c_adapter      *i2c_adap;
        u8                      i2c_addr;
 
        struct mutex            demod_lock; /* Lock access to shared register */
index d4ac29a..d895002 100644 (file)
@@ -46,7 +46,7 @@ static int stv6110x_read_reg(struct stv6110x_state *stv6110x, u8 reg, u8 *data)
        u8 b0[] = { reg };
        u8 b1[] = { 0 };
        struct i2c_msg msg[] = {
-               { .addr = config->addr, .flags = 0,        .buf = b0, .len = 1 },
+               { .addr = config->addr, .flags = 0,        .buf = b0, .len = 1 },
                { .addr = config->addr, .flags = I2C_M_RD, .buf = b1, .len = 1 }
        };
 
index a993aba..109dfaf 100644 (file)
 
 #define STV6110x_SETFIELD(mask, bitf, val)                             \
        (mask = (mask & (~(((1 << STV6110x_WIDTH_##bitf) - 1) <<        \
-                                 STV6110x_OFFST_##bitf))) |            \
+                                 STV6110x_OFFST_##bitf))) |            \
                          (val << STV6110x_OFFST_##bitf))
 
 #define STV6110x_GETFIELD(bitf, val)                                   \
-       ((val >> STV6110x_OFFST_##bitf) &                               \
+       ((val >> STV6110x_OFFST_##bitf) &                               \
        ((1 << STV6110x_WIDTH_##bitf) - 1))
 
 #define MAKEWORD16(a, b)                       (((a) << 8) | (b))
@@ -68,7 +68,7 @@
 struct stv6110x_state {
        struct i2c_adapter              *i2c;
        const struct stv6110x_config    *config;
-       u8                              regs[8];
+       u8                              regs[8];
 
        const struct stv6110x_devctl    *devctl;
 };
index abe2702..6c84916 100644 (file)
@@ -211,7 +211,7 @@ static int tda10023_set_symbolrate (struct tda10023_state* state, u32 sr)
 
                BDRX=1<<(24+NDEC);
                BDRX*=sr;
-               do_div(BDRX, state->sysclk);    /* BDRX/=SYSCLK; */
+               do_div(BDRX, state->sysclk);    /* BDRX/=SYSCLK; */
 
                BDR=(s32)BDRX;
        }
index 37db04f..1c933b2 100644 (file)
@@ -47,7 +47,7 @@
 #define AVC_OPCODE_DSIT                        0xc8
 #define AVC_OPCODE_DSD                 0xcb
 
-#define DESCRIPTOR_TUNER_STATUS        0x80
+#define DESCRIPTOR_TUNER_STATUS                0x80
 #define DESCRIPTOR_SUBUNIT_IDENTIFIER  0x00
 
 #define SFE_VENDOR_DE_COMPANYID_0      0x00 /* OUI of Digital Everywhere */
@@ -688,7 +688,7 @@ int avc_tuner_get_ts(struct firedtv *fdtv)
        c->operand[2] = 0xff;   /* status */
        c->operand[3] = 0x20;   /* system id = DVB */
        c->operand[4] = 0x00;   /* antenna number */
-       c->operand[5] = 0x0;    /* system_specific_search_flags */
+       c->operand[5] = 0x0;    /* system_specific_search_flags */
        c->operand[6] = sl;     /* system_specific_multiplex selection_length */
        /*
         * operand[7]: valid_flags[0]
index 86efeb1..a2ef4ed 100644 (file)
@@ -165,7 +165,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
        ops->read_snr                   = fdtv_read_snr;
        ops->read_ucblocks              = fdtv_read_uncorrected_blocks;
 
-       ops->diseqc_send_master_cmd     = fdtv_diseqc_send_master_cmd;
+       ops->diseqc_send_master_cmd     = fdtv_diseqc_send_master_cmd;
        ops->diseqc_send_burst          = fdtv_diseqc_send_burst;
        ops->set_tone                   = fdtv_set_tone;
        ops->set_voltage                = fdtv_set_voltage;
@@ -220,7 +220,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
                fi->symbol_rate_min     = 870000;
                fi->symbol_rate_max     = 6900000;
 
-               fi->caps                = FE_CAN_INVERSION_AUTO |
+               fi->caps                = FE_CAN_INVERSION_AUTO |
                                          FE_CAN_QAM_16         |
                                          FE_CAN_QAM_32         |
                                          FE_CAN_QAM_64         |
@@ -236,7 +236,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
                fi->frequency_max       = 861000000;
                fi->frequency_stepsize  = 62500;
 
-               fi->caps                = FE_CAN_INVERSION_AUTO         |
+               fi->caps                = FE_CAN_INVERSION_AUTO         |
                                          FE_CAN_FEC_2_3                |
                                          FE_CAN_TRANSMISSION_MODE_AUTO |
                                          FE_CAN_GUARD_INTERVAL_AUTO    |
index 4a9c137..98be63a 100644 (file)
@@ -1263,7 +1263,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
 static int set_v4lstd(struct i2c_client *client)
 {
        struct cx25840_state *state = to_state(i2c_get_clientdata(client));
-       u8 fmt = 0;     /* zero is autodetect */
+       u8 fmt = 0;     /* zero is autodetect */
        u8 pal_m = 0;
 
        /* First tests should be against specific std */
index 55432ed..fb13a62 100644 (file)
@@ -118,7 +118,7 @@ static inline bool is_cx23888(struct cx25840_state *state)
 }
 
 /* ----------------------------------------------------------------------- */
-/* cx25850-core.c                                                         */
+/* cx25850-core.c                                                         */
 int cx25840_write(struct i2c_client *client, u16 addr, u8 value);
 int cx25840_write4(struct i2c_client *client, u16 addr, u32 value);
 u8 cx25840_read(struct i2c_client *client, u16 addr);
index 548382b..ad7f66c 100644 (file)
@@ -28,7 +28,7 @@ static unsigned int ir_debug;
 module_param(ir_debug, int, 0644);
 MODULE_PARM_DESC(ir_debug, "enable integrated IR debug messages");
 
-#define CX25840_IR_REG_BASE    0x200
+#define CX25840_IR_REG_BASE    0x200
 
 #define CX25840_IR_CNTRL_REG   0x200
 #define CNTRL_WIN_3_3  0x00000000
index ab536c4..5905ed6 100644 (file)
@@ -195,7 +195,7 @@ struct adjust {
 struct ks0127 {
        struct v4l2_subdev sd;
        v4l2_std_id     norm;
-       u8              regs[256];
+       u8              regs[256];
 };
 
 static inline struct ks0127 *to_ks0127(struct v4l2_subdev *sd)
index c6c32f6..fd229bc 100644 (file)
@@ -412,12 +412,12 @@ static struct regval_list ov7670_fmt_yuv422[] = {
        { REG_COM1, 0 },        /* CCIR601 */
        { REG_COM15, COM15_R00FF },
        { REG_COM9, 0x48 }, /* 32x gain ceiling; 0x8 is reserved bit */
-       { 0x4f, 0x80 },         /* "matrix coefficient 1" */
-       { 0x50, 0x80 },         /* "matrix coefficient 2" */
+       { 0x4f, 0x80 },         /* "matrix coefficient 1" */
+       { 0x50, 0x80 },         /* "matrix coefficient 2" */
        { 0x51, 0    },         /* vb */
-       { 0x52, 0x22 },         /* "matrix coefficient 4" */
-       { 0x53, 0x5e },         /* "matrix coefficient 5" */
-       { 0x54, 0x80 },         /* "matrix coefficient 6" */
+       { 0x52, 0x22 },         /* "matrix coefficient 4" */
+       { 0x53, 0x5e },         /* "matrix coefficient 5" */
+       { 0x54, 0x80 },         /* "matrix coefficient 6" */
        { REG_COM13, COM13_GAMMA|COM13_UVSAT },
        { 0xff, 0xff },
 };
@@ -427,13 +427,13 @@ static struct regval_list ov7670_fmt_rgb565[] = {
        { REG_RGB444, 0 },      /* No RGB444 please */
        { REG_COM1, 0x0 },      /* CCIR601 */
        { REG_COM15, COM15_RGB565 },
-       { REG_COM9, 0x38 },     /* 16x gain ceiling; 0x8 is reserved bit */
-       { 0x4f, 0xb3 },         /* "matrix coefficient 1" */
-       { 0x50, 0xb3 },         /* "matrix coefficient 2" */
+       { REG_COM9, 0x38 },     /* 16x gain ceiling; 0x8 is reserved bit */
+       { 0x4f, 0xb3 },         /* "matrix coefficient 1" */
+       { 0x50, 0xb3 },         /* "matrix coefficient 2" */
        { 0x51, 0    },         /* vb */
-       { 0x52, 0x3d },         /* "matrix coefficient 4" */
-       { 0x53, 0xa7 },         /* "matrix coefficient 5" */
-       { 0x54, 0xe4 },         /* "matrix coefficient 6" */
+       { 0x52, 0x3d },         /* "matrix coefficient 4" */
+       { 0x53, 0xa7 },         /* "matrix coefficient 5" */
+       { 0x54, 0xe4 },         /* "matrix coefficient 6" */
        { REG_COM13, COM13_GAMMA|COM13_UVSAT },
        { 0xff, 0xff },
 };
@@ -443,13 +443,13 @@ static struct regval_list ov7670_fmt_rgb444[] = {
        { REG_RGB444, R444_ENABLE },    /* Enable xxxxrrrr ggggbbbb */
        { REG_COM1, 0x0 },      /* CCIR601 */
        { REG_COM15, COM15_R01FE|COM15_RGB565 }, /* Data range needed? */
-       { REG_COM9, 0x38 },     /* 16x gain ceiling; 0x8 is reserved bit */
-       { 0x4f, 0xb3 },         /* "matrix coefficient 1" */
-       { 0x50, 0xb3 },         /* "matrix coefficient 2" */
+       { REG_COM9, 0x38 },     /* 16x gain ceiling; 0x8 is reserved bit */
+       { 0x4f, 0xb3 },         /* "matrix coefficient 1" */
+       { 0x50, 0xb3 },         /* "matrix coefficient 2" */
        { 0x51, 0    },         /* vb */
-       { 0x52, 0x3d },         /* "matrix coefficient 4" */
-       { 0x53, 0xa7 },         /* "matrix coefficient 5" */
-       { 0x54, 0xe4 },         /* "matrix coefficient 6" */
+       { 0x52, 0x3d },         /* "matrix coefficient 4" */
+       { 0x53, 0xa7 },         /* "matrix coefficient 5" */
+       { 0x54, 0xe4 },         /* "matrix coefficient 6" */
        { REG_COM13, COM13_GAMMA|COM13_UVSAT|0x2 },  /* Magic rsvd bit */
        { 0xff, 0xff },
 };
@@ -667,7 +667,7 @@ static struct ov7670_format_struct {
        {
                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                .colorspace     = V4L2_COLORSPACE_SRGB,
-               .regs           = ov7670_fmt_yuv422,
+               .regs           = ov7670_fmt_yuv422,
                .cmatrix        = { 128, -128, 0, -34, -94, 128 },
        },
        {
@@ -685,7 +685,7 @@ static struct ov7670_format_struct {
        {
                .mbus_code      = MEDIA_BUS_FMT_SBGGR8_1X8,
                .colorspace     = V4L2_COLORSPACE_SRGB,
-               .regs           = ov7670_fmt_raw,
+               .regs           = ov7670_fmt_raw,
                .cmatrix        = { 0, 0, 0, 0, 0, 0 },
        },
 };
index 7202d3a..170cc65 100644 (file)
@@ -72,8 +72,8 @@ struct saa6752hs_mpeg_params {
        /* video */
        enum v4l2_mpeg_video_aspect     vi_aspect;
        enum v4l2_mpeg_video_bitrate_mode vi_bitrate_mode;
-       __u32                           vi_bitrate;
-       __u32                           vi_bitrate_peak;
+       __u32                           vi_bitrate;
+       __u32                           vi_bitrate_peak;
 };
 
 static const struct v4l2_format v4l2_format_table[] =
@@ -98,8 +98,8 @@ struct saa6752hs_state {
                struct v4l2_ctrl *video_bitrate;
                struct v4l2_ctrl *video_bitrate_peak;
        };
-       u32                           revision;
-       int                           has_ac3;
+       u32                           revision;
+       int                           has_ac3;
        struct saa6752hs_mpeg_params  params;
        enum saa6752hs_videoformat    video_format;
        v4l2_std_id                   standard;
index 7dd6cff..e216cd7 100644 (file)
@@ -748,7 +748,7 @@ static int saa711x_s_clock_freq(struct v4l2_subdev *sd, u32 freq)
        u32 acni;
        u32 hz;
        u64 f;
-       u8 acc = 0;     /* reg 0x3a, audio clock control */
+       u8 acc = 0;     /* reg 0x3a, audio clock control */
 
        /* Checks for chips that don't have audio clock (saa7111, saa7113) */
        if (!saa711x_has_reg(state->ident, R_30_AUD_MAST_CLK_CYCLES_PER_FIELD))
index 01784d4..e58a150 100644 (file)
@@ -132,109 +132,109 @@ struct i2c_reg_value {
 };
 
 static const struct i2c_reg_value saa7129_init_config_extra[] = {
-       { SAA7127_REG_OUTPUT_PORT_CONTROL,              0x38 },
-       { SAA7127_REG_VTRIG,                            0xfa },
+       { SAA7127_REG_OUTPUT_PORT_CONTROL,              0x38 },
+       { SAA7127_REG_VTRIG,                            0xfa },
        { 0, 0 }
 };
 
 static const struct i2c_reg_value saa7127_init_config_common[] = {
-       { SAA7127_REG_WIDESCREEN_CONFIG,                0x0d },
-       { SAA7127_REG_WIDESCREEN_ENABLE,                0x00 },
-       { SAA7127_REG_COPYGEN_0,                        0x77 },
-       { SAA7127_REG_COPYGEN_1,                        0x41 },
-       { SAA7127_REG_COPYGEN_2,                        0x00 }, /* Macrovision enable/disable */
-       { SAA7127_REG_OUTPUT_PORT_CONTROL,              0xbf },
-       { SAA7127_REG_GAIN_LUMINANCE_RGB,               0x00 },
-       { SAA7127_REG_GAIN_COLORDIFF_RGB,               0x00 },
-       { SAA7127_REG_INPUT_PORT_CONTROL_1,             0x80 }, /* for color bars */
-       { SAA7127_REG_LINE_21_ODD_0,                    0x77 },
-       { SAA7127_REG_LINE_21_ODD_1,                    0x41 },
-       { SAA7127_REG_LINE_21_EVEN_0,                   0x88 },
-       { SAA7127_REG_LINE_21_EVEN_1,                   0x41 },
-       { SAA7127_REG_RCV_PORT_CONTROL,                 0x12 },
-       { SAA7127_REG_VTRIG,                            0xf9 },
-       { SAA7127_REG_HTRIG_HI,                         0x00 },
-       { SAA7127_REG_RCV2_OUTPUT_START,                0x41 },
-       { SAA7127_REG_RCV2_OUTPUT_END,                  0xc3 },
-       { SAA7127_REG_RCV2_OUTPUT_MSBS,                 0x00 },
-       { SAA7127_REG_TTX_REQUEST_H_START,              0x3e },
-       { SAA7127_REG_TTX_REQUEST_H_DELAY_LENGTH,       0xb8 },
-       { SAA7127_REG_CSYNC_ADVANCE_VSYNC_SHIFT,        0x03 },
-       { SAA7127_REG_TTX_ODD_REQ_VERT_START,           0x15 },
-       { SAA7127_REG_TTX_ODD_REQ_VERT_END,             0x16 },
-       { SAA7127_REG_TTX_EVEN_REQ_VERT_START,          0x15 },
-       { SAA7127_REG_TTX_EVEN_REQ_VERT_END,            0x16 },
-       { SAA7127_REG_FIRST_ACTIVE,                     0x1a },
-       { SAA7127_REG_LAST_ACTIVE,                      0x01 },
-       { SAA7127_REG_MSB_VERTICAL,                     0xc0 },
-       { SAA7127_REG_DISABLE_TTX_LINE_LO_0,            0x00 },
-       { SAA7127_REG_DISABLE_TTX_LINE_LO_1,            0x00 },
+       { SAA7127_REG_WIDESCREEN_CONFIG,                0x0d },
+       { SAA7127_REG_WIDESCREEN_ENABLE,                0x00 },
+       { SAA7127_REG_COPYGEN_0,                        0x77 },
+       { SAA7127_REG_COPYGEN_1,                        0x41 },
+       { SAA7127_REG_COPYGEN_2,                        0x00 }, /* Macrovision enable/disable */
+       { SAA7127_REG_OUTPUT_PORT_CONTROL,              0xbf },
+       { SAA7127_REG_GAIN_LUMINANCE_RGB,               0x00 },
+       { SAA7127_REG_GAIN_COLORDIFF_RGB,               0x00 },
+       { SAA7127_REG_INPUT_PORT_CONTROL_1,             0x80 }, /* for color bars */
+       { SAA7127_REG_LINE_21_ODD_0,                    0x77 },
+       { SAA7127_REG_LINE_21_ODD_1,                    0x41 },
+       { SAA7127_REG_LINE_21_EVEN_0,                   0x88 },
+       { SAA7127_REG_LINE_21_EVEN_1,                   0x41 },
+       { SAA7127_REG_RCV_PORT_CONTROL,                 0x12 },
+       { SAA7127_REG_VTRIG,                            0xf9 },
+       { SAA7127_REG_HTRIG_HI,                         0x00 },
+       { SAA7127_REG_RCV2_OUTPUT_START,                0x41 },
+       { SAA7127_REG_RCV2_OUTPUT_END,                  0xc3 },
+       { SAA7127_REG_RCV2_OUTPUT_MSBS,                 0x00 },
+       { SAA7127_REG_TTX_REQUEST_H_START,              0x3e },
+       { SAA7127_REG_TTX_REQUEST_H_DELAY_LENGTH,       0xb8 },
+       { SAA7127_REG_CSYNC_ADVANCE_VSYNC_SHIFT,        0x03 },
+       { SAA7127_REG_TTX_ODD_REQ_VERT_START,           0x15 },
+       { SAA7127_REG_TTX_ODD_REQ_VERT_END,             0x16 },
+       { SAA7127_REG_TTX_EVEN_REQ_VERT_START,          0x15 },
+       { SAA7127_REG_TTX_EVEN_REQ_VERT_END,            0x16 },
+       { SAA7127_REG_FIRST_ACTIVE,                     0x1a },
+       { SAA7127_REG_LAST_ACTIVE,                      0x01 },
+       { SAA7127_REG_MSB_VERTICAL,                     0xc0 },
+       { SAA7127_REG_DISABLE_TTX_LINE_LO_0,            0x00 },
+       { SAA7127_REG_DISABLE_TTX_LINE_LO_1,            0x00 },
        { 0, 0 }
 };
 
 #define SAA7127_60HZ_DAC_CONTROL 0x15
 static const struct i2c_reg_value saa7127_init_config_60hz[] = {
-       { SAA7127_REG_BURST_START,                      0x19 },
+       { SAA7127_REG_BURST_START,                      0x19 },
        /* BURST_END is also used as a chip ID in saa7127_probe */
-       { SAA7127_REG_BURST_END,                        0x1d },
-       { SAA7127_REG_CHROMA_PHASE,                     0xa3 },
-       { SAA7127_REG_GAINU,                            0x98 },
-       { SAA7127_REG_GAINV,                            0xd3 },
-       { SAA7127_REG_BLACK_LEVEL,                      0x39 },
-       { SAA7127_REG_BLANKING_LEVEL,                   0x2e },
-       { SAA7127_REG_VBI_BLANKING,                     0x2e },
-       { SAA7127_REG_DAC_CONTROL,                      0x15 },
-       { SAA7127_REG_BURST_AMP,                        0x4d },
-       { SAA7127_REG_SUBC3,                            0x1f },
-       { SAA7127_REG_SUBC2,                            0x7c },
-       { SAA7127_REG_SUBC1,                            0xf0 },
-       { SAA7127_REG_SUBC0,                            0x21 },
-       { SAA7127_REG_MULTI,                            0x90 },
-       { SAA7127_REG_CLOSED_CAPTION,                   0x11 },
+       { SAA7127_REG_BURST_END,                        0x1d },
+       { SAA7127_REG_CHROMA_PHASE,                     0xa3 },
+       { SAA7127_REG_GAINU,                            0x98 },
+       { SAA7127_REG_GAINV,                            0xd3 },
+       { SAA7127_REG_BLACK_LEVEL,                      0x39 },
+       { SAA7127_REG_BLANKING_LEVEL,                   0x2e },
+       { SAA7127_REG_VBI_BLANKING,                     0x2e },
+       { SAA7127_REG_DAC_CONTROL,                      0x15 },
+       { SAA7127_REG_BURST_AMP,                        0x4d },
+       { SAA7127_REG_SUBC3,                            0x1f },
+       { SAA7127_REG_SUBC2,                            0x7c },
+       { SAA7127_REG_SUBC1,                            0xf0 },
+       { SAA7127_REG_SUBC0,                            0x21 },
+       { SAA7127_REG_MULTI,                            0x90 },
+       { SAA7127_REG_CLOSED_CAPTION,                   0x11 },
        { 0, 0 }
 };
 
 #define SAA7127_50HZ_PAL_DAC_CONTROL 0x02
 static struct i2c_reg_value saa7127_init_config_50hz_pal[] = {
-       { SAA7127_REG_BURST_START,                      0x21 },
+       { SAA7127_REG_BURST_START,                      0x21 },
        /* BURST_END is also used as a chip ID in saa7127_probe */
-       { SAA7127_REG_BURST_END,                        0x1d },
-       { SAA7127_REG_CHROMA_PHASE,                     0x3f },
-       { SAA7127_REG_GAINU,                            0x7d },
-       { SAA7127_REG_GAINV,                            0xaf },
-       { SAA7127_REG_BLACK_LEVEL,                      0x33 },
-       { SAA7127_REG_BLANKING_LEVEL,                   0x35 },
-       { SAA7127_REG_VBI_BLANKING,                     0x35 },
-       { SAA7127_REG_DAC_CONTROL,                      0x02 },
-       { SAA7127_REG_BURST_AMP,                        0x2f },
-       { SAA7127_REG_SUBC3,                            0xcb },
-       { SAA7127_REG_SUBC2,                            0x8a },
-       { SAA7127_REG_SUBC1,                            0x09 },
-       { SAA7127_REG_SUBC0,                            0x2a },
-       { SAA7127_REG_MULTI,                            0xa0 },
-       { SAA7127_REG_CLOSED_CAPTION,                   0x00 },
+       { SAA7127_REG_BURST_END,                        0x1d },
+       { SAA7127_REG_CHROMA_PHASE,                     0x3f },
+       { SAA7127_REG_GAINU,                            0x7d },
+       { SAA7127_REG_GAINV,                            0xaf },
+       { SAA7127_REG_BLACK_LEVEL,                      0x33 },
+       { SAA7127_REG_BLANKING_LEVEL,                   0x35 },
+       { SAA7127_REG_VBI_BLANKING,                     0x35 },
+       { SAA7127_REG_DAC_CONTROL,                      0x02 },
+       { SAA7127_REG_BURST_AMP,                        0x2f },
+       { SAA7127_REG_SUBC3,                            0xcb },
+       { SAA7127_REG_SUBC2,                            0x8a },
+       { SAA7127_REG_SUBC1,                            0x09 },
+       { SAA7127_REG_SUBC0,                            0x2a },
+       { SAA7127_REG_MULTI,                            0xa0 },
+       { SAA7127_REG_CLOSED_CAPTION,                   0x00 },
        { 0, 0 }
 };
 
 #define SAA7127_50HZ_SECAM_DAC_CONTROL 0x08
 static struct i2c_reg_value saa7127_init_config_50hz_secam[] = {
-       { SAA7127_REG_BURST_START,                      0x21 },
+       { SAA7127_REG_BURST_START,                      0x21 },
        /* BURST_END is also used as a chip ID in saa7127_probe */
-       { SAA7127_REG_BURST_END,                        0x1d },
-       { SAA7127_REG_CHROMA_PHASE,                     0x3f },
-       { SAA7127_REG_GAINU,                            0x6a },
-       { SAA7127_REG_GAINV,                            0x81 },
-       { SAA7127_REG_BLACK_LEVEL,                      0x33 },
-       { SAA7127_REG_BLANKING_LEVEL,                   0x35 },
-       { SAA7127_REG_VBI_BLANKING,                     0x35 },
-       { SAA7127_REG_DAC_CONTROL,                      0x08 },
-       { SAA7127_REG_BURST_AMP,                        0x2f },
-       { SAA7127_REG_SUBC3,                            0xb2 },
-       { SAA7127_REG_SUBC2,                            0x3b },
-       { SAA7127_REG_SUBC1,                            0xa3 },
-       { SAA7127_REG_SUBC0,                            0x28 },
-       { SAA7127_REG_MULTI,                            0x90 },
-       { SAA7127_REG_CLOSED_CAPTION,                   0x00 },
+       { SAA7127_REG_BURST_END,                        0x1d },
+       { SAA7127_REG_CHROMA_PHASE,                     0x3f },
+       { SAA7127_REG_GAINU,                            0x6a },
+       { SAA7127_REG_GAINV,                            0x81 },
+       { SAA7127_REG_BLACK_LEVEL,                      0x33 },
+       { SAA7127_REG_BLANKING_LEVEL,                   0x35 },
+       { SAA7127_REG_VBI_BLANKING,                     0x35 },
+       { SAA7127_REG_DAC_CONTROL,                      0x08 },
+       { SAA7127_REG_BURST_AMP,                        0x2f },
+       { SAA7127_REG_SUBC3,                            0xb2 },
+       { SAA7127_REG_SUBC2,                            0x3b },
+       { SAA7127_REG_SUBC1,                            0xa3 },
+       { SAA7127_REG_SUBC0,                            0x28 },
+       { SAA7127_REG_MULTI,                            0x90 },
+       { SAA7127_REG_CLOSED_CAPTION,                   0x00 },
        { 0, 0 }
 };
 
index 102467e..668c39c 100644 (file)
@@ -82,13 +82,13 @@ static inline struct v4l2_subdev *to_sd(struct v4l2_ctrl *ctrl)
 /* ----------------------------------------------------------------------- */
 
 /* for audio mode */
-#define TUNER_AUDIO_MONO       0  /* LL */
-#define TUNER_AUDIO_STEREO     1  /* LR */
-#define TUNER_AUDIO_LANG1      2  /* LL */
-#define TUNER_AUDIO_LANG2      3  /* RR */
+#define TUNER_AUDIO_MONO       0  /* LL */
+#define TUNER_AUDIO_STEREO     1  /* LR */
+#define TUNER_AUDIO_LANG1      2  /* LL */
+#define TUNER_AUDIO_LANG2      3  /* RR */
 
-#define SAA717X_NTSC_WIDTH     (704)
-#define SAA717X_NTSC_HEIGHT    (480)
+#define SAA717X_NTSC_WIDTH     (704)
+#define SAA717X_NTSC_HEIGHT    (480)
 
 /* ----------------------------------------------------------------------- */
 
index 71a3135..8206bf7 100644 (file)
@@ -319,7 +319,7 @@ static const struct v4l2_subdev_core_ops ths7303_core_ops = {
 
 static const struct v4l2_subdev_ops ths7303_ops = {
        .core   = &ths7303_core_ops,
-       .video  = &ths7303_video_ops,
+       .video  = &ths7303_video_ops,
 };
 
 static int ths7303_probe(struct i2c_client *client,
index e6edda5..772164b 100644 (file)
@@ -134,7 +134,7 @@ struct CHIPSTATE {
        /* thread */
        struct task_struct   *thread;
        struct timer_list    wt;
-       int                  audmode;
+       int                  audmode;
 };
 
 static inline struct CHIPSTATE *to_state(struct v4l2_subdev *sd)
index 9336735..3c8c8b0 100644 (file)
 #define TVP7002_L_FRAME_STAT_LSBS      0x37
 #define TVP7002_L_FRAME_STAT_MSBS      0x38
 #define TVP7002_CLK_L_STAT_LSBS                0x39
-#define TVP7002_CLK_L_STAT_MSBS        0x3a
+#define TVP7002_CLK_L_STAT_MSBS                0x3a
 #define TVP7002_HSYNC_W                        0x3b
 #define TVP7002_VSYNC_W                 0x3c
-#define TVP7002_L_LENGTH_TOL           0x3d
+#define TVP7002_L_LENGTH_TOL           0x3d
 /* Reserved 0x3e */
 #define TVP7002_VIDEO_BWTH_CTL         0x3f
 #define TVP7002_AVID_START_PIXEL_LSBS  0x40
 #define TVP7002_AVID_START_PIXEL_MSBS   0x41
-#define TVP7002_AVID_STOP_PIXEL_LSBS   0x42
+#define TVP7002_AVID_STOP_PIXEL_LSBS   0x42
 #define TVP7002_AVID_STOP_PIXEL_MSBS    0x43
 #define TVP7002_VBLK_F_0_START_L_OFF   0x44
 #define TVP7002_VBLK_F_1_START_L_OFF    0x45
index 67de79b..c3549fa 100644 (file)
@@ -201,7 +201,7 @@ static const unsigned short init_pal[] = {
                                 * skipped by the VFE) */
        0x8b, 16,               /* Horizontal begin */
        0x8c, 768,              /* Horizontal length */
-       0x8d, 784,              /* Number of pixels
+       0x8d, 784,              /* Number of pixels
                                 * Must be >= Horizontal begin + Horizontal length */
        0x8f, 0xc00,            /* Disable window 2 */
        0xf0, 0x77,             /* 13.5 MHz transport, Forced
index 7dcf509..1902732 100644 (file)
@@ -373,8 +373,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 15,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 2, 0, 0, 0 },
-               .gpiomute       = 10,
+               .gpiomux        = { 2, 0, 0, 0 },
+               .gpiomute       = 10,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
        },
@@ -385,8 +385,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 7,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0, 1, 2, 3 },
-               .gpiomute       = 4,
+               .gpiomux        = { 0, 1, 2, 3 },
+               .gpiomute       = 4,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
        },
@@ -397,8 +397,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 7,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 4, 0, 2, 3 },
-               .gpiomute       = 1,
+               .gpiomux        = { 4, 0, 2, 3 },
+               .gpiomute       = 1,
                .no_msp34xx     = 1,
                .tuner_type     = TUNER_PHILIPS_NTSC,
                .tuner_addr     = ADDR_UNSET,
@@ -414,7 +414,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0 },
+               .gpiomux        = { 0 },
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
        },
@@ -425,8 +425,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 3,
                .muxsel         = MUXSEL(2, 3, 1, 0),
-               .gpiomux        = { 0, 1, 0, 1 },
-               .gpiomute       = 3,
+               .gpiomux        = { 0, 1, 0, 1 },
+               .gpiomute       = 3,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
        },
@@ -437,7 +437,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 3,
                .muxsel         = MUXSEL(2, 3, 1, 1),
                .gpiomask       = 0x0f,
-               .gpiomux        = { 0x0c, 0x04, 0x08, 0x04 },
+               .gpiomux        = { 0x0c, 0x04, 0x08, 0x04 },
                /*                0x04 for some cards ?? */
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
@@ -451,7 +451,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 3,
                .gpiomask       = 0,
                .muxsel         = MUXSEL(2, 3, 1, 0, 0),
-               .gpiomux        = { 0 },
+               .gpiomux        = { 0 },
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
        },
@@ -464,8 +464,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0xc00,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0, 0xc00, 0x800, 0x400 },
-               .gpiomute       = 0xc00,
+               .gpiomux        = { 0, 0xc00, 0x800, 0x400 },
+               .gpiomute       = 0xc00,
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
@@ -477,7 +477,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 3,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 1, 1, 2, 3 },
+               .gpiomux        = { 1, 1, 2, 3 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_TEMIC_PAL,
                .tuner_addr     = ADDR_UNSET,
@@ -489,8 +489,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x0f, /* old: 7 */
                .muxsel         = MUXSEL(2, 0, 1, 1),
-               .gpiomux        = { 0, 1, 2, 3 },
-               .gpiomute       = 4,
+               .gpiomux        = { 0, 1, 2, 3 },
+               .gpiomute       = 4,
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
@@ -502,8 +502,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x3014f,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0x20001,0x10001, 0, 0 },
-               .gpiomute       = 10,
+               .gpiomux        = { 0x20001,0x10001, 0, 0 },
+               .gpiomute       = 10,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
        },
@@ -516,7 +516,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 15,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 13, 14, 11, 7 },
+               .gpiomux        = { 13, 14, 11, 7 },
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
        },
@@ -527,7 +527,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 15,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 13, 14, 11, 7 },
+               .gpiomux        = { 13, 14, 11, 7 },
                .msp34xx_alt    = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
@@ -542,8 +542,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 7,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0, 2, 1, 3 }, /* old: {0, 1, 2, 3, 4} */
-               .gpiomute       = 4,
+               .gpiomux        = { 0, 2, 1, 3 }, /* old: {0, 1, 2, 3, 4} */
+               .gpiomute       = 4,
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
@@ -555,8 +555,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 15,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0, 0, 1, 0 },
-               .gpiomute       = 10,
+               .gpiomux        = { 0, 0, 1, 0 },
+               .gpiomute       = 10,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
        },
@@ -571,7 +571,7 @@ struct tvcard bttv_tvcards[] = {
                .muxsel         = MUXSEL(2, 3, 1, 1),
                /* 2003-10-20 by "Anton A. Arapov" <arapov@mail.ru> */
                .gpiomux        = { 0x001e00, 0, 0x018000, 0x014000 },
-               .gpiomute       = 0x002000,
+               .gpiomute       = 0x002000,
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
@@ -583,8 +583,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x8300f8,
                .muxsel         = MUXSEL(2, 3, 1, 1, 0),
-               .gpiomux        = { 0x4fa007,0xcfa007,0xcfa007,0xcfa007 },
-               .gpiomute       = 0xcfa007,
+               .gpiomux        = { 0x4fa007,0xcfa007,0xcfa007,0xcfa007 },
+               .gpiomute       = 0xcfa007,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .volume_gpio    = winview_volume,
@@ -597,7 +597,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 1, 0, 0, 0 },
+               .gpiomux        = { 1, 0, 0, 0 },
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
        },
@@ -608,7 +608,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = NO_SVHS,
                .gpiomask       = 0x8dff00,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0 },
+               .gpiomux        = { 0 },
                .no_msp34xx     = 1,
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
@@ -631,8 +631,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x1800,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
-               .gpiomute       = 0x1800,
+               .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
+               .gpiomute       = 0x1800,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL_I,
                .tuner_addr     = ADDR_UNSET,
@@ -644,8 +644,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0xc00,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0, 1, 0x800, 0x400 },
-               .gpiomute       = 0xc00,
+               .gpiomux        = { 0, 1, 0x800, 0x400 },
+               .gpiomute       = 0xc00,
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
@@ -659,7 +659,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 7,
                .muxsel         = MUXSEL(2, 3, 0), /* input 2 is digital */
                /* .digital_mode= DIGITAL_MODE_CAMERA, */
-               .gpiomux        = { 0, 0, 0, 0 },
+               .gpiomux        = { 0, 0, 0, 0 },
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_ALPS_TSBB5_PAL_I,
@@ -674,8 +674,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0xe00,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = {0x400, 0x400, 0x400, 0x400 },
-               .gpiomute       = 0xc00,
+               .gpiomux        = {0x400, 0x400, 0x400, 0x400 },
+               .gpiomute       = 0xc00,
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
@@ -690,7 +690,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0x1f0fff,
                .muxsel         = MUXSEL(2, 3, 1, 1),
                .gpiomux        = { 0x20000, 0x30000, 0x10000, 0 },
-               .gpiomute       = 0x40000,
+               .gpiomute       = 0x40000,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
                .audio_mode_gpio= terratv_audio,
@@ -702,8 +702,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 3,
                .gpiomask       = 7,
                .muxsel         = MUXSEL(2, 0, 1, 1),
-               .gpiomux        = { 0, 1, 2, 3 },
-               .gpiomute       = 4,
+               .gpiomux        = { 0, 1, 2, 3 },
+               .gpiomute       = 4,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
        },
@@ -714,8 +714,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x1800,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
-               .gpiomute       = 0x1800,
+               .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
+               .gpiomute       = 0x1800,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_SECAM,
                .tuner_addr     = ADDR_UNSET,
@@ -729,8 +729,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x1f0fff,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0x20000, 0x30000, 0x10000, 0x00000 },
-               .gpiomute       = 0x40000,
+               .gpiomux        = { 0x20000, 0x30000, 0x10000, 0x00000 },
+               .gpiomute       = 0x40000,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
                .audio_mode_gpio= terratv_audio,
@@ -774,7 +774,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 1, /* was: 4 */
                .gpiomask       = 0,
                .muxsel         = MUXSEL(2, 3, 1, 0, 0),
-               .gpiomux        = { 0 },
+               .gpiomux        = { 0 },
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
                .muxsel_hook    = PXC200_muxsel,
@@ -787,8 +787,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x1800,  /* 0x8dfe00 */
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0, 0x0800, 0x1000, 0x1000 },
-               .gpiomute       = 0x1800,
+               .gpiomux        = { 0, 0x0800, 0x1000, 0x1000 },
+               .gpiomute       = 0x1800,
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
@@ -800,7 +800,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 3,
                .gpiomask       = 1,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 1, 0, 0, 0 },
+               .gpiomux        = { 1, 0, 0, 0 },
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
@@ -814,7 +814,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0 },
+               .gpiomux        = { 0 },
                .tuner_type     = TUNER_ABSENT,
                .tuner_addr     = ADDR_UNSET,
        },
@@ -825,8 +825,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0xffff00,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0x500, 0, 0x300, 0x900 },
-               .gpiomute       = 0x900,
+               .gpiomux        = { 0x500, 0, 0x300, 0x900 },
+               .gpiomute       = 0x900,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
@@ -840,8 +840,8 @@ struct tvcard bttv_tvcards[] = {
                .muxsel         = MUXSEL(2, 3, 1, 1, 0),
                /* Alexander Varakin <avarakin@hotmail.com> [stereo version] */
                .gpiomask       = 0xb33000,
-               .gpiomux        = { 0x122000,0x1000,0x0000,0x620000 },
-               .gpiomute       = 0x800000,
+               .gpiomux        = { 0x122000,0x1000,0x0000,0x620000 },
+               .gpiomute       = 0x800000,
                /* Audio Routing for "WinFast 2000 XP" (no tv stereo !)
                        gpio23 -- hef4052:nEnable (0x800000)
                        gpio12 -- hef4052:A1
@@ -867,8 +867,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x1800,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
-               .gpiomute       = 0x1800,
+               .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
+               .gpiomute       = 0x1800,
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
@@ -882,8 +882,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x1800,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
-               .gpiomute       = 0x1800,
+               .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
+               .gpiomute       = 0x1800,
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
@@ -896,8 +896,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0xff,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0x21, 0x20, 0x24, 0x2c },
-               .gpiomute       = 0x29,
+               .gpiomux        = { 0x21, 0x20, 0x24, 0x2c },
+               .gpiomute       = 0x29,
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = UNSET,
@@ -910,8 +910,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x551e00,
                .muxsel         = MUXSEL(2, 3, 1, 0),
-               .gpiomux        = { 0x551400, 0x551200, 0, 0 },
-               .gpiomute       = 0x551c00,
+               .gpiomux        = { 0x551400, 0x551200, 0, 0 },
+               .gpiomute       = 0x551c00,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL_I,
                .tuner_addr     = ADDR_UNSET,
@@ -924,8 +924,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x03000F,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 2, 0xd0001, 0, 0 },
-               .gpiomute       = 1,
+               .gpiomux        = { 2, 0xd0001, 0, 0 },
+               .gpiomute       = 1,
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
@@ -939,8 +939,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 7,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 4, 0, 2, 3 },
-               .gpiomute       = 1,
+               .gpiomux        = { 4, 0, 2, 3 },
+               .gpiomute       = 1,
                .no_msp34xx     = 1,
                .tuner_type     = TUNER_PHILIPS_NTSC,
                .tuner_addr     = ADDR_UNSET,
@@ -954,7 +954,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 15,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 13, 4, 11, 7 },
+               .gpiomux        = { 13, 4, 11, 7 },
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
@@ -968,7 +968,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0, 0, 0, 0},
+               .gpiomux        = { 0, 0, 0, 0},
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL_I,
@@ -981,8 +981,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0xe00b,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0xff9ff6, 0xff9ff6, 0xff1ff7, 0 },
-               .gpiomute       = 0xff3ffc,
+               .gpiomux        = { 0xff9ff6, 0xff9ff6, 0xff1ff7, 0 },
+               .gpiomute       = 0xff3ffc,
                .no_msp34xx     = 1,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
@@ -996,8 +996,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = NO_SVHS,
                .gpiomask       = 3,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 1, 1, 0, 2 },
-               .gpiomute       = 3,
+               .gpiomux        = { 1, 1, 0, 2 },
+               .gpiomute       = 3,
                .no_msp34xx     = 1,
                .pll            = PLL_NONE,
                .tuner_type     = UNSET,
@@ -1010,7 +1010,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 3,
                .gpiomask       = 0,
                .muxsel         = MUXSEL(2, 3, 1, 0, 0),
-               .gpiomux        = { 0 },
+               .gpiomux        = { 0 },
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_ABSENT,
@@ -1023,8 +1023,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0xbcf03f,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0xbc803f, 0xbc903f, 0xbcb03f, 0 },
-               .gpiomute       = 0xbcb03f,
+               .gpiomux        = { 0xbc803f, 0xbc903f, 0xbcb03f, 0 },
+               .gpiomute       = 0xbcb03f,
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_TEMIC_4039FR5_NTSC,
@@ -1037,8 +1037,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x70000,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0x20000, 0x30000, 0x10000, 0 },
-               .gpiomute       = 0x40000,
+               .gpiomux        = { 0x20000, 0x30000, 0x10000, 0 },
+               .gpiomute       = 0x40000,
                .no_msp34xx     = 1,
                .pll            = PLL_35,
                .tuner_type     = TUNER_PHILIPS_PAL_I,
@@ -1054,8 +1054,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 15,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = {2,0,0,0 },
-               .gpiomute       = 1,
+               .gpiomux        = {2,0,0,0 },
+               .gpiomute       = 1,
                .pll            = PLL_28,
                .tuner_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
@@ -1067,7 +1067,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x010f00,
                .muxsel         = MUXSEL(2, 3, 0, 0),
-               .gpiomux        = {0x10000, 0, 0x10000, 0 },
+               .gpiomux        = {0x10000, 0, 0x10000, 0 },
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_ALPS_TSHC6_NTSC,
@@ -1083,8 +1083,8 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0xAA0000,
                .muxsel         = MUXSEL(2, 3, 1, 1, 0), /* in 4 is digital */
                /* .digital_mode= DIGITAL_MODE_CAMERA, */
-               .gpiomux        = { 0x20000, 0, 0x80000, 0x80000 },
-               .gpiomute       = 0xa8000,
+               .gpiomux        = { 0x20000, 0, 0x80000, 0x80000 },
+               .gpiomute       = 0xa8000,
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL_I,
@@ -1108,7 +1108,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 7,
                .muxsel         = MUXSEL(2, 0, 1, 1),
                .gpiomux        = { 0, 1, 2, 3 },
-               .gpiomute       = 4,
+               .gpiomute       = 4,
                .pll            = PLL_28,
                .tuner_type     = UNSET /* TUNER_ALPS_TMDH2_NTSC */,
                .tuner_addr     = ADDR_UNSET,
@@ -1123,8 +1123,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 3,
                .gpiomask       = 0x03000F,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 1, 0xd0001, 0, 0 },
-               .gpiomute       = 10,
+               .gpiomux        = { 1, 0xd0001, 0, 0 },
+               .gpiomute       = 10,
                                /* sound path (5 sources):
                                MUX1 (mask 0x03), Enable Pin 0x08 (0=enable, 1=disable)
                                        0= ext. Audio IN
@@ -1147,8 +1147,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x1c,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0, 0, 0x10, 8 },
-               .gpiomute       = 4,
+               .gpiomux        = { 0, 0, 0x10, 8 },
+               .gpiomute       = 4,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
@@ -1166,8 +1166,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x18e0,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0x0000,0x0800,0x1000,0x1000 },
-               .gpiomute       = 0x18e0,
+               .gpiomux        = { 0x0000,0x0800,0x1000,0x1000 },
+               .gpiomute       = 0x18e0,
                        /* For cards with tda9820/tda9821:
                                0x0000: Tuner normal stereo
                                0x0080: Tuner A2 SAP (second audio program = Zweikanalton)
@@ -1186,7 +1186,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0xF,
                .muxsel         = MUXSEL(2, 3, 1, 0),
                .gpiomux        = { 2, 0, 0, 0 },
-               .gpiomute       = 10,
+               .gpiomute       = 10,
                .pll            = PLL_28,
                .tuner_type     = TUNER_TEMIC_PAL,
                .tuner_addr     = ADDR_UNSET,
@@ -1202,7 +1202,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0x1800,
                .muxsel         = MUXSEL(2, 3, 1, 1),
                .gpiomux        = { 0, 0x800, 0x1000, 0x1000 },
-               .gpiomute       = 0x1800,
+               .gpiomute       = 0x1800,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
@@ -1232,7 +1232,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0xe00,
                .muxsel         = MUXSEL(2, 3, 1, 1),
                .gpiomux        = { 0x400, 0x400, 0x400, 0x400 },
-               .gpiomute       = 0x800,
+               .gpiomute       = 0x800,
                .pll            = PLL_28,
                .tuner_type     = TUNER_TEMIC_4036FY5_NTSC,
                .tuner_addr     = ADDR_UNSET,
@@ -1246,7 +1246,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0x03000F,
                .muxsel         = MUXSEL(2, 3, 1, 0),
                .gpiomux        = { 2, 0, 0, 0 },
-               .gpiomute       = 1,
+               .gpiomute       = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_TEMIC_PAL,
                .tuner_addr     = ADDR_UNSET,
@@ -1263,7 +1263,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 11,
                .muxsel         = MUXSEL(2, 3, 1, 1),
                .gpiomux        = { 2, 0, 0, 1 },
-               .gpiomute       = 8,
+               .gpiomute       = 8,
                .pll            = PLL_35,
                .tuner_type     = TUNER_TEMIC_PAL,
                .tuner_addr     = ADDR_UNSET,
@@ -1293,7 +1293,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0xFF,
                .muxsel         = MUXSEL(2, 3, 1, 0),
                .gpiomux        = { 1, 0, 4, 4 },
-               .gpiomute       = 9,
+               .gpiomute       = 9,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
@@ -1306,8 +1306,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0xf03f,
                .muxsel         = MUXSEL(2, 3, 1, 0),
-               .gpiomux        = { 0xbffe, 0, 0xbfff, 0 },
-               .gpiomute       = 0xbffe,
+               .gpiomux        = { 0xbffe, 0, 0xbfff, 0 },
+               .gpiomute       = 0xbffe,
                .pll            = PLL_28,
                .tuner_type     = TUNER_TEMIC_4006FN5_MULTI_PAL,
                .tuner_addr     = ADDR_UNSET,
@@ -1322,7 +1322,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = NO_SVHS,
                .gpiomask       = 1,
                .muxsel         = MUXSEL(2, 3, 0, 1),
-               .gpiomux        = { 0, 0, 1, 0 },
+               .gpiomux        = { 0, 0, 1, 0 },
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_TEMIC_4006FN5_MULTI_PAL,
@@ -1339,8 +1339,8 @@ struct tvcard bttv_tvcards[] = {
                                /* Radio changed from 1e80 to 0x800 to make
                                FlyVideo2000S in .hu happy (gm)*/
                                /* -dk-???: set mute=0x1800 for tda9874h daughterboard */
-               .gpiomux        = { 0x0000,0x0800,0x1000,0x1000 },
-               .gpiomute       = 0x1800,
+               .gpiomux        = { 0x0000,0x0800,0x1000,0x1000 },
+               .gpiomute       = 0x1800,
                .audio_mode_gpio= fv2000s_audio,
                .no_msp34xx     = 1,
                .pll            = PLL_28,
@@ -1354,8 +1354,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0xffff00,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0x500, 0x500, 0x300, 0x900 },
-               .gpiomute       = 0x900,
+               .gpiomux        = { 0x500, 0x500, 0x300, 0x900 },
+               .gpiomute       = 0x900,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
@@ -1389,7 +1389,7 @@ struct tvcard bttv_tvcards[] = {
                /* 0x100000: 1=MSP enabled (0=disable again)
                * 0x010000: Connected to "S0" on tda9880 (0=Pal/BG, 1=NTSC) */
                .gpiomux        = {0x947fff, 0x987fff,0x947fff,0x947fff },
-               .gpiomute       = 0x947fff,
+               .gpiomute       = 0x947fff,
                /* tvtuner, radio,   external,internal, mute,  stereo
                * tuner, Composit, SVid, Composit-on-Svid-adapter */
                .muxsel         = MUXSEL(2, 3, 0, 1),
@@ -1409,7 +1409,7 @@ struct tvcard bttv_tvcards[] = {
                /* 0x100000: 1=MSP enabled (0=disable again)
                * 0x010000: Connected to "S0" on tda9880 (0=Pal/BG, 1=NTSC) */
                .gpiomux        = {0x947fff, 0x987fff,0x947fff,0x947fff },
-               .gpiomute       = 0x947fff,
+               .gpiomute       = 0x947fff,
                /* tvtuner, radio,   external,internal, mute,  stereo
                * tuner, Composit, SVid, Composit-on-Svid-adapter */
                .muxsel         = MUXSEL(2, 3, 0, 1),
@@ -1438,7 +1438,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 15,
                .muxsel         = MUXSEL(2, 3, 1, 1),
                .gpiomux        = { 0, 0, 11, 7 }, /* TV and Radio with same GPIO ! */
-               .gpiomute       = 13,
+               .gpiomute       = 13,
                .pll            = PLL_28,
                .tuner_type     = TUNER_LG_PAL_I_FM,
                .tuner_addr     = ADDR_UNSET,
@@ -1473,8 +1473,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x3f,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 0x01, 0x00, 0x03, 0x03 },
-               .gpiomute       = 0x09,
+               .gpiomux        = { 0x01, 0x00, 0x03, 0x03 },
+               .gpiomute       = 0x09,
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
@@ -1525,7 +1525,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0x1C800F,  /* Bit0-2: Audio select, 8-12:remote control 14:remote valid 15:remote reset */
                .muxsel         = MUXSEL(2, 1, 1),
                .gpiomux        = { 0, 1, 2, 2 },
-               .gpiomute       = 4,
+               .gpiomute       = 4,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
                .pll            = PLL_28,
@@ -1542,7 +1542,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0x140007,
                .muxsel         = MUXSEL(2, 3, 1, 1),
                .gpiomux        = { 0, 1, 2, 3 },
-               .gpiomute       = 4,
+               .gpiomute       = 4,
                .tuner_type     = TUNER_PHILIPS_NTSC,
                .tuner_addr     = ADDR_UNSET,
                .audio_mode_gpio= windvr_audio,
@@ -1575,7 +1575,7 @@ struct tvcard bttv_tvcards[] = {
                                                * gpiomux =1: lower volume, 2+3: mute
                                                * btwincap uses 0x80000/0x80003
                                                */
-               .gpiomute       = 4,
+               .gpiomute       = 4,
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
@@ -1626,7 +1626,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0x0f0f80,
                .muxsel         = MUXSEL(2, 3, 1, 0),
                .gpiomux        = {0x030000, 0x010000, 0, 0 },
-               .gpiomute       = 0x020000,
+               .gpiomute       = 0x020000,
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_NTSC_M,
@@ -1829,7 +1829,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 7,
                .muxsel         = MUXSEL(2, 3, 1, 1),
                .gpiomux        = { 0, 1, 2, 3},
-               .gpiomute       = 4,
+               .gpiomute       = 4,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
                .pll            = PLL_28,
@@ -1872,7 +1872,7 @@ struct tvcard bttv_tvcards[] = {
                .muxsel         = MUXSEL(2, 3, 1, 0),
                /*                  Tuner, Radio, external, internal, off,  on */
                .gpiomux        = { 0x08,  0x0f,  0x0a,     0x08 },
-               .gpiomute       = 0x0f,
+               .gpiomute       = 0x0f,
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_NTSC,
@@ -2139,7 +2139,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0x008007,
                .muxsel         = MUXSEL(2, 3, 0, 0),
                .gpiomux        = { 0, 0, 0, 0 },
-               .gpiomute       = 0x000003,
+               .gpiomute       = 0x000003,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
@@ -2182,7 +2182,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0x008007,
                .muxsel         = MUXSEL(2, 3, 1, 1),
                .gpiomux        = { 0, 1, 2, 2 },
-               .gpiomute       = 3,
+               .gpiomute       = 3,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
@@ -2297,7 +2297,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0xFF,
                .muxsel         = MUXSEL(2, 3, 1, 1),
                .gpiomux        = { 2, 0, 0, 0 },
-               .gpiomute       = 10,
+               .gpiomute       = 10,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_PAL,
                .tuner_addr     = ADDR_UNSET,
@@ -2326,7 +2326,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0x3f,
                .muxsel         = MUXSEL(2, 3, 1, 0),
                .gpiomux        = {0x31, 0x31, 0x31, 0x31 },
-               .gpiomute       = 0x31,
+               .gpiomute       = 0x31,
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_NTSC_M,
@@ -2440,7 +2440,7 @@ struct tvcard bttv_tvcards[] = {
                .muxsel         = MUXSEL(2, 3, 1),
                .gpiomask       = 0x00e00007,
                .gpiomux        = { 0x00400005, 0, 0x00000001, 0 },
-               .gpiomute       = 0x00c00007,
+               .gpiomute       = 0x00c00007,
                .no_msp34xx     = 1,
                .no_tda7432     = 1,
                .has_dvb        = 1,
@@ -2455,7 +2455,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0x01fe00,
                .muxsel         = MUXSEL(2, 3, 1, 1),
                .gpiomux        = { 0x001e00, 0, 0x018000, 0x014000 },
-               .gpiomute       = 0x002000,
+               .gpiomute       = 0x002000,
                .pll            = PLL_28,
                .tuner_type     = TUNER_YMEC_TVF66T5_B_DFF,
                .tuner_addr     = 0xc1 >>1,
@@ -2470,7 +2470,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0x001c0007,
                .muxsel         = MUXSEL(2, 3, 1, 1),
                .gpiomux        = { 0, 1, 2, 2 },
-               .gpiomute       = 3,
+               .gpiomute       = 3,
                .pll            = PLL_28,
                .tuner_type     = TUNER_TENA_9533_DI,
                .tuner_addr     = ADDR_UNSET,
@@ -2505,7 +2505,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0x3f,
                .muxsel         = MUXSEL(2, 3, 1, 1),
                .gpiomux        = { 0x21, 0x20, 0x24, 0x2c },
-               .gpiomute       = 0x29,
+               .gpiomute       = 0x29,
                .no_msp34xx     = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_YMEC_TVF_5533MF,
@@ -2549,8 +2549,8 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 15,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 2, 0, 0, 0 },
-               .gpiomute       = 1,
+               .gpiomux        = { 2, 0, 0, 0 },
+               .gpiomute       = 1,
                .pll            = PLL_28,
                .tuner_type     = TUNER_PHILIPS_NTSC,
                .tuner_addr     = ADDR_UNSET,
@@ -2563,7 +2563,7 @@ struct tvcard bttv_tvcards[] = {
                .svhs           = 2,
                .gpiomask       = 0x108007,
                .muxsel         = MUXSEL(2, 3, 1, 1),
-               .gpiomux        = { 100000, 100002, 100002, 100000 },
+               .gpiomux        = { 100000, 100002, 100002, 100000 },
                .no_msp34xx     = 1,
                .no_tda7432     = 1,
                .pll            = PLL_28,
@@ -2599,7 +2599,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 7,
                .muxsel         = MUXSEL(2, 3, 1, 1),
                .gpiomux        = { 0, 1, 2, 3 },
-               .gpiomute       = 4,
+               .gpiomute       = 4,
                .tuner_type     = TUNER_TEMIC_4009FR5_PAL,
                .tuner_addr     = ADDR_UNSET,
                .pll            = PLL_28,
@@ -2635,7 +2635,7 @@ struct tvcard bttv_tvcards[] = {
                .muxsel         = MUXSEL(2, 3, 1),
                .gpiomask       = 0x00e00007,
                .gpiomux        = { 0x00400005, 0, 0x00000001, 0 },
-               .gpiomute       = 0x00c00007,
+               .gpiomute       = 0x00c00007,
                .no_msp34xx     = 1,
                .no_tda7432     = 1,
        },
@@ -2679,7 +2679,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0x008007,
                .muxsel         = MUXSEL(2, 3, 1, 1),
                .gpiomux        = { 0, 1, 2, 2 }, /* CONTVFMi */
-               .gpiomute       = 3, /* CONTVFMi */
+               .gpiomute       = 3, /* CONTVFMi */
                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3, /* TCL MK3 */
                .tuner_addr     = ADDR_UNSET,
                .pll            = PLL_28,
@@ -2702,7 +2702,7 @@ struct tvcard bttv_tvcards[] = {
                .gpiomask       = 0x060040,
                .muxsel         = MUXSEL(2, 3, 3),
                .gpiomux        = { 0x60000, 0x60000, 0x20000, 0x20000 },
-               .gpiomute       = 0,
+               .gpiomute       = 0,
                .tuner_type     = TUNER_TCL_MF02GIP_5N,
                .tuner_addr     = ADDR_UNSET,
                .pll            = PLL_28,
@@ -2752,8 +2752,8 @@ struct tvcard bttv_tvcards[] = {
                /* Bruno Christo <bchristo@inf.ufsm.br>
                 *
                 * GeoVision GV-800(S) has 4 Conexant Fusion 878A:
-                *      1 audio input  per BT878A = 4 audio inputs
-                *      4 video inputs per BT878A = 16 video inputs
+                *      1 audio input  per BT878A = 4 audio inputs
+                *      4 video inputs per BT878A = 16 video inputs
                 * This is the first BT878A chip of the GV-800(S). It's the
                 * "master" chip and it controls the video inputs through an
                 * analog multiplexer (a CD22M3494) via some GPIO pins. The
@@ -2779,8 +2779,8 @@ struct tvcard bttv_tvcards[] = {
                /* Bruno Christo <bchristo@inf.ufsm.br>
                 *
                 * GeoVision GV-800(S) has 4 Conexant Fusion 878A:
-                *      1 audio input  per BT878A = 4 audio inputs
-                *      4 video inputs per BT878A = 16 video inputs
+                *      1 audio input  per BT878A = 4 audio inputs
+                *      4 video inputs per BT878A = 16 video inputs
                 * The 3 other BT878A chips are "slave" chips of the GV-800(S)
                 * and should use this card type.
                 * The audio input is not working yet.
@@ -4784,9 +4784,9 @@ static void gv800s_write(struct bttv *btv,
        * GPIO bits 0-9 are used for the analog switch:
        *   00 - 03:    camera selector
        *   04 - 06:    878A (controller) selector
-       *   16:         cselect
+       *   16:         cselect
        *   17:         strobe
-       *   18:         data (1->on, 0->off)
+       *   18:         data (1->on, 0->off)
        *   19:         reset
        */
        const u32 ADDRESS = ((xaddr&0xf) | (yaddr&3)<<4);
@@ -4882,7 +4882,7 @@ void __init bttv_check_chipset(void)
        int pcipci_fail = 0;
        struct pci_dev *dev = NULL;
 
-       if (pci_pci_problems & (PCIPCI_FAIL|PCIAGP_FAIL))       /* should check if target is AGP */
+       if (pci_pci_problems & (PCIPCI_FAIL|PCIAGP_FAIL))       /* should check if target is AGP */
                pcipci_fail = 1;
        if (pci_pci_problems & (PCIPCI_TRITON|PCIPCI_NATOMA|PCIPCI_VIAETBF))
                triton1 = 1;
index ac76747..da49c55 100644 (file)
@@ -349,12 +349,12 @@ static int get_key_pv951(struct IR_i2c *ir, enum rc_proto *protocol,
         * NOTE:
         * lirc_i2c maps the pv951 code as:
         *      addr = 0x61D6
-        *      cmd = bit_reverse (b)
+        *      cmd = bit_reverse (b)
         * So, it seems that this device uses NEC extended
         * I decided to not fix the table, due to two reasons:
-        *      1) Without the actual device, this is only a guess;
-        *      2) As the addr is not reported via I2C, nor can be changed,
-        *         the device is bound to the vendor-provided RC.
+        *      1) Without the actual device, this is only a guess;
+        *      2) As the addr is not reported via I2C, nor can be changed,
+        *         the device is bound to the vendor-provided RC.
         */
 
        *protocol = RC_PROTO_UNKNOWN;
index cc555a4..a27384a 100644 (file)
 #define BTTV_BOARD_PV_M4900                0x8b
 #define BTTV_BOARD_OSPREY440               0x8c
 #define BTTV_BOARD_ASOUND_SKYEYE          0x8d
-#define BTTV_BOARD_SABRENT_TVFM           0x8e
+#define BTTV_BOARD_SABRENT_TVFM                   0x8e
 #define BTTV_BOARD_HAUPPAUGE_IMPACTVCB     0x8f
 #define BTTV_BOARD_MACHTV_MAGICTV          0x90
 #define BTTV_BOARD_SSAI_SECURITY          0x91
@@ -265,7 +265,7 @@ extern struct tvcard bttv_tvcards[];
  * that they are changed to octal.  One should not use hex number, macros, or
  * anything else with this macro.  Just use plain integers from 0 to 3.
  */
-#define _MUXSELf(a)            0##a << 30
+#define _MUXSELf(a)            0##a << 30
 #define _MUXSELe(a, b...)      0##a << 28 | _MUXSELf(b)
 #define _MUXSELd(a, b...)      0##a << 26 | _MUXSELe(b)
 #define _MUXSELc(a, b...)      0##a << 24 | _MUXSELd(b)
index cb1b5e6..7a86e72 100644 (file)
@@ -141,7 +141,7 @@ struct bttv_ir {
        bool                    rc5_gpio;   /* Is RC5 legacy GPIO enabled? */
        u32                     last_bit;   /* last raw bit seen */
        u32                     code;       /* raw code under construction */
-       ktime_t                                         base_time;  /* time of last seen code */
+       ktime_t                                         base_time;  /* time of last seen code */
        bool                    active;     /* building raw code */
 };
 
@@ -400,8 +400,8 @@ struct bttv {
        int                        i2c_state, i2c_rc;
        int                        i2c_done;
        wait_queue_head_t          i2c_queue;
-       struct v4l2_subdev        *sd_msp34xx;
-       struct v4l2_subdev        *sd_tvaudio;
+       struct v4l2_subdev        *sd_msp34xx;
+       struct v4l2_subdev        *sd_tvaudio;
        struct v4l2_subdev        *sd_tda7432;
 
        /* video4linux (1) */
index aadd764..4f31042 100644 (file)
@@ -41,7 +41,7 @@ MODULE_PARM_DESC(pcm_debug, "enable debug messages for pcm");
 #define dprintk(fmt, arg...) do {                                      \
            if (pcm_debug)                                              \
                printk(KERN_INFO "cx18-alsa-pcm %s: " fmt,              \
-                                 __func__, ##arg);                     \
+                                 __func__, ##arg);                     \
        } while (0)
 
 static const struct snd_pcm_hardware snd_cx18_hw_capture = {
index 8b95e9a..3abc54c 100644 (file)
@@ -31,7 +31,7 @@ static int set_audclk_freq(struct cx18 *cx, u32 freq)
         * would ideally be:
         *
         * NTSC Color subcarrier freq * 8 =
-        *      4.5 MHz/286 * 455/2 * 8 = 28.63636363... MHz
+        *      4.5 MHz/286 * 455/2 * 8 = 28.63636363... MHz
         *
         * The accidents of history and rationale that explain from where this
         * combination of magic numbers originate can be found in:
index cf8817e..eda3433 100644 (file)
@@ -236,10 +236,10 @@ static void cx18_av_initialize(struct v4l2_subdev *sd)
         */
        cx18_av_and_or4(cx, CXADEC_AFE_CTRL, 0xFF000000, 0x00005D00);
 
-/*     if(dwEnable && dw3DCombAvailable) { */
-/*             CxDevWrReg(CXADEC_SRC_COMB_CFG, 0x7728021F); */
+/*     if(dwEnable && dw3DCombAvailable) { */
+/*             CxDevWrReg(CXADEC_SRC_COMB_CFG, 0x7728021F); */
 /*    } else { */
-/*             CxDevWrReg(CXADEC_SRC_COMB_CFG, 0x6628021F); */
+/*             CxDevWrReg(CXADEC_SRC_COMB_CFG, 0x6628021F); */
 /*    } */
        cx18_av_write4(cx, CXADEC_SRC_COMB_CFG, 0x6628021F);
        default_volume = cx18_av_read(cx, 0x8d4);
@@ -319,13 +319,13 @@ void cx18_av_std_setup(struct cx18 *cx)
                 * vblank656: half lines after line 625/mid-313 of blanked video
                 * vblank:    half lines, after line 5/317, of blanked video
                 * vactive:   half lines of active video +
-                *              5 half lines after the end of active video
+                *              5 half lines after the end of active video
                 *
                 * As far as I can tell:
                 * vblank656 starts counting from the falling edge of the first
-                *      vsync pulse (start of line 1 or mid-313)
+                *      vsync pulse (start of line 1 or mid-313)
                 * vblank starts counting from the after the 5 vsync pulses and
-                *      5 or 4 equalization pulses (start of line 6 or 318)
+                *      5 or 4 equalization pulses (start of line 6 or 318)
                 *
                 * For 625 line systems the driver will extract VBI information
                 * from lines 6-23 and lines 318-335 (but the slicer can only
@@ -395,9 +395,9 @@ void cx18_av_std_setup(struct cx18 *cx)
                 *
                 * As far as I can tell:
                 * vblank656 starts counting from the falling edge of the first
-                *      vsync pulse (start of line 4 or mid-266)
+                *      vsync pulse (start of line 4 or mid-266)
                 * vblank starts counting from the after the 6 vsync pulses and
-                *      6 or 5 equalization pulses (start of line 10 or 272)
+                *      6 or 5 equalization pulses (start of line 10 or 272)
                 *
                 * For 525 line systems the driver will extract VBI information
                 * from lines 10-21 and lines 273-284.
@@ -851,7 +851,7 @@ static int cx18_av_s_std(struct v4l2_subdev *sd, v4l2_std_id norm)
        struct cx18_av_state *state = to_cx18_av_state(sd);
        struct cx18 *cx = v4l2_get_subdevdata(sd);
 
-       u8 fmt = 0;     /* zero is autodetect */
+       u8 fmt = 0;     /* zero is autodetect */
        u8 pal_m = 0;
 
        if (state->radio == 0 && state->std == norm)
index c976ce6..1a37f26 100644 (file)
@@ -349,7 +349,7 @@ static inline struct v4l2_subdev *to_sd(struct v4l2_ctrl *ctrl)
 }
 
 /* ----------------------------------------------------------------------- */
-/* cx18_av-core.c                                                         */
+/* cx18_av-core.c                                                         */
 int cx18_av_write(struct cx18 *cx, u16 addr, u8 value);
 int cx18_av_write4(struct cx18 *cx, u16 addr, u32 value);
 int cx18_av_write4_noretry(struct cx18 *cx, u16 addr, u32 value);
index 11e898e..c2cf965 100644 (file)
@@ -388,7 +388,7 @@ static const struct cx18_card cx18_card_cnxt_raptor_pal = {
                { CX18_CARD_INPUT_COMPOSITE2, 2, CX18_AV_COMPOSITE6 },
        },
        .audio_inputs = {
-               { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5,        0 },
+               { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5,        0 },
                { CX18_CARD_INPUT_LINE_IN1,  CX18_AV_AUDIO_SERIAL1, 1 },
                { CX18_CARD_INPUT_LINE_IN2,  CX18_AV_AUDIO_SERIAL2, 1 },
        },
@@ -439,7 +439,7 @@ static const struct cx18_card cx18_card_toshiba_qosmio_dvbt = {
                { CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE1 },
        },
        .audio_inputs = {
-               { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5,        0 },
+               { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5,        0 },
                { CX18_CARD_INPUT_LINE_IN1,  CX18_AV_AUDIO_SERIAL1, 1 },
        },
        .tuners = {
@@ -485,7 +485,7 @@ static const struct cx18_card cx18_card_leadtek_pvr2100 = {
                { CX18_CARD_INPUT_COMPONENT1, 1, CX18_AV_COMPONENT1 },
        },
        .audio_inputs = {
-               { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5,        0 },
+               { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5,        0 },
                { CX18_CARD_INPUT_LINE_IN1,  CX18_AV_AUDIO_SERIAL1, 1 },
        },
        .tuners = {
@@ -538,7 +538,7 @@ static const struct cx18_card cx18_card_leadtek_dvr3100h = {
                { CX18_CARD_INPUT_COMPONENT1, 1, CX18_AV_COMPONENT1 },
        },
        .audio_inputs = {
-               { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5,        0 },
+               { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5,        0 },
                { CX18_CARD_INPUT_LINE_IN1,  CX18_AV_AUDIO_SERIAL1, 1 },
        },
        .tuners = {
index 5478f62..02d0fb7 100644 (file)
 
 /* video inputs */
 #define        CX18_CARD_INPUT_VID_TUNER       1
-#define        CX18_CARD_INPUT_SVIDEO1         2
-#define        CX18_CARD_INPUT_SVIDEO2         3
-#define        CX18_CARD_INPUT_COMPOSITE1      4
-#define        CX18_CARD_INPUT_COMPOSITE2      5
-#define        CX18_CARD_INPUT_COMPONENT1      6
+#define        CX18_CARD_INPUT_SVIDEO1         2
+#define        CX18_CARD_INPUT_SVIDEO2         3
+#define        CX18_CARD_INPUT_COMPOSITE1      4
+#define        CX18_CARD_INPUT_COMPOSITE2      5
+#define        CX18_CARD_INPUT_COMPONENT1      6
 
 /* audio inputs */
 #define        CX18_CARD_INPUT_AUD_TUNER       1
-#define        CX18_CARD_INPUT_LINE_IN1        2
-#define        CX18_CARD_INPUT_LINE_IN2        3
+#define        CX18_CARD_INPUT_LINE_IN1        2
+#define        CX18_CARD_INPUT_LINE_IN2        3
 
 #define CX18_CARD_MAX_VIDEO_INPUTS 6
 #define CX18_CARD_MAX_AUDIO_INPUTS 3
-#define CX18_CARD_MAX_TUNERS      2
+#define CX18_CARD_MAX_TUNERS      2
 
 /* V4L2 capability aliases */
 #define CX18_CAP_ENCODER (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER | \
@@ -51,7 +51,7 @@
                          V4L2_CAP_SLICED_VBI_CAPTURE)
 
 struct cx18_card_video_input {
-       u8  video_type;         /* video input type */
+       u8  video_type;         /* video input type */
        u8  audio_index;        /* index in cx18_card_audio_input array */
        u32 video_input;        /* hardware video input */
 };
@@ -74,7 +74,7 @@ struct cx18_card_pci_info {
 /* The mask is the set of bits used by the operation */
 
 struct cx18_gpio_init { /* set initial GPIO DIR and OUT values */
-       u32 direction;  /* DIR setting. Leave to 0 if no init is needed */
+       u32 direction;  /* DIR setting. Leave to 0 if no init is needed */
        u32 initial_value;
 };
 
@@ -86,16 +86,16 @@ struct cx18_gpio_i2c_slave_reset {
        u32 ir_reset_mask;  /* GPIO to reset the Zilog Z8F0811 IR contoller */
 };
 
-struct cx18_gpio_audio_input {         /* select tuner/line in input */
-       u32 mask;               /* leave to 0 if not supported */
+struct cx18_gpio_audio_input { /* select tuner/line in input */
+       u32 mask;               /* leave to 0 if not supported */
        u32 tuner;
        u32 linein;
        u32 radio;
 };
 
 struct cx18_card_tuner {
-       v4l2_std_id std;        /* standard for which the tuner is suitable */
-       int         tuner;      /* tuner ID (from tuner.h) */
+       v4l2_std_id std;        /* standard for which the tuner is suitable */
+       int         tuner;      /* tuner ID (from tuner.h) */
 };
 
 struct cx18_card_tuner_i2c {
@@ -128,8 +128,8 @@ struct cx18_card {
        struct cx18_card_audio_input radio_input;
 
        /* GPIO card-specific settings */
-       u8 xceive_pin;          /* XCeive tuner GPIO reset pin */
-       struct cx18_gpio_init            gpio_init;
+       u8 xceive_pin;          /* XCeive tuner GPIO reset pin */
+       struct cx18_gpio_init            gpio_init;
        struct cx18_gpio_i2c_slave_reset gpio_i2c_slave_reset;
        struct cx18_gpio_audio_input    gpio_audio_input;
 
index 3492023..0b707fa 100644 (file)
@@ -75,8 +75,8 @@
 /* Supported cards */
 #define CX18_CARD_HVR_1600_ESMT              0 /* Hauppauge HVR 1600 (ESMT memory) */
 #define CX18_CARD_HVR_1600_SAMSUNG    1        /* Hauppauge HVR 1600 (Samsung memory) */
-#define CX18_CARD_COMPRO_H900        2 /* Compro VideoMate H900 */
-#define CX18_CARD_YUAN_MPC718        3 /* Yuan MPC718 */
+#define CX18_CARD_COMPRO_H900        2 /* Compro VideoMate H900 */
+#define CX18_CARD_YUAN_MPC718        3 /* Yuan MPC718 */
 #define CX18_CARD_CNXT_RAPTOR_PAL     4        /* Conexant Raptor PAL */
 #define CX18_CARD_TOSHIBA_QOSMIO_DVBT 5 /* Toshiba Qosmio Interal DVB-T/Analog*/
 #define CX18_CARD_LEADTEK_PVR2100     6 /* Leadtek WinFast PVR2100 */
@@ -99,9 +99,9 @@
 #define PCI_DEVICE_ID_CX23418 0x5b7a
 
 /* subsystem vendor ID */
-#define CX18_PCI_ID_HAUPPAUGE          0x0070
-#define CX18_PCI_ID_COMPRO             0x185b
-#define CX18_PCI_ID_YUAN               0x12ab
+#define CX18_PCI_ID_HAUPPAUGE          0x0070
+#define CX18_PCI_ID_COMPRO             0x185b
+#define CX18_PCI_ID_YUAN               0x12ab
 #define CX18_PCI_ID_CONEXANT           0x14f1
 #define CX18_PCI_ID_TOSHIBA            0x1179
 #define CX18_PCI_ID_LEADTEK            0x107D
@@ -260,7 +260,7 @@ struct cx18_options {
 #define CX18_F_M_NEED_SWAP  0  /* mdl buffer data must be endianness swapped */
 
 /* per-stream, s_flags */
-#define CX18_F_S_CLAIMED       3       /* this stream is claimed */
+#define CX18_F_S_CLAIMED       3       /* this stream is claimed */
 #define CX18_F_S_STREAMING      4      /* the fw is decoding/encoding this stream */
 #define CX18_F_S_INTERNAL_USE  5       /* this stream is used internally (sliced VBI processing) */
 #define CX18_F_S_STREAMOFF     7       /* signal end of stream EOS */
@@ -268,12 +268,12 @@ struct cx18_options {
 #define CX18_F_S_STOPPING      9       /* telling the fw to stop capturing */
 
 /* per-cx18, i_flags */
-#define CX18_F_I_LOADED_FW             0       /* Loaded firmware 1st time */
-#define CX18_F_I_EOS                   4       /* End of encoder stream */
-#define CX18_F_I_RADIO_USER            5       /* radio tuner is selected */
-#define CX18_F_I_ENC_PAUSED            13      /* the encoder is paused */
-#define CX18_F_I_INITED                        21      /* set after first open */
-#define CX18_F_I_FAILED                        22      /* set if first open failed */
+#define CX18_F_I_LOADED_FW             0       /* Loaded firmware 1st time */
+#define CX18_F_I_EOS                   4       /* End of encoder stream */
+#define CX18_F_I_RADIO_USER            5       /* radio tuner is selected */
+#define CX18_F_I_ENC_PAUSED            13      /* the encoder is paused */
+#define CX18_F_I_INITED                        21      /* set after first open */
+#define CX18_F_I_FAILED                        22      /* set if first open failed */
 
 /* These are the VBI types as they appear in the embedded VBI private packets. */
 #define CX18_SLICED_TYPE_TELETEXT_B     (1)
@@ -370,7 +370,7 @@ struct cx18_stream {
           is not actually created. */
        struct video_device video_dev;  /* v4l2_dev is NULL when stream not created */
        struct cx18_dvb *dvb;           /* DVB / Digital Transport */
-       struct cx18 *cx;                /* for ease of use */
+       struct cx18 *cx;                /* for ease of use */
        const char *name;               /* name of the stream */
        int type;                       /* stream type */
        u32 handle;                     /* task handle */
@@ -525,14 +525,14 @@ struct vbi_info {
         * into the MPEG PS stream.
         *
         * In each sliced_mpeg_data[] buffer is:
-        *      16 byte MPEG-2 PS Program Pack Header
-        *      16 byte MPEG-2 Private Stream 1 PES Header
-        *       4 byte magic number: "itv0" or "ITV0"
-        *       4 byte first  field line mask, if "itv0"
-        *       4 byte second field line mask, if "itv0"
-        *      36 lines, if "ITV0"; or <36 lines, if "itv0"; of sliced VBI data
+        *      16 byte MPEG-2 PS Program Pack Header
+        *      16 byte MPEG-2 Private Stream 1 PES Header
+        *       4 byte magic number: "itv0" or "ITV0"
+        *       4 byte first  field line mask, if "itv0"
+        *       4 byte second field line mask, if "itv0"
+        *      36 lines, if "ITV0"; or <36 lines, if "itv0"; of sliced VBI data
         *
-        *      Each line in the payload is
+        *      Each line in the payload is
         *       1 byte line header derived from the SDID (WSS, CC, VPS, etc.)
         *      42 bytes of line data
         *
@@ -583,7 +583,7 @@ struct cx18 {
        u8 nof_inputs;          /* number of video inputs */
        u8 nof_audio_inputs;    /* number of audio inputs */
        u32 v4l2_cap;           /* V4L2 capabilities of card */
-       u32 hw_flags;           /* Hardware description of the board */
+       u32 hw_flags;           /* Hardware description of the board */
        unsigned int free_mdl_idx;
        struct cx18_scb __iomem *scb; /* pointer to SCB */
        struct mutex epu2apu_mb_lock; /* protect driver to chip mailbox in SCB*/
@@ -602,10 +602,10 @@ struct cx18 {
        u32 dualwatch_stereo_mode;
 
        struct mutex serialize_lock;    /* mutex used to serialize open/close/start/stop/ioctl operations */
-       struct cx18_options options;    /* User options */
+       struct cx18_options options;    /* User options */
        int stream_buffers[CX18_MAX_STREAMS]; /* # of buffers for each stream */
        int stream_buf_size[CX18_MAX_STREAMS]; /* Stream buffer size */
-       struct cx18_stream streams[CX18_MAX_STREAMS];   /* Stream data */
+       struct cx18_stream streams[CX18_MAX_STREAMS];   /* Stream data */
        struct snd_cx18_card *alsa; /* ALSA interface for PCM capture stream */
        void (*pcm_announce_callback)(struct snd_cx18_card *card, u8 *pcm_data,
                                      size_t num_bytes);
index 1b34ea1..498a185 100644 (file)
 #include "cx18-cards.h"
 #include <linux/firmware.h>
 
-#define CX18_PROC_SOFT_RESET           0xc70010
-#define CX18_DDR_SOFT_RESET            0xc70014
-#define CX18_CLOCK_SELECT1             0xc71000
-#define CX18_CLOCK_SELECT2             0xc71004
-#define CX18_HALF_CLOCK_SELECT1        0xc71008
-#define CX18_HALF_CLOCK_SELECT2        0xc7100C
-#define CX18_CLOCK_POLARITY1           0xc71010
-#define CX18_CLOCK_POLARITY2           0xc71014
-#define CX18_ADD_DELAY_ENABLE1         0xc71018
-#define CX18_ADD_DELAY_ENABLE2         0xc7101C
-#define CX18_CLOCK_ENABLE1             0xc71020
-#define CX18_CLOCK_ENABLE2             0xc71024
-
-#define CX18_REG_BUS_TIMEOUT_EN        0xc72024
-
-#define CX18_FAST_CLOCK_PLL_INT        0xc78000
-#define CX18_FAST_CLOCK_PLL_FRAC       0xc78004
-#define CX18_FAST_CLOCK_PLL_POST       0xc78008
-#define CX18_FAST_CLOCK_PLL_PRESCALE   0xc7800C
+#define CX18_PROC_SOFT_RESET           0xc70010
+#define CX18_DDR_SOFT_RESET            0xc70014
+#define CX18_CLOCK_SELECT1             0xc71000
+#define CX18_CLOCK_SELECT2             0xc71004
+#define CX18_HALF_CLOCK_SELECT1                0xc71008
+#define CX18_HALF_CLOCK_SELECT2                0xc7100C
+#define CX18_CLOCK_POLARITY1           0xc71010
+#define CX18_CLOCK_POLARITY2           0xc71014
+#define CX18_ADD_DELAY_ENABLE1         0xc71018
+#define CX18_ADD_DELAY_ENABLE2         0xc7101C
+#define CX18_CLOCK_ENABLE1             0xc71020
+#define CX18_CLOCK_ENABLE2             0xc71024
+
+#define CX18_REG_BUS_TIMEOUT_EN                0xc72024
+
+#define CX18_FAST_CLOCK_PLL_INT                0xc78000
+#define CX18_FAST_CLOCK_PLL_FRAC       0xc78004
+#define CX18_FAST_CLOCK_PLL_POST       0xc78008
+#define CX18_FAST_CLOCK_PLL_PRESCALE   0xc7800C
 #define CX18_FAST_CLOCK_PLL_ADJUST_BANDWIDTH 0xc78010
 
-#define CX18_SLOW_CLOCK_PLL_INT        0xc78014
-#define CX18_SLOW_CLOCK_PLL_FRAC       0xc78018
-#define CX18_SLOW_CLOCK_PLL_POST       0xc7801C
+#define CX18_SLOW_CLOCK_PLL_INT                0xc78014
+#define CX18_SLOW_CLOCK_PLL_FRAC       0xc78018
+#define CX18_SLOW_CLOCK_PLL_POST       0xc7801C
 #define CX18_MPEG_CLOCK_PLL_INT                0xc78040
 #define CX18_MPEG_CLOCK_PLL_FRAC       0xc78044
 #define CX18_MPEG_CLOCK_PLL_POST       0xc78048
-#define CX18_PLL_POWER_DOWN            0xc78088
+#define CX18_PLL_POWER_DOWN            0xc78088
 #define CX18_SW1_INT_STATUS             0xc73104
 #define CX18_SW1_INT_ENABLE_PCI         0xc7311C
 #define CX18_SW2_INT_SET                0xc73140
 #define CX18_SW2_INT_STATUS             0xc73144
-#define CX18_ADEC_CONTROL              0xc78120
+#define CX18_ADEC_CONTROL              0xc78120
 
-#define CX18_DDR_REQUEST_ENABLE        0xc80000
-#define CX18_DDR_CHIP_CONFIG           0xc80004
-#define CX18_DDR_REFRESH               0xc80008
-#define CX18_DDR_TIMING1               0xc8000C
-#define CX18_DDR_TIMING2               0xc80010
+#define CX18_DDR_REQUEST_ENABLE                0xc80000
+#define CX18_DDR_CHIP_CONFIG           0xc80004
+#define CX18_DDR_REFRESH               0xc80008
+#define CX18_DDR_TIMING1               0xc8000C
+#define CX18_DDR_TIMING2               0xc80010
 #define CX18_DDR_POWER_REG             0xc8001C
 
-#define CX18_DDR_TUNE_LANE             0xc80048
-#define CX18_DDR_INITIAL_EMRS          0xc80054
-#define CX18_DDR_MB_PER_ROW_7          0xc8009C
-#define CX18_DDR_BASE_63_ADDR          0xc804FC
-
-#define CX18_WMB_CLIENT02              0xc90108
-#define CX18_WMB_CLIENT05              0xc90114
-#define CX18_WMB_CLIENT06              0xc90118
-#define CX18_WMB_CLIENT07              0xc9011C
-#define CX18_WMB_CLIENT08              0xc90120
-#define CX18_WMB_CLIENT09              0xc90124
-#define CX18_WMB_CLIENT10              0xc90128
-#define CX18_WMB_CLIENT11              0xc9012C
-#define CX18_WMB_CLIENT12              0xc90130
-#define CX18_WMB_CLIENT13              0xc90134
-#define CX18_WMB_CLIENT14              0xc90138
-
-#define CX18_DSP0_INTERRUPT_MASK       0xd0004C
+#define CX18_DDR_TUNE_LANE             0xc80048
+#define CX18_DDR_INITIAL_EMRS          0xc80054
+#define CX18_DDR_MB_PER_ROW_7          0xc8009C
+#define CX18_DDR_BASE_63_ADDR          0xc804FC
+
+#define CX18_WMB_CLIENT02              0xc90108
+#define CX18_WMB_CLIENT05              0xc90114
+#define CX18_WMB_CLIENT06              0xc90118
+#define CX18_WMB_CLIENT07              0xc9011C
+#define CX18_WMB_CLIENT08              0xc90120
+#define CX18_WMB_CLIENT09              0xc90124
+#define CX18_WMB_CLIENT10              0xc90128
+#define CX18_WMB_CLIENT11              0xc9012C
+#define CX18_WMB_CLIENT12              0xc90130
+#define CX18_WMB_CLIENT13              0xc90134
+#define CX18_WMB_CLIENT14              0xc90138
+
+#define CX18_DSP0_INTERRUPT_MASK       0xd0004C
 
 #define APU_ROM_SYNC1 0x6D676553 /* "mgeS" */
 #define APU_ROM_SYNC2 0x72646548 /* "rdeH" */
@@ -229,7 +229,7 @@ void cx18_init_power(struct cx18 *cx, int lowpwr)
         * would ideally be:
         *
         * NTSC Color subcarrier freq * 8 =
-        *      4.5 MHz/286 * 455/2 * 8 = 28.63636363... MHz
+        *      4.5 MHz/286 * 455/2 * 8 = 28.63636363... MHz
         *
         * The accidents of history and rationale that explain from where this
         * combination of magic numbers originate can be found in:
index 763f960..f66dd63 100644 (file)
@@ -35,7 +35,7 @@ struct cx18_api_info {
        u32 cmd;
        u8 flags;               /* Flags, see above */
        u8 rpu;                 /* Processing unit */
-       const char *name;       /* The name of the command */
+       const char *name;       /* The name of the command */
 };
 
 #define API_ENTRY(rpu, x, f) { (x), (f), (rpu), #x }
@@ -43,9 +43,9 @@ struct cx18_api_info {
 static const struct cx18_api_info api_info[] = {
        /* MPEG encoder API */
        API_ENTRY(CPU, CX18_CPU_SET_CHANNEL_TYPE,               0),
-       API_ENTRY(CPU, CX18_EPU_DEBUG,                          0),
-       API_ENTRY(CPU, CX18_CREATE_TASK,                        0),
-       API_ENTRY(CPU, CX18_DESTROY_TASK,                       0),
+       API_ENTRY(CPU, CX18_EPU_DEBUG,                          0),
+       API_ENTRY(CPU, CX18_CREATE_TASK,                        0),
+       API_ENTRY(CPU, CX18_DESTROY_TASK,                       0),
        API_ENTRY(CPU, CX18_CPU_CAPTURE_START,                  API_SLOW),
        API_ENTRY(CPU, CX18_CPU_CAPTURE_STOP,                   API_SLOW),
        API_ENTRY(CPU, CX18_CPU_CAPTURE_PAUSE,                  0),
index b9c6831..a594cfd 100644 (file)
@@ -29,7 +29,7 @@
 #include "cx18-scb.h"
 #include "cx18-dvb.h"
 
-#define CX18_DSP0_INTERRUPT_MASK       0xd0004C
+#define CX18_DSP0_INTERRUPT_MASK       0xd0004C
 
 static const struct v4l2_file_operations cx18_v4l2_enc_fops = {
        .owner = THIS_MODULE,
index 72c74d6..81f1e27 100644 (file)
@@ -47,7 +47,7 @@ static void copy_vbi_data(struct cx18 *cx, int lines, u32 pts_stamp)
                0x00, 0x00, 0x01, 0xbd,             /* Priv Stream 1 start */
                0x00, 0x1a,                         /* length */
                0x84, 0x80, 0x07,                   /* flags, hdr data len */
-               0x21, 0x00, 0x5d, 0x63, 0xa7,       /* PTS, markers */
+               0x21, 0x00, 0x5d, 0x63, 0xa7,       /* PTS, markers */
                0xff, 0xff                          /* stuffing */
        };
        const int sd = sizeof(mpeg_hdr_data);   /* start of vbi data */
index 901ed7f..15205b6 100644 (file)
 
 #include <media/drv-intf/cx2341x.h>
 
-#define MGR_CMD_MASK                           0x40000000
+#define MGR_CMD_MASK                           0x40000000
 /* The MSB of the command code indicates that this is the completion of a
    command */
-#define MGR_CMD_MASK_ACK                       (MGR_CMD_MASK | 0x80000000)
+#define MGR_CMD_MASK_ACK                       (MGR_CMD_MASK | 0x80000000)
 
 /* Description: This command creates a new instance of a certain task
    IN[0]  - Task ID. This is one of the XPU_CMD_MASK_YYY where XPU is
    OUT[0] - Task handle. This handle is passed along with commands to
            dispatch to the right instance of the task
    ReturnCode - One of the ERR_SYS_... */
-#define CX18_CREATE_TASK                       (MGR_CMD_MASK | 0x0001)
+#define CX18_CREATE_TASK                       (MGR_CMD_MASK | 0x0001)
 
 /* Description: This command destroys an instance of a task
    IN[0] - Task handle. Hanlde of the task to destroy
    ReturnCode - One of the ERR_SYS_... */
-#define CX18_DESTROY_TASK                      (MGR_CMD_MASK | 0x0002)
+#define CX18_DESTROY_TASK                      (MGR_CMD_MASK | 0x0002)
 
 /* All commands for CPU have the following mask set */
-#define CPU_CMD_MASK                           0x20000000
-#define CPU_CMD_MASK_DEBUG                     (CPU_CMD_MASK | 0x00000000)
-#define CPU_CMD_MASK_ACK                       (CPU_CMD_MASK | 0x80000000)
-#define CPU_CMD_MASK_CAPTURE                   (CPU_CMD_MASK | 0x00020000)
-#define CPU_CMD_MASK_TS                        (CPU_CMD_MASK | 0x00040000)
+#define CPU_CMD_MASK                           0x20000000
+#define CPU_CMD_MASK_DEBUG                     (CPU_CMD_MASK | 0x00000000)
+#define CPU_CMD_MASK_ACK                       (CPU_CMD_MASK | 0x80000000)
+#define CPU_CMD_MASK_CAPTURE                   (CPU_CMD_MASK | 0x00020000)
+#define CPU_CMD_MASK_TS                                (CPU_CMD_MASK | 0x00040000)
 
-#define EPU_CMD_MASK                           0x02000000
-#define EPU_CMD_MASK_DEBUG                     (EPU_CMD_MASK | 0x000000)
-#define EPU_CMD_MASK_DE                        (EPU_CMD_MASK | 0x040000)
+#define EPU_CMD_MASK                           0x02000000
+#define EPU_CMD_MASK_DEBUG                     (EPU_CMD_MASK | 0x000000)
+#define EPU_CMD_MASK_DE                                (EPU_CMD_MASK | 0x040000)
 
-#define APU_CMD_MASK                           0x10000000
-#define APU_CMD_MASK_ACK                       (APU_CMD_MASK | 0x80000000)
+#define APU_CMD_MASK                           0x10000000
+#define APU_CMD_MASK_ACK                       (APU_CMD_MASK | 0x80000000)
 
 #define CX18_APU_ENCODING_METHOD_MPEG          (0 << 28)
 #define CX18_APU_ENCODING_METHOD_AC3           (1 << 28)
@@ -67,7 +67,7 @@
 
 /* Description: Command APU to reset the AI
    ReturnCode - ??? */
-#define CX18_APU_RESETAI                       (APU_CMD_MASK | 0x05)
+#define CX18_APU_RESETAI                       (APU_CMD_MASK | 0x05)
 
 /* Description: This command indicates that a Memory Descriptor List has been
    filled with the requested channel type
    IN[1] - Offset of the MDL_ACK from the beginning of the local DDR.
    IN[2] - Number of CNXT_MDL_ACK structures in the array pointed to by IN[1]
    ReturnCode - One of the ERR_DE_... */
-#define CX18_EPU_DMA_DONE                              (EPU_CMD_MASK_DE | 0x0001)
+#define CX18_EPU_DMA_DONE                      (EPU_CMD_MASK_DE | 0x0001)
 
 /* Something interesting happened
    IN[0] - A value to log
    IN[1] - An offset of a string in the MiniMe memory;
           0/zero/NULL means "I have nothing to say" */
-#define CX18_EPU_DEBUG                                 (EPU_CMD_MASK_DEBUG | 0x0003)
+#define CX18_EPU_DEBUG                         (EPU_CMD_MASK_DEBUG | 0x0003)
 
 /* Reads memory/registers (32-bit)
    IN[0] - Address
 /* Description: This command starts streaming with the set channel type
    IN[0] - Task handle. Handle of the task to start
    ReturnCode - One of the ERR_CAPTURE_... */
-#define CX18_CPU_CAPTURE_START                 (CPU_CMD_MASK_CAPTURE | 0x0002)
+#define CX18_CPU_CAPTURE_START                 (CPU_CMD_MASK_CAPTURE | 0x0002)
 
 /* Description: This command stops streaming with the set channel type
    IN[0] - Task handle. Handle of the task to stop
    IN[1] - 0 = stop at end of GOP, 1 = stop at end of frame (MPEG only)
    ReturnCode - One of the ERR_CAPTURE_... */
-#define CX18_CPU_CAPTURE_STOP                  (CPU_CMD_MASK_CAPTURE | 0x0003)
+#define CX18_CPU_CAPTURE_STOP                  (CPU_CMD_MASK_CAPTURE | 0x0003)
 
 /* Description: This command pauses streaming with the set channel type
    IN[0] - Task handle. Handle of the task to pause
    ReturnCode - One of the ERR_CAPTURE_... */
-#define CX18_CPU_CAPTURE_PAUSE                 (CPU_CMD_MASK_CAPTURE | 0x0007)
+#define CX18_CPU_CAPTURE_PAUSE                 (CPU_CMD_MASK_CAPTURE | 0x0007)
 
 /* Description: This command resumes streaming with the set channel type
    IN[0] - Task handle. Handle of the task to resume
    ReturnCode - One of the ERR_CAPTURE_... */
-#define CX18_CPU_CAPTURE_RESUME                (CPU_CMD_MASK_CAPTURE | 0x0008)
-
-#define CAPTURE_CHANNEL_TYPE_NONE              0
-#define CAPTURE_CHANNEL_TYPE_MPEG              1
-#define CAPTURE_CHANNEL_TYPE_INDEX             2
-#define CAPTURE_CHANNEL_TYPE_YUV               3
-#define CAPTURE_CHANNEL_TYPE_PCM               4
-#define CAPTURE_CHANNEL_TYPE_VBI               5
+#define CX18_CPU_CAPTURE_RESUME                        (CPU_CMD_MASK_CAPTURE | 0x0008)
+
+#define CAPTURE_CHANNEL_TYPE_NONE              0
+#define CAPTURE_CHANNEL_TYPE_MPEG              1
+#define CAPTURE_CHANNEL_TYPE_INDEX             2
+#define CAPTURE_CHANNEL_TYPE_YUV               3
+#define CAPTURE_CHANNEL_TYPE_PCM               4
+#define CAPTURE_CHANNEL_TYPE_VBI               5
 #define CAPTURE_CHANNEL_TYPE_SLICED_VBI                6
 #define CAPTURE_CHANNEL_TYPE_TS                        7
-#define CAPTURE_CHANNEL_TYPE_MAX               15
+#define CAPTURE_CHANNEL_TYPE_MAX               15
 
 /* Description: This command sets the channel type. This can only be done
    when stopped.
    IN[0] - Task handle. Handle of the task to start
    IN[1] - Channel Type. See Below.
    ReturnCode - One of the ERR_CAPTURE_... */
-#define CX18_CPU_SET_CHANNEL_TYPE                      (CPU_CMD_MASK_CAPTURE + 1)
+#define CX18_CPU_SET_CHANNEL_TYPE              (CPU_CMD_MASK_CAPTURE + 1)
 
 /* Description: Set stream output type
    IN[0] - task handle. Handle of the task to start
    IN[4] - reserved
    IN[5] - frame rate, 0 - 29.97f/s, 1 - 25f/s
    ReturnCode - One of the ERR_CAPTURE_... */
-#define CX18_CPU_SET_VIDEO_IN                  (CPU_CMD_MASK_CAPTURE | 0x0004)
+#define CX18_CPU_SET_VIDEO_IN                  (CPU_CMD_MASK_CAPTURE | 0x0004)
 
 /* Description: Set video frame rate
    IN[0] - task handle. Handle of the task to start
    IN[3] - video peak rate
    IN[4] - system mux rate
    ReturnCode - One of the ERR_CAPTURE_... */
-#define CX18_CPU_SET_VIDEO_RATE                (CPU_CMD_MASK_CAPTURE | 0x0005)
+#define CX18_CPU_SET_VIDEO_RATE                        (CPU_CMD_MASK_CAPTURE | 0x0005)
 
 /* Description: Set video output resolution
    IN[0] - task handle
                                3 = horizontal/vertical, 4 = diagonal
    IN[3] - strength, temporal 0 - 31, spatial 0 - 15
    ReturnCode - One of the ERR_CAPTURE_... */
-#define CX18_CPU_SET_FILTER_PARAM              (CPU_CMD_MASK_CAPTURE | 0x0009)
+#define CX18_CPU_SET_FILTER_PARAM              (CPU_CMD_MASK_CAPTURE | 0x0009)
 
 /* Description: This command set spatial filter type
    IN[0] - Task handle.
                      3 = 2D H/V separable, 4 = 2D symmetric non-separable
    IN[2] - chroma type: 0 - disable, 1 = 1D horizontal
    ReturnCode - One of the ERR_CAPTURE_... */
-#define CX18_CPU_SET_SPATIAL_FILTER_TYPE       (CPU_CMD_MASK_CAPTURE | 0x000C)
+#define CX18_CPU_SET_SPATIAL_FILTER_TYPE       (CPU_CMD_MASK_CAPTURE | 0x000C)
 
 /* Description: This command set coring levels for median filter
    IN[0] - Task handle.
    IN[3] - chroma_high
    IN[4] - chroma_low
    ReturnCode - One of the ERR_CAPTURE_... */
-#define CX18_CPU_SET_MEDIAN_CORING             (CPU_CMD_MASK_CAPTURE | 0x000E)
+#define CX18_CPU_SET_MEDIAN_CORING             (CPU_CMD_MASK_CAPTURE | 0x000E)
 
 /* Description: This command set the picture type mask for index file
    IN[0] - Task handle (ignored by firmware)
-   IN[1] -     0 = disable index file output
+   IN[1] -     0 = disable index file output
                        1 = output I picture
                        2 = P picture
                        4 = B picture
                        other = illegal */
-#define CX18_CPU_SET_INDEXTABLE                (CPU_CMD_MASK_CAPTURE | 0x0010)
+#define CX18_CPU_SET_INDEXTABLE                        (CPU_CMD_MASK_CAPTURE | 0x0010)
 
 /* Description: Set audio parameters
    IN[0] - task handle. Handle of the task to start
 /* Description: Set stream output type
    IN[0] - task handle. Handle of the task to start
    IN[1] - subType
-           SET_INITIAL_SCR                     1
+           SET_INITIAL_SCR                     1
            SET_QUALITY_MODE            2
            SET_VIM_PROTECT_MODE        3
            SET_PTS_CORRECTION          4
                        bit 0:  output user data, 1 - enable
                        bit 1:  output private stream, 1 - enable
                        bit 2:  mux option, 0 - in GOP, 1 - in picture
-                       bit[7:0]        private stream ID
+                       bit[7:0]        private stream ID
    IN[5] - insertion period while mux option is in picture
    ReturnCode - VBI data offset */
 #define CX18_CPU_SET_SLICED_VBI_PARAM          (CPU_CMD_MASK_CAPTURE | 0x0020)
 #define CX18_CPU_SET_VFC_PARAM                  (CPU_CMD_MASK_CAPTURE | 0x0023)
 
 /* Below is the list of commands related to the data exchange */
-#define CPU_CMD_MASK_DE                        (CPU_CMD_MASK | 0x040000)
+#define CPU_CMD_MASK_DE                                (CPU_CMD_MASK | 0x040000)
 
 /* Description: This command provides the physical base address of the local
    DDR as viewed by EPU
    IN[0] - Physical offset where EPU has the local DDR mapped
    ReturnCode - One of the ERR_DE_... */
-#define CPU_CMD_DE_SetBase                     (CPU_CMD_MASK_DE | 0x0001)
+#define CPU_CMD_DE_SetBase                     (CPU_CMD_MASK_DE | 0x0001)
 
 /* Description: This command provides the offsets in the device memory where
    the 2 cx18_mdl_ack blocks reside
    IN[2] - Offset of the second cx18_mdl_ack from the beginning of the
           local DDR.
    ReturnCode - One of the ERR_DE_... */
-#define CX18_CPU_DE_SET_MDL_ACK                        (CPU_CMD_MASK_DE | 0x0002)
+#define CX18_CPU_DE_SET_MDL_ACK                        (CPU_CMD_MASK_DE | 0x0002)
 
 /* Description: This command provides the offset to a Memory Descriptor List
    IN[0] - Task handle. Handle of the task to start
    IN[3] - Buffer ID
    IN[4] - Total buffer length
    ReturnCode - One of the ERR_DE_... */
-#define CX18_CPU_DE_SET_MDL                    (CPU_CMD_MASK_DE | 0x0005)
+#define CX18_CPU_DE_SET_MDL                    (CPU_CMD_MASK_DE | 0x0005)
 
 /* Description: This command requests return of all current Memory
    Descriptor Lists to the driver
    IN[0] - Task handle. Handle of the task to start
    ReturnCode - One of the ERR_DE_... */
-#define CX18_CPU_DE_RELEASE_MDL                (CPU_CMD_MASK_DE | 0x0006)
+#define CX18_CPU_DE_RELEASE_MDL                        (CPU_CMD_MASK_DE | 0x0006)
 
 /* Description: This command signals the cpu that the dat buffer has been
    consumed and ready for re-use.
index 96f75f6..19c005f 100644 (file)
@@ -54,7 +54,7 @@
 #define NETUP_CI_CTL           0x04
 #define NETUP_CI_RD            1
 
-#define NETUP_IRQ_DETAM        0x1
+#define NETUP_IRQ_DETAM                0x1
 #define NETUP_IRQ_IRQAM                0x4
 
 static unsigned int ci_dbg;
index ecc580a..a03dcb6 100644 (file)
@@ -1146,7 +1146,7 @@ static struct video_device cx23885_vbi_template;
 static struct video_device cx23885_video_template = {
        .name                 = "cx23885-video",
        .fops                 = &video_fops,
-       .ioctl_ops            = &video_ioctl_ops,
+       .ioctl_ops            = &video_ioctl_ops,
        .tvnorms              = CX23885_NORMS,
 };
 
index 6aab713..2a17209 100644 (file)
@@ -357,7 +357,7 @@ struct cx23885_audio_dev {
 
 struct cx23885_dev {
        atomic_t                   refcount;
-       struct v4l2_device         v4l2_dev;
+       struct v4l2_device         v4l2_dev;
        struct v4l2_ctrl_handler   ctrl_handler;
 
        /* pci stuff */
@@ -407,7 +407,7 @@ struct cx23885_dev {
        unsigned int               tuner_bus;
        unsigned int               radio_type;
        unsigned char              radio_addr;
-       struct v4l2_subdev         *sd_cx25840;
+       struct v4l2_subdev         *sd_cx25840;
        struct work_struct         cx25840_work;
 
        /* Infrared */
index b0d4e44..00329f6 100644 (file)
@@ -29,7 +29,7 @@ static unsigned int ir_888_debug;
 module_param(ir_888_debug, int, 0644);
 MODULE_PARM_DESC(ir_888_debug, "enable debug messages [CX23888 IR controller]");
 
-#define CX23888_IR_REG_BASE    0x170000
+#define CX23888_IR_REG_BASE    0x170000
 /*
  * These CX23888 register offsets have a straightforward one to one mapping
  * to the CX23885 register offsets of 0x200 through 0x218
index 06e7b4e..1557a6e 100644 (file)
 #define IVTV_CARDS_H
 
 /* Supported cards */
-#define IVTV_CARD_PVR_250            0 /* WinTV PVR 250 */
-#define IVTV_CARD_PVR_350            1 /* encoder, decoder, tv-out */
-#define IVTV_CARD_PVR_150            2 /* WinTV PVR 150 and PVR 500 (really just two
+#define IVTV_CARD_PVR_250            0 /* WinTV PVR 250 */
+#define IVTV_CARD_PVR_350            1 /* encoder, decoder, tv-out */
+#define IVTV_CARD_PVR_150            2 /* WinTV PVR 150 and PVR 500 (really just two
                                           PVR150s on one PCI board) */
-#define IVTV_CARD_M179               3 /* AVerMedia M179 (encoder only) */
-#define IVTV_CARD_MPG600             4 /* Kuroutoshikou ITVC16-STVLP/YUAN MPG600, encoder only */
-#define IVTV_CARD_MPG160             5 /* Kuroutoshikou ITVC15-STVLP/YUAN MPG160
+#define IVTV_CARD_M179               3 /* AVerMedia M179 (encoder only) */
+#define IVTV_CARD_MPG600             4 /* Kuroutoshikou ITVC16-STVLP/YUAN MPG600, encoder only */
+#define IVTV_CARD_MPG160             5 /* Kuroutoshikou ITVC15-STVLP/YUAN MPG160
                                           cx23415 based, but does not have tv-out */
-#define IVTV_CARD_PG600              6 /* YUAN PG600/DIAMONDMM PVR-550 based on the CX Falcon 2 */
-#define IVTV_CARD_AVC2410            7 /* Adaptec AVC-2410 */
-#define IVTV_CARD_AVC2010            8 /* Adaptec AVD-2010 (No Tuner) */
-#define IVTV_CARD_TG5000TV           9 /* NAGASE TRANSGEAR 5000TV, encoder only */
+#define IVTV_CARD_PG600                      6 /* YUAN PG600/DIAMONDMM PVR-550 based on the CX Falcon 2 */
+#define IVTV_CARD_AVC2410            7 /* Adaptec AVC-2410 */
+#define IVTV_CARD_AVC2010            8 /* Adaptec AVD-2010 (No Tuner) */
+#define IVTV_CARD_TG5000TV           9 /* NAGASE TRANSGEAR 5000TV, encoder only */
 #define IVTV_CARD_VA2000MAX_SNT6     10 /* VA2000MAX-STN6 */
-#define IVTV_CARD_CX23416GYC        11 /* Kuroutoshikou CX23416GYC-STVLP (Yuan MPG600GR OEM) */
-#define IVTV_CARD_GV_MVPRX          12 /* I/O Data GV-MVP/RX, RX2, RX2W */
-#define IVTV_CARD_GV_MVPRX2E        13 /* I/O Data GV-MVP/RX2E */
+#define IVTV_CARD_CX23416GYC        11 /* Kuroutoshikou CX23416GYC-STVLP (Yuan MPG600GR OEM) */
+#define IVTV_CARD_GV_MVPRX          12 /* I/O Data GV-MVP/RX, RX2, RX2W */
+#define IVTV_CARD_GV_MVPRX2E        13 /* I/O Data GV-MVP/RX2E */
 #define IVTV_CARD_GOTVIEW_PCI_DVD    14        /* GotView PCI DVD */
 #define IVTV_CARD_GOTVIEW_PCI_DVD2   15        /* GotView PCI DVD2 */
 #define IVTV_CARD_YUAN_MPC622        16        /* Yuan MPC622 miniPCI */
-#define IVTV_CARD_DCTMTVP1          17 /* DIGITAL COWBOY DCT-MTVP1 */
+#define IVTV_CARD_DCTMTVP1          17 /* DIGITAL COWBOY DCT-MTVP1 */
 #define IVTV_CARD_PG600V2           18 /* Yuan PG600V2/GotView PCI DVD Lite */
 #define IVTV_CARD_CLUB3D            19 /* Club3D ZAP-TV1x01 */
 #define IVTV_CARD_AVERTV_MCE116             20 /* AVerTV MCE 116 Plus */
@@ -52,7 +52,7 @@
 #define IVTV_CARD_BUFFALO_MV5L       25 /* Buffalo PC-MV5L/PCI card */
 #define IVTV_CARD_AVER_ULTRA1500MCE  26 /* AVerMedia UltraTV 1500 MCE */
 #define IVTV_CARD_KIKYOU             27 /* Sony VAIO Giga Pocket (ENX Kikyou) */
-#define IVTV_CARD_LAST                      27
+#define IVTV_CARD_LAST              27
 
 /* Variants of existing cards but with the same PCI IDs. The driver
    detects these based on other device information.
@@ -61,7 +61,7 @@
    must be adjusted accordingly. */
 
 /* PVR-350 V1 (uses saa7114) */
-#define IVTV_CARD_PVR_350_V1        (IVTV_CARD_LAST+1)
+#define IVTV_CARD_PVR_350_V1        (IVTV_CARD_LAST+1)
 /* 2 variants of Kuroutoshikou CX23416GYC-STVLP (Yuan MPG600GR OEM) */
 #define IVTV_CARD_CX23416GYC_NOGR    (IVTV_CARD_LAST+2)
 #define IVTV_CARD_CX23416GYC_NOGRYCS (IVTV_CARD_LAST+3)
 #define PCI_DEVICE_ID_IVTV16 0x0016
 
 /* subsystem vendor ID */
-#define IVTV_PCI_ID_HAUPPAUGE          0x0070
-#define IVTV_PCI_ID_HAUPPAUGE_ALT1     0x0270
-#define IVTV_PCI_ID_HAUPPAUGE_ALT2     0x4070
-#define IVTV_PCI_ID_ADAPTEC            0x9005
-#define IVTV_PCI_ID_ASUSTEK            0x1043
-#define IVTV_PCI_ID_AVERMEDIA          0x1461
+#define IVTV_PCI_ID_HAUPPAUGE          0x0070
+#define IVTV_PCI_ID_HAUPPAUGE_ALT1     0x0270
+#define IVTV_PCI_ID_HAUPPAUGE_ALT2     0x4070
+#define IVTV_PCI_ID_ADAPTEC            0x9005
+#define IVTV_PCI_ID_ASUSTEK            0x1043
+#define IVTV_PCI_ID_AVERMEDIA          0x1461
 #define IVTV_PCI_ID_YUAN1              0x12ab
-#define IVTV_PCI_ID_YUAN2              0xff01
-#define IVTV_PCI_ID_YUAN3              0xffab
-#define IVTV_PCI_ID_YUAN4              0xfbab
-#define IVTV_PCI_ID_DIAMONDMM          0xff92
-#define IVTV_PCI_ID_IODATA             0x10fc
-#define IVTV_PCI_ID_MELCO              0x1154
+#define IVTV_PCI_ID_YUAN2              0xff01
+#define IVTV_PCI_ID_YUAN3              0xffab
+#define IVTV_PCI_ID_YUAN4              0xfbab
+#define IVTV_PCI_ID_DIAMONDMM          0xff92
+#define IVTV_PCI_ID_IODATA             0x10fc
+#define IVTV_PCI_ID_MELCO              0x1154
 #define IVTV_PCI_ID_GOTVIEW1           0xffac
-#define IVTV_PCI_ID_GOTVIEW2           0xffad
-#define IVTV_PCI_ID_SONY               0x104d
+#define IVTV_PCI_ID_GOTVIEW2           0xffad
+#define IVTV_PCI_ID_SONY               0x104d
 
 /* hardware flags, no gaps allowed */
 #define IVTV_HW_CX25840                        (1 << 0)
 
 /* video inputs */
 #define        IVTV_CARD_INPUT_VID_TUNER       1
-#define        IVTV_CARD_INPUT_SVIDEO1         2
-#define        IVTV_CARD_INPUT_SVIDEO2         3
-#define        IVTV_CARD_INPUT_COMPOSITE1      4
-#define        IVTV_CARD_INPUT_COMPOSITE2      5
-#define        IVTV_CARD_INPUT_COMPOSITE3      6
+#define        IVTV_CARD_INPUT_SVIDEO1         2
+#define        IVTV_CARD_INPUT_SVIDEO2         3
+#define        IVTV_CARD_INPUT_COMPOSITE1      4
+#define        IVTV_CARD_INPUT_COMPOSITE2      5
+#define        IVTV_CARD_INPUT_COMPOSITE3      6
 
 /* audio inputs */
 #define        IVTV_CARD_INPUT_AUD_TUNER       1
-#define        IVTV_CARD_INPUT_LINE_IN1        2
-#define        IVTV_CARD_INPUT_LINE_IN2        3
+#define        IVTV_CARD_INPUT_LINE_IN1        2
+#define        IVTV_CARD_INPUT_LINE_IN2        3
 
 #define IVTV_CARD_MAX_VIDEO_INPUTS 6
 #define IVTV_CARD_MAX_AUDIO_INPUTS 3
-#define IVTV_CARD_MAX_TUNERS      3
+#define IVTV_CARD_MAX_TUNERS      3
 
 /* SAA71XX HW inputs */
 #define IVTV_SAA71XX_COMPOSITE0 0
                          V4L2_CAP_SLICED_VBI_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_OVERLAY)
 
 struct ivtv_card_video_input {
-       u8  video_type;         /* video input type */
+       u8  video_type;         /* video input type */
        u8  audio_index;        /* index in ivtv_card_audio_input array */
        u16 video_input;        /* hardware video input */
 };
@@ -199,55 +199,55 @@ struct ivtv_card_pci_info {
 
 /* The mask is the set of bits used by the operation */
 
-struct ivtv_gpio_init {        /* set initial GPIO DIR and OUT values */
-       u16 direction;          /* DIR setting. Leave to 0 if no init is needed */
+struct ivtv_gpio_init {                /* set initial GPIO DIR and OUT values */
+       u16 direction;          /* DIR setting. Leave to 0 if no init is needed */
        u16 initial_value;
 };
 
-struct ivtv_gpio_video_input {         /* select tuner/line in input */
-       u16 mask;               /* leave to 0 if not supported */
+struct ivtv_gpio_video_input { /* select tuner/line in input */
+       u16 mask;               /* leave to 0 if not supported */
        u16 tuner;
        u16 composite;
        u16 svideo;
 };
 
-struct ivtv_gpio_audio_input {         /* select tuner/line in input */
-       u16 mask;               /* leave to 0 if not supported */
+struct ivtv_gpio_audio_input { /* select tuner/line in input */
+       u16 mask;               /* leave to 0 if not supported */
        u16 tuner;
        u16 linein;
        u16 radio;
 };
 
 struct ivtv_gpio_audio_mute {
-       u16 mask;               /* leave to 0 if not supported */
+       u16 mask;               /* leave to 0 if not supported */
        u16 mute;               /* set this value to mute, 0 to unmute */
 };
 
 struct ivtv_gpio_audio_mode {
-       u16 mask;               /* leave to 0 if not supported */
-       u16 mono;               /* set audio to mono */
-       u16 stereo;             /* set audio to stereo */
+       u16 mask;               /* leave to 0 if not supported */
+       u16 mono;               /* set audio to mono */
+       u16 stereo;             /* set audio to stereo */
        u16 lang1;              /* set audio to the first language */
        u16 lang2;              /* set audio to the second language */
-       u16 both;               /* both languages are output */
+       u16 both;               /* both languages are output */
 };
 
 struct ivtv_gpio_audio_freq {
-       u16 mask;               /* leave to 0 if not supported */
+       u16 mask;               /* leave to 0 if not supported */
        u16 f32000;
        u16 f44100;
        u16 f48000;
 };
 
 struct ivtv_gpio_audio_detect {
-       u16 mask;               /* leave to 0 if not supported */
-       u16 stereo;             /* if the input matches this value then
+       u16 mask;               /* leave to 0 if not supported */
+       u16 stereo;             /* if the input matches this value then
                                   stereo is detected */
 };
 
 struct ivtv_card_tuner {
-       v4l2_std_id std;        /* standard for which the tuner is suitable */
-       int         tuner;      /* tuner ID (from tuner.h) */
+       v4l2_std_id std;        /* standard for which the tuner is suitable */
+       int         tuner;      /* tuner ID (from tuner.h) */
 };
 
 struct ivtv_card_tuner_i2c {
@@ -272,17 +272,17 @@ struct ivtv_card {
        struct ivtv_card_audio_input radio_input;
        int nof_outputs;
        const struct ivtv_card_output *video_outputs;
-       u8 gr_config;           /* config byte for the ghost reduction device */
-       u8 xceive_pin;          /* XCeive tuner GPIO reset pin */
+       u8 gr_config;           /* config byte for the ghost reduction device */
+       u8 xceive_pin;          /* XCeive tuner GPIO reset pin */
 
        /* GPIO card-specific settings */
-       struct ivtv_gpio_init           gpio_init;
+       struct ivtv_gpio_init           gpio_init;
        struct ivtv_gpio_video_input    gpio_video_input;
-       struct ivtv_gpio_audio_input    gpio_audio_input;
-       struct ivtv_gpio_audio_mute     gpio_audio_mute;
-       struct ivtv_gpio_audio_mode     gpio_audio_mode;
-       struct ivtv_gpio_audio_freq     gpio_audio_freq;
-       struct ivtv_gpio_audio_detect   gpio_audio_detect;
+       struct ivtv_gpio_audio_input    gpio_audio_input;
+       struct ivtv_gpio_audio_mute     gpio_audio_mute;
+       struct ivtv_gpio_audio_mode     gpio_audio_mode;
+       struct ivtv_gpio_audio_freq     gpio_audio_freq;
+       struct ivtv_gpio_audio_detect   gpio_audio_detect;
 
        struct ivtv_card_tuner tuners[IVTV_CARD_MAX_TUNERS];
        struct ivtv_card_tuner_i2c *i2c;
index d27c5c2..cafba6b 100644 (file)
@@ -76,7 +76,7 @@
 #define IVTV_ENCODER_SIZE      0x00800000      /* Total size is 0x01000000, but only first half is used */
 #define IVTV_DECODER_OFFSET    0x01000000
 #define IVTV_DECODER_SIZE      0x00800000      /* Total size is 0x01000000, but only first half is used */
-#define IVTV_REG_OFFSET        0x02000000
+#define IVTV_REG_OFFSET                0x02000000
 #define IVTV_REG_SIZE          0x00010000
 
 /* Maximum ivtv driver instances. Some people have a huge number of
 #define IVTV_DMA_SG_OSD_ENT    (2883584/PAGE_SIZE)     /* sg entities */
 
 /* DMA Registers */
-#define IVTV_REG_DMAXFER       (0x0000)
-#define IVTV_REG_DMASTATUS     (0x0004)
-#define IVTV_REG_DECDMAADDR    (0x0008)
-#define IVTV_REG_ENCDMAADDR    (0x000c)
-#define IVTV_REG_DMACONTROL    (0x0010)
-#define IVTV_REG_IRQSTATUS     (0x0040)
-#define IVTV_REG_IRQMASK       (0x0048)
+#define IVTV_REG_DMAXFER       (0x0000)
+#define IVTV_REG_DMASTATUS     (0x0004)
+#define IVTV_REG_DECDMAADDR    (0x0008)
+#define IVTV_REG_ENCDMAADDR    (0x000c)
+#define IVTV_REG_DMACONTROL    (0x0010)
+#define IVTV_REG_IRQSTATUS     (0x0040)
+#define IVTV_REG_IRQMASK       (0x0048)
 
 /* Setup Registers */
-#define IVTV_REG_ENC_SDRAM_REFRESH     (0x07F8)
-#define IVTV_REG_ENC_SDRAM_PRECHARGE   (0x07FC)
-#define IVTV_REG_DEC_SDRAM_REFRESH     (0x08F8)
-#define IVTV_REG_DEC_SDRAM_PRECHARGE   (0x08FC)
-#define IVTV_REG_VDM                   (0x2800)
-#define IVTV_REG_AO                    (0x2D00)
-#define IVTV_REG_BYTEFLUSH             (0x2D24)
-#define IVTV_REG_SPU                   (0x9050)
-#define IVTV_REG_HW_BLOCKS             (0x9054)
-#define IVTV_REG_VPU                   (0x9058)
-#define IVTV_REG_APU                   (0xA064)
+#define IVTV_REG_ENC_SDRAM_REFRESH     (0x07F8)
+#define IVTV_REG_ENC_SDRAM_PRECHARGE   (0x07FC)
+#define IVTV_REG_DEC_SDRAM_REFRESH     (0x08F8)
+#define IVTV_REG_DEC_SDRAM_PRECHARGE   (0x08FC)
+#define IVTV_REG_VDM                   (0x2800)
+#define IVTV_REG_AO                    (0x2D00)
+#define IVTV_REG_BYTEFLUSH             (0x2D24)
+#define IVTV_REG_SPU                   (0x9050)
+#define IVTV_REG_HW_BLOCKS             (0x9054)
+#define IVTV_REG_VPU                   (0x9058)
+#define IVTV_REG_APU                   (0xA064)
 
 /* Other registers */
 #define IVTV_REG_DEC_LINE_FIELD                (0x28C0)
@@ -158,7 +158,7 @@ extern int ivtv_fw_debug;
 
 #define IVTV_DEBUG_HIGH_VOL(x, type, fmt, args...) \
        do { \
-               if (((x) & ivtv_debug) && (ivtv_debug & IVTV_DBGFLG_HIGHVOL))   \
+               if (((x) & ivtv_debug) && (ivtv_debug & IVTV_DBGFLG_HIGHVOL))   \
                        v4l2_info(&itv->v4l2_dev, " " type ": " fmt , ##args);  \
        } while (0)
 #define IVTV_DEBUG_HI_WARN(fmt, args...)  IVTV_DEBUG_HIGH_VOL(IVTV_DBGFLG_WARN,  "warn",  fmt , ## args)
@@ -226,9 +226,9 @@ struct ivtv_mailbox_data {
 /* per-stream, s_flags */
 #define IVTV_F_S_DMA_PENDING   0       /* this stream has pending DMA */
 #define IVTV_F_S_DMA_HAS_VBI   1       /* the current DMA request also requests VBI data */
-#define IVTV_F_S_NEEDS_DATA    2       /* this decoding stream needs more data */
+#define IVTV_F_S_NEEDS_DATA    2       /* this decoding stream needs more data */
 
-#define IVTV_F_S_CLAIMED       3       /* this stream is claimed */
+#define IVTV_F_S_CLAIMED       3       /* this stream is claimed */
 #define IVTV_F_S_STREAMING      4      /* the fw is decoding/encoding this stream */
 #define IVTV_F_S_INTERNAL_USE  5       /* this stream is used internally (sliced VBI processing) */
 #define IVTV_F_S_PASSTHROUGH   6       /* this stream is in passthrough mode */
@@ -239,35 +239,35 @@ struct ivtv_mailbox_data {
 #define IVTV_F_S_PIO_HAS_VBI   1       /* the current PIO request also requests VBI data */
 
 /* per-ivtv, i_flags */
-#define IVTV_F_I_DMA              0    /* DMA in progress */
-#define IVTV_F_I_UDMA             1    /* UDMA in progress */
-#define IVTV_F_I_UDMA_PENDING     2    /* UDMA pending */
-#define IVTV_F_I_SPEED_CHANGE     3    /* a speed change is in progress */
-#define IVTV_F_I_EOS              4    /* end of encoder stream reached */
-#define IVTV_F_I_RADIO_USER       5    /* the radio tuner is selected */
-#define IVTV_F_I_DIG_RST          6    /* reset digitizer */
-#define IVTV_F_I_DEC_YUV          7    /* YUV instead of MPG is being decoded */
-#define IVTV_F_I_UPDATE_CC        9    /* CC should be updated */
-#define IVTV_F_I_UPDATE_WSS       10   /* WSS should be updated */
-#define IVTV_F_I_UPDATE_VPS       11   /* VPS should be updated */
-#define IVTV_F_I_DECODING_YUV     12   /* this stream is YUV frame decoding */
-#define IVTV_F_I_ENC_PAUSED       13   /* the encoder is paused */
-#define IVTV_F_I_VALID_DEC_TIMINGS 14  /* last_dec_timing is valid */
-#define IVTV_F_I_HAVE_WORK        15   /* used in the interrupt handler: there is work to be done */
+#define IVTV_F_I_DMA              0    /* DMA in progress */
+#define IVTV_F_I_UDMA             1    /* UDMA in progress */
+#define IVTV_F_I_UDMA_PENDING     2    /* UDMA pending */
+#define IVTV_F_I_SPEED_CHANGE     3    /* a speed change is in progress */
+#define IVTV_F_I_EOS              4    /* end of encoder stream reached */
+#define IVTV_F_I_RADIO_USER       5    /* the radio tuner is selected */
+#define IVTV_F_I_DIG_RST          6    /* reset digitizer */
+#define IVTV_F_I_DEC_YUV          7    /* YUV instead of MPG is being decoded */
+#define IVTV_F_I_UPDATE_CC        9    /* CC should be updated */
+#define IVTV_F_I_UPDATE_WSS       10   /* WSS should be updated */
+#define IVTV_F_I_UPDATE_VPS       11   /* VPS should be updated */
+#define IVTV_F_I_DECODING_YUV     12   /* this stream is YUV frame decoding */
+#define IVTV_F_I_ENC_PAUSED       13   /* the encoder is paused */
+#define IVTV_F_I_VALID_DEC_TIMINGS 14  /* last_dec_timing is valid */
+#define IVTV_F_I_HAVE_WORK        15   /* used in the interrupt handler: there is work to be done */
 #define IVTV_F_I_WORK_HANDLER_VBI  16  /* there is work to be done for VBI */
 #define IVTV_F_I_WORK_HANDLER_YUV  17  /* there is work to be done for YUV */
 #define IVTV_F_I_WORK_HANDLER_PIO  18  /* there is work to be done for PIO */
 #define IVTV_F_I_PIO              19   /* PIO in progress */
-#define IVTV_F_I_DEC_PAUSED       20   /* the decoder is paused */
-#define IVTV_F_I_INITED                   21   /* set after first open */
-#define IVTV_F_I_FAILED                   22   /* set if first open failed */
+#define IVTV_F_I_DEC_PAUSED       20   /* the decoder is paused */
+#define IVTV_F_I_INITED                   21   /* set after first open */
+#define IVTV_F_I_FAILED                   22   /* set if first open failed */
 #define IVTV_F_I_WORK_HANDLER_PCM  23  /* there is work to be done for PCM */
 
 /* Event notifications */
 #define IVTV_F_I_EV_DEC_STOPPED           28   /* decoder stopped event */
-#define IVTV_F_I_EV_VSYNC         29   /* VSYNC event */
-#define IVTV_F_I_EV_VSYNC_FIELD    30  /* VSYNC event field (0 = first, 1 = second field) */
-#define IVTV_F_I_EV_VSYNC_ENABLED  31  /* VSYNC event enabled */
+#define IVTV_F_I_EV_VSYNC         29   /* VSYNC event */
+#define IVTV_F_I_EV_VSYNC_FIELD    30  /* VSYNC event field (0 = first, 1 = second field) */
+#define IVTV_F_I_EV_VSYNC_ENABLED  31  /* VSYNC event enabled */
 
 /* Scatter-Gather array element, used in DMA transfers */
 struct ivtv_sg_element {
@@ -330,13 +330,13 @@ struct ivtv_stream {
        /* These first four fields are always set, even if the stream
           is not actually created. */
        struct video_device vdev;       /* vdev.v4l2_dev is NULL if there is no device */
-       struct ivtv *itv;               /* for ease of use */
+       struct ivtv *itv;               /* for ease of use */
        const char *name;               /* name of the stream */
        int type;                       /* stream type */
        u32 caps;                       /* V4L2 capabilities */
 
        struct v4l2_fh *fh;             /* pointer to the streaming filehandle */
-       spinlock_t qlock;               /* locks access to the queues */
+       spinlock_t qlock;               /* locks access to the queues */
        unsigned long s_flags;          /* status flags, see above */
        int dma;                        /* can be PCI_DMA_TODEVICE, PCI_DMA_FROMDEVICE or PCI_DMA_NONE */
        u32 pending_offset;
@@ -564,7 +564,7 @@ struct vbi_info {
 
        /* Raw VBI compatibility hack */
 
-       u32 frame;                              /* frame counter hack needed for backwards compatibility
+       u32 frame;                              /* frame counter hack needed for backwards compatibility
                                                   of old VBI software */
 
        /* Sliced VBI output data */
@@ -620,7 +620,7 @@ struct ivtv {
        u8 nof_inputs;                  /* number of video inputs */
        u8 nof_audio_inputs;            /* number of audio inputs */
        u32 v4l2_cap;                   /* V4L2 capabilities of card */
-       u32 hw_flags;                   /* hardware description of the board */
+       u32 hw_flags;                   /* hardware description of the board */
        v4l2_std_id tuner_std;          /* the norm of the card's tuner (fixed) */
        struct v4l2_subdev *sd_video;   /* controlling video decoder subdev */
        struct v4l2_subdev *sd_audio;   /* controlling audio subdev */
@@ -629,7 +629,7 @@ struct ivtv {
        volatile void __iomem *enc_mem; /* pointer to mapped encoder memory */
        volatile void __iomem *dec_mem; /* pointer to mapped decoder memory */
        volatile void __iomem *reg_mem; /* pointer to mapped registers */
-       struct ivtv_options options;    /* user options */
+       struct ivtv_options options;    /* user options */
 
        struct v4l2_device v4l2_dev;
        struct cx2341x_handler cxhdl;
@@ -668,7 +668,7 @@ struct ivtv {
 
        /* Streams */
        int stream_buf_size[IVTV_MAX_STREAMS];          /* stream buffer size */
-       struct ivtv_stream streams[IVTV_MAX_STREAMS];   /* stream data */
+       struct ivtv_stream streams[IVTV_MAX_STREAMS];   /* stream data */
        atomic_t capturing;             /* count number of active capture streams */
        atomic_t decoding;              /* count number of active decoding streams */
 
@@ -704,7 +704,7 @@ struct ivtv {
        /* Mailbox */
        struct ivtv_mailbox_data enc_mbox;              /* encoder mailboxes */
        struct ivtv_mailbox_data dec_mbox;              /* decoder mailboxes */
-       struct ivtv_api_cache api_cache[256];           /* cached API commands */
+       struct ivtv_api_cache api_cache[256];           /* cached API commands */
 
 
        /* I2C */
@@ -828,7 +828,7 @@ static inline int ivtv_raw_vbi(const struct ivtv *itv)
 
 /* Call the specified callback for all subdevs matching hw (if 0, then
    match them all). Ignore any errors. */
-#define ivtv_call_hw(itv, hw, o, f, args...)                           \
+#define ivtv_call_hw(itv, hw, o, f, args...)                           \
        v4l2_device_mask_call_all(&(itv)->v4l2_dev, hw, o, f, ##args)
 
 #define ivtv_call_all(itv, o, f, args...) ivtv_call_hw(itv, 0, o, f , ##args)
index ba279fd..9f05472 100644 (file)
 #include <linux/firmware.h>
 #include <media/i2c/saa7127.h>
 
-#define IVTV_MASK_SPU_ENABLE           0xFFFFFFFE
-#define IVTV_MASK_VPU_ENABLE15                 0xFFFFFFF6
-#define IVTV_MASK_VPU_ENABLE16                 0xFFFFFFFB
-#define IVTV_CMD_VDM_STOP              0x00000000
-#define IVTV_CMD_AO_STOP               0x00000005
-#define IVTV_CMD_APU_PING              0x00000000
-#define IVTV_CMD_VPU_STOP15            0xFFFFFFFE
-#define IVTV_CMD_VPU_STOP16            0xFFFFFFEE
-#define IVTV_CMD_HW_BLOCKS_RST                 0xFFFFFFFF
-#define IVTV_CMD_SPU_STOP              0x00000001
-#define IVTV_CMD_SDRAM_PRECHARGE_INIT  0x0000001A
-#define IVTV_CMD_SDRAM_REFRESH_INIT    0x80000640
-#define IVTV_SDRAM_SLEEPTIME           600
-
-#define IVTV_DECODE_INIT_MPEG_FILENAME         "v4l-cx2341x-init.mpg"
-#define IVTV_DECODE_INIT_MPEG_SIZE     (152*1024)
+#define IVTV_MASK_SPU_ENABLE           0xFFFFFFFE
+#define IVTV_MASK_VPU_ENABLE15         0xFFFFFFF6
+#define IVTV_MASK_VPU_ENABLE16         0xFFFFFFFB
+#define IVTV_CMD_VDM_STOP              0x00000000
+#define IVTV_CMD_AO_STOP               0x00000005
+#define IVTV_CMD_APU_PING              0x00000000
+#define IVTV_CMD_VPU_STOP15            0xFFFFFFFE
+#define IVTV_CMD_VPU_STOP16            0xFFFFFFEE
+#define IVTV_CMD_HW_BLOCKS_RST         0xFFFFFFFF
+#define IVTV_CMD_SPU_STOP              0x00000001
+#define IVTV_CMD_SDRAM_PRECHARGE_INIT  0x0000001A
+#define IVTV_CMD_SDRAM_REFRESH_INIT    0x80000640
+#define IVTV_SDRAM_SLEEPTIME           600
+
+#define IVTV_DECODE_INIT_MPEG_FILENAME "v4l-cx2341x-init.mpg"
+#define IVTV_DECODE_INIT_MPEG_SIZE     (152*1024)
 
 /* Encoder/decoder firmware sizes */
-#define IVTV_FW_ENC_SIZE               (376836)
-#define IVTV_FW_DEC_SIZE               (256*1024)
+#define IVTV_FW_ENC_SIZE               (376836)
+#define IVTV_FW_DEC_SIZE               (256*1024)
 
 static int load_fw_direct(const char *fn, volatile u8 __iomem *mem, struct ivtv *itv, long size)
 {
index 66696e6..522cd11 100644 (file)
 
 #define IVTV_CS53L32A_I2C_ADDR         0x11
 #define IVTV_M52790_I2C_ADDR           0x48
-#define IVTV_CX25840_I2C_ADDR          0x44
-#define IVTV_SAA7115_I2C_ADDR          0x21
-#define IVTV_SAA7127_I2C_ADDR          0x44
-#define IVTV_SAA717x_I2C_ADDR          0x21
-#define IVTV_MSP3400_I2C_ADDR          0x40
-#define IVTV_HAUPPAUGE_I2C_ADDR        0x50
-#define IVTV_WM8739_I2C_ADDR           0x1a
+#define IVTV_CX25840_I2C_ADDR          0x44
+#define IVTV_SAA7115_I2C_ADDR          0x21
+#define IVTV_SAA7127_I2C_ADDR          0x44
+#define IVTV_SAA717x_I2C_ADDR          0x21
+#define IVTV_MSP3400_I2C_ADDR          0x40
+#define IVTV_HAUPPAUGE_I2C_ADDR                0x50
+#define IVTV_WM8739_I2C_ADDR           0x1a
 #define IVTV_WM8775_I2C_ADDR           0x1b
 #define IVTV_TEA5767_I2C_ADDR          0x60
-#define IVTV_UPD64031A_I2C_ADDR        0x12
-#define IVTV_UPD64083_I2C_ADDR                 0x5c
-#define IVTV_VP27SMPX_I2C_ADDR         0x5b
-#define IVTV_M52790_I2C_ADDR           0x48
+#define IVTV_UPD64031A_I2C_ADDR                0x12
+#define IVTV_UPD64083_I2C_ADDR         0x5c
+#define IVTV_VP27SMPX_I2C_ADDR         0x5b
+#define IVTV_M52790_I2C_ADDR           0x48
 #define IVTV_AVERMEDIA_IR_RX_I2C_ADDR  0x40
-#define IVTV_HAUP_EXT_IR_RX_I2C_ADDR   0x1a
-#define IVTV_HAUP_INT_IR_RX_I2C_ADDR   0x18
+#define IVTV_HAUP_EXT_IR_RX_I2C_ADDR   0x1a
+#define IVTV_HAUP_INT_IR_RX_I2C_ADDR   0x18
 #define IVTV_Z8F0811_IR_TX_I2C_ADDR    0x70
 #define IVTV_Z8F0811_IR_RX_I2C_ADDR    0x71
 #define IVTV_ADAPTEC_IR_ADDR           0x6b
index 670462d..4cdc6d2 100644 (file)
@@ -1884,65 +1884,65 @@ static long ivtv_default(struct file *file, void *fh, bool valid_prio,
 }
 
 static const struct v4l2_ioctl_ops ivtv_ioctl_ops = {
-       .vidioc_querycap                    = ivtv_querycap,
-       .vidioc_s_audio                     = ivtv_s_audio,
-       .vidioc_g_audio                     = ivtv_g_audio,
-       .vidioc_enumaudio                   = ivtv_enumaudio,
-       .vidioc_s_audout                    = ivtv_s_audout,
-       .vidioc_g_audout                    = ivtv_g_audout,
-       .vidioc_enum_input                  = ivtv_enum_input,
-       .vidioc_enum_output                 = ivtv_enum_output,
-       .vidioc_enumaudout                  = ivtv_enumaudout,
-       .vidioc_cropcap                     = ivtv_cropcap,
+       .vidioc_querycap                    = ivtv_querycap,
+       .vidioc_s_audio                     = ivtv_s_audio,
+       .vidioc_g_audio                     = ivtv_g_audio,
+       .vidioc_enumaudio                   = ivtv_enumaudio,
+       .vidioc_s_audout                    = ivtv_s_audout,
+       .vidioc_g_audout                    = ivtv_g_audout,
+       .vidioc_enum_input                  = ivtv_enum_input,
+       .vidioc_enum_output                 = ivtv_enum_output,
+       .vidioc_enumaudout                  = ivtv_enumaudout,
+       .vidioc_cropcap                     = ivtv_cropcap,
        .vidioc_s_selection                 = ivtv_s_selection,
        .vidioc_g_selection                 = ivtv_g_selection,
-       .vidioc_g_input                     = ivtv_g_input,
-       .vidioc_s_input                     = ivtv_s_input,
-       .vidioc_g_output                    = ivtv_g_output,
-       .vidioc_s_output                    = ivtv_s_output,
-       .vidioc_g_frequency                 = ivtv_g_frequency,
-       .vidioc_s_frequency                 = ivtv_s_frequency,
-       .vidioc_s_tuner                     = ivtv_s_tuner,
-       .vidioc_g_tuner                     = ivtv_g_tuner,
-       .vidioc_g_enc_index                 = ivtv_g_enc_index,
+       .vidioc_g_input                     = ivtv_g_input,
+       .vidioc_s_input                     = ivtv_s_input,
+       .vidioc_g_output                    = ivtv_g_output,
+       .vidioc_s_output                    = ivtv_s_output,
+       .vidioc_g_frequency                 = ivtv_g_frequency,
+       .vidioc_s_frequency                 = ivtv_s_frequency,
+       .vidioc_s_tuner                     = ivtv_s_tuner,
+       .vidioc_g_tuner                     = ivtv_g_tuner,
+       .vidioc_g_enc_index                 = ivtv_g_enc_index,
        .vidioc_g_fbuf                      = ivtv_g_fbuf,
        .vidioc_s_fbuf                      = ivtv_s_fbuf,
-       .vidioc_g_std                       = ivtv_g_std,
-       .vidioc_s_std                       = ivtv_s_std,
+       .vidioc_g_std                       = ivtv_g_std,
+       .vidioc_s_std                       = ivtv_s_std,
        .vidioc_overlay                     = ivtv_overlay,
        .vidioc_log_status                  = ivtv_log_status,
-       .vidioc_enum_fmt_vid_cap            = ivtv_enum_fmt_vid_cap,
-       .vidioc_encoder_cmd                 = ivtv_encoder_cmd,
-       .vidioc_try_encoder_cmd             = ivtv_try_encoder_cmd,
+       .vidioc_enum_fmt_vid_cap            = ivtv_enum_fmt_vid_cap,
+       .vidioc_encoder_cmd                 = ivtv_encoder_cmd,
+       .vidioc_try_encoder_cmd             = ivtv_try_encoder_cmd,
        .vidioc_decoder_cmd                 = ivtv_decoder_cmd,
        .vidioc_try_decoder_cmd             = ivtv_try_decoder_cmd,
-       .vidioc_enum_fmt_vid_out            = ivtv_enum_fmt_vid_out,
-       .vidioc_g_fmt_vid_cap               = ivtv_g_fmt_vid_cap,
+       .vidioc_enum_fmt_vid_out            = ivtv_enum_fmt_vid_out,
+       .vidioc_g_fmt_vid_cap               = ivtv_g_fmt_vid_cap,
        .vidioc_g_fmt_vbi_cap               = ivtv_g_fmt_vbi_cap,
        .vidioc_g_fmt_sliced_vbi_cap        = ivtv_g_fmt_sliced_vbi_cap,
        .vidioc_g_fmt_vid_out               = ivtv_g_fmt_vid_out,
        .vidioc_g_fmt_vid_out_overlay       = ivtv_g_fmt_vid_out_overlay,
        .vidioc_g_fmt_sliced_vbi_out        = ivtv_g_fmt_sliced_vbi_out,
-       .vidioc_s_fmt_vid_cap               = ivtv_s_fmt_vid_cap,
-       .vidioc_s_fmt_vbi_cap               = ivtv_s_fmt_vbi_cap,
+       .vidioc_s_fmt_vid_cap               = ivtv_s_fmt_vid_cap,
+       .vidioc_s_fmt_vbi_cap               = ivtv_s_fmt_vbi_cap,
        .vidioc_s_fmt_sliced_vbi_cap        = ivtv_s_fmt_sliced_vbi_cap,
        .vidioc_s_fmt_vid_out               = ivtv_s_fmt_vid_out,
        .vidioc_s_fmt_vid_out_overlay       = ivtv_s_fmt_vid_out_overlay,
        .vidioc_s_fmt_sliced_vbi_out        = ivtv_s_fmt_sliced_vbi_out,
-       .vidioc_try_fmt_vid_cap             = ivtv_try_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap             = ivtv_try_fmt_vid_cap,
        .vidioc_try_fmt_vbi_cap             = ivtv_try_fmt_vbi_cap,
        .vidioc_try_fmt_sliced_vbi_cap      = ivtv_try_fmt_sliced_vbi_cap,
-       .vidioc_try_fmt_vid_out             = ivtv_try_fmt_vid_out,
+       .vidioc_try_fmt_vid_out             = ivtv_try_fmt_vid_out,
        .vidioc_try_fmt_vid_out_overlay     = ivtv_try_fmt_vid_out_overlay,
-       .vidioc_try_fmt_sliced_vbi_out      = ivtv_try_fmt_sliced_vbi_out,
-       .vidioc_g_sliced_vbi_cap            = ivtv_g_sliced_vbi_cap,
+       .vidioc_try_fmt_sliced_vbi_out      = ivtv_try_fmt_sliced_vbi_out,
+       .vidioc_g_sliced_vbi_cap            = ivtv_g_sliced_vbi_cap,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-       .vidioc_g_register                  = ivtv_g_register,
-       .vidioc_s_register                  = ivtv_s_register,
+       .vidioc_g_register                  = ivtv_g_register,
+       .vidioc_s_register                  = ivtv_s_register,
 #endif
-       .vidioc_default                     = ivtv_default,
-       .vidioc_subscribe_event             = ivtv_subscribe_event,
-       .vidioc_unsubscribe_event           = v4l2_event_unsubscribe,
+       .vidioc_default                     = ivtv_default,
+       .vidioc_subscribe_event             = ivtv_subscribe_event,
+       .vidioc_unsubscribe_event           = v4l2_event_unsubscribe,
 };
 
 void ivtv_set_funcs(struct video_device *vdev)
index 9a2506a..f317c8f 100644 (file)
 #define IVTV_MBOX_FIRMWARE_DONE 0x00000004
 #define IVTV_MBOX_DRIVER_DONE   0x00000002
 #define IVTV_MBOX_DRIVER_BUSY   0x00000001
-#define IVTV_MBOX_FREE                 0x00000000
+#define IVTV_MBOX_FREE         0x00000000
 
 /* Firmware mailbox standard timeout */
-#define IVTV_API_STD_TIMEOUT   0x02000000
+#define IVTV_API_STD_TIMEOUT   0x02000000
 
-#define API_CACHE       (1 << 0)       /* Allow the command to be stored in the cache */
-#define API_RESULT      (1 << 1)       /* Allow 1 second for this cmd to end */
+#define API_CACHE       (1 << 0)       /* Allow the command to be stored in the cache */
+#define API_RESULT      (1 << 1)       /* Allow 1 second for this cmd to end */
 #define API_FAST_RESULT         (3 << 1)       /* Allow 0.1 second for this cmd to end */
-#define API_DMA         (1 << 3)       /* DMA mailbox, has special handling */
-#define API_HIGH_VOL    (1 << 5)       /* High volume command (i.e. called during encoding or decoding) */
-#define API_NO_WAIT_MB          (1 << 4)       /* Command may not wait for a free mailbox */
+#define API_DMA                 (1 << 3)       /* DMA mailbox, has special handling */
+#define API_HIGH_VOL    (1 << 5)       /* High volume command (i.e. called during encoding or decoding) */
+#define API_NO_WAIT_MB  (1 << 4)       /* Command may not wait for a free mailbox */
 #define API_NO_WAIT_RES         (1 << 5)       /* Command may not wait for the result */
 #define API_NO_POLL     (1 << 6)       /* Avoid pointless polling */
 
 struct ivtv_api_info {
        int flags;              /* Flags, see above */
-       const char *name;       /* The name of the command */
+       const char *name;       /* The name of the command */
 };
 
 #define API_ENTRY(x, f) [x] = { (f), #x }
 
 static const struct ivtv_api_info api_info[256] = {
        /* MPEG encoder API */
-       API_ENTRY(CX2341X_ENC_PING_FW,                  API_FAST_RESULT),
-       API_ENTRY(CX2341X_ENC_START_CAPTURE,            API_RESULT | API_NO_POLL),
-       API_ENTRY(CX2341X_ENC_STOP_CAPTURE,             API_RESULT),
-       API_ENTRY(CX2341X_ENC_SET_AUDIO_ID,             API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_VIDEO_ID,             API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_PCR_ID,               API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_FRAME_RATE,           API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_FRAME_SIZE,           API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_BIT_RATE,             API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_GOP_PROPERTIES,       API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_ASPECT_RATIO,         API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_DNR_FILTER_MODE,      API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_DNR_FILTER_PROPS,     API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_CORING_LEVELS,        API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_SPATIAL_FILTER_TYPE,  API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_VBI_LINE,             API_RESULT),
-       API_ENTRY(CX2341X_ENC_SET_STREAM_TYPE,          API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_OUTPUT_PORT,          API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_AUDIO_PROPERTIES,     API_CACHE),
-       API_ENTRY(CX2341X_ENC_HALT_FW,                  API_FAST_RESULT),
-       API_ENTRY(CX2341X_ENC_GET_VERSION,              API_FAST_RESULT),
-       API_ENTRY(CX2341X_ENC_SET_GOP_CLOSURE,          API_CACHE),
-       API_ENTRY(CX2341X_ENC_GET_SEQ_END,              API_RESULT),
-       API_ENTRY(CX2341X_ENC_SET_PGM_INDEX_INFO,       API_FAST_RESULT),
-       API_ENTRY(CX2341X_ENC_SET_VBI_CONFIG,           API_RESULT),
-       API_ENTRY(CX2341X_ENC_SET_DMA_BLOCK_SIZE,       API_CACHE),
-       API_ENTRY(CX2341X_ENC_GET_PREV_DMA_INFO_MB_10,  API_FAST_RESULT),
-       API_ENTRY(CX2341X_ENC_GET_PREV_DMA_INFO_MB_9,   API_FAST_RESULT),
-       API_ENTRY(CX2341X_ENC_SCHED_DMA_TO_HOST,        API_DMA | API_HIGH_VOL),
-       API_ENTRY(CX2341X_ENC_INITIALIZE_INPUT,         API_RESULT),
-       API_ENTRY(CX2341X_ENC_SET_FRAME_DROP_RATE,      API_CACHE),
-       API_ENTRY(CX2341X_ENC_PAUSE_ENCODER,            API_RESULT),
-       API_ENTRY(CX2341X_ENC_REFRESH_INPUT,            API_NO_WAIT_MB | API_HIGH_VOL),
-       API_ENTRY(CX2341X_ENC_SET_COPYRIGHT,            API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_EVENT_NOTIFICATION,   API_RESULT),
-       API_ENTRY(CX2341X_ENC_SET_NUM_VSYNC_LINES,      API_CACHE),
-       API_ENTRY(CX2341X_ENC_SET_PLACEHOLDER,          API_CACHE),
-       API_ENTRY(CX2341X_ENC_MUTE_VIDEO,               API_RESULT),
-       API_ENTRY(CX2341X_ENC_MUTE_AUDIO,               API_RESULT),
+       API_ENTRY(CX2341X_ENC_PING_FW,                  API_FAST_RESULT),
+       API_ENTRY(CX2341X_ENC_START_CAPTURE,            API_RESULT | API_NO_POLL),
+       API_ENTRY(CX2341X_ENC_STOP_CAPTURE,             API_RESULT),
+       API_ENTRY(CX2341X_ENC_SET_AUDIO_ID,             API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_VIDEO_ID,             API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_PCR_ID,               API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_FRAME_RATE,           API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_FRAME_SIZE,           API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_BIT_RATE,             API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_GOP_PROPERTIES,       API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_ASPECT_RATIO,         API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_DNR_FILTER_MODE,      API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_DNR_FILTER_PROPS,     API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_CORING_LEVELS,        API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_SPATIAL_FILTER_TYPE,  API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_VBI_LINE,             API_RESULT),
+       API_ENTRY(CX2341X_ENC_SET_STREAM_TYPE,          API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_OUTPUT_PORT,          API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_AUDIO_PROPERTIES,     API_CACHE),
+       API_ENTRY(CX2341X_ENC_HALT_FW,                  API_FAST_RESULT),
+       API_ENTRY(CX2341X_ENC_GET_VERSION,              API_FAST_RESULT),
+       API_ENTRY(CX2341X_ENC_SET_GOP_CLOSURE,          API_CACHE),
+       API_ENTRY(CX2341X_ENC_GET_SEQ_END,              API_RESULT),
+       API_ENTRY(CX2341X_ENC_SET_PGM_INDEX_INFO,       API_FAST_RESULT),
+       API_ENTRY(CX2341X_ENC_SET_VBI_CONFIG,           API_RESULT),
+       API_ENTRY(CX2341X_ENC_SET_DMA_BLOCK_SIZE,       API_CACHE),
+       API_ENTRY(CX2341X_ENC_GET_PREV_DMA_INFO_MB_10,  API_FAST_RESULT),
+       API_ENTRY(CX2341X_ENC_GET_PREV_DMA_INFO_MB_9,   API_FAST_RESULT),
+       API_ENTRY(CX2341X_ENC_SCHED_DMA_TO_HOST,        API_DMA | API_HIGH_VOL),
+       API_ENTRY(CX2341X_ENC_INITIALIZE_INPUT,         API_RESULT),
+       API_ENTRY(CX2341X_ENC_SET_FRAME_DROP_RATE,      API_CACHE),
+       API_ENTRY(CX2341X_ENC_PAUSE_ENCODER,            API_RESULT),
+       API_ENTRY(CX2341X_ENC_REFRESH_INPUT,            API_NO_WAIT_MB | API_HIGH_VOL),
+       API_ENTRY(CX2341X_ENC_SET_COPYRIGHT,            API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_EVENT_NOTIFICATION,   API_RESULT),
+       API_ENTRY(CX2341X_ENC_SET_NUM_VSYNC_LINES,      API_CACHE),
+       API_ENTRY(CX2341X_ENC_SET_PLACEHOLDER,          API_CACHE),
+       API_ENTRY(CX2341X_ENC_MUTE_VIDEO,               API_RESULT),
+       API_ENTRY(CX2341X_ENC_MUTE_AUDIO,               API_RESULT),
        API_ENTRY(CX2341X_ENC_SET_VERT_CROP_LINE,       API_FAST_RESULT),
-       API_ENTRY(CX2341X_ENC_MISC,                     API_FAST_RESULT),
+       API_ENTRY(CX2341X_ENC_MISC,                     API_FAST_RESULT),
        /* Obsolete PULLDOWN API command */
-       API_ENTRY(0xb1,                                 API_CACHE),
+       API_ENTRY(0xb1,                                 API_CACHE),
 
        /* MPEG decoder API */
-       API_ENTRY(CX2341X_DEC_PING_FW,                  API_FAST_RESULT),
-       API_ENTRY(CX2341X_DEC_START_PLAYBACK,           API_RESULT | API_NO_POLL),
-       API_ENTRY(CX2341X_DEC_STOP_PLAYBACK,            API_RESULT),
-       API_ENTRY(CX2341X_DEC_SET_PLAYBACK_SPEED,       API_RESULT),
-       API_ENTRY(CX2341X_DEC_STEP_VIDEO,               API_RESULT),
-       API_ENTRY(CX2341X_DEC_SET_DMA_BLOCK_SIZE,       API_CACHE),
-       API_ENTRY(CX2341X_DEC_GET_XFER_INFO,            API_FAST_RESULT),
-       API_ENTRY(CX2341X_DEC_GET_DMA_STATUS,           API_FAST_RESULT),
-       API_ENTRY(CX2341X_DEC_SCHED_DMA_FROM_HOST,      API_DMA | API_HIGH_VOL),
-       API_ENTRY(CX2341X_DEC_PAUSE_PLAYBACK,           API_RESULT),
-       API_ENTRY(CX2341X_DEC_HALT_FW,                  API_FAST_RESULT),
-       API_ENTRY(CX2341X_DEC_SET_STANDARD,             API_CACHE),
-       API_ENTRY(CX2341X_DEC_GET_VERSION,              API_FAST_RESULT),
-       API_ENTRY(CX2341X_DEC_SET_STREAM_INPUT,         API_CACHE),
-       API_ENTRY(CX2341X_DEC_GET_TIMING_INFO,          API_RESULT /*| API_NO_WAIT_RES*/),
-       API_ENTRY(CX2341X_DEC_SET_AUDIO_MODE,           API_CACHE),
-       API_ENTRY(CX2341X_DEC_SET_EVENT_NOTIFICATION,   API_RESULT),
-       API_ENTRY(CX2341X_DEC_SET_DISPLAY_BUFFERS,      API_CACHE),
-       API_ENTRY(CX2341X_DEC_EXTRACT_VBI,              API_RESULT),
-       API_ENTRY(CX2341X_DEC_SET_DECODER_SOURCE,       API_FAST_RESULT),
-       API_ENTRY(CX2341X_DEC_SET_PREBUFFERING,         API_CACHE),
+       API_ENTRY(CX2341X_DEC_PING_FW,                  API_FAST_RESULT),
+       API_ENTRY(CX2341X_DEC_START_PLAYBACK,           API_RESULT | API_NO_POLL),
+       API_ENTRY(CX2341X_DEC_STOP_PLAYBACK,            API_RESULT),
+       API_ENTRY(CX2341X_DEC_SET_PLAYBACK_SPEED,       API_RESULT),
+       API_ENTRY(CX2341X_DEC_STEP_VIDEO,               API_RESULT),
+       API_ENTRY(CX2341X_DEC_SET_DMA_BLOCK_SIZE,       API_CACHE),
+       API_ENTRY(CX2341X_DEC_GET_XFER_INFO,            API_FAST_RESULT),
+       API_ENTRY(CX2341X_DEC_GET_DMA_STATUS,           API_FAST_RESULT),
+       API_ENTRY(CX2341X_DEC_SCHED_DMA_FROM_HOST,      API_DMA | API_HIGH_VOL),
+       API_ENTRY(CX2341X_DEC_PAUSE_PLAYBACK,           API_RESULT),
+       API_ENTRY(CX2341X_DEC_HALT_FW,                  API_FAST_RESULT),
+       API_ENTRY(CX2341X_DEC_SET_STANDARD,             API_CACHE),
+       API_ENTRY(CX2341X_DEC_GET_VERSION,              API_FAST_RESULT),
+       API_ENTRY(CX2341X_DEC_SET_STREAM_INPUT,         API_CACHE),
+       API_ENTRY(CX2341X_DEC_GET_TIMING_INFO,          API_RESULT /*| API_NO_WAIT_RES*/),
+       API_ENTRY(CX2341X_DEC_SET_AUDIO_MODE,           API_CACHE),
+       API_ENTRY(CX2341X_DEC_SET_EVENT_NOTIFICATION,   API_RESULT),
+       API_ENTRY(CX2341X_DEC_SET_DISPLAY_BUFFERS,      API_CACHE),
+       API_ENTRY(CX2341X_DEC_EXTRACT_VBI,              API_RESULT),
+       API_ENTRY(CX2341X_DEC_SET_DECODER_SOURCE,       API_FAST_RESULT),
+       API_ENTRY(CX2341X_DEC_SET_PREBUFFERING,         API_CACHE),
 
        /* OSD API */
-       API_ENTRY(CX2341X_OSD_GET_FRAMEBUFFER,          API_FAST_RESULT),
-       API_ENTRY(CX2341X_OSD_GET_PIXEL_FORMAT,         API_FAST_RESULT),
-       API_ENTRY(CX2341X_OSD_SET_PIXEL_FORMAT,         API_CACHE),
-       API_ENTRY(CX2341X_OSD_GET_STATE,                API_FAST_RESULT),
-       API_ENTRY(CX2341X_OSD_SET_STATE,                API_CACHE),
-       API_ENTRY(CX2341X_OSD_GET_OSD_COORDS,           API_FAST_RESULT),
-       API_ENTRY(CX2341X_OSD_SET_OSD_COORDS,           API_CACHE),
-       API_ENTRY(CX2341X_OSD_GET_SCREEN_COORDS,        API_FAST_RESULT),
-       API_ENTRY(CX2341X_OSD_SET_SCREEN_COORDS,        API_CACHE),
-       API_ENTRY(CX2341X_OSD_GET_GLOBAL_ALPHA,         API_FAST_RESULT),
-       API_ENTRY(CX2341X_OSD_SET_GLOBAL_ALPHA,         API_CACHE),
-       API_ENTRY(CX2341X_OSD_SET_BLEND_COORDS,         API_CACHE),
-       API_ENTRY(CX2341X_OSD_GET_FLICKER_STATE,        API_FAST_RESULT),
-       API_ENTRY(CX2341X_OSD_SET_FLICKER_STATE,        API_CACHE),
-       API_ENTRY(CX2341X_OSD_BLT_COPY,                 API_RESULT),
-       API_ENTRY(CX2341X_OSD_BLT_FILL,                 API_RESULT),
-       API_ENTRY(CX2341X_OSD_BLT_TEXT,                 API_RESULT),
-       API_ENTRY(CX2341X_OSD_SET_FRAMEBUFFER_WINDOW,   API_CACHE),
-       API_ENTRY(CX2341X_OSD_SET_CHROMA_KEY,           API_CACHE),
-       API_ENTRY(CX2341X_OSD_GET_ALPHA_CONTENT_INDEX,  API_FAST_RESULT),
-       API_ENTRY(CX2341X_OSD_SET_ALPHA_CONTENT_INDEX,  API_CACHE)
+       API_ENTRY(CX2341X_OSD_GET_FRAMEBUFFER,          API_FAST_RESULT),
+       API_ENTRY(CX2341X_OSD_GET_PIXEL_FORMAT,         API_FAST_RESULT),
+       API_ENTRY(CX2341X_OSD_SET_PIXEL_FORMAT,         API_CACHE),
+       API_ENTRY(CX2341X_OSD_GET_STATE,                API_FAST_RESULT),
+       API_ENTRY(CX2341X_OSD_SET_STATE,                API_CACHE),
+       API_ENTRY(CX2341X_OSD_GET_OSD_COORDS,           API_FAST_RESULT),
+       API_ENTRY(CX2341X_OSD_SET_OSD_COORDS,           API_CACHE),
+       API_ENTRY(CX2341X_OSD_GET_SCREEN_COORDS,        API_FAST_RESULT),
+       API_ENTRY(CX2341X_OSD_SET_SCREEN_COORDS,        API_CACHE),
+       API_ENTRY(CX2341X_OSD_GET_GLOBAL_ALPHA,         API_FAST_RESULT),
+       API_ENTRY(CX2341X_OSD_SET_GLOBAL_ALPHA,         API_CACHE),
+       API_ENTRY(CX2341X_OSD_SET_BLEND_COORDS,         API_CACHE),
+       API_ENTRY(CX2341X_OSD_GET_FLICKER_STATE,        API_FAST_RESULT),
+       API_ENTRY(CX2341X_OSD_SET_FLICKER_STATE,        API_CACHE),
+       API_ENTRY(CX2341X_OSD_BLT_COPY,                 API_RESULT),
+       API_ENTRY(CX2341X_OSD_BLT_FILL,                 API_RESULT),
+       API_ENTRY(CX2341X_OSD_BLT_TEXT,                 API_RESULT),
+       API_ENTRY(CX2341X_OSD_SET_FRAMEBUFFER_WINDOW,   API_CACHE),
+       API_ENTRY(CX2341X_OSD_SET_CHROMA_KEY,           API_CACHE),
+       API_ENTRY(CX2341X_OSD_GET_ALPHA_CONTENT_INDEX,  API_FAST_RESULT),
+       API_ENTRY(CX2341X_OSD_SET_ALPHA_CONTENT_INDEX,  API_CACHE)
 };
 
 static int try_mailbox(struct ivtv *itv, struct ivtv_mailbox_data *mbdata, int mb)
index 7761f9d..762ed9f 100644 (file)
 #define MANTIS_CARD_PLUGOUT            (0x01 <<  0)
 
 #define MANTIS_GPIF_BRADDR             0xa0
-#define MANTIS_GPIF_PCMCIAREG          (0x01           << 27)
-#define MANTIS_GPIF_PCMCIAIOM          (0x01           << 26)
+#define MANTIS_GPIF_PCMCIAREG          (0x01           << 27)
+#define MANTIS_GPIF_PCMCIAIOM          (0x01           << 26)
 #define MANTIS_GPIF_BR_ADDR            (0xfffffff      <<  0)
 
 #define MANTIS_GPIF_BRBYTES            0xa4
-#define MANTIS_GPIF_BRCNT              (0xfff          <<  0)
+#define MANTIS_GPIF_BRCNT              (0xfff          <<  0)
 
 #define MANTIS_PCMCIA_RESET            0xa8
 #define MANTIS_PCMCIA_RSTVAL           (0xff << 0)
index 47e0c48..0eeccc2 100644 (file)
@@ -47,70 +47,70 @@ static const struct stb0899_s1_reg vp1041_stb0899_s1_init_1[] = {
        /* 0x0000000b, *//* SYSREG */
        { STB0899_DEV_ID                , 0x30 },
        { STB0899_DISCNTRL1             , 0x32 },
-       { STB0899_DISCNTRL2             , 0x80 },
-       { STB0899_DISRX_ST0             , 0x04 },
-       { STB0899_DISRX_ST1             , 0x00 },
-       { STB0899_DISPARITY             , 0x00 },
+       { STB0899_DISCNTRL2             , 0x80 },
+       { STB0899_DISRX_ST0             , 0x04 },
+       { STB0899_DISRX_ST1             , 0x00 },
+       { STB0899_DISPARITY             , 0x00 },
        { STB0899_DISSTATUS             , 0x20 },
-       { STB0899_DISF22                , 0x99 },
-       { STB0899_DISF22RX              , 0xa8 },
+       { STB0899_DISF22                , 0x99 },
+       { STB0899_DISF22RX              , 0xa8 },
        /* SYSREG ? */
-       { STB0899_ACRPRESC              , 0x11 },
-       { STB0899_ACRDIV1               , 0x0a },
-       { STB0899_ACRDIV2               , 0x05 },
-       { STB0899_DACR1                 , 0x00 },
-       { STB0899_DACR2                 , 0x00 },
-       { STB0899_OUTCFG                , 0x00 },
-       { STB0899_MODECFG               , 0x00 },
+       { STB0899_ACRPRESC              , 0x11 },
+       { STB0899_ACRDIV1               , 0x0a },
+       { STB0899_ACRDIV2               , 0x05 },
+       { STB0899_DACR1                 , 0x00 },
+       { STB0899_DACR2                 , 0x00 },
+       { STB0899_OUTCFG                , 0x00 },
+       { STB0899_MODECFG               , 0x00 },
        { STB0899_IRQSTATUS_3           , 0xfe },
        { STB0899_IRQSTATUS_2           , 0x03 },
        { STB0899_IRQSTATUS_1           , 0x7c },
        { STB0899_IRQSTATUS_0           , 0xf4 },
-       { STB0899_IRQMSK_3              , 0xf3 },
-       { STB0899_IRQMSK_2              , 0xfc },
-       { STB0899_IRQMSK_1              , 0xff },
+       { STB0899_IRQMSK_3              , 0xf3 },
+       { STB0899_IRQMSK_2              , 0xfc },
+       { STB0899_IRQMSK_1              , 0xff },
        { STB0899_IRQMSK_0              , 0xff },
        { STB0899_IRQCFG                , 0x00 },
-       { STB0899_I2CCFG                , 0x88 },
-       { STB0899_I2CRPT                , 0x58 },
+       { STB0899_I2CCFG                , 0x88 },
+       { STB0899_I2CRPT                , 0x58 },
        { STB0899_IOPVALUE5             , 0x00 },
        { STB0899_IOPVALUE4             , 0x33 },
        { STB0899_IOPVALUE3             , 0x6d },
        { STB0899_IOPVALUE2             , 0x90 },
        { STB0899_IOPVALUE1             , 0x60 },
        { STB0899_IOPVALUE0             , 0x00 },
-       { STB0899_GPIO00CFG             , 0x82 },
-       { STB0899_GPIO01CFG             , 0x82 },
-       { STB0899_GPIO02CFG             , 0x82 },
-       { STB0899_GPIO03CFG             , 0x82 },
-       { STB0899_GPIO04CFG             , 0x82 },
-       { STB0899_GPIO05CFG             , 0x82 },
-       { STB0899_GPIO06CFG             , 0x82 },
-       { STB0899_GPIO07CFG             , 0x82 },
-       { STB0899_GPIO08CFG             , 0x82 },
-       { STB0899_GPIO09CFG             , 0x82 },
-       { STB0899_GPIO10CFG             , 0x82 },
-       { STB0899_GPIO11CFG             , 0x82 },
-       { STB0899_GPIO12CFG             , 0x82 },
-       { STB0899_GPIO13CFG             , 0x82 },
-       { STB0899_GPIO14CFG             , 0x82 },
-       { STB0899_GPIO15CFG             , 0x82 },
-       { STB0899_GPIO16CFG             , 0x82 },
-       { STB0899_GPIO17CFG             , 0x82 },
-       { STB0899_GPIO18CFG             , 0x82 },
-       { STB0899_GPIO19CFG             , 0x82 },
-       { STB0899_GPIO20CFG             , 0x82 },
-       { STB0899_SDATCFG               , 0xb8 },
-       { STB0899_SCLTCFG               , 0xba },
-       { STB0899_AGCRFCFG              , 0x1c }, /* 0x11 */
-       { STB0899_GPIO22                , 0x82 }, /* AGCBB2CFG */
-       { STB0899_GPIO21                , 0x91 }, /* AGCBB1CFG */
-       { STB0899_DIRCLKCFG             , 0x82 },
-       { STB0899_CLKOUT27CFG           , 0x7e },
-       { STB0899_STDBYCFG              , 0x82 },
-       { STB0899_CS0CFG                , 0x82 },
-       { STB0899_CS1CFG                , 0x82 },
-       { STB0899_DISEQCOCFG            , 0x20 },
+       { STB0899_GPIO00CFG             , 0x82 },
+       { STB0899_GPIO01CFG             , 0x82 },
+       { STB0899_GPIO02CFG             , 0x82 },
+       { STB0899_GPIO03CFG             , 0x82 },
+       { STB0899_GPIO04CFG             , 0x82 },
+       { STB0899_GPIO05CFG             , 0x82 },
+       { STB0899_GPIO06CFG             , 0x82 },
+       { STB0899_GPIO07CFG             , 0x82 },
+       { STB0899_GPIO08CFG             , 0x82 },
+       { STB0899_GPIO09CFG             , 0x82 },
+       { STB0899_GPIO10CFG             , 0x82 },
+       { STB0899_GPIO11CFG             , 0x82 },
+       { STB0899_GPIO12CFG             , 0x82 },
+       { STB0899_GPIO13CFG             , 0x82 },
+       { STB0899_GPIO14CFG             , 0x82 },
+       { STB0899_GPIO15CFG             , 0x82 },
+       { STB0899_GPIO16CFG             , 0x82 },
+       { STB0899_GPIO17CFG             , 0x82 },
+       { STB0899_GPIO18CFG             , 0x82 },
+       { STB0899_GPIO19CFG             , 0x82 },
+       { STB0899_GPIO20CFG             , 0x82 },
+       { STB0899_SDATCFG               , 0xb8 },
+       { STB0899_SCLTCFG               , 0xba },
+       { STB0899_AGCRFCFG              , 0x1c }, /* 0x11 */
+       { STB0899_GPIO22                , 0x82 }, /* AGCBB2CFG */
+       { STB0899_GPIO21                , 0x91 }, /* AGCBB1CFG */
+       { STB0899_DIRCLKCFG             , 0x82 },
+       { STB0899_CLKOUT27CFG           , 0x7e },
+       { STB0899_STDBYCFG              , 0x82 },
+       { STB0899_CS0CFG                , 0x82 },
+       { STB0899_CS1CFG                , 0x82 },
+       { STB0899_DISEQCOCFG            , 0x20 },
        { STB0899_GPIO32CFG             , 0x82 },
        { STB0899_GPIO33CFG             , 0x82 },
        { STB0899_GPIO34CFG             , 0x82 },
@@ -119,35 +119,35 @@ static const struct stb0899_s1_reg vp1041_stb0899_s1_init_1[] = {
        { STB0899_GPIO37CFG             , 0x82 },
        { STB0899_GPIO38CFG             , 0x82 },
        { STB0899_GPIO39CFG             , 0x82 },
-       { STB0899_NCOARSE               , 0x17 }, /* 0x15 = 27 Mhz Clock, F/3 = 198MHz, F/6 = 99MHz */
-       { STB0899_SYNTCTRL              , 0x02 }, /* 0x00 = CLK from CLKI, 0x02 = CLK from XTALI */
-       { STB0899_FILTCTRL              , 0x00 },
-       { STB0899_SYSCTRL               , 0x01 },
-       { STB0899_STOPCLK1              , 0x20 },
-       { STB0899_STOPCLK2              , 0x00 },
+       { STB0899_NCOARSE               , 0x17 }, /* 0x15 = 27 Mhz Clock, F/3 = 198MHz, F/6 = 99MHz */
+       { STB0899_SYNTCTRL              , 0x02 }, /* 0x00 = CLK from CLKI, 0x02 = CLK from XTALI */
+       { STB0899_FILTCTRL              , 0x00 },
+       { STB0899_SYSCTRL               , 0x01 },
+       { STB0899_STOPCLK1              , 0x20 },
+       { STB0899_STOPCLK2              , 0x00 },
        { STB0899_INTBUFSTATUS          , 0x00 },
-       { STB0899_INTBUFCTRL            , 0x0a },
+       { STB0899_INTBUFCTRL            , 0x0a },
        { 0xffff                        , 0xff },
 };
 
 static const struct stb0899_s1_reg vp1041_stb0899_s1_init_3[] = {
-       { STB0899_DEMOD                 , 0x00 },
-       { STB0899_RCOMPC                , 0xc9 },
-       { STB0899_AGC1CN                , 0x01 },
-       { STB0899_AGC1REF               , 0x10 },
+       { STB0899_DEMOD                 , 0x00 },
+       { STB0899_RCOMPC                , 0xc9 },
+       { STB0899_AGC1CN                , 0x01 },
+       { STB0899_AGC1REF               , 0x10 },
        { STB0899_RTC                   , 0x23 },
-       { STB0899_TMGCFG                , 0x4e },
-       { STB0899_AGC2REF               , 0x34 },
-       { STB0899_TLSR                  , 0x84 },
-       { STB0899_CFD                   , 0xf7 },
+       { STB0899_TMGCFG                , 0x4e },
+       { STB0899_AGC2REF               , 0x34 },
+       { STB0899_TLSR                  , 0x84 },
+       { STB0899_CFD                   , 0xf7 },
        { STB0899_ACLC                  , 0x87 },
-       { STB0899_BCLC                  , 0x94 },
-       { STB0899_EQON                  , 0x41 },
-       { STB0899_LDT                   , 0xf1 },
-       { STB0899_LDT2                  , 0xe3 },
-       { STB0899_EQUALREF              , 0xb4 },
-       { STB0899_TMGRAMP               , 0x10 },
-       { STB0899_TMGTHD                , 0x30 },
+       { STB0899_BCLC                  , 0x94 },
+       { STB0899_EQON                  , 0x41 },
+       { STB0899_LDT                   , 0xf1 },
+       { STB0899_LDT2                  , 0xe3 },
+       { STB0899_EQUALREF              , 0xb4 },
+       { STB0899_TMGRAMP               , 0x10 },
+       { STB0899_TMGTHD                , 0x30 },
        { STB0899_IDCCOMP               , 0xfd },
        { STB0899_QDCCOMP               , 0xff },
        { STB0899_POWERI                , 0x0c },
@@ -166,12 +166,12 @@ static const struct stb0899_s1_reg vp1041_stb0899_s1_init_3[] = {
        { STB0899_NIRL                  , 0x80 },
        { STB0899_ISYMB                 , 0x1d },
        { STB0899_QSYMB                 , 0xa6 },
-       { STB0899_SFRH                  , 0x2f },
-       { STB0899_SFRM                  , 0x68 },
-       { STB0899_SFRL                  , 0x40 },
-       { STB0899_SFRUPH                , 0x2f },
-       { STB0899_SFRUPM                , 0x68 },
-       { STB0899_SFRUPL                , 0x40 },
+       { STB0899_SFRH                  , 0x2f },
+       { STB0899_SFRM                  , 0x68 },
+       { STB0899_SFRL                  , 0x40 },
+       { STB0899_SFRUPH                , 0x2f },
+       { STB0899_SFRUPM                , 0x68 },
+       { STB0899_SFRUPL                , 0x40 },
        { STB0899_EQUAI1                , 0x02 },
        { STB0899_EQUAQ1                , 0xff },
        { STB0899_EQUAI2                , 0x04 },
@@ -183,7 +183,7 @@ static const struct stb0899_s1_reg vp1041_stb0899_s1_init_3[] = {
        { STB0899_EQUAI5                , 0x08 },
        { STB0899_EQUAQ5                , 0xf5 },
        { STB0899_DSTATUS2              , 0x00 },
-       { STB0899_VSTATUS               , 0x00 },
+       { STB0899_VSTATUS               , 0x00 },
        { STB0899_VERROR                , 0x86 },
        { STB0899_IQSWAP                , 0x2a },
        { STB0899_ECNT1M                , 0x00 },
@@ -192,26 +192,26 @@ static const struct stb0899_s1_reg vp1041_stb0899_s1_init_3[] = {
        { STB0899_ECNT2L                , 0x00 },
        { STB0899_ECNT3M                , 0x0a },
        { STB0899_ECNT3L                , 0xad },
-       { STB0899_FECAUTO1              , 0x06 },
+       { STB0899_FECAUTO1              , 0x06 },
        { STB0899_FECM                  , 0x01 },
-       { STB0899_VTH12                 , 0xb0 },
-       { STB0899_VTH23                 , 0x7a },
+       { STB0899_VTH12                 , 0xb0 },
+       { STB0899_VTH23                 , 0x7a },
        { STB0899_VTH34                 , 0x58 },
-       { STB0899_VTH56                 , 0x38 },
-       { STB0899_VTH67                 , 0x34 },
-       { STB0899_VTH78                 , 0x24 },
-       { STB0899_PRVIT                 , 0xff },
-       { STB0899_VITSYNC               , 0x19 },
-       { STB0899_RSULC                 , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */
-       { STB0899_TSULC                 , 0x42 },
-       { STB0899_RSLLC                 , 0x41 },
+       { STB0899_VTH56                 , 0x38 },
+       { STB0899_VTH67                 , 0x34 },
+       { STB0899_VTH78                 , 0x24 },
+       { STB0899_PRVIT                 , 0xff },
+       { STB0899_VITSYNC               , 0x19 },
+       { STB0899_RSULC                 , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */
+       { STB0899_TSULC                 , 0x42 },
+       { STB0899_RSLLC                 , 0x41 },
        { STB0899_TSLPL                 , 0x12 },
-       { STB0899_TSCFGH                , 0x0c },
-       { STB0899_TSCFGM                , 0x00 },
-       { STB0899_TSCFGL                , 0x00 },
+       { STB0899_TSCFGH                , 0x0c },
+       { STB0899_TSCFGM                , 0x00 },
+       { STB0899_TSCFGL                , 0x00 },
        { STB0899_TSOUT                 , 0x69 }, /* 0x0d for CAM */
-       { STB0899_RSSYNCDEL             , 0x00 },
-       { STB0899_TSINHDELH             , 0x02 },
+       { STB0899_RSSYNCDEL             , 0x00 },
+       { STB0899_TSINHDELH             , 0x02 },
        { STB0899_TSINHDELM             , 0x00 },
        { STB0899_TSINHDELL             , 0x00 },
        { STB0899_TSLLSTKM              , 0x1b },
@@ -222,18 +222,18 @@ static const struct stb0899_s1_reg vp1041_stb0899_s1_init_3[] = {
        { STB0899_PCKLENLL              , 0xcc },
        { STB0899_RSPCKLEN              , 0xbd },
        { STB0899_TSSTATUS              , 0x90 },
-       { STB0899_ERRCTRL1              , 0xb6 },
-       { STB0899_ERRCTRL2              , 0x95 },
-       { STB0899_ERRCTRL3              , 0x8d },
+       { STB0899_ERRCTRL1              , 0xb6 },
+       { STB0899_ERRCTRL2              , 0x95 },
+       { STB0899_ERRCTRL3              , 0x8d },
        { STB0899_DMONMSK1              , 0x27 },
        { STB0899_DMONMSK0              , 0x03 },
-       { STB0899_DEMAPVIT              , 0x5c },
+       { STB0899_DEMAPVIT              , 0x5c },
        { STB0899_PLPARM                , 0x19 },
-       { STB0899_PDELCTRL              , 0x48 },
-       { STB0899_PDELCTRL2             , 0x00 },
-       { STB0899_BBHCTRL1              , 0x00 },
-       { STB0899_BBHCTRL2              , 0x00 },
-       { STB0899_HYSTTHRESH            , 0x77 },
+       { STB0899_PDELCTRL              , 0x48 },
+       { STB0899_PDELCTRL2             , 0x00 },
+       { STB0899_BBHCTRL1              , 0x00 },
+       { STB0899_BBHCTRL2              , 0x00 },
+       { STB0899_HYSTTHRESH            , 0x77 },
        { STB0899_MATCSTM               , 0x00 },
        { STB0899_MATCSTL               , 0x00 },
        { STB0899_UPLCSTM               , 0x00 },
@@ -270,7 +270,7 @@ static struct stb0899_config vp1041_stb0899_config = {
        .init_s2_fec            = stb0899_s2_init_4,
        .init_tst               = stb0899_s1_init_5,
 
-       .demod_address          = 0x68, /*  0xd0 >> 1 */
+       .demod_address          = 0x68, /*  0xd0 >> 1 */
 
        .xtal_freq              = 27000000,
        .inversion              = IQ_SWAP_ON,
index 23999a8..be860ec 100644 (file)
@@ -1536,7 +1536,7 @@ static const struct v4l2_ioctl_ops meye_ioctl_ops = {
 static const struct video_device meye_template = {
        .name           = "meye",
        .fops           = &meye_fops,
-       .ioctl_ops      = &meye_ioctl_ops,
+       .ioctl_ops      = &meye_ioctl_ops,
        .release        = video_device_release_empty,
 };
 
index 9965d35..9d6688a 100644 (file)
@@ -323,7 +323,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .empress_addr   = 0x20,
+               .empress_addr   = 0x20,
 
                .inputs         = {{
                        .type = SAA7134_INPUT_COMPOSITE1,
@@ -454,7 +454,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .empress_addr   = 0x20,
+               .empress_addr   = 0x20,
                .tda9887_conf   = TDA9887_PRESENT,
                .gpiomask       = 0x820000,
                .inputs         = {{
@@ -849,7 +849,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .empress_addr   = 0x20,
+               .empress_addr   = 0x20,
                .inputs         = {{
                        .type = SAA7134_INPUT_COMPOSITE1,
                        .vmux = 4,
@@ -1006,7 +1006,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .empress_addr   = 0x20,
+               .empress_addr   = 0x20,
                .inputs         = {{
                        .type = SAA7134_INPUT_COMPOSITE1,
                        .vmux = 1,
@@ -1767,7 +1767,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .rds_addr       = 0x10,
+               .rds_addr       = 0x10,
                .tda9887_conf   = TDA9887_PRESENT,
                .inputs         = {{
                        .type = SAA7134_INPUT_TV,
@@ -2412,7 +2412,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .empress_addr   = 0x21,
+               .empress_addr   = 0x21,
                .inputs         = {{
                        .type = SAA7134_INPUT_COMPOSITE0,
                        .vmux   = 0,
@@ -3978,13 +3978,13 @@ struct saa7134_board saa7134_boards[] = {
        [SAA7134_BOARD_BEHOLD_407] = {
                /*       Beholder Intl. Ltd. 2008      */
                /*Dmitry Belimov <d.belimov@gmail.com> */
-               .name           = "Beholder BeholdTV 407",
-               .audio_clock    = 0x00187de7,
-               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
-               .radio_type     = UNSET,
-               .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
-               .tda9887_conf   = TDA9887_PRESENT,
+               .name           = "Beholder BeholdTV 407",
+               .audio_clock    = 0x00187de7,
+               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
                .gpiomask       = 0x00008000,
                .inputs = {{
                        .type = SAA7134_INPUT_SVIDEO,
@@ -4006,13 +4006,13 @@ struct saa7134_board saa7134_boards[] = {
        [SAA7134_BOARD_BEHOLD_407FM] = {
                /*       Beholder Intl. Ltd. 2008      */
                /*Dmitry Belimov <d.belimov@gmail.com> */
-               .name           = "Beholder BeholdTV 407 FM",
-               .audio_clock    = 0x00187de7,
-               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
-               .radio_type     = UNSET,
-               .tuner_addr     = ADDR_UNSET,
-               .radio_addr     = ADDR_UNSET,
-               .tda9887_conf   = TDA9887_PRESENT,
+               .name           = "Beholder BeholdTV 407 FM",
+               .audio_clock    = 0x00187de7,
+               .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .tda9887_conf   = TDA9887_PRESENT,
                .gpiomask       = 0x00008000,
                .inputs = {{
                        .type = SAA7134_INPUT_SVIDEO,
@@ -4103,7 +4103,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .rds_addr       = 0x10,
+               .rds_addr       = 0x10,
                .tda9887_conf   = TDA9887_PRESENT,
                .gpiomask       = 0x00008000,
                .inputs         = {{
@@ -4166,7 +4166,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .rds_addr       = 0x10,
+               .rds_addr       = 0x10,
                .tda9887_conf   = TDA9887_PRESENT,
                .gpiomask       = 0x00008000,
                .inputs         = {{
@@ -4196,7 +4196,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .rds_addr       = 0x10,
+               .rds_addr       = 0x10,
                .tda9887_conf   = TDA9887_PRESENT,
                .gpiomask       = 0x00008000,
                .inputs         = {{
@@ -4366,7 +4366,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .rds_addr       = 0x10,
+               .rds_addr       = 0x10,
                .tda9887_conf   = TDA9887_PRESENT,
                .inputs         = {{
                        .type = SAA7134_INPUT_TV,
@@ -4394,7 +4394,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .rds_addr       = 0x10,
+               .rds_addr       = 0x10,
                .tda9887_conf   = TDA9887_PRESENT,
                .inputs         = {{
                        .type = SAA7134_INPUT_TV,
@@ -4422,7 +4422,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .rds_addr       = 0x10,
+               .rds_addr       = 0x10,
                .tda9887_conf   = TDA9887_PRESENT,
                .inputs         = {{
                        .type = SAA7134_INPUT_TV,
@@ -4450,7 +4450,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .rds_addr       = 0x10,
+               .rds_addr       = 0x10,
                .tda9887_conf   = TDA9887_PRESENT,
                .inputs         = {{
                        .type = SAA7134_INPUT_TV,
@@ -4481,7 +4481,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .empress_addr   = 0x20,
+               .empress_addr   = 0x20,
                .tda9887_conf   = TDA9887_PRESENT,
                .inputs         = { {
                        .type = SAA7134_INPUT_TV,
@@ -4517,7 +4517,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .empress_addr   = 0x20,
+               .empress_addr   = 0x20,
                .tda9887_conf   = TDA9887_PRESENT,
                .inputs         = { {
                        .type = SAA7134_INPUT_TV,
@@ -4554,8 +4554,8 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .rds_addr       = 0x10,
-               .empress_addr   = 0x20,
+               .rds_addr       = 0x10,
+               .empress_addr   = 0x20,
                .tda9887_conf   = TDA9887_PRESENT,
                .inputs         = { {
                        .type = SAA7134_INPUT_TV,
@@ -5297,7 +5297,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
-               .rds_addr       = 0x10,
+               .rds_addr       = 0x10,
                .tda9887_conf   = TDA9887_PRESENT,
                .gpiomask       = 0x00008000,
                .inputs         = {{
index b55f9a1..a7a63d6 100644 (file)
@@ -1389,7 +1389,7 @@ static int dvb_init(struct saa7134_dev *dev)
                        if (configure_tda827x_fe(dev, &lifeview_trio_config,
                                                 &tda827x_cfg_0) < 0)
                                goto detach_frontend;
-               } else {                /* satellite */
+               } else {                /* satellite */
                        fe0->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, &dev->i2c_adap);
                        if (fe0->dvb.frontend) {
                                if (dvb_attach(tda826x_attach, fe0->dvb.frontend, 0x63,
@@ -1659,7 +1659,7 @@ static int dvb_init(struct saa7134_dev *dev)
                        if (configure_tda827x_fe(dev, &asus_tiger_3in1_config,
                                                        &tda827x_cfg_2) < 0)
                                goto detach_frontend;
-               } else {                /* satellite */
+               } else {                /* satellite */
                        fe0->dvb.frontend = dvb_attach(tda10086_attach,
                                                &flydvbs, &dev->i2c_adap);
                        if (fe0->dvb.frontend) {
index 1ae5d2d..052e101 100644 (file)
@@ -2043,14 +2043,14 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = {
 struct video_device saa7134_video_template = {
        .name                           = "saa7134-video",
        .fops                           = &video_fops,
-       .ioctl_ops                      = &video_ioctl_ops,
+       .ioctl_ops                      = &video_ioctl_ops,
        .tvnorms                        = SAA7134_NORMS,
 };
 
 struct video_device saa7134_radio_template = {
        .name                   = "saa7134-radio",
        .fops                   = &radio_fops,
-       .ioctl_ops              = &radio_ioctl_ops,
+       .ioctl_ops              = &radio_ioctl_ops,
 };
 
 static const struct v4l2_ctrl_ops saa7134_ctrl_ops = {
index 39c36e6..d99e937 100644 (file)
@@ -261,8 +261,8 @@ struct saa7134_card_ir {
 #define SAA7134_BOARD_SABRENT_TV_PCB05     115
 #define SAA7134_BOARD_10MOONSTVMASTER3     116
 #define SAA7134_BOARD_AVERMEDIA_SUPER_007  117
-#define SAA7134_BOARD_BEHOLD_401       118
-#define SAA7134_BOARD_BEHOLD_403       119
+#define SAA7134_BOARD_BEHOLD_401       118
+#define SAA7134_BOARD_BEHOLD_403       119
 #define SAA7134_BOARD_BEHOLD_403FM     120
 #define SAA7134_BOARD_BEHOLD_405       121
 #define SAA7134_BOARD_BEHOLD_405FM     122
@@ -581,7 +581,7 @@ struct saa7134_dev {
        /* config info */
        unsigned int               board;
        unsigned int               tuner_type;
-       unsigned int               radio_type;
+       unsigned int               radio_type;
        unsigned char              tuner_addr;
        unsigned char              radio_addr;
 
@@ -592,7 +592,7 @@ struct saa7134_dev {
        struct i2c_adapter         i2c_adap;
        struct i2c_client          i2c_client;
        unsigned char              eedata[256];
-       int                        has_rds;
+       int                        has_rds;
 
        /* video overlay */
        struct v4l2_framebuffer    ovbuf;
index 39357ed..5817d9c 100644 (file)
@@ -70,8 +70,8 @@ struct hexium
        struct video_device     video_dev;
        struct i2c_adapter      i2c_adapter;
 
-       int             cur_input;      /* current input */
-       v4l2_std_id     cur_std;        /* current standard */
+       int             cur_input;      /* current input */
+       v4l2_std_id     cur_std;        /* current standard */
 };
 
 /* Samsung KS0127B decoder default registers */
@@ -138,19 +138,19 @@ static struct hexium_data hexium_input_select[] = {
    are currently *not* supported*/
 static struct saa7146_standard hexium_standards[] = {
        {
-               .name   = "PAL",        .id     = V4L2_STD_PAL,
-               .v_offset       = 28,   .v_field        = 288,
-               .h_offset       = 1,    .h_pixels       = 680,
+               .name   = "PAL",        .id     = V4L2_STD_PAL,
+               .v_offset       = 28,   .v_field        = 288,
+               .h_offset       = 1,    .h_pixels       = 680,
                .v_max_out      = 576,  .h_max_out      = 768,
        }, {
-               .name   = "NTSC",       .id     = V4L2_STD_NTSC,
-               .v_offset       = 28,   .v_field        = 240,
-               .h_offset       = 1,    .h_pixels       = 640,
+               .name   = "NTSC",       .id     = V4L2_STD_NTSC,
+               .v_offset       = 28,   .v_field        = 240,
+               .h_offset       = 1,    .h_pixels       = 640,
                .v_max_out      = 480,  .h_max_out      = 640,
        }, {
-               .name   = "SECAM",      .id     = V4L2_STD_SECAM,
-               .v_offset       = 28,   .v_field        = 288,
-               .h_offset       = 1,    .h_pixels       = 720,
+               .name   = "SECAM",      .id     = V4L2_STD_SECAM,
+               .v_offset       = 28,   .v_field        = 288,
+               .h_offset       = 1,    .h_pixels       = 720,
                .v_max_out      = 576,  .h_max_out      = 768,
        }
 };
index 461e421..0a05176 100644 (file)
@@ -188,19 +188,19 @@ static struct {
 
 static struct saa7146_standard hexium_standards[] = {
        {
-               .name   = "PAL",        .id     = V4L2_STD_PAL,
-               .v_offset       = 16,   .v_field        = 288,
-               .h_offset       = 1,    .h_pixels       = 680,
+               .name   = "PAL",        .id     = V4L2_STD_PAL,
+               .v_offset       = 16,   .v_field        = 288,
+               .h_offset       = 1,    .h_pixels       = 680,
                .v_max_out      = 576,  .h_max_out      = 768,
        }, {
-               .name   = "NTSC",       .id     = V4L2_STD_NTSC,
-               .v_offset       = 16,   .v_field        = 240,
-               .h_offset       = 1,    .h_pixels       = 640,
+               .name   = "NTSC",       .id     = V4L2_STD_NTSC,
+               .v_offset       = 16,   .v_field        = 240,
+               .h_offset       = 1,    .h_pixels       = 640,
                .v_max_out      = 480,  .h_max_out      = 640,
        }, {
-               .name   = "SECAM",      .id     = V4L2_STD_SECAM,
-               .v_offset       = 16,   .v_field        = 288,
-               .h_offset       = 1,    .h_pixels       = 720,
+               .name   = "SECAM",      .id     = V4L2_STD_SECAM,
+               .v_offset       = 16,   .v_field        = 288,
+               .h_offset       = 1,    .h_pixels       = 720,
                .v_max_out      = 576,  .h_max_out      = 768,
        }
 };
index 2526fc0..6b5582b 100644 (file)
@@ -793,24 +793,24 @@ static int std_callback(struct saa7146_dev *dev, struct saa7146_standard *standa
 
 static struct saa7146_standard standard[] = {
        {
-               .name   = "PAL-BG",     .id     = V4L2_STD_PAL_BG,
-               .v_offset       = 0x17, .v_field        = 288,
-               .h_offset       = 0x14, .h_pixels       = 680,
+               .name   = "PAL-BG",     .id     = V4L2_STD_PAL_BG,
+               .v_offset       = 0x17, .v_field        = 288,
+               .h_offset       = 0x14, .h_pixels       = 680,
                .v_max_out      = 576,  .h_max_out      = 768,
        }, {
-               .name   = "PAL-I",      .id     = V4L2_STD_PAL_I,
-               .v_offset       = 0x17, .v_field        = 288,
-               .h_offset       = 0x14, .h_pixels       = 680,
+               .name   = "PAL-I",      .id     = V4L2_STD_PAL_I,
+               .v_offset       = 0x17, .v_field        = 288,
+               .h_offset       = 0x14, .h_pixels       = 680,
                .v_max_out      = 576,  .h_max_out      = 768,
        }, {
-               .name   = "NTSC",       .id     = V4L2_STD_NTSC,
-               .v_offset       = 0x16, .v_field        = 240,
-               .h_offset       = 0x06, .h_pixels       = 708,
+               .name   = "NTSC",       .id     = V4L2_STD_NTSC,
+               .v_offset       = 0x16, .v_field        = 240,
+               .h_offset       = 0x06, .h_pixels       = 708,
                .v_max_out      = 480,  .h_max_out      = 640,
        }, {
-               .name   = "SECAM",      .id     = V4L2_STD_SECAM,
-               .v_offset       = 0x14, .v_field        = 288,
-               .h_offset       = 0x14, .h_pixels       = 720,
+               .name   = "SECAM",      .id     = V4L2_STD_SECAM,
+               .v_offset       = 0x14, .v_field        = 288,
+               .h_offset       = 0x14, .h_pixels       = 720,
                .v_max_out      = 576,  .h_max_out      = 768,
        }
 };
index 9bfbb14..8606ef5 100644 (file)
@@ -52,7 +52,7 @@ extern int av7110_debug;
 enum {AV_PES_STREAM, PS_STREAM, TS_STREAM, PES_STREAM};
 
 enum av7110_video_mode {
-       AV7110_VIDEO_MODE_PAL   = 0,
+       AV7110_VIDEO_MODE_PAL   = 0,
        AV7110_VIDEO_MODE_NTSC  = 1
 };
 
index 6b0e09c..abc98f1 100644 (file)
@@ -1181,14 +1181,14 @@ static u8 read_pwm(struct budget_av *budget_av)
 #define SUBID_DVBS_KNC1_PLUS           0x0011
 #define SUBID_DVBS_TYPHOON             0x4f56
 #define SUBID_DVBS_CINERGY1200         0x1154
-#define SUBID_DVBS_CYNERGY1200N        0x1155
+#define SUBID_DVBS_CYNERGY1200N                0x1155
 #define SUBID_DVBS_TV_STAR             0x0014
 #define SUBID_DVBS_TV_STAR_PLUS_X4     0x0015
 #define SUBID_DVBS_TV_STAR_CI          0x0016
 #define SUBID_DVBS2_KNC1               0x0018
 #define SUBID_DVBS2_KNC1_OEM           0x0019
-#define SUBID_DVBS_EASYWATCH_1         0x001a
-#define SUBID_DVBS_EASYWATCH_2         0x001b
+#define SUBID_DVBS_EASYWATCH_1         0x001a
+#define SUBID_DVBS_EASYWATCH_2         0x001b
 #define SUBID_DVBS2_EASYWATCH          0x001d
 #define SUBID_DVBS_EASYWATCH           0x001e
 
index f67ed11..ec8f925 100644 (file)
@@ -1050,70 +1050,70 @@ static const struct stb0899_s1_reg tt3200_stb0899_s1_init_1[] = {
 
        { STB0899_DEV_ID                , 0x81 },
        { STB0899_DISCNTRL1             , 0x32 },
-       { STB0899_DISCNTRL2             , 0x80 },
-       { STB0899_DISRX_ST0             , 0x04 },
-       { STB0899_DISRX_ST1             , 0x00 },
-       { STB0899_DISPARITY             , 0x00 },
+       { STB0899_DISCNTRL2             , 0x80 },
+       { STB0899_DISRX_ST0             , 0x04 },
+       { STB0899_DISRX_ST1             , 0x00 },
+       { STB0899_DISPARITY             , 0x00 },
        { STB0899_DISSTATUS             , 0x20 },
-       { STB0899_DISF22                , 0x8c },
-       { STB0899_DISF22RX              , 0x9a },
+       { STB0899_DISF22                , 0x8c },
+       { STB0899_DISF22RX              , 0x9a },
        { STB0899_SYSREG                , 0x0b },
-       { STB0899_ACRPRESC              , 0x11 },
-       { STB0899_ACRDIV1               , 0x0a },
-       { STB0899_ACRDIV2               , 0x05 },
-       { STB0899_DACR1                 , 0x00 },
-       { STB0899_DACR2                 , 0x00 },
-       { STB0899_OUTCFG                , 0x00 },
-       { STB0899_MODECFG               , 0x00 },
+       { STB0899_ACRPRESC              , 0x11 },
+       { STB0899_ACRDIV1               , 0x0a },
+       { STB0899_ACRDIV2               , 0x05 },
+       { STB0899_DACR1                 , 0x00 },
+       { STB0899_DACR2                 , 0x00 },
+       { STB0899_OUTCFG                , 0x00 },
+       { STB0899_MODECFG               , 0x00 },
        { STB0899_IRQSTATUS_3           , 0x30 },
        { STB0899_IRQSTATUS_2           , 0x00 },
        { STB0899_IRQSTATUS_1           , 0x00 },
        { STB0899_IRQSTATUS_0           , 0x00 },
-       { STB0899_IRQMSK_3              , 0xf3 },
-       { STB0899_IRQMSK_2              , 0xfc },
-       { STB0899_IRQMSK_1              , 0xff },
+       { STB0899_IRQMSK_3              , 0xf3 },
+       { STB0899_IRQMSK_2              , 0xfc },
+       { STB0899_IRQMSK_1              , 0xff },
        { STB0899_IRQMSK_0              , 0xff },
        { STB0899_IRQCFG                , 0x00 },
-       { STB0899_I2CCFG                , 0x88 },
-       { STB0899_I2CRPT                , 0x48 }, /* 12k Pullup, Repeater=16, Stop=disabled */
+       { STB0899_I2CCFG                , 0x88 },
+       { STB0899_I2CRPT                , 0x48 }, /* 12k Pullup, Repeater=16, Stop=disabled */
        { STB0899_IOPVALUE5             , 0x00 },
        { STB0899_IOPVALUE4             , 0x20 },
        { STB0899_IOPVALUE3             , 0xc9 },
        { STB0899_IOPVALUE2             , 0x90 },
        { STB0899_IOPVALUE1             , 0x40 },
        { STB0899_IOPVALUE0             , 0x00 },
-       { STB0899_GPIO00CFG             , 0x82 },
-       { STB0899_GPIO01CFG             , 0x82 },
-       { STB0899_GPIO02CFG             , 0x82 },
-       { STB0899_GPIO03CFG             , 0x82 },
-       { STB0899_GPIO04CFG             , 0x82 },
-       { STB0899_GPIO05CFG             , 0x82 },
-       { STB0899_GPIO06CFG             , 0x82 },
-       { STB0899_GPIO07CFG             , 0x82 },
-       { STB0899_GPIO08CFG             , 0x82 },
-       { STB0899_GPIO09CFG             , 0x82 },
-       { STB0899_GPIO10CFG             , 0x82 },
-       { STB0899_GPIO11CFG             , 0x82 },
-       { STB0899_GPIO12CFG             , 0x82 },
-       { STB0899_GPIO13CFG             , 0x82 },
-       { STB0899_GPIO14CFG             , 0x82 },
-       { STB0899_GPIO15CFG             , 0x82 },
-       { STB0899_GPIO16CFG             , 0x82 },
-       { STB0899_GPIO17CFG             , 0x82 },
-       { STB0899_GPIO18CFG             , 0x82 },
-       { STB0899_GPIO19CFG             , 0x82 },
-       { STB0899_GPIO20CFG             , 0x82 },
-       { STB0899_SDATCFG               , 0xb8 },
-       { STB0899_SCLTCFG               , 0xba },
-       { STB0899_AGCRFCFG              , 0x1c }, /* 0x11 */
-       { STB0899_GPIO22                , 0x82 }, /* AGCBB2CFG */
-       { STB0899_GPIO21                , 0x91 }, /* AGCBB1CFG */
-       { STB0899_DIRCLKCFG             , 0x82 },
-       { STB0899_CLKOUT27CFG           , 0x7e },
-       { STB0899_STDBYCFG              , 0x82 },
-       { STB0899_CS0CFG                , 0x82 },
-       { STB0899_CS1CFG                , 0x82 },
-       { STB0899_DISEQCOCFG            , 0x20 },
+       { STB0899_GPIO00CFG             , 0x82 },
+       { STB0899_GPIO01CFG             , 0x82 },
+       { STB0899_GPIO02CFG             , 0x82 },
+       { STB0899_GPIO03CFG             , 0x82 },
+       { STB0899_GPIO04CFG             , 0x82 },
+       { STB0899_GPIO05CFG             , 0x82 },
+       { STB0899_GPIO06CFG             , 0x82 },
+       { STB0899_GPIO07CFG             , 0x82 },
+       { STB0899_GPIO08CFG             , 0x82 },
+       { STB0899_GPIO09CFG             , 0x82 },
+       { STB0899_GPIO10CFG             , 0x82 },
+       { STB0899_GPIO11CFG             , 0x82 },
+       { STB0899_GPIO12CFG             , 0x82 },
+       { STB0899_GPIO13CFG             , 0x82 },
+       { STB0899_GPIO14CFG             , 0x82 },
+       { STB0899_GPIO15CFG             , 0x82 },
+       { STB0899_GPIO16CFG             , 0x82 },
+       { STB0899_GPIO17CFG             , 0x82 },
+       { STB0899_GPIO18CFG             , 0x82 },
+       { STB0899_GPIO19CFG             , 0x82 },
+       { STB0899_GPIO20CFG             , 0x82 },
+       { STB0899_SDATCFG               , 0xb8 },
+       { STB0899_SCLTCFG               , 0xba },
+       { STB0899_AGCRFCFG              , 0x1c }, /* 0x11 */
+       { STB0899_GPIO22                , 0x82 }, /* AGCBB2CFG */
+       { STB0899_GPIO21                , 0x91 }, /* AGCBB1CFG */
+       { STB0899_DIRCLKCFG             , 0x82 },
+       { STB0899_CLKOUT27CFG           , 0x7e },
+       { STB0899_STDBYCFG              , 0x82 },
+       { STB0899_CS0CFG                , 0x82 },
+       { STB0899_CS1CFG                , 0x82 },
+       { STB0899_DISEQCOCFG            , 0x20 },
        { STB0899_GPIO32CFG             , 0x82 },
        { STB0899_GPIO33CFG             , 0x82 },
        { STB0899_GPIO34CFG             , 0x82 },
@@ -1122,35 +1122,35 @@ static const struct stb0899_s1_reg tt3200_stb0899_s1_init_1[] = {
        { STB0899_GPIO37CFG             , 0x82 },
        { STB0899_GPIO38CFG             , 0x82 },
        { STB0899_GPIO39CFG             , 0x82 },
-       { STB0899_NCOARSE               , 0x15 }, /* 0x15 = 27 Mhz Clock, F/3 = 198MHz, F/6 = 99MHz */
-       { STB0899_SYNTCTRL              , 0x02 }, /* 0x00 = CLK from CLKI, 0x02 = CLK from XTALI */
-       { STB0899_FILTCTRL              , 0x00 },
-       { STB0899_SYSCTRL               , 0x00 },
-       { STB0899_STOPCLK1              , 0x20 },
-       { STB0899_STOPCLK2              , 0x00 },
+       { STB0899_NCOARSE               , 0x15 }, /* 0x15 = 27 Mhz Clock, F/3 = 198MHz, F/6 = 99MHz */
+       { STB0899_SYNTCTRL              , 0x02 }, /* 0x00 = CLK from CLKI, 0x02 = CLK from XTALI */
+       { STB0899_FILTCTRL              , 0x00 },
+       { STB0899_SYSCTRL               , 0x00 },
+       { STB0899_STOPCLK1              , 0x20 },
+       { STB0899_STOPCLK2              , 0x00 },
        { STB0899_INTBUFSTATUS          , 0x00 },
-       { STB0899_INTBUFCTRL            , 0x0a },
+       { STB0899_INTBUFCTRL            , 0x0a },
        { 0xffff                        , 0xff },
 };
 
 static const struct stb0899_s1_reg tt3200_stb0899_s1_init_3[] = {
-       { STB0899_DEMOD                 , 0x00 },
-       { STB0899_RCOMPC                , 0xc9 },
-       { STB0899_AGC1CN                , 0x41 },
-       { STB0899_AGC1REF               , 0x10 },
+       { STB0899_DEMOD                 , 0x00 },
+       { STB0899_RCOMPC                , 0xc9 },
+       { STB0899_AGC1CN                , 0x41 },
+       { STB0899_AGC1REF               , 0x10 },
        { STB0899_RTC                   , 0x7a },
-       { STB0899_TMGCFG                , 0x4e },
-       { STB0899_AGC2REF               , 0x34 },
-       { STB0899_TLSR                  , 0x84 },
-       { STB0899_CFD                   , 0xc7 },
+       { STB0899_TMGCFG                , 0x4e },
+       { STB0899_AGC2REF               , 0x34 },
+       { STB0899_TLSR                  , 0x84 },
+       { STB0899_CFD                   , 0xc7 },
        { STB0899_ACLC                  , 0x87 },
-       { STB0899_BCLC                  , 0x94 },
-       { STB0899_EQON                  , 0x41 },
-       { STB0899_LDT                   , 0xdd },
-       { STB0899_LDT2                  , 0xc9 },
-       { STB0899_EQUALREF              , 0xb4 },
-       { STB0899_TMGRAMP               , 0x10 },
-       { STB0899_TMGTHD                , 0x30 },
+       { STB0899_BCLC                  , 0x94 },
+       { STB0899_EQON                  , 0x41 },
+       { STB0899_LDT                   , 0xdd },
+       { STB0899_LDT2                  , 0xc9 },
+       { STB0899_EQUALREF              , 0xb4 },
+       { STB0899_TMGRAMP               , 0x10 },
+       { STB0899_TMGTHD                , 0x30 },
        { STB0899_IDCCOMP               , 0xfb },
        { STB0899_QDCCOMP               , 0x03 },
        { STB0899_POWERI                , 0x3b },
@@ -1169,12 +1169,12 @@ static const struct stb0899_s1_reg tt3200_stb0899_s1_init_3[] = {
        { STB0899_NIRL                  , 0x05 },
        { STB0899_ISYMB                 , 0x17 },
        { STB0899_QSYMB                 , 0xfa },
-       { STB0899_SFRH                  , 0x2f },
-       { STB0899_SFRM                  , 0x68 },
-       { STB0899_SFRL                  , 0x40 },
-       { STB0899_SFRUPH                , 0x2f },
-       { STB0899_SFRUPM                , 0x68 },
-       { STB0899_SFRUPL                , 0x40 },
+       { STB0899_SFRH                  , 0x2f },
+       { STB0899_SFRM                  , 0x68 },
+       { STB0899_SFRL                  , 0x40 },
+       { STB0899_SFRUPH                , 0x2f },
+       { STB0899_SFRUPM                , 0x68 },
+       { STB0899_SFRUPL                , 0x40 },
        { STB0899_EQUAI1                , 0xfd },
        { STB0899_EQUAQ1                , 0x04 },
        { STB0899_EQUAI2                , 0x0f },
@@ -1186,7 +1186,7 @@ static const struct stb0899_s1_reg tt3200_stb0899_s1_init_3[] = {
        { STB0899_EQUAI5                , 0xbd },
        { STB0899_EQUAQ5                , 0xf7 },
        { STB0899_DSTATUS2              , 0x00 },
-       { STB0899_VSTATUS               , 0x00 },
+       { STB0899_VSTATUS               , 0x00 },
        { STB0899_VERROR                , 0xff },
        { STB0899_IQSWAP                , 0x2a },
        { STB0899_ECNT1M                , 0x00 },
@@ -1195,26 +1195,26 @@ static const struct stb0899_s1_reg tt3200_stb0899_s1_init_3[] = {
        { STB0899_ECNT2L                , 0x00 },
        { STB0899_ECNT3M                , 0x00 },
        { STB0899_ECNT3L                , 0x00 },
-       { STB0899_FECAUTO1              , 0x06 },
+       { STB0899_FECAUTO1              , 0x06 },
        { STB0899_FECM                  , 0x01 },
-       { STB0899_VTH12                 , 0xf0 },
-       { STB0899_VTH23                 , 0xa0 },
+       { STB0899_VTH12                 , 0xf0 },
+       { STB0899_VTH23                 , 0xa0 },
        { STB0899_VTH34                 , 0x78 },
-       { STB0899_VTH56                 , 0x4e },
-       { STB0899_VTH67                 , 0x48 },
-       { STB0899_VTH78                 , 0x38 },
-       { STB0899_PRVIT                 , 0xff },
-       { STB0899_VITSYNC               , 0x19 },
-       { STB0899_RSULC                 , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */
-       { STB0899_TSULC                 , 0x42 },
-       { STB0899_RSLLC                 , 0x40 },
+       { STB0899_VTH56                 , 0x4e },
+       { STB0899_VTH67                 , 0x48 },
+       { STB0899_VTH78                 , 0x38 },
+       { STB0899_PRVIT                 , 0xff },
+       { STB0899_VITSYNC               , 0x19 },
+       { STB0899_RSULC                 , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */
+       { STB0899_TSULC                 , 0x42 },
+       { STB0899_RSLLC                 , 0x40 },
        { STB0899_TSLPL                 , 0x12 },
-       { STB0899_TSCFGH                , 0x0c },
-       { STB0899_TSCFGM                , 0x00 },
-       { STB0899_TSCFGL                , 0x0c },
+       { STB0899_TSCFGH                , 0x0c },
+       { STB0899_TSCFGM                , 0x00 },
+       { STB0899_TSCFGL                , 0x0c },
        { STB0899_TSOUT                 , 0x4d }, /* 0x0d for CAM */
-       { STB0899_RSSYNCDEL             , 0x00 },
-       { STB0899_TSINHDELH             , 0x02 },
+       { STB0899_RSSYNCDEL             , 0x00 },
+       { STB0899_TSINHDELH             , 0x02 },
        { STB0899_TSINHDELM             , 0x00 },
        { STB0899_TSINHDELL             , 0x00 },
        { STB0899_TSLLSTKM              , 0x00 },
@@ -1225,18 +1225,18 @@ static const struct stb0899_s1_reg tt3200_stb0899_s1_init_3[] = {
        { STB0899_PCKLENLL              , 0xcc },
        { STB0899_RSPCKLEN              , 0xcc },
        { STB0899_TSSTATUS              , 0x80 },
-       { STB0899_ERRCTRL1              , 0xb6 },
-       { STB0899_ERRCTRL2              , 0x96 },
-       { STB0899_ERRCTRL3              , 0x89 },
+       { STB0899_ERRCTRL1              , 0xb6 },
+       { STB0899_ERRCTRL2              , 0x96 },
+       { STB0899_ERRCTRL3              , 0x89 },
        { STB0899_DMONMSK1              , 0x27 },
        { STB0899_DMONMSK0              , 0x03 },
-       { STB0899_DEMAPVIT              , 0x5c },
+       { STB0899_DEMAPVIT              , 0x5c },
        { STB0899_PLPARM                , 0x1f },
-       { STB0899_PDELCTRL              , 0x48 },
-       { STB0899_PDELCTRL2             , 0x00 },
-       { STB0899_BBHCTRL1              , 0x00 },
-       { STB0899_BBHCTRL2              , 0x00 },
-       { STB0899_HYSTTHRESH            , 0x77 },
+       { STB0899_PDELCTRL              , 0x48 },
+       { STB0899_PDELCTRL2             , 0x00 },
+       { STB0899_BBHCTRL1              , 0x00 },
+       { STB0899_BBHCTRL2              , 0x00 },
+       { STB0899_HYSTTHRESH            , 0x77 },
        { STB0899_MATCSTM               , 0x00 },
        { STB0899_MATCSTL               , 0x00 },
        { STB0899_UPLCSTM               , 0x00 },
@@ -1275,7 +1275,7 @@ static struct stb0899_config tt3200_config = {
 
        .postproc               = NULL,
 
-       .demod_address          = 0x68,
+       .demod_address          = 0x68,
 
        .xtal_freq              = 27000000,
        .inversion              = IQ_SWAP_ON,
index d078400..10fefdf 100644 (file)
@@ -2792,21 +2792,21 @@ zoran_mmap (struct file           *file,
 }
 
 static const struct v4l2_ioctl_ops zoran_ioctl_ops = {
-       .vidioc_querycap                    = zoran_querycap,
+       .vidioc_querycap                    = zoran_querycap,
        .vidioc_s_selection                 = zoran_s_selection,
        .vidioc_g_selection                 = zoran_g_selection,
-       .vidioc_enum_input                  = zoran_enum_input,
-       .vidioc_g_input                     = zoran_g_input,
-       .vidioc_s_input                     = zoran_s_input,
-       .vidioc_enum_output                 = zoran_enum_output,
-       .vidioc_g_output                    = zoran_g_output,
-       .vidioc_s_output                    = zoran_s_output,
+       .vidioc_enum_input                  = zoran_enum_input,
+       .vidioc_g_input                     = zoran_g_input,
+       .vidioc_s_input                     = zoran_s_input,
+       .vidioc_enum_output                 = zoran_enum_output,
+       .vidioc_g_output                    = zoran_g_output,
+       .vidioc_s_output                    = zoran_s_output,
        .vidioc_g_fbuf                      = zoran_g_fbuf,
        .vidioc_s_fbuf                      = zoran_s_fbuf,
-       .vidioc_g_std                       = zoran_g_std,
-       .vidioc_s_std                       = zoran_s_std,
-       .vidioc_g_jpegcomp                  = zoran_g_jpegcomp,
-       .vidioc_s_jpegcomp                  = zoran_s_jpegcomp,
+       .vidioc_g_std                       = zoran_g_std,
+       .vidioc_s_std                       = zoran_s_std,
+       .vidioc_g_jpegcomp                  = zoran_g_jpegcomp,
+       .vidioc_s_jpegcomp                  = zoran_s_jpegcomp,
        .vidioc_overlay                     = zoran_overlay,
        .vidioc_reqbufs                     = zoran_reqbufs,
        .vidioc_querybuf                    = zoran_querybuf,
@@ -2814,18 +2814,18 @@ static const struct v4l2_ioctl_ops zoran_ioctl_ops = {
        .vidioc_dqbuf                       = zoran_dqbuf,
        .vidioc_streamon                    = zoran_streamon,
        .vidioc_streamoff                   = zoran_streamoff,
-       .vidioc_enum_fmt_vid_cap            = zoran_enum_fmt_vid_cap,
-       .vidioc_enum_fmt_vid_out            = zoran_enum_fmt_vid_out,
-       .vidioc_enum_fmt_vid_overlay        = zoran_enum_fmt_vid_overlay,
-       .vidioc_g_fmt_vid_cap               = zoran_g_fmt_vid_cap,
+       .vidioc_enum_fmt_vid_cap            = zoran_enum_fmt_vid_cap,
+       .vidioc_enum_fmt_vid_out            = zoran_enum_fmt_vid_out,
+       .vidioc_enum_fmt_vid_overlay        = zoran_enum_fmt_vid_overlay,
+       .vidioc_g_fmt_vid_cap               = zoran_g_fmt_vid_cap,
        .vidioc_g_fmt_vid_out               = zoran_g_fmt_vid_out,
        .vidioc_g_fmt_vid_overlay           = zoran_g_fmt_vid_overlay,
-       .vidioc_s_fmt_vid_cap               = zoran_s_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap               = zoran_s_fmt_vid_cap,
        .vidioc_s_fmt_vid_out               = zoran_s_fmt_vid_out,
        .vidioc_s_fmt_vid_overlay           = zoran_s_fmt_vid_overlay,
-       .vidioc_try_fmt_vid_cap             = zoran_try_fmt_vid_cap,
-       .vidioc_try_fmt_vid_out             = zoran_try_fmt_vid_out,
-       .vidioc_try_fmt_vid_overlay         = zoran_try_fmt_vid_overlay,
+       .vidioc_try_fmt_vid_cap             = zoran_try_fmt_vid_cap,
+       .vidioc_try_fmt_vid_out             = zoran_try_fmt_vid_out,
+       .vidioc_try_fmt_vid_overlay         = zoran_try_fmt_vid_overlay,
        .vidioc_subscribe_event             = v4l2_ctrl_subscribe_event,
        .vidioc_unsubscribe_event           = v4l2_event_unsubscribe,
 };
index c9ffef1..c8acb21 100644 (file)
 #define ZR36057_ICR_IntPinEn            (1<<24)
 
 #define ZR36057_I2CBR           0x044  /* I2C Bus Register */
-#define ZR36057_I2CBR_SDA              (1<<1)
-#define ZR36057_I2CBR_SCL              (1<<0)
+#define ZR36057_I2CBR_SDA              (1<<1)
+#define ZR36057_I2CBR_SCL              (1<<0)
 
 #define ZR36057_JMC             0x100  /* JPEG Mode and Control */
 #define ZR36057_JMC_JPG                 (1 << 31)
index 347fba8..7f30804 100644 (file)
@@ -23,7 +23,7 @@ obj-$(CONFIG_VIDEO_TI_VPE)            += ti-vpe/
 obj-$(CONFIG_VIDEO_TI_CAL)             += ti-vpe/
 
 obj-$(CONFIG_VIDEO_MX2_EMMAPRP)                += mx2_emmaprp.o
-obj-$(CONFIG_VIDEO_CODA)               += coda/
+obj-$(CONFIG_VIDEO_CODA)               += coda/
 
 obj-$(CONFIG_VIDEO_SH_VEU)             += sh_veu.o
 
@@ -33,8 +33,8 @@ obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE)       += m2m-deinterlace.o
 
 obj-$(CONFIG_VIDEO_MUX)                        += video-mux.o
 
-obj-$(CONFIG_VIDEO_S3C_CAMIF)          += s3c-camif/
-obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS)         += exynos4-is/
+obj-$(CONFIG_VIDEO_S3C_CAMIF)          += s3c-camif/
+obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS) += exynos4-is/
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG)   += s5p-jpeg/
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC)    += s5p-mfc/
 
@@ -45,13 +45,13 @@ obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC)      += exynos-gsc/
 obj-$(CONFIG_VIDEO_STI_BDISP)          += sti/bdisp/
 obj-$(CONFIG_VIDEO_STI_HVA)            += sti/hva/
 obj-$(CONFIG_DVB_C8SECTPFE)            += sti/c8sectpfe/
-obj-$(CONFIG_VIDEO_STI_HDMI_CEC)       += sti/cec/
+obj-$(CONFIG_VIDEO_STI_HDMI_CEC)       += sti/cec/
 
 obj-$(CONFIG_VIDEO_STI_DELTA)          += sti/delta/
 
 obj-$(CONFIG_VIDEO_TEGRA_HDMI_CEC)     += tegra-cec/
 
-obj-y                                  += stm32/
+obj-y                                  += stm32/
 
 obj-y                                   += blackfin/
 
@@ -62,9 +62,9 @@ obj-$(CONFIG_VIDEO_SH_VOU)            += sh_vou.o
 obj-$(CONFIG_SOC_CAMERA)               += soc_camera/
 
 obj-$(CONFIG_VIDEO_RCAR_DRIF)          += rcar_drif.o
-obj-$(CONFIG_VIDEO_RENESAS_FCP)        += rcar-fcp.o
+obj-$(CONFIG_VIDEO_RENESAS_FCP)                += rcar-fcp.o
 obj-$(CONFIG_VIDEO_RENESAS_FDP1)       += rcar_fdp1.o
-obj-$(CONFIG_VIDEO_RENESAS_JPU)        += rcar_jpu.o
+obj-$(CONFIG_VIDEO_RENESAS_JPU)                += rcar_jpu.o
 obj-$(CONFIG_VIDEO_RENESAS_VSP1)       += vsp1/
 
 obj-$(CONFIG_VIDEO_ROCKCHIP_RGA)       += rockchip/rga/
index 1351374..1e865fe 100644 (file)
@@ -56,7 +56,7 @@
 
 #define VERSION        "0.0.5"
 
-#define ar_inl(addr)           inl((unsigned long)(addr))
+#define ar_inl(addr)           inl((unsigned long)(addr))
 #define ar_outl(val, addr)     outl((unsigned long)(val), (unsigned long)(addr))
 
 extern struct cpuinfo_m32r     boot_cpu_data;
@@ -210,8 +210,8 @@ static void init_iic(void)
         * ICU Setting (iic)
         */
        /* I2C Setting */
-       ar_outl(0x0, PLDI2CCR);         /* I2CCR Disable                   */
-       ar_outl(0x0300, PLDI2CMOD);     /* I2CMOD ACK/8b-data/7b-addr/auto */
+       ar_outl(0x0, PLDI2CCR);         /* I2CCR Disable                   */
+       ar_outl(0x0300, PLDI2CMOD);     /* I2CMOD ACK/8b-data/7b-addr/auto */
        ar_outl(0x1, PLDI2CACK);        /* I2CACK ACK                      */
 
        /* I2C CLK */
@@ -222,7 +222,7 @@ static void init_iic(void)
                ar_outl(244, PLDI2CFREQ);       /* BCLK = 50MHz */
        else
                ar_outl(244, PLDI2CFREQ);       /* default: BCLK = 50MHz */
-       ar_outl(0x1, PLDI2CCR);         /* I2CCR Enable */
+       ar_outl(0x1, PLDI2CCR);         /* I2CCR Enable */
 }
 
 /**************************************************************************
@@ -300,9 +300,9 @@ static ssize_t ar_read(struct file *file, char *buf, size_t count, loff_t *ppos)
        ar_outl(ARDATA32, M32R_DMA0CSA_PORTL);
        ar_outl(ARDATA32, M32R_DMA0RSA_PORTL);
        ar_outl(ar->line_buff, M32R_DMA0CDA_PORTL);     /* destination addr. */
-       ar_outl(ar->line_buff, M32R_DMA0RDA_PORTL);     /* reload address */
-       ar_outl(ar->line_bytes, M32R_DMA0CBCUT_PORTL);  /* byte count (bytes) */
-       ar_outl(ar->line_bytes, M32R_DMA0RBCUT_PORTL);  /* reload count (bytes) */
+       ar_outl(ar->line_buff, M32R_DMA0RDA_PORTL);     /* reload address */
+       ar_outl(ar->line_bytes, M32R_DMA0CBCUT_PORTL);  /* byte count (bytes) */
+       ar_outl(ar->line_bytes, M32R_DMA0RBCUT_PORTL);  /* reload count (bytes) */
 
        /*
         * Okay, kick AR LSI to invoke an interrupt
@@ -364,7 +364,7 @@ static ssize_t ar_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 
        /*
         * convert YUV422 to YUV422P
-        *      +--------------------+
+        *      +--------------------+
         *      |  Y0,Y1,...         |
         *      |  ..............Yn  |
         *      +--------------------+
@@ -533,9 +533,9 @@ static void ar_interrupt(int irq, void *dev)
        line_count = ar_inl(ARVHCOUNT);                 /* line number */
        if (ar->mode == AR_MODE_INTERLACE && ar->size == AR_SIZE_VGA) {
                /* operations for interlace mode */
-               if (line_count < (AR_HEIGHT_VGA / 2))   /* even line */
+               if (line_count < (AR_HEIGHT_VGA / 2))   /* even line */
                        line_number = (line_count << 1);
-               else                                    /* odd line */
+               else                                    /* odd line */
                        line_number =
                        (((line_count - (AR_HEIGHT_VGA / 2)) << 1) + 1);
        } else {
@@ -568,7 +568,7 @@ static void ar_interrupt(int irq, void *dev)
                 * if captured all line of a frame, disable AR interrupt
                 * and wake a process up.
                 */
-               if (line_number == (ar->height - 1)) {  /* end  of line */
+               if (line_number == (ar->height - 1)) {  /* end  of line */
 
                        ar->start_capture = 0;
 
@@ -718,14 +718,14 @@ static const struct v4l2_file_operations ar_fops = {
 };
 
 static const struct v4l2_ioctl_ops ar_ioctl_ops = {
-       .vidioc_querycap                    = ar_querycap,
-       .vidioc_g_input                     = ar_g_input,
-       .vidioc_s_input                     = ar_s_input,
-       .vidioc_enum_input                  = ar_enum_input,
-       .vidioc_enum_fmt_vid_cap            = ar_enum_fmt_vid_cap,
-       .vidioc_g_fmt_vid_cap               = ar_g_fmt_vid_cap,
-       .vidioc_s_fmt_vid_cap               = ar_s_fmt_vid_cap,
-       .vidioc_try_fmt_vid_cap             = ar_try_fmt_vid_cap,
+       .vidioc_querycap                    = ar_querycap,
+       .vidioc_g_input                     = ar_g_input,
+       .vidioc_s_input                     = ar_s_input,
+       .vidioc_enum_input                  = ar_enum_input,
+       .vidioc_enum_fmt_vid_cap            = ar_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap               = ar_g_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap               = ar_s_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap             = ar_try_fmt_vid_cap,
 };
 
 #define ALIGN4(x)      ((((int)(x)) & 0x3) == 0)
@@ -776,9 +776,9 @@ static int __init ar_init(void)
        video_set_drvdata(&ar->vdev, ar);
 
        if (vga) {
-               ar->width       = AR_WIDTH_VGA;
-               ar->height      = AR_HEIGHT_VGA;
-               ar->size        = AR_SIZE_VGA;
+               ar->width       = AR_WIDTH_VGA;
+               ar->height      = AR_HEIGHT_VGA;
+               ar->size        = AR_SIZE_VGA;
                ar->frame_bytes = AR_FRAME_BYTES_VGA;
                ar->line_bytes  = AR_LINE_BYTES_VGA;
                if (vga_interlace)
@@ -786,9 +786,9 @@ static int __init ar_init(void)
                else
                        ar->mode = AR_MODE_NORMAL;
        } else {
-               ar->width       = AR_WIDTH_QVGA;
-               ar->height      = AR_HEIGHT_QVGA;
-               ar->size        = AR_SIZE_QVGA;
+               ar->width       = AR_WIDTH_QVGA;
+               ar->height      = AR_HEIGHT_QVGA;
+               ar->size        = AR_SIZE_QVGA;
                ar->frame_bytes = AR_FRAME_BYTES_QVGA;
                ar->line_bytes  = AR_LINE_BYTES_QVGA;
                ar->mode        = AR_MODE_INTERLACE;
index 35e620c..3b650b8 100644 (file)
 #define                CODA9_MODE_ENCODE_H264          8
 #define                CODA9_MODE_ENCODE_MP4           11
 #define                CODA9_MODE_ENCODE_MJPG          13
-#define        CODA_MODE_INVALID               0xffff
+#define                CODA_MODE_INVALID               0xffff
 #define CODA_REG_BIT_INT_ENABLE                0x170
 #define                CODA_INT_INTERRUPT_ENABLE       (1 << 3)
 #define CODA_REG_BIT_INT_REASON                        0x174
index a753ce2..20ba390 100644 (file)
 #define CCDC_RAW_IP_MODE                       0
 #define CCDC_VDHDOUT_INPUT                     0
 #define CCDC_YCINSWP_RAW                       (0 << 4)
-#define CCDC_EXWEN_DISABLE                     0
+#define CCDC_EXWEN_DISABLE                     0
 #define CCDC_DATAPOL_NORMAL                    0
 #define CCDC_CCDCFG_FIDMD_LATCH_VSYNC          0
 #define CCDC_CCDCFG_FIDMD_NO_LATCH_VSYNC       (1 << 6)
 #define CCDC_ALAW_GAMMA_WD_MASK                        7
 #define CCDC_REC656IF_BT656_EN                 3
 
-#define CCDC_FMTCFG_FMTMODE_MASK               3
+#define CCDC_FMTCFG_FMTMODE_MASK               3
 #define CCDC_FMTCFG_FMTMODE_SHIFT              1
 #define CCDC_FMTCFG_LNUM_MASK                  3
 #define CCDC_FMTCFG_LNUM_SHIFT                 4
 #define CCDC_LATCH_ON_VSYNC_DISABLE            (1 << 15)
 #define CCDC_LATCH_ON_VSYNC_ENABLE             (0 << 15)
 #define CCDC_FPC_ENABLE                                (1 << 15)
-#define CCDC_FPC_FPC_NUM_MASK                  0x7FFF
+#define CCDC_FPC_FPC_NUM_MASK                  0x7FFF
 #define CCDC_DATA_PACK_ENABLE                  (1 << 11)
 #define CCDC_FMT_HORZ_FMTLNH_MASK              0x1FFF
 #define CCDC_FMT_HORZ_FMTSPH_MASK              0x1FFF
index bece0bd..ffd89c7 100644 (file)
@@ -97,7 +97,7 @@
 #define CCDC_LATCH_ON_VSYNC_DISABLE            (1 << 15)
 #define CCDC_FPC_ENABLE                                (1 << 15)
 #define CCDC_FPC_DISABLE                       0
-#define CCDC_FPC_FPC_NUM_MASK                  0x7FFF
+#define CCDC_FPC_FPC_NUM_MASK                  0x7FFF
 #define CCDC_DATA_PACK_ENABLE                  (1 << 11)
 #define CCDC_FMTCFG_VPIN_MASK                  7
 #define CCDC_FMTCFG_VPIN_SHIFT                 12
 #define CCDC_REC656IF_BT656_EN                 3
 #define CCDC_SYN_MODE_VD_POL_NEGATIVE          (1 << 2)
 #define CCDC_CCDCFG_Y8POS_SHIFT                        11
-#define CCDC_CCDCFG_BW656_10BIT                (1 << 5)
+#define CCDC_CCDCFG_BW656_10BIT                        (1 << 5)
 #define CCDC_SDOFST_FIELD_INTERLEAVED          0x249
 #define CCDC_NO_CULLING                                0xffff00ff
 #endif
index a3564ab..97d3ba1 100644 (file)
@@ -35,7 +35,7 @@
 #define LINCFG0                                        0x44
 #define LINCFG1                                        0x48
 #define CCOLP                                  0x4c
-#define CRGAIN                                         0x50
+#define CRGAIN                                 0x50
 #define CGRGAIN                                        0x54
 #define CGBGAIN                                        0x58
 #define CBGAIN                                 0x5c
@@ -46,7 +46,7 @@
 #define VDINT0                                 0x70
 #define VDINT1                                 0x74
 #define VDINT2                                 0x78
-#define MISC                                   0x7c
+#define MISC                                   0x7c
 #define CGAMMAWD                               0x80
 #define REC656IF                               0x84
 #define CCDCFG                                 0x88
 #define ISIF_VD_POL_SHIFT                      2
 #define ISIF_DATAPOL_NORMAL                    0
 #define ISIF_DATAPOL_SHIFT                     6
-#define ISIF_EXWEN_DISABLE                     0
+#define ISIF_EXWEN_DISABLE                     0
 #define ISIF_EXWEN_SHIFT                       5
 #define ISIF_FRM_FMT_SHIFT                     7
 #define ISIF_DATASFT_SHIFT                     8
index 498f69b..7d08f0f 100644 (file)
@@ -1794,7 +1794,7 @@ static int vpfe_probe(struct platform_device *pdev)
        vfd->fops               = &vpfe_fops;
        vfd->ioctl_ops          = &vpfe_ioctl_ops;
        vfd->tvnorms            = 0;
-       vfd->v4l2_dev           = &vpfe_dev->v4l2_dev;
+       vfd->v4l2_dev           = &vpfe_dev->v4l2_dev;
        snprintf(vfd->name, sizeof(vfd->name),
                 "%s_V%d.%d.%d",
                 CAPTURE_DRV_NAME,
index 9956e67..2466c7c 100644 (file)
@@ -226,11 +226,11 @@ static inline void vpif_clr_bit(u32 reg, u32 bit)
        (VPIF_INT_BOTH << VPIF_CH1_INT_CTRL_SHIFT)), VPIF_CH1_CTRL))
 
 /* enabled interrupt on both the fields on vpid_ch0_ctrl register */
-#define channel2_intr_assert()         (regw((regr(VPIF_CH2_CTRL)|\
+#define channel2_intr_assert() (regw((regr(VPIF_CH2_CTRL)|\
        (VPIF_INT_BOTH << VPIF_CH2_INT_CTRL_SHIFT)), VPIF_CH2_CTRL))
 
 /* enabled interrupt on both the fields on vpid_ch1_ctrl register */
-#define channel3_intr_assert()         (regw((regr(VPIF_CH3_CTRL)|\
+#define channel3_intr_assert() (regw((regr(VPIF_CH3_CTRL)|\
        (VPIF_INT_BOTH << VPIF_CH3_INT_CTRL_SHIFT)), VPIF_CH3_CTRL))
 
 #define VPIF_CH_FID_MASK       (0x20)
index f2d27b9..b738865 100644 (file)
@@ -59,9 +59,9 @@ MODULE_AUTHOR("Texas Instruments");
 #define DM365_ISP5_INTSEL1             0x10
 #define DM365_ISP5_INTSEL2             0x14
 #define DM365_ISP5_INTSEL3             0x18
-#define DM365_ISP5_CCDCMUX             0x20
-#define DM365_ISP5_PG_FRAME_SIZE       0x28
-#define DM365_VPBE_CLK_CTRL            0x00
+#define DM365_ISP5_CCDCMUX             0x20
+#define DM365_ISP5_PG_FRAME_SIZE       0x28
+#define DM365_VPBE_CLK_CTRL            0x00
 
 #define VPSS_CLK_CTRL                  0x01c40044
 #define VPSS_CLK_CTRL_VENCCLKEN                BIT(3)
@@ -78,8 +78,8 @@ MODULE_AUTHOR("Texas Instruments");
 #define DM365_ISP5_INTSEL3_DEFAULT     0x00000015
 
 /* masks and shifts for DM365*/
-#define DM365_CCDC_PG_VD_POL_SHIFT     0
-#define DM365_CCDC_PG_HD_POL_SHIFT     1
+#define DM365_CCDC_PG_VD_POL_SHIFT     0
+#define DM365_CCDC_PG_HD_POL_SHIFT     1
 
 #define CCD_SRC_SEL_MASK               (BIT_MASK(5) | BIT_MASK(4))
 #define CCD_SRC_SEL_SHIFT              4
index 7ae239f..d8d8c99 100644 (file)
@@ -1246,7 +1246,7 @@ static struct platform_driver fimc_driver = {
        .driver = {
                .of_match_table = fimc_of_match,
                .name           = FIMC_DRIVER_NAME,
-               .pm             = &fimc_pm_ops,
+               .pm             = &fimc_pm_ops,
        }
 };
 
index c8a1249..5f5c34e 100644 (file)
@@ -384,16 +384,16 @@ static void deinterlace_device_run(void *priv)
         * 4 possible field conversions are possible at the moment:
         *  V4L2_FIELD_SEQ_TB --> V4L2_FIELD_INTERLACED_TB:
         *      two separate fields in the same input buffer are interlaced
-        *      in the output buffer using weaving. Top field comes first.
+        *      in the output buffer using weaving. Top field comes first.
         *  V4L2_FIELD_SEQ_TB --> V4L2_FIELD_NONE:
-        *      top field from the input buffer is copied to the output buffer
-        *      using line doubling. Bottom field from the input buffer is discarded.
+        *      top field from the input buffer is copied to the output buffer
+        *      using line doubling. Bottom field from the input buffer is discarded.
         * V4L2_FIELD_SEQ_BT --> V4L2_FIELD_INTERLACED_BT:
         *      two separate fields in the same input buffer are interlaced
-        *      in the output buffer using weaving. Bottom field comes first.
+        *      in the output buffer using weaving. Bottom field comes first.
         * V4L2_FIELD_SEQ_BT --> V4L2_FIELD_NONE:
-        *      bottom field from the input buffer is copied to the output buffer
-        *      using line doubling. Top field from the input buffer is discarded.
+        *      bottom field from the input buffer is copied to the output buffer
+        *      using line doubling. Top field from the input buffer is discarded.
         */
        switch (dst_q_data->fmt->fourcc) {
        case V4L2_PIX_FMT_YUV420:
index 6f1b0c7..7278a1e 100644 (file)
@@ -1774,8 +1774,8 @@ static int vidioc_g_fbuf(struct file *file, void *fh,
 }
 
 static const struct v4l2_ioctl_ops vout_ioctl_ops = {
-       .vidioc_querycap                        = vidioc_querycap,
-       .vidioc_enum_fmt_vid_out                = vidioc_enum_fmt_vid_out,
+       .vidioc_querycap                        = vidioc_querycap,
+       .vidioc_enum_fmt_vid_out                = vidioc_enum_fmt_vid_out,
        .vidioc_g_fmt_vid_out                   = vidioc_g_fmt_vid_out,
        .vidioc_try_fmt_vid_out                 = vidioc_try_fmt_vid_out,
        .vidioc_s_fmt_vid_out                   = vidioc_s_fmt_vid_out,
@@ -1795,12 +1795,12 @@ static const struct v4l2_ioctl_ops vout_ioctl_ops = {
 };
 
 static const struct v4l2_file_operations omap_vout_fops = {
-       .owner          = THIS_MODULE,
+       .owner          = THIS_MODULE,
        .poll           = omap_vout_poll,
        .unlocked_ioctl = video_ioctl2,
-       .mmap           = omap_vout_mmap,
-       .open           = omap_vout_open,
-       .release        = omap_vout_release,
+       .mmap           = omap_vout_mmap,
+       .open           = omap_vout_open,
+       .release        = omap_vout_release,
 };
 
 /* Init functions used during driver initialization */
index 871da2a..4dccf29 100644 (file)
@@ -1181,7 +1181,7 @@ static int sh_vou_release(struct file *file)
 
 /* sh_vou display ioctl operations */
 static const struct v4l2_ioctl_ops sh_vou_ioctl_ops = {
-       .vidioc_querycap                = sh_vou_querycap,
+       .vidioc_querycap                = sh_vou_querycap,
        .vidioc_enum_fmt_vid_out        = sh_vou_enum_fmt_vid_out,
        .vidioc_g_fmt_vid_out           = sh_vou_g_fmt_vid_out,
        .vidioc_s_fmt_vid_out           = sh_vou_s_fmt_vid_out,
index ea93087..5ef635e 100644 (file)
@@ -26,7 +26,7 @@
  * Fully tested with the Keene USB FM Transmitter and the v4l2-compliance tool.
  */
 
-#include <linux/module.h>      /* Modules                      */
+#include <linux/module.h>      /* Modules                      */
 #include <linux/init.h>                /* Initdata                     */
 #include <linux/ioport.h>      /* request_region               */
 #include <linux/delay.h>       /* msleep                       */
index f445327..9e12c60 100644 (file)
@@ -15,7 +15,7 @@
  * Fully tested with the Keene USB FM Transmitter and the v4l2-compliance tool.
 */
 
-#include <linux/module.h>      /* Modules                      */
+#include <linux/module.h>      /* Modules                      */
 #include <linux/init.h>                /* Initdata                     */
 #include <linux/ioport.h>      /* request_region               */
 #include <linux/delay.h>       /* udelay                       */
index 7575e53..ec5c888 100644 (file)
@@ -30,7 +30,7 @@
  *             Changed API to V4L2
  */
 
-#include <linux/module.h>      /* Modules                      */
+#include <linux/module.h>      /* Modules                      */
 #include <linux/init.h>                /* Initdata                     */
 #include <linux/ioport.h>      /* request_region               */
 #include <linux/delay.h>       /* udelay                       */
@@ -503,7 +503,7 @@ static unsigned int cadet_poll(struct file *file, struct poll_table_struct *wait
 static const struct v4l2_file_operations cadet_fops = {
        .owner          = THIS_MODULE,
        .open           = cadet_open,
-       .release        = cadet_release,
+       .release        = cadet_release,
        .read           = cadet_read,
        .unlocked_ioctl = video_ioctl2,
        .poll           = cadet_poll,
index ddc12b1..3ff4c4e 100644 (file)
@@ -22,7 +22,7 @@
  * Fully tested with the Keene USB FM Transmitter and the v4l2-compliance tool.
  */
 
-#include <linux/module.h>      /* Modules                      */
+#include <linux/module.h>      /* Modules                      */
 #include <linux/init.h>                /* Initdata                     */
 #include <linux/ioport.h>      /* request_region               */
 #include <linux/delay.h>       /* udelay                       */
@@ -102,9 +102,9 @@ struct gemtek {
        u32 bu2614data;
 };
 
-#define BU2614_FREQ_BITS       16 /* D0..D15, Frequency data           */
+#define BU2614_FREQ_BITS       16 /* D0..D15, Frequency data           */
 #define BU2614_PORT_BITS       3 /* P0..P2, Output port control data   */
-#define BU2614_VOID_BITS       4 /* unused                             */
+#define BU2614_VOID_BITS       4 /* unused                             */
 #define BU2614_FMES_BITS       1 /* CT, Frequency measurement beginning data */
 #define BU2614_STDF_BITS       3 /* R0..R2, Standard frequency data    */
 #define BU2614_SWIN_BITS       1 /* S, Switch between FMIN / AMIN      */
@@ -113,7 +113,7 @@ struct gemtek {
 #define BU2614_FMUN_BITS       1 /* GT, Frequency measurement time & unlock */
 #define BU2614_TEST_BITS       1 /* TS, Test data is input             */
 
-#define BU2614_FREQ_SHIFT      0
+#define BU2614_FREQ_SHIFT      0
 #define BU2614_PORT_SHIFT      (BU2614_FREQ_BITS + BU2614_FREQ_SHIFT)
 #define BU2614_VOID_SHIFT      (BU2614_PORT_BITS + BU2614_PORT_SHIFT)
 #define BU2614_FMES_SHIFT      (BU2614_VOID_BITS + BU2614_VOID_SHIFT)
index 09cfbc3..abeaedd 100644 (file)
@@ -12,7 +12,7 @@
  * Fully tested with actual hardware and the v4l2-compliance tool.
  */
 
-#include <linux/module.h>      /* Modules                      */
+#include <linux/module.h>      /* Modules                      */
 #include <linux/init.h>                /* Initdata                     */
 #include <linux/ioport.h>      /* request_region               */
 #include <linux/delay.h>       /* udelay                       */
index 28a8946..fc4e63d 100644 (file)
@@ -17,7 +17,7 @@
  */
 
 #include <linux/kernel.h>      /* __setup                      */
-#include <linux/module.h>      /* Modules                      */
+#include <linux/module.h>      /* Modules                      */
 #include <linux/init.h>                /* Initdata                     */
 #include <linux/ioport.h>      /* request_region               */
 #include <linux/delay.h>       /* udelay                       */
@@ -110,7 +110,7 @@ static inline int fmi_getsigstr(struct fmi *fmi)
        val = fmi->mute ? 0x00 : 0x08;  /* mute/unmute */
        outb(val, fmi->io);
        outb(val | 0x10, fmi->io);
-       msleep(143);            /* was schedule_timeout(HZ/7) */
+       msleep(143);            /* was schedule_timeout(HZ/7) */
        res = (int)inb(fmi->io + 1);
        outb(val, fmi->io);
 
index de79d55..7b07d42 100644 (file)
@@ -7,7 +7,7 @@
  */
 
 #include <linux/delay.h>
-#include <linux/module.h>      /* Modules                      */
+#include <linux/module.h>      /* Modules                      */
 #include <linux/init.h>                /* Initdata                     */
 #include <linux/slab.h>
 #include <linux/ioport.h>      /* request_region               */
index bc7e69e..afb7632 100644 (file)
@@ -417,7 +417,7 @@ static const struct v4l2_ioctl_ops tea5764_ioctl_ops = {
 static const struct video_device tea5764_radio_template = {
        .name           = "TEA5764 FM-Radio",
        .fops           = &tea5764_fops,
-       .ioctl_ops      = &tea5764_ioctl_ops,
+       .ioctl_ops      = &tea5764_ioctl_ops,
        .release        = video_device_release_empty,
 };
 
index be10a80..4f116ea 100644 (file)
@@ -20,7 +20,7 @@
  * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>
  */
 
-#include <linux/module.h>      /* Modules                      */
+#include <linux/module.h>      /* Modules                      */
 #include <linux/init.h>                /* Initdata                     */
 #include <linux/ioport.h>      /* request_region               */
 #include <linux/videodev2.h>   /* kernel radio structs         */
@@ -45,12 +45,12 @@ static int radio_nr = -1;
 module_param(radio_nr, int, 0444);
 MODULE_PARM_DESC(radio_nr, "Radio device number");
 
-#define WRT_DIS        0x00
+#define WRT_DIS                0x00
 #define CLK_OFF                0x00
 #define IIC_DATA       0x01
 #define IIC_CLK                0x02
 #define DATA           0x04
-#define CLK_ON                 0x08
+#define CLK_ON         0x08
 #define WRT_EN         0x10
 
 static struct radio_isa_card *terratec_alloc(void)
index 4dc2067..7412fe1 100644 (file)
@@ -498,7 +498,7 @@ static const struct v4l2_ioctl_ops tea575x_ioctl_ops = {
 };
 
 static const struct video_device tea575x_radio = {
-       .ioctl_ops      = &tea575x_ioctl_ops,
+       .ioctl_ops      = &tea575x_ioctl_ops,
        .release        = video_device_release_empty,
 };
 
index 61f679f..e730579 100644 (file)
@@ -30,12 +30,12 @@ static struct rc_map_table behold_columbus[] = {
 
        /*  0x01    0x02    0x03  0x0D    *
         *   1       2       3   Stereo   *
-        *                                *
+        *                                *
         *  0x04    0x05    0x06  0x19    *
         *   4       5       6   Snapshot *
-        *                                *
+        *                                *
         *  0x07    0x08    0x09  0x10    *
-        *   7       8       9    Zoom    *
+        *   7       8       9    Zoom    *
         *                                */
        { 0x01, KEY_1 },
        { 0x02, KEY_2 },
index 3049567..e443192 100644 (file)
@@ -37,7 +37,7 @@ static struct rc_map_table winfast_usbii_deluxe[] = {
        { 0x60, KEY_CHANNELDOWN},       /* CHANNELDOWN */
        { 0x61, KEY_LAST},              /* LAST CHANNEL (RECALL) */
 
-       { 0x72, KEY_VIDEO},             /* INPUT MODES (TV/FM) */
+       { 0x72, KEY_VIDEO},             /* INPUT MODES (TV/FM) */
 
        { 0x70, KEY_POWER2},            /* TV ON/OFF */
 
index 57c6d90..355ef29 100644 (file)
@@ -1677,10 +1677,10 @@ static u16 MXL5005_TunerConfig(struct dvb_frontend *fe,
        u8      AGC_Mode,       /* AGC Mode - Dual AGC: 0, Single AGC: 1 */
        u16     TOP,            /* 0: Dual AGC; Value: take over point */
        u16     IF_OUT_LOAD,    /* IF Out Load Resistor (200 / 300 Ohms) */
-       u8      CLOCK_OUT,      /* 0: turn off clk out; 1: turn on clock out */
+       u8      CLOCK_OUT,      /* 0: turn off clk out; 1: turn on clock out */
        u8      DIV_OUT,        /* 0: Div-1; 1: Div-4 */
-       u8      CAPSELECT,      /* 0: disable On-Chip pulling cap; 1: enable */
-       u8      EN_RSSI,        /* 0: disable RSSI; 1: enable RSSI */
+       u8      CAPSELECT,      /* 0: disable On-Chip pulling cap; 1: enable */
+       u8      EN_RSSI,        /* 0: disable RSSI; 1: enable RSSI */
 
        /* Modulation Type; */
        /* 0 - Default; 1 - DVB-T; 2 - ATSC; 3 - QAM; 4 - Analog Cable */
index 264e80b..a08d3f9 100644 (file)
@@ -36,7 +36,7 @@ struct tda827x_config
 
        /* interface to tda829x driver */
        enum tda8290_lna config;
-       int          switch_addr;
+       int          switch_addr;
 
        void (*agcf)(struct dvb_frontend *fe);
 };
index c0e815f..9777da0 100644 (file)
@@ -31,7 +31,7 @@ struct tda9887_priv {
        struct tuner_i2c_props i2c_props;
        struct list_head hybrid_tuner_instance_list;
 
-       unsigned char      data[4];
+       unsigned char      data[4];
        unsigned int       config;
        unsigned int       mode;
        unsigned int       audmode;
@@ -94,7 +94,7 @@ struct tvnorm {
 #define cAudioGain6             0x80    // bit c7
 
 #define cTopMask                0x1f    // bit c0:4
-#define cTopDefault            0x10    // bit c0:4
+#define cTopDefault            0x10    // bit c0:4
 
 //// third reg (e)
 #define cAudioIF_4_5             0x00    // bit e0:1
index cf44d36..36b88f8 100644 (file)
@@ -53,7 +53,7 @@ MODULE_PARM_DESC(dtv_input, "specify dtv rf input, 0 for autoselect");
 /* tv tuner system standard selection for Philips FQ1216ME
    this value takes the low bits of control byte 2
    from datasheet "1999 Nov 16" (supersedes "1999 Mar 23")
-     standard          BG      DK      I       L       L`
+     standard          BG      DK      I       L       L`
      picture carrier   38.90   38.90   38.90   38.90   33.95
      colour            34.47   34.47   34.47   34.47   38.38
      sound 1           33.40   32.40   32.90   32.40   40.45
index 8cda36a..fca85e0 100644 (file)
@@ -87,7 +87,7 @@ struct firmware_properties {
        v4l2_std_id     std_req;
        __u16           int_freq;
        unsigned int    scode_table;
-       int             scode_nr;
+       int             scode_nr;
 };
 
 enum xc2028_state {
@@ -137,7 +137,7 @@ struct xc2028_data {
                                       ibuf, isize);                    \
        if (isize != _rc)                                               \
                tuner_err("i2c input error: rc = %d (should be %d)\n",  \
-                          _rc, (int)isize);                            \
+                          _rc, (int)isize);                            \
        if (priv->ctrl.msleep)                                          \
                msleep(priv->ctrl.msleep);                              \
        _rc;                                                            \
@@ -172,7 +172,7 @@ static int xc2028_get_reg(struct xc2028_data *priv, u16 reg, u16 *val)
        return 0;
 }
 
-#define dump_firm_type(t)      dump_firm_type_and_int_freq(t, 0)
+#define dump_firm_type(t)      dump_firm_type_and_int_freq(t, 0)
 static void dump_firm_type_and_int_freq(unsigned int type, u16 int_freq)
 {
        if (type & BASE)
index cd96288..03fd6d4 100644 (file)
@@ -48,7 +48,7 @@ struct xc2028_ctrl {
 
 struct xc2028_config {
        struct i2c_adapter *i2c_adap;
-       u8                 i2c_addr;
+       u8                 i2c_addr;
        struct xc2028_ctrl *ctrl;
 };
 
index 1f4412e..dbd8a90 100644 (file)
@@ -17,7 +17,7 @@
 
 #define AU0828_BOARD_UNKNOWN           0
 #define AU0828_BOARD_HAUPPAUGE_HVR950Q 1
-#define AU0828_BOARD_HAUPPAUGE_HVR850  2
+#define AU0828_BOARD_HAUPPAUGE_HVR850  2
 #define AU0828_BOARD_DVICO_FUSIONHDTV7 3
 #define AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL     4
 #define AU0828_BOARD_HAUPPAUGE_WOODBURY        5
index a240153..c765d54 100644 (file)
@@ -1797,7 +1797,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 static const struct video_device au0828_video_template = {
        .fops                       = &au0828_v4l_fops,
        .release                    = video_device_release_empty,
-       .ioctl_ops                  = &video_ioctl_ops,
+       .ioctl_ops                  = &video_ioctl_ops,
        .tvnorms                    = V4L2_STD_NTSC_M | V4L2_STD_PAL_M,
 };
 
index 9e3c123..004eade 100644 (file)
@@ -190,7 +190,7 @@ struct au0828_dev {
        struct i2c_adapter              i2c_adap;
        struct i2c_algorithm            i2c_algo;
        struct i2c_client               i2c_client;
-       u32                             i2c_rc;
+       u32                             i2c_rc;
 
        /* Digital */
        struct au0828_dvb               dvb;
@@ -293,8 +293,8 @@ struct au0828_dev {
 /* ----------------------------------------------------------- */
 #define au0828_read(dev, reg) au0828_readreg(dev, reg)
 #define au0828_write(dev, reg, value) au0828_writereg(dev, reg, value)
-#define au0828_andor(dev, reg, mask, value)                            \
-        au0828_writereg(dev, reg,                                      \
+#define au0828_andor(dev, reg, mask, value)                            \
+        au0828_writereg(dev, reg,                                      \
        (au0828_readreg(dev, reg) & ~(mask)) | ((value) & (mask)))
 
 #define au0828_set(dev, reg, bit) au0828_andor(dev, (reg), (bit), (bit))
index 6089036..f3a1e5b 100644 (file)
 
 static int frame_sizes[] = {
        0,      // USBIF_CMDONLY
-       0,      // USBIF_BULK
-       128,    // USBIF_ISO_1
-       384,    // USBIF_ISO_2
-       640,    // USBIF_ISO_3
-       768,    // USBIF_ISO_4
-       896,    // USBIF_ISO_5
-       1023,   // USBIF_ISO_6
+       0,      // USBIF_BULK
+       128,    // USBIF_ISO_1
+       384,    // USBIF_ISO_2
+       640,    // USBIF_ISO_3
+       768,    // USBIF_ISO_4
+       896,    // USBIF_ISO_5
+       1023,   // USBIF_ISO_6
 };
 
 #define FRAMES_PER_DESC    10
index 06f10d7..d96236d 100644 (file)
@@ -404,9 +404,9 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
 }
 
 static const struct snd_pcm_hardware snd_cx231xx_hw_capture = {
-       .info = SNDRV_PCM_INFO_BLOCK_TRANSFER   |
-           SNDRV_PCM_INFO_MMAP                 |
-           SNDRV_PCM_INFO_INTERLEAVED          |
+       .info = SNDRV_PCM_INFO_BLOCK_TRANSFER   |
+           SNDRV_PCM_INFO_MMAP                 |
+           SNDRV_PCM_INFO_INTERLEAVED          |
            SNDRV_PCM_INFO_MMAP_VALID,
 
        .formats = SNDRV_PCM_FMTBIT_S16_LE,
index 0df62d3..fdd3c22 100644 (file)
@@ -2168,7 +2168,7 @@ int cx231xx_tuner_post_channel_change(struct cx231xx *dev)
 }
 
 /******************************************************************************
- *                 I 2 S - B L O C K    C O N T R O L   functions            *
+ *                 I 2 S - B L O C K    C O N T R O L   functions            *
  ******************************************************************************/
 int cx231xx_i2s_blk_initialize(struct cx231xx *dev)
 {
index f372ad3..4f43668 100644 (file)
@@ -56,7 +56,7 @@ MODULE_PARM_DESC(alt, "alternate setting to use for video endpoint");
                         dev->name, __func__ , ##arg); } while (0)
 
 /*****************************************************************
-*             Device control list functions                                     *
+*             Device control list functions                                     *
 ******************************************************************/
 
 LIST_HEAD(cx231xx_devlist);
index 23648da..6e1bef2 100644 (file)
@@ -51,7 +51,7 @@ do {                                                  \
        if (i2c_debug >= lvl) {                         \
                printk(KERN_DEBUG "%s at %s: " fmt,     \
                       dev->name, __func__ , ##args);   \
-      }                                                \
+      }                                                        \
 } while (0)
 
 static inline int get_real_i2c_port(struct cx231xx *dev, int bus_nr)
index 4511dc5..8f00b1d 100644 (file)
@@ -144,7 +144,7 @@ enum AVDEC_STATUS{
 #define SOURCE_EXTERNAL         0x8
 #define SOURCE_TS_BDA                  0x10
 #define SOURCE_TS_ENCODE               0x20
-#define SOURCE_TS_EXTERNAL     0x40
+#define SOURCE_TS_EXTERNAL     0x40
 
 /***************************************************************************
                                * interface information define *
index 750c5d3..db5af8d 100644 (file)
 #define      FLD_AC97_SHUTDOWN        0x00000001
 
 /* Cx231xx redefine */
-#define      QPSK_IAGC_CTL1            0x94c
-#define      QPSK_IAGC_CTL2            0x950
-#define      QPSK_FEPR_FREQ            0x954
-#define      QPSK_BTL_CTL1             0x958
-#define      QPSK_BTL_CTL2             0x95c
-#define      QPSK_CTL_CTL1             0x960
-#define      QPSK_CTL_CTL2             0x964
-#define      QPSK_MF_FAGC_CTL          0x968
-#define      QPSK_EQ_CTL               0x96c
-#define      QPSK_LOCK_CTL             0x970
+#define      QPSK_IAGC_CTL1            0x94c
+#define      QPSK_IAGC_CTL2            0x950
+#define      QPSK_FEPR_FREQ            0x954
+#define      QPSK_BTL_CTL1             0x958
+#define      QPSK_BTL_CTL2             0x95c
+#define      QPSK_CTL_CTL1             0x960
+#define      QPSK_CTL_CTL2             0x964
+#define      QPSK_MF_FAGC_CTL          0x968
+#define      QPSK_EQ_CTL               0x96c
+#define      QPSK_LOCK_CTL             0x970
 
 /*****************************************************************************/
 #define      FM1_DFT_CTL              0x9a8
index 96bbb53..f0d10ac 100644 (file)
@@ -36,70 +36,70 @@ static const struct stb0899_s1_reg az6027_stb0899_s1_init_1[] = {
        /* 0x0000000b, SYSREG */
        { STB0899_DEV_ID                , 0x30 },
        { STB0899_DISCNTRL1             , 0x32 },
-       { STB0899_DISCNTRL2             , 0x80 },
-       { STB0899_DISRX_ST0             , 0x04 },
-       { STB0899_DISRX_ST1             , 0x00 },
-       { STB0899_DISPARITY             , 0x00 },
+       { STB0899_DISCNTRL2             , 0x80 },
+       { STB0899_DISRX_ST0             , 0x04 },
+       { STB0899_DISRX_ST1             , 0x00 },
+       { STB0899_DISPARITY             , 0x00 },
        { STB0899_DISSTATUS             , 0x20 },
-       { STB0899_DISF22                , 0x99 },
-       { STB0899_DISF22RX              , 0xa8 },
+       { STB0899_DISF22                , 0x99 },
+       { STB0899_DISF22RX              , 0xa8 },
        /* SYSREG ? */
-       { STB0899_ACRPRESC              , 0x11 },
-       { STB0899_ACRDIV1               , 0x0a },
-       { STB0899_ACRDIV2               , 0x05 },
-       { STB0899_DACR1                 , 0x00 },
-       { STB0899_DACR2                 , 0x00 },
-       { STB0899_OUTCFG                , 0x00 },
-       { STB0899_MODECFG               , 0x00 },
+       { STB0899_ACRPRESC              , 0x11 },
+       { STB0899_ACRDIV1               , 0x0a },
+       { STB0899_ACRDIV2               , 0x05 },
+       { STB0899_DACR1                 , 0x00 },
+       { STB0899_DACR2                 , 0x00 },
+       { STB0899_OUTCFG                , 0x00 },
+       { STB0899_MODECFG               , 0x00 },
        { STB0899_IRQSTATUS_3           , 0xfe },
        { STB0899_IRQSTATUS_2           , 0x03 },
        { STB0899_IRQSTATUS_1           , 0x7c },
        { STB0899_IRQSTATUS_0           , 0xf4 },
-       { STB0899_IRQMSK_3              , 0xf3 },
-       { STB0899_IRQMSK_2              , 0xfc },
-       { STB0899_IRQMSK_1              , 0xff },
+       { STB0899_IRQMSK_3              , 0xf3 },
+       { STB0899_IRQMSK_2              , 0xfc },
+       { STB0899_IRQMSK_1              , 0xff },
        { STB0899_IRQMSK_0              , 0xff },
        { STB0899_IRQCFG                , 0x00 },
-       { STB0899_I2CCFG                , 0x88 },
-       { STB0899_I2CRPT                , 0x58 },
+       { STB0899_I2CCFG                , 0x88 },
+       { STB0899_I2CRPT                , 0x58 },
        { STB0899_IOPVALUE5             , 0x00 },
        { STB0899_IOPVALUE4             , 0x33 },
        { STB0899_IOPVALUE3             , 0x6d },
        { STB0899_IOPVALUE2             , 0x90 },
        { STB0899_IOPVALUE1             , 0x60 },
        { STB0899_IOPVALUE0             , 0x00 },
-       { STB0899_GPIO00CFG             , 0x82 },
-       { STB0899_GPIO01CFG             , 0x82 },
-       { STB0899_GPIO02CFG             , 0x82 },
-       { STB0899_GPIO03CFG             , 0x82 },
-       { STB0899_GPIO04CFG             , 0x82 },
-       { STB0899_GPIO05CFG             , 0x82 },
-       { STB0899_GPIO06CFG             , 0x82 },
-       { STB0899_GPIO07CFG             , 0x82 },
-       { STB0899_GPIO08CFG             , 0x82 },
-       { STB0899_GPIO09CFG             , 0x82 },
-       { STB0899_GPIO10CFG             , 0x82 },
-       { STB0899_GPIO11CFG             , 0x82 },
-       { STB0899_GPIO12CFG             , 0x82 },
-       { STB0899_GPIO13CFG             , 0x82 },
-       { STB0899_GPIO14CFG             , 0x82 },
-       { STB0899_GPIO15CFG             , 0x82 },
-       { STB0899_GPIO16CFG             , 0x82 },
-       { STB0899_GPIO17CFG             , 0x82 },
-       { STB0899_GPIO18CFG             , 0x82 },
-       { STB0899_GPIO19CFG             , 0x82 },
-       { STB0899_GPIO20CFG             , 0x82 },
-       { STB0899_SDATCFG               , 0xb8 },
-       { STB0899_SCLTCFG               , 0xba },
-       { STB0899_AGCRFCFG              , 0x1c }, /* 0x11 */
-       { STB0899_GPIO22                , 0x82 }, /* AGCBB2CFG */
-       { STB0899_GPIO21                , 0x91 }, /* AGCBB1CFG */
-       { STB0899_DIRCLKCFG             , 0x82 },
-       { STB0899_CLKOUT27CFG           , 0x7e },
-       { STB0899_STDBYCFG              , 0x82 },
-       { STB0899_CS0CFG                , 0x82 },
-       { STB0899_CS1CFG                , 0x82 },
-       { STB0899_DISEQCOCFG            , 0x20 },
+       { STB0899_GPIO00CFG             , 0x82 },
+       { STB0899_GPIO01CFG             , 0x82 },
+       { STB0899_GPIO02CFG             , 0x82 },
+       { STB0899_GPIO03CFG             , 0x82 },
+       { STB0899_GPIO04CFG             , 0x82 },
+       { STB0899_GPIO05CFG             , 0x82 },
+       { STB0899_GPIO06CFG             , 0x82 },
+       { STB0899_GPIO07CFG             , 0x82 },
+       { STB0899_GPIO08CFG             , 0x82 },
+       { STB0899_GPIO09CFG             , 0x82 },
+       { STB0899_GPIO10CFG             , 0x82 },
+       { STB0899_GPIO11CFG             , 0x82 },
+       { STB0899_GPIO12CFG             , 0x82 },
+       { STB0899_GPIO13CFG             , 0x82 },
+       { STB0899_GPIO14CFG             , 0x82 },
+       { STB0899_GPIO15CFG             , 0x82 },
+       { STB0899_GPIO16CFG             , 0x82 },
+       { STB0899_GPIO17CFG             , 0x82 },
+       { STB0899_GPIO18CFG             , 0x82 },
+       { STB0899_GPIO19CFG             , 0x82 },
+       { STB0899_GPIO20CFG             , 0x82 },
+       { STB0899_SDATCFG               , 0xb8 },
+       { STB0899_SCLTCFG               , 0xba },
+       { STB0899_AGCRFCFG              , 0x1c }, /* 0x11 */
+       { STB0899_GPIO22                , 0x82 }, /* AGCBB2CFG */
+       { STB0899_GPIO21                , 0x91 }, /* AGCBB1CFG */
+       { STB0899_DIRCLKCFG             , 0x82 },
+       { STB0899_CLKOUT27CFG           , 0x7e },
+       { STB0899_STDBYCFG              , 0x82 },
+       { STB0899_CS0CFG                , 0x82 },
+       { STB0899_CS1CFG                , 0x82 },
+       { STB0899_DISEQCOCFG            , 0x20 },
        { STB0899_GPIO32CFG             , 0x82 },
        { STB0899_GPIO33CFG             , 0x82 },
        { STB0899_GPIO34CFG             , 0x82 },
@@ -108,35 +108,35 @@ static const struct stb0899_s1_reg az6027_stb0899_s1_init_1[] = {
        { STB0899_GPIO37CFG             , 0x82 },
        { STB0899_GPIO38CFG             , 0x82 },
        { STB0899_GPIO39CFG             , 0x82 },
-       { STB0899_NCOARSE               , 0x17 }, /* 0x15 = 27 Mhz Clock, F/3 = 198MHz, F/6 = 99MHz */
-       { STB0899_SYNTCTRL              , 0x02 }, /* 0x00 = CLK from CLKI, 0x02 = CLK from XTALI */
-       { STB0899_FILTCTRL              , 0x00 },
-       { STB0899_SYSCTRL               , 0x01 },
-       { STB0899_STOPCLK1              , 0x20 },
-       { STB0899_STOPCLK2              , 0x00 },
+       { STB0899_NCOARSE               , 0x17 }, /* 0x15 = 27 Mhz Clock, F/3 = 198MHz, F/6 = 99MHz */
+       { STB0899_SYNTCTRL              , 0x02 }, /* 0x00 = CLK from CLKI, 0x02 = CLK from XTALI */
+       { STB0899_FILTCTRL              , 0x00 },
+       { STB0899_SYSCTRL               , 0x01 },
+       { STB0899_STOPCLK1              , 0x20 },
+       { STB0899_STOPCLK2              , 0x00 },
        { STB0899_INTBUFSTATUS          , 0x00 },
-       { STB0899_INTBUFCTRL            , 0x0a },
+       { STB0899_INTBUFCTRL            , 0x0a },
        { 0xffff                        , 0xff },
 };
 
 static const struct stb0899_s1_reg az6027_stb0899_s1_init_3[] = {
-       { STB0899_DEMOD                 , 0x00 },
-       { STB0899_RCOMPC                , 0xc9 },
-       { STB0899_AGC1CN                , 0x01 },
-       { STB0899_AGC1REF               , 0x10 },
+       { STB0899_DEMOD                 , 0x00 },
+       { STB0899_RCOMPC                , 0xc9 },
+       { STB0899_AGC1CN                , 0x01 },
+       { STB0899_AGC1REF               , 0x10 },
        { STB0899_RTC                   , 0x23 },
-       { STB0899_TMGCFG                , 0x4e },
-       { STB0899_AGC2REF               , 0x34 },
-       { STB0899_TLSR                  , 0x84 },
-       { STB0899_CFD                   , 0xf7 },
+       { STB0899_TMGCFG                , 0x4e },
+       { STB0899_AGC2REF               , 0x34 },
+       { STB0899_TLSR                  , 0x84 },
+       { STB0899_CFD                   , 0xf7 },
        { STB0899_ACLC                  , 0x87 },
-       { STB0899_BCLC                  , 0x94 },
-       { STB0899_EQON                  , 0x41 },
-       { STB0899_LDT                   , 0xf1 },
-       { STB0899_LDT2                  , 0xe3 },
-       { STB0899_EQUALREF              , 0xb4 },
-       { STB0899_TMGRAMP               , 0x10 },
-       { STB0899_TMGTHD                , 0x30 },
+       { STB0899_BCLC                  , 0x94 },
+       { STB0899_EQON                  , 0x41 },
+       { STB0899_LDT                   , 0xf1 },
+       { STB0899_LDT2                  , 0xe3 },
+       { STB0899_EQUALREF              , 0xb4 },
+       { STB0899_TMGRAMP               , 0x10 },
+       { STB0899_TMGTHD                , 0x30 },
        { STB0899_IDCCOMP               , 0xfd },
        { STB0899_QDCCOMP               , 0xff },
        { STB0899_POWERI                , 0x0c },
@@ -155,12 +155,12 @@ static const struct stb0899_s1_reg az6027_stb0899_s1_init_3[] = {
        { STB0899_NIRL                  , 0x80 },
        { STB0899_ISYMB                 , 0x1d },
        { STB0899_QSYMB                 , 0xa6 },
-       { STB0899_SFRH                  , 0x2f },
-       { STB0899_SFRM                  , 0x68 },
-       { STB0899_SFRL                  , 0x40 },
-       { STB0899_SFRUPH                , 0x2f },
-       { STB0899_SFRUPM                , 0x68 },
-       { STB0899_SFRUPL                , 0x40 },
+       { STB0899_SFRH                  , 0x2f },
+       { STB0899_SFRM                  , 0x68 },
+       { STB0899_SFRL                  , 0x40 },
+       { STB0899_SFRUPH                , 0x2f },
+       { STB0899_SFRUPM                , 0x68 },
+       { STB0899_SFRUPL                , 0x40 },
        { STB0899_EQUAI1                , 0x02 },
        { STB0899_EQUAQ1                , 0xff },
        { STB0899_EQUAI2                , 0x04 },
@@ -172,7 +172,7 @@ static const struct stb0899_s1_reg az6027_stb0899_s1_init_3[] = {
        { STB0899_EQUAI5                , 0x08 },
        { STB0899_EQUAQ5                , 0xf5 },
        { STB0899_DSTATUS2              , 0x00 },
-       { STB0899_VSTATUS               , 0x00 },
+       { STB0899_VSTATUS               , 0x00 },
        { STB0899_VERROR                , 0x86 },
        { STB0899_IQSWAP                , 0x2a },
        { STB0899_ECNT1M                , 0x00 },
@@ -181,26 +181,26 @@ static const struct stb0899_s1_reg az6027_stb0899_s1_init_3[] = {
        { STB0899_ECNT2L                , 0x00 },
        { STB0899_ECNT3M                , 0x0a },
        { STB0899_ECNT3L                , 0xad },
-       { STB0899_FECAUTO1              , 0x06 },
+       { STB0899_FECAUTO1              , 0x06 },
        { STB0899_FECM                  , 0x01 },
-       { STB0899_VTH12                 , 0xb0 },
-       { STB0899_VTH23                 , 0x7a },
+       { STB0899_VTH12                 , 0xb0 },
+       { STB0899_VTH23                 , 0x7a },
        { STB0899_VTH34                 , 0x58 },
-       { STB0899_VTH56                 , 0x38 },
-       { STB0899_VTH67                 , 0x34 },
-       { STB0899_VTH78                 , 0x24 },
-       { STB0899_PRVIT                 , 0xff },
-       { STB0899_VITSYNC               , 0x19 },
-       { STB0899_RSULC                 , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */
-       { STB0899_TSULC                 , 0x42 },
-       { STB0899_RSLLC                 , 0x41 },
+       { STB0899_VTH56                 , 0x38 },
+       { STB0899_VTH67                 , 0x34 },
+       { STB0899_VTH78                 , 0x24 },
+       { STB0899_PRVIT                 , 0xff },
+       { STB0899_VITSYNC               , 0x19 },
+       { STB0899_RSULC                 , 0xb1 }, /* DVB = 0xb1, DSS = 0xa1 */
+       { STB0899_TSULC                 , 0x42 },
+       { STB0899_RSLLC                 , 0x41 },
        { STB0899_TSLPL                 , 0x12 },
-       { STB0899_TSCFGH                , 0x0c },
-       { STB0899_TSCFGM                , 0x00 },
-       { STB0899_TSCFGL                , 0x00 },
+       { STB0899_TSCFGH                , 0x0c },
+       { STB0899_TSCFGM                , 0x00 },
+       { STB0899_TSCFGL                , 0x00 },
        { STB0899_TSOUT                 , 0x69 }, /* 0x0d for CAM */
-       { STB0899_RSSYNCDEL             , 0x00 },
-       { STB0899_TSINHDELH             , 0x02 },
+       { STB0899_RSSYNCDEL             , 0x00 },
+       { STB0899_TSINHDELH             , 0x02 },
        { STB0899_TSINHDELM             , 0x00 },
        { STB0899_TSINHDELL             , 0x00 },
        { STB0899_TSLLSTKM              , 0x1b },
@@ -211,18 +211,18 @@ static const struct stb0899_s1_reg az6027_stb0899_s1_init_3[] = {
        { STB0899_PCKLENLL              , 0xcc },
        { STB0899_RSPCKLEN              , 0xbd },
        { STB0899_TSSTATUS              , 0x90 },
-       { STB0899_ERRCTRL1              , 0xb6 },
-       { STB0899_ERRCTRL2              , 0x95 },
-       { STB0899_ERRCTRL3              , 0x8d },
+       { STB0899_ERRCTRL1              , 0xb6 },
+       { STB0899_ERRCTRL2              , 0x95 },
+       { STB0899_ERRCTRL3              , 0x8d },
        { STB0899_DMONMSK1              , 0x27 },
        { STB0899_DMONMSK0              , 0x03 },
-       { STB0899_DEMAPVIT              , 0x5c },
+       { STB0899_DEMAPVIT              , 0x5c },
        { STB0899_PLPARM                , 0x19 },
-       { STB0899_PDELCTRL              , 0x48 },
-       { STB0899_PDELCTRL2             , 0x00 },
-       { STB0899_BBHCTRL1              , 0x00 },
-       { STB0899_BBHCTRL2              , 0x00 },
-       { STB0899_HYSTTHRESH            , 0x77 },
+       { STB0899_PDELCTRL              , 0x48 },
+       { STB0899_PDELCTRL2             , 0x00 },
+       { STB0899_BBHCTRL1              , 0x00 },
+       { STB0899_BBHCTRL2              , 0x00 },
+       { STB0899_HYSTTHRESH            , 0x77 },
        { STB0899_MATCSTM               , 0x00 },
        { STB0899_MATCSTL               , 0x00 },
        { STB0899_UPLCSTM               , 0x00 },
@@ -261,7 +261,7 @@ static struct stb0899_config az6027_stb0899_config = {
        .init_s2_fec            = stb0899_s2_init_4,
        .init_tst               = stb0899_s1_init_5,
 
-       .demod_address          = 0xd0, /* 0x68, 0xd0 >> 1 */
+       .demod_address          = 0xd0, /* 0x68, 0xd0 >> 1 */
 
        .xtal_freq              = 27000000,
        .inversion              = IQ_SWAP_ON,
@@ -1181,9 +1181,9 @@ static struct dvb_usb_device_properties az6027_properties = {
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver az6027_usb_driver = {
        .name           = "dvb_usb_az6027",
-       .probe          = az6027_usb_probe,
-       .disconnect     = az6027_usb_disconnect,
-       .id_table       = az6027_usb_table,
+       .probe          = az6027_usb_probe,
+       .disconnect     = az6027_usb_disconnect,
+       .id_table       = az6027_usb_table,
 };
 
 module_usb_driver(az6027_usb_driver);
index 2715218..6080a35 100644 (file)
@@ -579,7 +579,7 @@ static int stv06xx_config(struct gspca_dev *gspca_dev,
 
 /* -- module initialisation -- */
 static const struct usb_device_id device_table[] = {
-       {USB_DEVICE(0x046d, 0x0840), .driver_info = BRIDGE_STV600 },    /* QuickCam Express */
+       {USB_DEVICE(0x046d, 0x0840), .driver_info = BRIDGE_STV600 },    /* QuickCam Express */
        {USB_DEVICE(0x046d, 0x0850), .driver_info = BRIDGE_STV610 },    /* LEGO cam / QuickCam Web */
        {USB_DEVICE(0x046d, 0x0870), .driver_info = BRIDGE_STV602 },    /* Dexxa WebCam USB */
        {USB_DEVICE(0x046D, 0x08F0), .driver_info = BRIDGE_ST6422 },    /* QuickCam Messenger */
index 7fb036d..5e5f63f 100644 (file)
@@ -941,18 +941,18 @@ static int hdpvr_s_ctrl(struct v4l2_ctrl *ctrl)
                return 0;
        case V4L2_CID_MPEG_VIDEO_ENCODING:
                return 0;
-/*     case V4L2_CID_MPEG_VIDEO_B_FRAMES: */
-/*             if (ctrl->value == 0 && !(opt->gop_mode & 0x2)) { */
-/*                     opt->gop_mode |= 0x2; */
-/*                     hdpvr_config_call(dev, CTRL_GOP_MODE_VALUE, */
-/*                                       opt->gop_mode); */
-/*             } */
-/*             if (ctrl->value == 128 && opt->gop_mode & 0x2) { */
-/*                     opt->gop_mode &= ~0x2; */
-/*                     hdpvr_config_call(dev, CTRL_GOP_MODE_VALUE, */
-/*                                       opt->gop_mode); */
-/*             } */
-/*             break; */
+/*     case V4L2_CID_MPEG_VIDEO_B_FRAMES: */
+/*             if (ctrl->value == 0 && !(opt->gop_mode & 0x2)) { */
+/*                     opt->gop_mode |= 0x2; */
+/*                     hdpvr_config_call(dev, CTRL_GOP_MODE_VALUE, */
+/*                                       opt->gop_mode); */
+/*             } */
+/*             if (ctrl->value == 128 && opt->gop_mode & 0x2) { */
+/*                     opt->gop_mode &= ~0x2; */
+/*                     hdpvr_config_call(dev, CTRL_GOP_MODE_VALUE, */
+/*                                       opt->gop_mode); */
+/*             } */
+/*             break; */
        case V4L2_CID_MPEG_VIDEO_BITRATE_MODE: {
                uint peak_bitrate = dev->video_bitrate_peak->val / 100000;
                uint bitrate = dev->video_bitrate->val / 100000;
@@ -1154,7 +1154,7 @@ static void hdpvr_device_release(struct video_device *vdev)
 static const struct video_device hdpvr_video_template = {
        .fops                   = &hdpvr_fops,
        .release                = hdpvr_device_release,
-       .ioctl_ops              = &hdpvr_ioctl_ops,
+       .ioctl_ops              = &hdpvr_ioctl_ops,
        .tvnorms                = V4L2_STD_ALL,
 };
 
index 96e36a8..1d65b41 100644 (file)
@@ -232,15 +232,15 @@ enum {
 
 
 /* :0 s 38 d3 0000 0000 0001 1 = 00 */
-/*             ret = usb_control_msg(dev->udev, */
-/*                                   usb_sndctrlpipe(dev->udev, 0), */
-/*                                   0xd3, 0x38, */
-/*                                   0, 0, */
-/*                                   "\0", 1, */
-/*                                   1000); */
-
-/*             info("control request returned %d", ret); */
-/*             msleep(5000); */
+/*             ret = usb_control_msg(dev->udev, */
+/*                                   usb_sndctrlpipe(dev->udev, 0), */
+/*                                   0xd3, 0x38, */
+/*                                   0, 0, */
+/*                                   "\0", 1, */
+/*                                   1000); */
+
+/*             info("control request returned %d", ret); */
+/*             msleep(5000); */
 
 
        /* :0 s b8 81 1400 0003 0005 5 <
index 3c73bda..6701001 100644 (file)
@@ -50,7 +50,7 @@
 
 /* Version block */
 #define PWC_VERSION    "10.0.15"
-#define PWC_NAME       "pwc"
+#define PWC_NAME       "pwc"
 #define PFX            PWC_NAME ": "
 
 
 #define MAX_ISO_BUFS           3
 #define ISO_FRAMES_PER_DESC    10
 #define ISO_MAX_FRAME_SIZE     960
-#define ISO_BUFFER_SIZE        (ISO_FRAMES_PER_DESC * ISO_MAX_FRAME_SIZE)
+#define ISO_BUFFER_SIZE                (ISO_FRAMES_PER_DESC * ISO_MAX_FRAME_SIZE)
 
 /* Maximum size after decompression is 640x480 YUV data, 1.5 * 640 * 480 */
-#define PWC_FRAME_SIZE                 (460800 + TOUCAM_HEADER_SIZE + TOUCAM_TRAILER_SIZE)
+#define PWC_FRAME_SIZE         (460800 + TOUCAM_HEADER_SIZE + TOUCAM_TRAILER_SIZE)
 
 /* Absolute minimum and maximum number of buffers available for mmap() */
 #define MIN_FRAMES             2
index d07349c..f13e4b0 100644 (file)
@@ -61,7 +61,7 @@ struct smsusb_device_t {
        struct usb_device *udev;
        struct smscore_device_t *coredev;
 
-       struct smsusb_urb_t     surbs[MAX_URBS];
+       struct smsusb_urb_t     surbs[MAX_URBS];
 
        int             response_alignment;
        int             buffer_size;
index 8e6c22f..b943db0 100644 (file)
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
-stk1160-y :=   stk1160-core.o \
+stk1160-y :=   stk1160-core.o \
                stk1160-v4l.o \
                stk1160-video.o \
                stk1160-i2c.o \
index c1d4505..9a7dbef 100644 (file)
@@ -397,12 +397,12 @@ int stk_sensor_init(struct stk_camera *dev)
 /* V4L2_PIX_FMT_UYVY */
 static struct regval ov_fmt_uyvy[] = {
        {REG_TSLB, TSLB_YLAST|0x08 },
-       { 0x4f, 0x80 },         /* "matrix coefficient 1" */
-       { 0x50, 0x80 },         /* "matrix coefficient 2" */
+       { 0x4f, 0x80 },         /* "matrix coefficient 1" */
+       { 0x50, 0x80 },         /* "matrix coefficient 2" */
        { 0x51, 0    },         /* vb */
-       { 0x52, 0x22 },         /* "matrix coefficient 4" */
-       { 0x53, 0x5e },         /* "matrix coefficient 5" */
-       { 0x54, 0x80 },         /* "matrix coefficient 6" */
+       { 0x52, 0x22 },         /* "matrix coefficient 4" */
+       { 0x53, 0x5e },         /* "matrix coefficient 5" */
+       { 0x54, 0x80 },         /* "matrix coefficient 6" */
        {REG_COM13, COM13_UVSAT|COM13_CMATRIX},
        {REG_COM15, COM15_R00FF },
        {0xff, 0xff}, /* END MARKER */
@@ -410,12 +410,12 @@ static struct regval ov_fmt_uyvy[] = {
 /* V4L2_PIX_FMT_YUYV */
 static struct regval ov_fmt_yuyv[] = {
        {REG_TSLB, 0 },
-       { 0x4f, 0x80 },         /* "matrix coefficient 1" */
-       { 0x50, 0x80 },         /* "matrix coefficient 2" */
+       { 0x4f, 0x80 },         /* "matrix coefficient 1" */
+       { 0x50, 0x80 },         /* "matrix coefficient 2" */
        { 0x51, 0    },         /* vb */
-       { 0x52, 0x22 },         /* "matrix coefficient 4" */
-       { 0x53, 0x5e },         /* "matrix coefficient 5" */
-       { 0x54, 0x80 },         /* "matrix coefficient 6" */
+       { 0x52, 0x22 },         /* "matrix coefficient 4" */
+       { 0x53, 0x5e },         /* "matrix coefficient 5" */
+       { 0x54, 0x80 },         /* "matrix coefficient 6" */
        {REG_COM13, COM13_UVSAT|COM13_CMATRIX},
        {REG_COM15, COM15_R00FF },
        {0xff, 0xff}, /* END MARKER */
@@ -426,13 +426,13 @@ static struct regval ov_fmt_rgbr[] = {
        { REG_RGB444, 0 },      /* No RGB444 please */
        {REG_TSLB, 0x00},
        { REG_COM1, 0x0 },
-       { REG_COM9, 0x38 },     /* 16x gain ceiling; 0x8 is reserved bit */
-       { 0x4f, 0xb3 },         /* "matrix coefficient 1" */
-       { 0x50, 0xb3 },         /* "matrix coefficient 2" */
+       { REG_COM9, 0x38 },     /* 16x gain ceiling; 0x8 is reserved bit */
+       { 0x4f, 0xb3 },         /* "matrix coefficient 1" */
+       { 0x50, 0xb3 },         /* "matrix coefficient 2" */
        { 0x51, 0    },         /* vb */
-       { 0x52, 0x3d },         /* "matrix coefficient 4" */
-       { 0x53, 0xa7 },         /* "matrix coefficient 5" */
-       { 0x54, 0xe4 },         /* "matrix coefficient 6" */
+       { 0x52, 0x3d },         /* "matrix coefficient 4" */
+       { 0x53, 0xa7 },         /* "matrix coefficient 5" */
+       { 0x54, 0xe4 },         /* "matrix coefficient 6" */
        { REG_COM13, COM13_GAMMA },
        { REG_COM15, COM15_RGB565|COM15_R00FF },
        { 0xff, 0xff },
@@ -443,13 +443,13 @@ static struct regval ov_fmt_rgbp[] = {
        { REG_RGB444, 0 },      /* No RGB444 please */
        {REG_TSLB, TSLB_BYTEORD },
        { REG_COM1, 0x0 },
-       { REG_COM9, 0x38 },     /* 16x gain ceiling; 0x8 is reserved bit */
-       { 0x4f, 0xb3 },         /* "matrix coefficient 1" */
-       { 0x50, 0xb3 },         /* "matrix coefficient 2" */
+       { REG_COM9, 0x38 },     /* 16x gain ceiling; 0x8 is reserved bit */
+       { 0x4f, 0xb3 },         /* "matrix coefficient 1" */
+       { 0x50, 0xb3 },         /* "matrix coefficient 2" */
        { 0x51, 0    },         /* vb */
-       { 0x52, 0x3d },         /* "matrix coefficient 4" */
-       { 0x53, 0xa7 },         /* "matrix coefficient 5" */
-       { 0x54, 0xe4 },         /* "matrix coefficient 6" */
+       { 0x52, 0x3d },         /* "matrix coefficient 4" */
+       { 0x53, 0xa7 },         /* "matrix coefficient 5" */
+       { 0x54, 0xe4 },         /* "matrix coefficient 6" */
        { REG_COM13, COM13_GAMMA },
        { REG_COM15, COM15_RGB565|COM15_R00FF },
        { 0xff, 0xff },
index 108577c..fd387bf 100644 (file)
@@ -963,11 +963,11 @@ static int uvc_parse_vendor_control(struct uvc_device *dev,
                 *      Size of this descriptor, in bytes: 24+p+n*2
                 * ----------------------------------------------------------
                 * 23+p+n       bmControlsType  N       Bitmap
-                *      Individual bits in the set are defined:
-                *      0: Absolute
-                *      1: Relative
+                *      Individual bits in the set are defined:
+                *      0: Absolute
+                *      1: Relative
                 *
-                *      This bitset is mapped exactly the same as bmControls.
+                *      This bitset is mapped exactly the same as bmControls.
                 * ----------------------------------------------------------
                 * 23+p+n*2     bReserved       1       Boolean
                 * ----------------------------------------------------------
@@ -2481,7 +2481,7 @@ static const struct usb_device_id uvc_ids[] = {
          .bInterfaceClass      = USB_CLASS_VIDEO,
          .bInterfaceSubClass   = 1,
          .bInterfaceProtocol   = 0,
-         .driver_info          = (kernel_ulong_t)&uvc_quirk_probe_def },
+         .driver_info          = (kernel_ulong_t)&uvc_quirk_probe_def },
        /* Dell SP2008WFP Monitor */
        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                | USB_DEVICE_ID_MATCH_INT_INFO,
@@ -2490,7 +2490,7 @@ static const struct usb_device_id uvc_ids[] = {
          .bInterfaceClass      = USB_CLASS_VIDEO,
          .bInterfaceSubClass   = 1,
          .bInterfaceProtocol   = 0,
-         .driver_info          = (kernel_ulong_t)&uvc_quirk_probe_def },
+         .driver_info          = (kernel_ulong_t)&uvc_quirk_probe_def },
        /* Dell Alienware X51 */
        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                | USB_DEVICE_ID_MATCH_INT_INFO,
@@ -2526,7 +2526,7 @@ static const struct usb_device_id uvc_ids[] = {
          .bInterfaceClass      = USB_CLASS_VIDEO,
          .bInterfaceSubClass   = 1,
          .bInterfaceProtocol   = 0,
-         .driver_info          = UVC_QUIRK_INFO(UVC_QUIRK_PROBE_MINMAX
+         .driver_info          = UVC_QUIRK_INFO(UVC_QUIRK_PROBE_MINMAX
                                        | UVC_QUIRK_BUILTIN_ISIGHT) },
        /* Apple Built-In iSight via iBridge */
        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
index fb940cf..5059fbf 100644 (file)
  *
  * Offset   Size (bytes)       Description
  * ------------------------------------------------------------------
- * 0x00        1       Header length
- * 0x01        1       Flags (UVC-compliant)
- * 0x02        4       Always equal to '11223344'
- * 0x06        8       Always equal to 'deadbeefdeadface'
- * 0x0e        16      Unknown
+ * 0x00        1       Header length
+ * 0x01        1       Flags (UVC-compliant)
+ * 0x02        4       Always equal to '11223344'
+ * 0x06        8       Always equal to 'deadbeefdeadface'
+ * 0x0e        16      Unknown
  *
  * The header can be prefixed by an optional, unknown-purpose byte.
  */
index 8d79691..e48d590 100644 (file)
@@ -33,7 +33,7 @@ static long native_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
 struct v4l2_clip32 {
        struct v4l2_rect        c;
-       compat_caddr_t          next;
+       compat_caddr_t          next;
 };
 
 struct v4l2_window32 {
@@ -582,7 +582,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
 struct v4l2_framebuffer32 {
        __u32                   capability;
        __u32                   flags;
-       compat_caddr_t          base;
+       compat_caddr_t          base;
        struct {
                __u32           width;
                __u32           height;
@@ -857,7 +857,7 @@ static int put_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
 #define VIDIOC_ENUMINPUT32     _IOWR('V', 26, struct v4l2_input32)
 #define VIDIOC_G_EDID32                _IOWR('V', 40, struct v4l2_edid32)
 #define VIDIOC_S_EDID32                _IOWR('V', 41, struct v4l2_edid32)
-#define VIDIOC_TRY_FMT32       _IOWR('V', 64, struct v4l2_format32)
+#define VIDIOC_TRY_FMT32       _IOWR('V', 64, struct v4l2_format32)
 #define VIDIOC_G_EXT_CTRLS32    _IOWR('V', 71, struct v4l2_ext_controls32)
 #define VIDIOC_S_EXT_CTRLS32    _IOWR('V', 72, struct v4l2_ext_controls32)
 #define VIDIOC_TRY_EXT_CTRLS32  _IOWR('V', 73, struct v4l2_ext_controls32)
index 1d7c2ea..59d2100 100644 (file)
@@ -46,37 +46,37 @@ struct std_descr {
 };
 
 static const struct std_descr standards[] = {
-       { V4L2_STD_NTSC,        "NTSC"      },
-       { V4L2_STD_NTSC_M,      "NTSC-M"    },
-       { V4L2_STD_NTSC_M_JP,   "NTSC-M-JP" },
+       { V4L2_STD_NTSC,        "NTSC"      },
+       { V4L2_STD_NTSC_M,      "NTSC-M"    },
+       { V4L2_STD_NTSC_M_JP,   "NTSC-M-JP" },
        { V4L2_STD_NTSC_M_KR,   "NTSC-M-KR" },
-       { V4L2_STD_NTSC_443,    "NTSC-443"  },
-       { V4L2_STD_PAL,         "PAL"       },
-       { V4L2_STD_PAL_BG,      "PAL-BG"    },
-       { V4L2_STD_PAL_B,       "PAL-B"     },
-       { V4L2_STD_PAL_B1,      "PAL-B1"    },
-       { V4L2_STD_PAL_G,       "PAL-G"     },
-       { V4L2_STD_PAL_H,       "PAL-H"     },
-       { V4L2_STD_PAL_I,       "PAL-I"     },
-       { V4L2_STD_PAL_DK,      "PAL-DK"    },
-       { V4L2_STD_PAL_D,       "PAL-D"     },
-       { V4L2_STD_PAL_D1,      "PAL-D1"    },
-       { V4L2_STD_PAL_K,       "PAL-K"     },
-       { V4L2_STD_PAL_M,       "PAL-M"     },
-       { V4L2_STD_PAL_N,       "PAL-N"     },
-       { V4L2_STD_PAL_Nc,      "PAL-Nc"    },
-       { V4L2_STD_PAL_60,      "PAL-60"    },
-       { V4L2_STD_SECAM,       "SECAM"     },
-       { V4L2_STD_SECAM_B,     "SECAM-B"   },
-       { V4L2_STD_SECAM_G,     "SECAM-G"   },
-       { V4L2_STD_SECAM_H,     "SECAM-H"   },
-       { V4L2_STD_SECAM_DK,    "SECAM-DK"  },
-       { V4L2_STD_SECAM_D,     "SECAM-D"   },
-       { V4L2_STD_SECAM_K,     "SECAM-K"   },
-       { V4L2_STD_SECAM_K1,    "SECAM-K1"  },
-       { V4L2_STD_SECAM_L,     "SECAM-L"   },
-       { V4L2_STD_SECAM_LC,    "SECAM-Lc"  },
-       { 0,                    "Unknown"   }
+       { V4L2_STD_NTSC_443,    "NTSC-443"  },
+       { V4L2_STD_PAL,         "PAL"       },
+       { V4L2_STD_PAL_BG,      "PAL-BG"    },
+       { V4L2_STD_PAL_B,       "PAL-B"     },
+       { V4L2_STD_PAL_B1,      "PAL-B1"    },
+       { V4L2_STD_PAL_G,       "PAL-G"     },
+       { V4L2_STD_PAL_H,       "PAL-H"     },
+       { V4L2_STD_PAL_I,       "PAL-I"     },
+       { V4L2_STD_PAL_DK,      "PAL-DK"    },
+       { V4L2_STD_PAL_D,       "PAL-D"     },
+       { V4L2_STD_PAL_D1,      "PAL-D1"    },
+       { V4L2_STD_PAL_K,       "PAL-K"     },
+       { V4L2_STD_PAL_M,       "PAL-M"     },
+       { V4L2_STD_PAL_N,       "PAL-N"     },
+       { V4L2_STD_PAL_Nc,      "PAL-Nc"    },
+       { V4L2_STD_PAL_60,      "PAL-60"    },
+       { V4L2_STD_SECAM,       "SECAM"     },
+       { V4L2_STD_SECAM_B,     "SECAM-B"   },
+       { V4L2_STD_SECAM_G,     "SECAM-G"   },
+       { V4L2_STD_SECAM_H,     "SECAM-H"   },
+       { V4L2_STD_SECAM_DK,    "SECAM-DK"  },
+       { V4L2_STD_SECAM_D,     "SECAM-D"   },
+       { V4L2_STD_SECAM_K,     "SECAM-K"   },
+       { V4L2_STD_SECAM_K1,    "SECAM-K1"  },
+       { V4L2_STD_SECAM_L,     "SECAM-L"   },
+       { V4L2_STD_SECAM_LC,    "SECAM-Lc"  },
+       { 0,                    "Unknown"   }
 };
 
 /* video4linux standard ID conversion to standard name
@@ -2544,7 +2544,7 @@ struct v4l2_ioctl_info {
 #define INFO_FL_CLEAR(v4l2_struct, field)                      \
        ((offsetof(struct v4l2_struct, field) +                 \
          sizeof(((struct v4l2_struct *)0)->field)) << 16)
-#define INFO_FL_CLEAR_MASK     (_IOC_SIZEMASK << 16)
+#define INFO_FL_CLEAR_MASK     (_IOC_SIZEMASK << 16)
 
 #define IOCTL_INFO_STD(_ioctl, _vidioc, _debug, _flags)                        \
        [_IOC_NR(_ioctl)] = {                                           \
index 9635eeb..33a97bf 100644 (file)
@@ -29,8 +29,8 @@ enum cx2341x_port {
 
 enum cx2341x_cap {
        CX2341X_CAP_HAS_SLICED_VBI = 1 << 0,
-       CX2341X_CAP_HAS_TS         = 1 << 1,
-       CX2341X_CAP_HAS_AC3        = 1 << 2,
+       CX2341X_CAP_HAS_TS         = 1 << 1,
+       CX2341X_CAP_HAS_AC3        = 1 << 2,
 };
 
 struct cx2341x_mpeg_params {
@@ -204,92 +204,92 @@ void cx2341x_handler_set_busy(struct cx2341x_handler *cxhdl, int busy);
 /* Firmware API commands */
 
 /* MPEG decoder API, specific to the cx23415 */
-#define CX2341X_DEC_PING_FW                    0x00
-#define CX2341X_DEC_START_PLAYBACK             0x01
-#define CX2341X_DEC_STOP_PLAYBACK              0x02
-#define CX2341X_DEC_SET_PLAYBACK_SPEED                 0x03
-#define CX2341X_DEC_STEP_VIDEO                         0x05
-#define CX2341X_DEC_SET_DMA_BLOCK_SIZE                 0x08
+#define CX2341X_DEC_PING_FW                    0x00
+#define CX2341X_DEC_START_PLAYBACK             0x01
+#define CX2341X_DEC_STOP_PLAYBACK              0x02
+#define CX2341X_DEC_SET_PLAYBACK_SPEED         0x03
+#define CX2341X_DEC_STEP_VIDEO                 0x05
+#define CX2341X_DEC_SET_DMA_BLOCK_SIZE         0x08
 #define CX2341X_DEC_GET_XFER_INFO              0x09
 #define CX2341X_DEC_GET_DMA_STATUS             0x0a
 #define CX2341X_DEC_SCHED_DMA_FROM_HOST                0x0b
-#define CX2341X_DEC_PAUSE_PLAYBACK             0x0d
-#define CX2341X_DEC_HALT_FW                    0x0e
-#define CX2341X_DEC_SET_STANDARD               0x10
+#define CX2341X_DEC_PAUSE_PLAYBACK             0x0d
+#define CX2341X_DEC_HALT_FW                    0x0e
+#define CX2341X_DEC_SET_STANDARD               0x10
 #define CX2341X_DEC_GET_VERSION                        0x11
-#define CX2341X_DEC_SET_STREAM_INPUT           0x14
-#define CX2341X_DEC_GET_TIMING_INFO            0x15
-#define CX2341X_DEC_SET_AUDIO_MODE             0x16
+#define CX2341X_DEC_SET_STREAM_INPUT           0x14
+#define CX2341X_DEC_GET_TIMING_INFO            0x15
+#define CX2341X_DEC_SET_AUDIO_MODE             0x16
 #define CX2341X_DEC_SET_EVENT_NOTIFICATION     0x17
 #define CX2341X_DEC_SET_DISPLAY_BUFFERS                0x18
-#define CX2341X_DEC_EXTRACT_VBI                0x19
-#define CX2341X_DEC_SET_DECODER_SOURCE                 0x1a
+#define CX2341X_DEC_EXTRACT_VBI                        0x19
+#define CX2341X_DEC_SET_DECODER_SOURCE         0x1a
 #define CX2341X_DEC_SET_PREBUFFERING           0x1e
 
 /* MPEG encoder API */
-#define CX2341X_ENC_PING_FW                    0x80
-#define CX2341X_ENC_START_CAPTURE              0x81
-#define CX2341X_ENC_STOP_CAPTURE               0x82
-#define CX2341X_ENC_SET_AUDIO_ID               0x89
-#define CX2341X_ENC_SET_VIDEO_ID               0x8b
-#define CX2341X_ENC_SET_PCR_ID                         0x8d
-#define CX2341X_ENC_SET_FRAME_RATE             0x8f
-#define CX2341X_ENC_SET_FRAME_SIZE             0x91
-#define CX2341X_ENC_SET_BIT_RATE               0x95
-#define CX2341X_ENC_SET_GOP_PROPERTIES                 0x97
-#define CX2341X_ENC_SET_ASPECT_RATIO           0x99
-#define CX2341X_ENC_SET_DNR_FILTER_MODE        0x9b
-#define CX2341X_ENC_SET_DNR_FILTER_PROPS       0x9d
-#define CX2341X_ENC_SET_CORING_LEVELS          0x9f
-#define CX2341X_ENC_SET_SPATIAL_FILTER_TYPE    0xa1
-#define CX2341X_ENC_SET_VBI_LINE               0xb7
-#define CX2341X_ENC_SET_STREAM_TYPE            0xb9
-#define CX2341X_ENC_SET_OUTPUT_PORT            0xbb
-#define CX2341X_ENC_SET_AUDIO_PROPERTIES       0xbd
-#define CX2341X_ENC_HALT_FW                    0xc3
+#define CX2341X_ENC_PING_FW                    0x80
+#define CX2341X_ENC_START_CAPTURE              0x81
+#define CX2341X_ENC_STOP_CAPTURE               0x82
+#define CX2341X_ENC_SET_AUDIO_ID               0x89
+#define CX2341X_ENC_SET_VIDEO_ID               0x8b
+#define CX2341X_ENC_SET_PCR_ID                 0x8d
+#define CX2341X_ENC_SET_FRAME_RATE             0x8f
+#define CX2341X_ENC_SET_FRAME_SIZE             0x91
+#define CX2341X_ENC_SET_BIT_RATE               0x95
+#define CX2341X_ENC_SET_GOP_PROPERTIES         0x97
+#define CX2341X_ENC_SET_ASPECT_RATIO           0x99
+#define CX2341X_ENC_SET_DNR_FILTER_MODE                0x9b
+#define CX2341X_ENC_SET_DNR_FILTER_PROPS       0x9d
+#define CX2341X_ENC_SET_CORING_LEVELS          0x9f
+#define CX2341X_ENC_SET_SPATIAL_FILTER_TYPE    0xa1
+#define CX2341X_ENC_SET_VBI_LINE               0xb7
+#define CX2341X_ENC_SET_STREAM_TYPE            0xb9
+#define CX2341X_ENC_SET_OUTPUT_PORT            0xbb
+#define CX2341X_ENC_SET_AUDIO_PROPERTIES       0xbd
+#define CX2341X_ENC_HALT_FW                    0xc3
 #define CX2341X_ENC_GET_VERSION                        0xc4
-#define CX2341X_ENC_SET_GOP_CLOSURE            0xc5
-#define CX2341X_ENC_GET_SEQ_END                0xc6
-#define CX2341X_ENC_SET_PGM_INDEX_INFO                 0xc7
+#define CX2341X_ENC_SET_GOP_CLOSURE            0xc5
+#define CX2341X_ENC_GET_SEQ_END                        0xc6
+#define CX2341X_ENC_SET_PGM_INDEX_INFO         0xc7
 #define CX2341X_ENC_SET_VBI_CONFIG             0xc8
-#define CX2341X_ENC_SET_DMA_BLOCK_SIZE                 0xc9
+#define CX2341X_ENC_SET_DMA_BLOCK_SIZE         0xc9
 #define CX2341X_ENC_GET_PREV_DMA_INFO_MB_10    0xca
 #define CX2341X_ENC_GET_PREV_DMA_INFO_MB_9     0xcb
-#define CX2341X_ENC_SCHED_DMA_TO_HOST          0xcc
-#define CX2341X_ENC_INITIALIZE_INPUT           0xcd
-#define CX2341X_ENC_SET_FRAME_DROP_RATE        0xd0
-#define CX2341X_ENC_PAUSE_ENCODER              0xd2
-#define CX2341X_ENC_REFRESH_INPUT              0xd3
+#define CX2341X_ENC_SCHED_DMA_TO_HOST          0xcc
+#define CX2341X_ENC_INITIALIZE_INPUT           0xcd
+#define CX2341X_ENC_SET_FRAME_DROP_RATE                0xd0
+#define CX2341X_ENC_PAUSE_ENCODER              0xd2
+#define CX2341X_ENC_REFRESH_INPUT              0xd3
 #define CX2341X_ENC_SET_COPYRIGHT              0xd4
-#define CX2341X_ENC_SET_EVENT_NOTIFICATION     0xd5
-#define CX2341X_ENC_SET_NUM_VSYNC_LINES        0xd6
-#define CX2341X_ENC_SET_PLACEHOLDER            0xd7
-#define CX2341X_ENC_MUTE_VIDEO                         0xd9
-#define CX2341X_ENC_MUTE_AUDIO                         0xda
+#define CX2341X_ENC_SET_EVENT_NOTIFICATION     0xd5
+#define CX2341X_ENC_SET_NUM_VSYNC_LINES                0xd6
+#define CX2341X_ENC_SET_PLACEHOLDER            0xd7
+#define CX2341X_ENC_MUTE_VIDEO                 0xd9
+#define CX2341X_ENC_MUTE_AUDIO                 0xda
 #define CX2341X_ENC_SET_VERT_CROP_LINE         0xdb
-#define CX2341X_ENC_MISC                       0xdc
+#define CX2341X_ENC_MISC                       0xdc
 
 /* OSD API, specific to the cx23415 */
-#define CX2341X_OSD_GET_FRAMEBUFFER            0x41
-#define CX2341X_OSD_GET_PIXEL_FORMAT           0x42
-#define CX2341X_OSD_SET_PIXEL_FORMAT           0x43
-#define CX2341X_OSD_GET_STATE                  0x44
-#define CX2341X_OSD_SET_STATE                  0x45
-#define CX2341X_OSD_GET_OSD_COORDS             0x46
-#define CX2341X_OSD_SET_OSD_COORDS             0x47
-#define CX2341X_OSD_GET_SCREEN_COORDS          0x48
-#define CX2341X_OSD_SET_SCREEN_COORDS          0x49
-#define CX2341X_OSD_GET_GLOBAL_ALPHA           0x4a
-#define CX2341X_OSD_SET_GLOBAL_ALPHA           0x4b
-#define CX2341X_OSD_SET_BLEND_COORDS           0x4c
-#define CX2341X_OSD_GET_FLICKER_STATE          0x4f
-#define CX2341X_OSD_SET_FLICKER_STATE          0x50
-#define CX2341X_OSD_BLT_COPY                   0x52
-#define CX2341X_OSD_BLT_FILL                   0x53
-#define CX2341X_OSD_BLT_TEXT                   0x54
-#define CX2341X_OSD_SET_FRAMEBUFFER_WINDOW     0x56
-#define CX2341X_OSD_SET_CHROMA_KEY             0x60
-#define CX2341X_OSD_GET_ALPHA_CONTENT_INDEX    0x61
-#define CX2341X_OSD_SET_ALPHA_CONTENT_INDEX    0x62
+#define CX2341X_OSD_GET_FRAMEBUFFER            0x41
+#define CX2341X_OSD_GET_PIXEL_FORMAT           0x42
+#define CX2341X_OSD_SET_PIXEL_FORMAT           0x43
+#define CX2341X_OSD_GET_STATE                  0x44
+#define CX2341X_OSD_SET_STATE                  0x45
+#define CX2341X_OSD_GET_OSD_COORDS             0x46
+#define CX2341X_OSD_SET_OSD_COORDS             0x47
+#define CX2341X_OSD_GET_SCREEN_COORDS          0x48
+#define CX2341X_OSD_SET_SCREEN_COORDS          0x49
+#define CX2341X_OSD_GET_GLOBAL_ALPHA           0x4a
+#define CX2341X_OSD_SET_GLOBAL_ALPHA           0x4b
+#define CX2341X_OSD_SET_BLEND_COORDS           0x4c
+#define CX2341X_OSD_GET_FLICKER_STATE          0x4f
+#define CX2341X_OSD_SET_FLICKER_STATE          0x50
+#define CX2341X_OSD_BLT_COPY                   0x52
+#define CX2341X_OSD_BLT_FILL                   0x53
+#define CX2341X_OSD_BLT_TEXT                   0x54
+#define CX2341X_OSD_SET_FRAMEBUFFER_WINDOW     0x56
+#define CX2341X_OSD_SET_CHROMA_KEY             0x60
+#define CX2341X_OSD_GET_ALPHA_CONTENT_INDEX    0x61
+#define CX2341X_OSD_SET_ALPHA_CONTENT_INDEX    0x62
 
 #endif /* CX2341X_H */
index 1e6e802..db98ce4 100644 (file)
  */
 
 /* SCART input to DSP selection */
-#define MSP_IN_SCART1                  0  /* Pin SC1_IN */
-#define MSP_IN_SCART2                  1  /* Pin SC2_IN */
-#define MSP_IN_SCART3                  2  /* Pin SC3_IN */
-#define MSP_IN_SCART4                  3  /* Pin SC4_IN */
-#define MSP_IN_MONO            6  /* Pin MONO_IN */
-#define MSP_IN_MUTE            7  /* Mute DSP input */
-#define MSP_SCART_TO_DSP(in)   (in)
+#define MSP_IN_SCART1          0  /* Pin SC1_IN */
+#define MSP_IN_SCART2          1  /* Pin SC2_IN */
+#define MSP_IN_SCART3          2  /* Pin SC3_IN */
+#define MSP_IN_SCART4          3  /* Pin SC4_IN */
+#define MSP_IN_MONO            6  /* Pin MONO_IN */
+#define MSP_IN_MUTE            7  /* Mute DSP input */
+#define MSP_SCART_TO_DSP(in)   (in)
 /* Tuner input to demodulator and DSP selection */
-#define MSP_IN_TUNER1          0  /* Analog Sound IF input pin ANA_IN1 */
-#define MSP_IN_TUNER2          1  /* Analog Sound IF input pin ANA_IN2 */
-#define MSP_TUNER_TO_DSP(in)   ((in) << 3)
+#define MSP_IN_TUNER1          0  /* Analog Sound IF input pin ANA_IN1 */
+#define MSP_IN_TUNER2          1  /* Analog Sound IF input pin ANA_IN2 */
+#define MSP_TUNER_TO_DSP(in)   ((in) << 3)
 
 /* The msp has up to 5 DSP outputs, each output can independently select
    a DSP input.
    DSP. This is currently not implemented. Also not implemented is the
    multi-channel capable I2S3 input of the 44x0G. If someone can demonstrate
    a need for one of those features then additional support can be added. */
-#define MSP_DSP_IN_TUNER       0  /* Tuner DSP input */
-#define MSP_DSP_IN_SCART       2  /* SCART DSP input */
-#define MSP_DSP_IN_I2S1        5  /* I2S1 DSP input */
-#define MSP_DSP_IN_I2S2        6  /* I2S2 DSP input */
-#define MSP_DSP_IN_I2S3        7  /* I2S3 DSP input */
-#define MSP_DSP_IN_MAIN_AVC    11 /* MAIN AVC processed DSP input */
-#define MSP_DSP_IN_MAIN        12 /* MAIN DSP input */
-#define MSP_DSP_IN_AUX                 13 /* AUX DSP input */
-#define MSP_DSP_TO_MAIN(in)    ((in) << 4)
-#define MSP_DSP_TO_AUX(in)     ((in) << 8)
-#define MSP_DSP_TO_SCART1(in)  ((in) << 12)
-#define MSP_DSP_TO_SCART2(in)  ((in) << 16)
-#define MSP_DSP_TO_I2S(in)     ((in) << 20)
+#define MSP_DSP_IN_TUNER       0  /* Tuner DSP input */
+#define MSP_DSP_IN_SCART       2  /* SCART DSP input */
+#define MSP_DSP_IN_I2S1                5  /* I2S1 DSP input */
+#define MSP_DSP_IN_I2S2                6  /* I2S2 DSP input */
+#define MSP_DSP_IN_I2S3                7  /* I2S3 DSP input */
+#define MSP_DSP_IN_MAIN_AVC    11 /* MAIN AVC processed DSP input */
+#define MSP_DSP_IN_MAIN                12 /* MAIN DSP input */
+#define MSP_DSP_IN_AUX         13 /* AUX DSP input */
+#define MSP_DSP_TO_MAIN(in)    ((in) << 4)
+#define MSP_DSP_TO_AUX(in)     ((in) << 8)
+#define MSP_DSP_TO_SCART1(in)  ((in) << 12)
+#define MSP_DSP_TO_SCART2(in)  ((in) << 16)
+#define MSP_DSP_TO_I2S(in)     ((in) << 20)
 
 /* Output SCART select: the SCART outputs can select which input
    to use. */
-#define MSP_SC_IN_SCART1       0  /* SCART1 input, bypassing the DSP */
-#define MSP_SC_IN_SCART2       1  /* SCART2 input, bypassing the DSP */
-#define MSP_SC_IN_SCART3       2  /* SCART3 input, bypassing the DSP */
-#define MSP_SC_IN_SCART4       3  /* SCART4 input, bypassing the DSP */
-#define MSP_SC_IN_DSP_SCART1   4  /* DSP SCART1 input */
-#define MSP_SC_IN_DSP_SCART2   5  /* DSP SCART2 input */
-#define MSP_SC_IN_MONO                 6  /* MONO input, bypassing the DSP */
-#define MSP_SC_IN_MUTE                 7  /* MUTE output */
+#define MSP_SC_IN_SCART1       0  /* SCART1 input, bypassing the DSP */
+#define MSP_SC_IN_SCART2       1  /* SCART2 input, bypassing the DSP */
+#define MSP_SC_IN_SCART3       2  /* SCART3 input, bypassing the DSP */
+#define MSP_SC_IN_SCART4       3  /* SCART4 input, bypassing the DSP */
+#define MSP_SC_IN_DSP_SCART1   4  /* DSP SCART1 input */
+#define MSP_SC_IN_DSP_SCART2   5  /* DSP SCART2 input */
+#define MSP_SC_IN_MONO         6  /* MONO input, bypassing the DSP */
+#define MSP_SC_IN_MUTE         7  /* MUTE output */
 #define MSP_SC_TO_SCART1(in)   (in)
 #define MSP_SC_TO_SCART2(in)   ((in) << 4)
 
index 769c6cf..a7bf2c4 100644 (file)
@@ -118,7 +118,7 @@ struct saa7146_dev
 {
        struct module                   *module;
 
-       struct v4l2_device              v4l2_dev;
+       struct v4l2_device              v4l2_dev;
        struct v4l2_ctrl_handler        ctrl_handler;
 
        /* different device locks */
index 8025f4b..1bcf0db 100644 (file)
@@ -30,7 +30,7 @@
 
    Note: these ioctls that internal to the kernel and are never called
    from userspace. */
-#define BT819_FIFO_RESET_LOW   _IO('b', 0)
-#define BT819_FIFO_RESET_HIGH  _IO('b', 1)
+#define BT819_FIFO_RESET_LOW   _IO('b', 0)
+#define BT819_FIFO_RESET_HIGH  _IO('b', 1)
 
 #endif
index 7ddffae..8d9db3c 100644 (file)
 
 /* Input routing switch 1 */
 
-#define M52790_SW1_IN_MASK     0x0003
-#define M52790_SW1_IN_TUNER    0x0000
-#define M52790_SW1_IN_V2       0x0001
-#define M52790_SW1_IN_V3       0x0002
-#define M52790_SW1_IN_V4       0x0003
+#define M52790_SW1_IN_MASK     0x0003
+#define M52790_SW1_IN_TUNER    0x0000
+#define M52790_SW1_IN_V2       0x0001
+#define M52790_SW1_IN_V3       0x0002
+#define M52790_SW1_IN_V4       0x0003
 
 /* Selects component input instead of composite */
-#define M52790_SW1_YCMIX       0x0004
+#define M52790_SW1_YCMIX       0x0004
 
 
 /* Input routing switch 2 */
 
-#define M52790_SW2_IN_MASK     0x0300
-#define M52790_SW2_IN_TUNER    0x0000
-#define M52790_SW2_IN_V2       0x0100
-#define M52790_SW2_IN_V3       0x0200
-#define M52790_SW2_IN_V4       0x0300
+#define M52790_SW2_IN_MASK     0x0300
+#define M52790_SW2_IN_TUNER    0x0000
+#define M52790_SW2_IN_V2       0x0100
+#define M52790_SW2_IN_V3       0x0200
+#define M52790_SW2_IN_V4       0x0300
 
 /* Selects component input instead of composite */
-#define M52790_SW2_YCMIX       0x0400
+#define M52790_SW2_YCMIX       0x0400
 
 
 /* Output routing switch 1 */
 
 /* Enable 6dB amplifier for composite out */
-#define M52790_SW1_V_AMP       0x0008
+#define M52790_SW1_V_AMP       0x0008
 
 /* Enable 6dB amplifier for component out */
-#define M52790_SW1_YC_AMP      0x0010
+#define M52790_SW1_YC_AMP      0x0010
 
 /* Audio output mode */
-#define M52790_SW1_AUDIO_MASK  0x00c0
-#define M52790_SW1_AUDIO_MUTE  0x0000
-#define M52790_SW1_AUDIO_R     0x0040
-#define M52790_SW1_AUDIO_L     0x0080
+#define M52790_SW1_AUDIO_MASK  0x00c0
+#define M52790_SW1_AUDIO_MUTE  0x0000
+#define M52790_SW1_AUDIO_R     0x0040
+#define M52790_SW1_AUDIO_L     0x0080
 #define M52790_SW1_AUDIO_STEREO 0x00c0
 
 
 /* Output routing switch 2 */
 
 /* Enable 6dB amplifier for composite out */
-#define M52790_SW2_V_AMP       0x0800
+#define M52790_SW2_V_AMP       0x0800
 
 /* Enable 6dB amplifier for component out */
-#define M52790_SW2_YC_AMP      0x1000
+#define M52790_SW2_YC_AMP      0x1000
 
 /* Audio output mode */
-#define M52790_SW2_AUDIO_MASK  0xc000
-#define M52790_SW2_AUDIO_MUTE  0x0000
-#define M52790_SW2_AUDIO_R     0x4000
-#define M52790_SW2_AUDIO_L     0x8000
+#define M52790_SW2_AUDIO_MASK  0xc000
+#define M52790_SW2_AUDIO_MUTE  0x0000
+#define M52790_SW2_AUDIO_R     0x4000
+#define M52790_SW2_AUDIO_L     0x8000
 #define M52790_SW2_AUDIO_STEREO 0xc000
 
 
@@ -83,9 +83,9 @@
 #define M52790_IN_V3    (M52790_SW1_IN_V3 | M52790_SW2_IN_V3)
 #define M52790_IN_V4    (M52790_SW1_IN_V4 | M52790_SW2_IN_V4)
 
-#define M52790_OUT_STEREO      (M52790_SW1_AUDIO_STEREO | \
+#define M52790_OUT_STEREO      (M52790_SW1_AUDIO_STEREO | \
                                 M52790_SW2_AUDIO_STEREO)
-#define M52790_OUT_AMP_STEREO  (M52790_SW1_AUDIO_STEREO | \
+#define M52790_OUT_AMP_STEREO  (M52790_SW1_AUDIO_STEREO | \
                                 M52790_SW1_V_AMP | \
                                 M52790_SW2_AUDIO_STEREO | \
                                 M52790_SW2_V_AMP)
index 53954c9..a0cda42 100644 (file)
 #define SAA7115_SVIDEO3    9
 
 /* outputs */
-#define SAA7115_IPORT_ON       1
-#define SAA7115_IPORT_OFF      0
+#define SAA7115_IPORT_ON       1
+#define SAA7115_IPORT_OFF      0
 
 /* SAA7111 specific outputs. */
-#define SAA7111_VBI_BYPASS     2
+#define SAA7111_VBI_BYPASS     2
 #define SAA7111_FMT_YUV422      0x00
-#define SAA7111_FMT_RGB        0x40
-#define SAA7111_FMT_CCIR       0x80
-#define SAA7111_FMT_YUV411     0xc0
+#define SAA7111_FMT_RGB                0x40
+#define SAA7111_FMT_CCIR       0x80
+#define SAA7111_FMT_YUV411     0xc0
 
 /* config flags */
 /*
index 48ec03c..1eba24d 100644 (file)
@@ -18,9 +18,9 @@
 #define _UPD64031A_H_
 
 /* Ghost reduction modes */
-#define UPD64031A_GR_ON        0
-#define UPD64031A_GR_OFF       1
-#define UPD64031A_GR_THROUGH   3
+#define UPD64031A_GR_ON                0
+#define UPD64031A_GR_OFF       1
+#define UPD64031A_GR_THROUGH   3
 
 /* Direct 3D/YCS Connection */
 #define UPD64031A_3DYCS_DISABLE   (0 << 2)
index 7fc0bc6..e0d95a7 100644 (file)
@@ -50,7 +50,7 @@
 /* These three macros assume that the debug level is set with a module
    parameter called 'debug'. */
 #define v4l_dbg(level, debug, client, fmt, arg...)                          \
-       do {                                                                 \
+       do {                                                                 \
                if (debug >= (level))                                        \
                        v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \
        } while (0)
@@ -80,9 +80,9 @@
 /* These three macros assume that the debug level is set with a module
    parameter called 'debug'. */
 #define v4l2_dbg(level, debug, dev, fmt, arg...)                       \
-       do {                                                            \
+       do {                                                            \
                if (debug >= (level))                                   \
-                       v4l2_printk(KERN_DEBUG, dev, fmt , ## arg);     \
+                       v4l2_printk(KERN_DEBUG, dev, fmt , ## arg);     \
        } while (0)
 
 /**
@@ -266,7 +266,7 @@ struct v4l2_priv_tun_config {
 };
 #define TUNER_SET_CONFIG           _IOW('d', 92, struct v4l2_priv_tun_config)
 
-#define VIDIOC_INT_RESET               _IOW ('d', 102, u32)
+#define VIDIOC_INT_RESET               _IOW ('d', 102, u32)
 
 /* ------------------------------------------------------------------------- */
 
index 4d51f98..df3d702 100644 (file)
@@ -83,11 +83,11 @@ typedef enum {
 #define VIDEO_CMD_CONTINUE    (3)
 
 /* Flags for VIDEO_CMD_FREEZE */
-#define VIDEO_CMD_FREEZE_TO_BLACK      (1 << 0)
+#define VIDEO_CMD_FREEZE_TO_BLACK      (1 << 0)
 
 /* Flags for VIDEO_CMD_STOP */
-#define VIDEO_CMD_STOP_TO_BLACK        (1 << 0)
-#define VIDEO_CMD_STOP_IMMEDIATELY             (1 << 1)
+#define VIDEO_CMD_STOP_TO_BLACK                (1 << 0)
+#define VIDEO_CMD_STOP_IMMEDIATELY     (1 << 1)
 
 /* Play input formats: */
 /* The decoder has no special format requirements */
@@ -124,8 +124,8 @@ struct video_command {
 /* FIELD_UNKNOWN can be used if the hardware does not know whether
    the Vsync is for an odd, even or progressive (i.e. non-interlaced)
    field. */
-#define VIDEO_VSYNC_FIELD_UNKNOWN      (0)
-#define VIDEO_VSYNC_FIELD_ODD          (1)
+#define VIDEO_VSYNC_FIELD_UNKNOWN      (0)
+#define VIDEO_VSYNC_FIELD_ODD          (1)
 #define VIDEO_VSYNC_FIELD_EVEN         (2)
 #define VIDEO_VSYNC_FIELD_PROGRESSIVE  (3)
 
@@ -133,8 +133,8 @@ struct video_event {
        __s32 type;
 #define VIDEO_EVENT_SIZE_CHANGED       1
 #define VIDEO_EVENT_FRAME_RATE_CHANGED 2
-#define VIDEO_EVENT_DECODER_STOPPED    3
-#define VIDEO_EVENT_VSYNC              4
+#define VIDEO_EVENT_DECODER_STOPPED    3
+#define VIDEO_EVENT_VSYNC              4
        /* unused, make sure to use atomic time for y2038 if it ever gets used */
        long timestamp;
        union {
@@ -268,9 +268,9 @@ typedef __u16 video_attributes_t;
 #define VIDEO_GET_PTS              _IOR('o', 57, __u64)
 
 /* Read the number of displayed frames since the decoder was started */
-#define VIDEO_GET_FRAME_COUNT             _IOR('o', 58, __u64)
+#define VIDEO_GET_FRAME_COUNT     _IOR('o', 58, __u64)
 
-#define VIDEO_COMMAND             _IOWR('o', 59, struct video_command)
-#define VIDEO_TRY_COMMAND         _IOWR('o', 60, struct video_command)
+#define VIDEO_COMMAND             _IOWR('o', 59, struct video_command)
+#define VIDEO_TRY_COMMAND         _IOWR('o', 60, struct video_command)
 
 #endif /* _UAPI_DVBVIDEO_H_ */
index a692623..cbbb750 100644 (file)
@@ -67,8 +67,8 @@
 /* User-class control IDs */
 
 #define V4L2_CID_BASE                  (V4L2_CTRL_CLASS_USER | 0x900)
-#define V4L2_CID_USER_BASE             V4L2_CID_BASE
-#define V4L2_CID_USER_CLASS            (V4L2_CTRL_CLASS_USER | 1)
+#define V4L2_CID_USER_BASE             V4L2_CID_BASE
+#define V4L2_CID_USER_CLASS            (V4L2_CTRL_CLASS_USER | 1)
 #define V4L2_CID_BRIGHTNESS            (V4L2_CID_BASE+0)
 #define V4L2_CID_CONTRAST              (V4L2_CID_BASE+1)
 #define V4L2_CID_SATURATION            (V4L2_CID_BASE+2)
@@ -102,7 +102,7 @@ enum v4l2_power_line_frequency {
 #define V4L2_CID_HUE_AUTO                      (V4L2_CID_BASE+25)
 #define V4L2_CID_WHITE_BALANCE_TEMPERATURE     (V4L2_CID_BASE+26)
 #define V4L2_CID_SHARPNESS                     (V4L2_CID_BASE+27)
-#define V4L2_CID_BACKLIGHT_COMPENSATION        (V4L2_CID_BASE+28)
+#define V4L2_CID_BACKLIGHT_COMPENSATION                (V4L2_CID_BASE+28)
 #define V4L2_CID_CHROMA_AGC                     (V4L2_CID_BASE+29)
 #define V4L2_CID_COLOR_KILLER                   (V4L2_CID_BASE+30)
 #define V4L2_CID_COLORFX                       (V4L2_CID_BASE+31)
@@ -194,11 +194,11 @@ enum v4l2_colorfx {
 /* The MPEG controls are applicable to all codec controls
  * and the 'MPEG' part of the define is historical */
 
-#define V4L2_CID_MPEG_BASE                     (V4L2_CTRL_CLASS_MPEG | 0x900)
-#define V4L2_CID_MPEG_CLASS                    (V4L2_CTRL_CLASS_MPEG | 1)
+#define V4L2_CID_MPEG_BASE                     (V4L2_CTRL_CLASS_MPEG | 0x900)
+#define V4L2_CID_MPEG_CLASS                    (V4L2_CTRL_CLASS_MPEG | 1)
 
 /*  MPEG streams, specific to multiplexed streams */
-#define V4L2_CID_MPEG_STREAM_TYPE              (V4L2_CID_MPEG_BASE+0)
+#define V4L2_CID_MPEG_STREAM_TYPE              (V4L2_CID_MPEG_BASE+0)
 enum v4l2_mpeg_stream_type {
        V4L2_MPEG_STREAM_TYPE_MPEG2_PS   = 0, /* MPEG-2 program stream */
        V4L2_MPEG_STREAM_TYPE_MPEG2_TS   = 1, /* MPEG-2 transport stream */
@@ -207,26 +207,26 @@ enum v4l2_mpeg_stream_type {
        V4L2_MPEG_STREAM_TYPE_MPEG1_VCD  = 4, /* MPEG-1 VCD-compatible stream */
        V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */
 };
-#define V4L2_CID_MPEG_STREAM_PID_PMT           (V4L2_CID_MPEG_BASE+1)
-#define V4L2_CID_MPEG_STREAM_PID_AUDIO                 (V4L2_CID_MPEG_BASE+2)
-#define V4L2_CID_MPEG_STREAM_PID_VIDEO                 (V4L2_CID_MPEG_BASE+3)
-#define V4L2_CID_MPEG_STREAM_PID_PCR           (V4L2_CID_MPEG_BASE+4)
-#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO      (V4L2_CID_MPEG_BASE+5)
-#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO      (V4L2_CID_MPEG_BASE+6)
-#define V4L2_CID_MPEG_STREAM_VBI_FMT           (V4L2_CID_MPEG_BASE+7)
+#define V4L2_CID_MPEG_STREAM_PID_PMT           (V4L2_CID_MPEG_BASE+1)
+#define V4L2_CID_MPEG_STREAM_PID_AUDIO         (V4L2_CID_MPEG_BASE+2)
+#define V4L2_CID_MPEG_STREAM_PID_VIDEO         (V4L2_CID_MPEG_BASE+3)
+#define V4L2_CID_MPEG_STREAM_PID_PCR           (V4L2_CID_MPEG_BASE+4)
+#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO      (V4L2_CID_MPEG_BASE+5)
+#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO      (V4L2_CID_MPEG_BASE+6)
+#define V4L2_CID_MPEG_STREAM_VBI_FMT           (V4L2_CID_MPEG_BASE+7)
 enum v4l2_mpeg_stream_vbi_fmt {
        V4L2_MPEG_STREAM_VBI_FMT_NONE = 0,  /* No VBI in the MPEG stream */
        V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1,  /* VBI in private packets, IVTV format */
 };
 
 /*  MPEG audio controls specific to multiplexed streams  */
-#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ      (V4L2_CID_MPEG_BASE+100)
+#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ      (V4L2_CID_MPEG_BASE+100)
 enum v4l2_mpeg_audio_sampling_freq {
        V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0,
        V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1,
        V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2,
 };
-#define V4L2_CID_MPEG_AUDIO_ENCODING           (V4L2_CID_MPEG_BASE+101)
+#define V4L2_CID_MPEG_AUDIO_ENCODING           (V4L2_CID_MPEG_BASE+101)
 enum v4l2_mpeg_audio_encoding {
        V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
        V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
@@ -234,7 +234,7 @@ enum v4l2_mpeg_audio_encoding {
        V4L2_MPEG_AUDIO_ENCODING_AAC     = 3,
        V4L2_MPEG_AUDIO_ENCODING_AC3     = 4,
 };
-#define V4L2_CID_MPEG_AUDIO_L1_BITRATE                 (V4L2_CID_MPEG_BASE+102)
+#define V4L2_CID_MPEG_AUDIO_L1_BITRATE         (V4L2_CID_MPEG_BASE+102)
 enum v4l2_mpeg_audio_l1_bitrate {
        V4L2_MPEG_AUDIO_L1_BITRATE_32K  = 0,
        V4L2_MPEG_AUDIO_L1_BITRATE_64K  = 1,
@@ -251,7 +251,7 @@ enum v4l2_mpeg_audio_l1_bitrate {
        V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12,
        V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13,
 };
-#define V4L2_CID_MPEG_AUDIO_L2_BITRATE                 (V4L2_CID_MPEG_BASE+103)
+#define V4L2_CID_MPEG_AUDIO_L2_BITRATE         (V4L2_CID_MPEG_BASE+103)
 enum v4l2_mpeg_audio_l2_bitrate {
        V4L2_MPEG_AUDIO_L2_BITRATE_32K  = 0,
        V4L2_MPEG_AUDIO_L2_BITRATE_48K  = 1,
@@ -268,7 +268,7 @@ enum v4l2_mpeg_audio_l2_bitrate {
        V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12,
        V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13,
 };
-#define V4L2_CID_MPEG_AUDIO_L3_BITRATE                 (V4L2_CID_MPEG_BASE+104)
+#define V4L2_CID_MPEG_AUDIO_L3_BITRATE         (V4L2_CID_MPEG_BASE+104)
 enum v4l2_mpeg_audio_l3_bitrate {
        V4L2_MPEG_AUDIO_L3_BITRATE_32K  = 0,
        V4L2_MPEG_AUDIO_L3_BITRATE_40K  = 1,
@@ -285,32 +285,32 @@ enum v4l2_mpeg_audio_l3_bitrate {
        V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12,
        V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13,
 };
-#define V4L2_CID_MPEG_AUDIO_MODE               (V4L2_CID_MPEG_BASE+105)
+#define V4L2_CID_MPEG_AUDIO_MODE               (V4L2_CID_MPEG_BASE+105)
 enum v4l2_mpeg_audio_mode {
        V4L2_MPEG_AUDIO_MODE_STEREO       = 0,
        V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1,
        V4L2_MPEG_AUDIO_MODE_DUAL         = 2,
        V4L2_MPEG_AUDIO_MODE_MONO         = 3,
 };
-#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION     (V4L2_CID_MPEG_BASE+106)
+#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION     (V4L2_CID_MPEG_BASE+106)
 enum v4l2_mpeg_audio_mode_extension {
        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4  = 0,
        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8  = 1,
        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2,
        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3,
 };
-#define V4L2_CID_MPEG_AUDIO_EMPHASIS           (V4L2_CID_MPEG_BASE+107)
+#define V4L2_CID_MPEG_AUDIO_EMPHASIS           (V4L2_CID_MPEG_BASE+107)
 enum v4l2_mpeg_audio_emphasis {
        V4L2_MPEG_AUDIO_EMPHASIS_NONE         = 0,
        V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1,
        V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17    = 2,
 };
-#define V4L2_CID_MPEG_AUDIO_CRC                (V4L2_CID_MPEG_BASE+108)
+#define V4L2_CID_MPEG_AUDIO_CRC                        (V4L2_CID_MPEG_BASE+108)
 enum v4l2_mpeg_audio_crc {
        V4L2_MPEG_AUDIO_CRC_NONE  = 0,
        V4L2_MPEG_AUDIO_CRC_CRC16 = 1,
 };
-#define V4L2_CID_MPEG_AUDIO_MUTE               (V4L2_CID_MPEG_BASE+109)
+#define V4L2_CID_MPEG_AUDIO_MUTE               (V4L2_CID_MPEG_BASE+109)
 #define V4L2_CID_MPEG_AUDIO_AAC_BITRATE                (V4L2_CID_MPEG_BASE+110)
 #define V4L2_CID_MPEG_AUDIO_AC3_BITRATE                (V4L2_CID_MPEG_BASE+111)
 enum v4l2_mpeg_audio_ac3_bitrate {
@@ -346,33 +346,33 @@ enum v4l2_mpeg_audio_dec_playback {
 #define V4L2_CID_MPEG_AUDIO_DEC_MULTILINGUAL_PLAYBACK (V4L2_CID_MPEG_BASE+113)
 
 /*  MPEG video controls specific to multiplexed streams */
-#define V4L2_CID_MPEG_VIDEO_ENCODING           (V4L2_CID_MPEG_BASE+200)
+#define V4L2_CID_MPEG_VIDEO_ENCODING           (V4L2_CID_MPEG_BASE+200)
 enum v4l2_mpeg_video_encoding {
        V4L2_MPEG_VIDEO_ENCODING_MPEG_1     = 0,
        V4L2_MPEG_VIDEO_ENCODING_MPEG_2     = 1,
        V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
 };
-#define V4L2_CID_MPEG_VIDEO_ASPECT             (V4L2_CID_MPEG_BASE+201)
+#define V4L2_CID_MPEG_VIDEO_ASPECT             (V4L2_CID_MPEG_BASE+201)
 enum v4l2_mpeg_video_aspect {
        V4L2_MPEG_VIDEO_ASPECT_1x1     = 0,
        V4L2_MPEG_VIDEO_ASPECT_4x3     = 1,
        V4L2_MPEG_VIDEO_ASPECT_16x9    = 2,
        V4L2_MPEG_VIDEO_ASPECT_221x100 = 3,
 };
-#define V4L2_CID_MPEG_VIDEO_B_FRAMES           (V4L2_CID_MPEG_BASE+202)
-#define V4L2_CID_MPEG_VIDEO_GOP_SIZE           (V4L2_CID_MPEG_BASE+203)
-#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE        (V4L2_CID_MPEG_BASE+204)
-#define V4L2_CID_MPEG_VIDEO_PULLDOWN           (V4L2_CID_MPEG_BASE+205)
-#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE       (V4L2_CID_MPEG_BASE+206)
+#define V4L2_CID_MPEG_VIDEO_B_FRAMES           (V4L2_CID_MPEG_BASE+202)
+#define V4L2_CID_MPEG_VIDEO_GOP_SIZE           (V4L2_CID_MPEG_BASE+203)
+#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE                (V4L2_CID_MPEG_BASE+204)
+#define V4L2_CID_MPEG_VIDEO_PULLDOWN           (V4L2_CID_MPEG_BASE+205)
+#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE       (V4L2_CID_MPEG_BASE+206)
 enum v4l2_mpeg_video_bitrate_mode {
        V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0,
        V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1,
 };
-#define V4L2_CID_MPEG_VIDEO_BITRATE            (V4L2_CID_MPEG_BASE+207)
-#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK       (V4L2_CID_MPEG_BASE+208)
+#define V4L2_CID_MPEG_VIDEO_BITRATE            (V4L2_CID_MPEG_BASE+207)
+#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK       (V4L2_CID_MPEG_BASE+208)
 #define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209)
-#define V4L2_CID_MPEG_VIDEO_MUTE               (V4L2_CID_MPEG_BASE+210)
-#define V4L2_CID_MPEG_VIDEO_MUTE_YUV           (V4L2_CID_MPEG_BASE+211)
+#define V4L2_CID_MPEG_VIDEO_MUTE               (V4L2_CID_MPEG_BASE+210)
+#define V4L2_CID_MPEG_VIDEO_MUTE_YUV           (V4L2_CID_MPEG_BASE+211)
 #define V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE            (V4L2_CID_MPEG_BASE+212)
 #define V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER       (V4L2_CID_MPEG_BASE+213)
 #define V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB            (V4L2_CID_MPEG_BASE+214)
@@ -590,14 +590,14 @@ enum v4l2_vp8_golden_frame_sel {
 #define V4L2_CID_MPEG_VIDEO_VPX_PROFILE                        (V4L2_CID_MPEG_BASE+511)
 
 /*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
-#define V4L2_CID_MPEG_CX2341X_BASE                             (V4L2_CTRL_CLASS_MPEG | 0x1000)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE        (V4L2_CID_MPEG_CX2341X_BASE+0)
+#define V4L2_CID_MPEG_CX2341X_BASE                             (V4L2_CTRL_CLASS_MPEG | 0x1000)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE                (V4L2_CID_MPEG_CX2341X_BASE+0)
 enum v4l2_mpeg_cx2341x_video_spatial_filter_mode {
        V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0,
        V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO   = 1,
 };
-#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER             (V4L2_CID_MPEG_CX2341X_BASE+1)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE   (V4L2_CID_MPEG_CX2341X_BASE+2)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER             (V4L2_CID_MPEG_CX2341X_BASE+1)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE   (V4L2_CID_MPEG_CX2341X_BASE+2)
 enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF                  = 0,
        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR               = 1,
@@ -605,18 +605,18 @@ enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE      = 3,
        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4,
 };
-#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE         (V4L2_CID_MPEG_CX2341X_BASE+3)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+3)
 enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type {
        V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF    = 0,
        V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1,
 };
-#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE       (V4L2_CID_MPEG_CX2341X_BASE+4)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE       (V4L2_CID_MPEG_CX2341X_BASE+4)
 enum v4l2_mpeg_cx2341x_video_temporal_filter_mode {
        V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0,
        V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO   = 1,
 };
-#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER            (V4L2_CID_MPEG_CX2341X_BASE+5)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE                 (V4L2_CID_MPEG_CX2341X_BASE+6)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER            (V4L2_CID_MPEG_CX2341X_BASE+5)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE         (V4L2_CID_MPEG_CX2341X_BASE+6)
 enum v4l2_mpeg_cx2341x_video_median_filter_type {
        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF      = 0,
        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR      = 1,
@@ -624,11 +624,11 @@ enum v4l2_mpeg_cx2341x_video_median_filter_type {
        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3,
        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG     = 4,
 };
-#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM  (V4L2_CID_MPEG_CX2341X_BASE+7)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP     (V4L2_CID_MPEG_CX2341X_BASE+8)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM  (V4L2_CID_MPEG_CX2341X_BASE+7)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP     (V4L2_CID_MPEG_CX2341X_BASE+8)
 #define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM        (V4L2_CID_MPEG_CX2341X_BASE+9)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP   (V4L2_CID_MPEG_CX2341X_BASE+10)
-#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS        (V4L2_CID_MPEG_CX2341X_BASE+11)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP   (V4L2_CID_MPEG_CX2341X_BASE+10)
+#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS                (V4L2_CID_MPEG_CX2341X_BASE+11)
 
 /*  MPEG-class control IDs specific to the Samsung MFC 5.1 driver as defined by V4L2 */
 #define V4L2_CID_MPEG_MFC51_BASE                               (V4L2_CTRL_CLASS_MPEG | 0x1100)
@@ -660,8 +660,8 @@ enum v4l2_mpeg_mfc51_video_force_frame_type {
 
 /*  Camera class control IDs */
 
-#define V4L2_CID_CAMERA_CLASS_BASE     (V4L2_CTRL_CLASS_CAMERA | 0x900)
-#define V4L2_CID_CAMERA_CLASS          (V4L2_CTRL_CLASS_CAMERA | 1)
+#define V4L2_CID_CAMERA_CLASS_BASE     (V4L2_CTRL_CLASS_CAMERA | 0x900)
+#define V4L2_CID_CAMERA_CLASS          (V4L2_CTRL_CLASS_CAMERA | 1)
 
 #define V4L2_CID_EXPOSURE_AUTO                 (V4L2_CID_CAMERA_CLASS_BASE+1)
 enum  v4l2_exposure_auto_type {
index faa97fd..9827189 100644 (file)
@@ -107,14 +107,14 @@ enum v4l2_field {
                                         transmitted first */
 };
 #define V4L2_FIELD_HAS_TOP(field)      \
-       ((field) == V4L2_FIELD_TOP      ||\
+       ((field) == V4L2_FIELD_TOP      ||\
         (field) == V4L2_FIELD_INTERLACED ||\
         (field) == V4L2_FIELD_INTERLACED_TB ||\
         (field) == V4L2_FIELD_INTERLACED_BT ||\
         (field) == V4L2_FIELD_SEQ_TB   ||\
         (field) == V4L2_FIELD_SEQ_BT)
 #define V4L2_FIELD_HAS_BOTTOM(field)   \
-       ((field) == V4L2_FIELD_BOTTOM   ||\
+       ((field) == V4L2_FIELD_BOTTOM   ||\
         (field) == V4L2_FIELD_INTERLACED ||\
         (field) == V4L2_FIELD_INTERLACED_TB ||\
         (field) == V4L2_FIELD_INTERLACED_BT ||\
@@ -467,12 +467,12 @@ struct v4l2_capability {
  *     V I D E O   I M A G E   F O R M A T
  */
 struct v4l2_pix_format {
-       __u32                   width;
+       __u32                   width;
        __u32                   height;
        __u32                   pixelformat;
        __u32                   field;          /* enum v4l2_field */
-       __u32                   bytesperline;   /* for padding, zero if unused */
-       __u32                   sizeimage;
+       __u32                   bytesperline;   /* for padding, zero if unused */
+       __u32                   sizeimage;
        __u32                   colorspace;     /* enum v4l2_colorspace */
        __u32                   priv;           /* private data, depends on pixelformat */
        __u32                   flags;          /* format flags (V4L2_PIX_FMT_FLAG_*) */
@@ -1173,7 +1173,7 @@ typedef __u64 v4l2_std_id;
                                 V4L2_STD_NTSC_M_JP     |\
                                 V4L2_STD_NTSC_M_KR)
 /* Secam macros */
-#define V4L2_STD_SECAM_DK              (V4L2_STD_SECAM_D       |\
+#define V4L2_STD_SECAM_DK      (V4L2_STD_SECAM_D       |\
                                 V4L2_STD_SECAM_K       |\
                                 V4L2_STD_SECAM_K1)
 /* All Secam Standards */
@@ -1254,7 +1254,7 @@ struct v4l2_standard {
 };
 
 /*
- *     D V     B T     T I M I N G S
+ *     D V     B T     T I M I N G S
  */
 
 /** struct v4l2_bt_timings - BT.656/BT.1120 timing data
@@ -1595,7 +1595,7 @@ struct v4l2_ext_controls {
        struct v4l2_ext_control *controls;
 };
 
-#define V4L2_CTRL_ID_MASK                (0x0fffffff)
+#define V4L2_CTRL_ID_MASK        (0x0fffffff)
 #ifndef __KERNEL__
 #define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
 #endif
@@ -1667,11 +1667,11 @@ struct v4l2_querymenu {
 /*  Control flags  */
 #define V4L2_CTRL_FLAG_DISABLED                0x0001
 #define V4L2_CTRL_FLAG_GRABBED         0x0002
-#define V4L2_CTRL_FLAG_READ_ONLY       0x0004
-#define V4L2_CTRL_FLAG_UPDATE          0x0008
-#define V4L2_CTRL_FLAG_INACTIVE        0x0010
-#define V4L2_CTRL_FLAG_SLIDER          0x0020
-#define V4L2_CTRL_FLAG_WRITE_ONLY      0x0040
+#define V4L2_CTRL_FLAG_READ_ONLY       0x0004
+#define V4L2_CTRL_FLAG_UPDATE          0x0008
+#define V4L2_CTRL_FLAG_INACTIVE                0x0010
+#define V4L2_CTRL_FLAG_SLIDER          0x0020
+#define V4L2_CTRL_FLAG_WRITE_ONLY      0x0040
 #define V4L2_CTRL_FLAG_VOLATILE                0x0080
 #define V4L2_CTRL_FLAG_HAS_PAYLOAD     0x0100
 #define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE        0x0200
@@ -1785,21 +1785,21 @@ struct v4l2_hw_freq_seek {
  */
 
 struct v4l2_rds_data {
-       __u8    lsb;
-       __u8    msb;
-       __u8    block;
+       __u8    lsb;
+       __u8    msb;
+       __u8    block;
 } __attribute__ ((packed));
 
-#define V4L2_RDS_BLOCK_MSK      0x7
-#define V4L2_RDS_BLOCK_A        0
-#define V4L2_RDS_BLOCK_B        1
-#define V4L2_RDS_BLOCK_C        2
-#define V4L2_RDS_BLOCK_D        3
-#define V4L2_RDS_BLOCK_C_ALT    4
-#define V4L2_RDS_BLOCK_INVALID          7
+#define V4L2_RDS_BLOCK_MSK      0x7
+#define V4L2_RDS_BLOCK_A        0
+#define V4L2_RDS_BLOCK_B        1
+#define V4L2_RDS_BLOCK_C        2
+#define V4L2_RDS_BLOCK_D        3
+#define V4L2_RDS_BLOCK_C_ALT    4
+#define V4L2_RDS_BLOCK_INVALID  7
 
 #define V4L2_RDS_BLOCK_CORRECTED 0x40
-#define V4L2_RDS_BLOCK_ERROR    0x80
+#define V4L2_RDS_BLOCK_ERROR    0x80
 
 /*
  *     A U D I O
@@ -2355,8 +2355,8 @@ struct v4l2_create_buffers {
 #define VIDIOC_S_CROP           _IOW('V', 60, struct v4l2_crop)
 #define VIDIOC_G_JPEGCOMP       _IOR('V', 61, struct v4l2_jpegcompression)
 #define VIDIOC_S_JPEGCOMP       _IOW('V', 62, struct v4l2_jpegcompression)
-#define VIDIOC_QUERYSTD         _IOR('V', 63, v4l2_std_id)
-#define VIDIOC_TRY_FMT         _IOWR('V', 64, struct v4l2_format)
+#define VIDIOC_QUERYSTD                 _IOR('V', 63, v4l2_std_id)
+#define VIDIOC_TRY_FMT         _IOWR('V', 64, struct v4l2_format)
 #define VIDIOC_ENUMAUDIO       _IOWR('V', 65, struct v4l2_audio)
 #define VIDIOC_ENUMAUDOUT      _IOWR('V', 66, struct v4l2_audioout)
 #define VIDIOC_G_PRIORITY       _IOR('V', 67, __u32) /* enum v4l2_priority */
@@ -2377,8 +2377,8 @@ struct v4l2_create_buffers {
  * Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
  * You must be root to use these ioctls. Never use these in applications!
  */
-#define        VIDIOC_DBG_S_REGISTER    _IOW('V', 79, struct v4l2_dbg_register)
-#define        VIDIOC_DBG_G_REGISTER   _IOWR('V', 80, struct v4l2_dbg_register)
+#define        VIDIOC_DBG_S_REGISTER    _IOW('V', 79, struct v4l2_dbg_register)
+#define        VIDIOC_DBG_G_REGISTER   _IOWR('V', 80, struct v4l2_dbg_register)
 
 #define VIDIOC_S_HW_FREQ_SEEK   _IOW('V', 82, struct v4l2_hw_freq_seek)
 #define        VIDIOC_S_DV_TIMINGS     _IOWR('V', 87, struct v4l2_dv_timings)