1 files changed, 135 insertions, 135 deletions

diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 8c58c5b5fa36..d51f8c63bcf9 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -1,5 +1,5 @@
 /*
-   em2820-cards.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
+   em28xx-cards.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
 
    Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com>
                       Ludovico Cavedon <cavedon@sssup.it>
@@ -22,8 +22,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef _EM2820_H
-#define _EM2820_H
+#ifndef _EM28XX_H
+#define _EM28XX_H
 
 #include <linux/videodev.h>
 #include <linux/i2c.h>
@@ -45,27 +45,27 @@
 #define UNSET -1
 
 /* maximum number of em28xx boards */
-#define EM2820_MAXBOARDS 1 /*FIXME: should be bigger */
+#define EM28XX_MAXBOARDS 1 /*FIXME: should be bigger */
 
 /* maximum number of frames that can be queued */
-#define EM2820_NUM_FRAMES 5
+#define EM28XX_NUM_FRAMES 5
 /* number of frames that get used for v4l2_read() */
-#define EM2820_NUM_READ_FRAMES 2
+#define EM28XX_NUM_READ_FRAMES 2
 
 /* number of buffers for isoc transfers */
-#define EM2820_NUM_BUFS 5
+#define EM28XX_NUM_BUFS 5
 
 /* number of packets for each buffer
    windows requests only 40 packets .. so we better do the same
    this is what I found out for all alternate numbers there!
  */
-#define EM2820_NUM_PACKETS 40
+#define EM28XX_NUM_PACKETS 40
 
 /* default alternate; 0 means choose the best */
-#define EM2820_PINOUT 0
-#define EM2820_MAX_ALT 7
+#define EM28XX_PINOUT 0
+#define EM28XX_MAX_ALT 7
 
-#define EM2820_INTERLACED_DEFAULT 1
+#define EM28XX_INTERLACED_DEFAULT 1
 
 /*
 #define (use usbview if you want to get the other alternate number infos)
@@ -89,13 +89,13 @@
 */
 
 /* time to wait when stopping the isoc transfer */
-#define EM2820_URB_TIMEOUT       msecs_to_jiffies(EM2820_NUM_BUFS * EM2820_NUM_PACKETS)
+#define EM28XX_URB_TIMEOUT       msecs_to_jiffies(EM28XX_NUM_BUFS * EM28XX_NUM_PACKETS)
 
 /* time in msecs to wait for i2c writes to finish */
 #define EM2800_I2C_WRITE_TIMEOUT 20
 
 /* the various frame states */
-enum em2820_frame_state {
+enum em28xx_frame_state {
         F_UNUSED = 0,
         F_QUEUED,
         F_GRABBING,
@@ -104,17 +104,17 @@ enum em2820_frame_state {
 };
 
 /* stream states */
-enum em2820_stream_state {
+enum em28xx_stream_state {
         STREAM_OFF,
         STREAM_INTERRUPT,
         STREAM_ON,
 };
 
 /* frames */
-struct em2820_frame_t {
+struct em28xx_frame_t {
         void *bufmem;
         struct v4l2_buffer buf;
-        enum em2820_frame_state state;
+        enum em28xx_frame_state state;
         struct list_head frame;
         unsigned long vma_use_count;
         int top_field;
@@ -122,7 +122,7 @@ struct em2820_frame_t {
 };
 
 /* io methods */
-enum em2820_io_method {
+enum em28xx_io_method {
         IO_NONE,
         IO_READ,
         IO_MMAP,
@@ -130,35 +130,35 @@ enum em2820_io_method {
 
 /* inputs */
 
-#define MAX_EM2820_INPUT 4
-enum enum2820_itype {
-        EM2820_VMUX_COMPOSITE1 = 1,
-        EM2820_VMUX_COMPOSITE2,
-        EM2820_VMUX_COMPOSITE3,
-        EM2820_VMUX_COMPOSITE4,
-        EM2820_VMUX_SVIDEO,
-        EM2820_VMUX_TELEVISION,
-        EM2820_VMUX_CABLE,
-        EM2820_VMUX_DVB,
-        EM2820_VMUX_DEBUG,
-        EM2820_RADIO,
+#define MAX_EM28XX_INPUT 4
+enum enum28xx_itype {
+        EM28XX_VMUX_COMPOSITE1 = 1,
+        EM28XX_VMUX_COMPOSITE2,
+        EM28XX_VMUX_COMPOSITE3,
+        EM28XX_VMUX_COMPOSITE4,
+        EM28XX_VMUX_SVIDEO,
+        EM28XX_VMUX_TELEVISION,
+        EM28XX_VMUX_CABLE,
+        EM28XX_VMUX_DVB,
+        EM28XX_VMUX_DEBUG,
+        EM28XX_RADIO,
 };
 
-struct em2820_input {
-        enum enum2820_itype type;
+struct em28xx_input {
+        enum enum28xx_itype type;
         unsigned int vmux;
         unsigned int amux;
 };
 
-#define INPUT(nr) (&em2820_boards[dev->model].input[nr])
+#define INPUT(nr) (&em28xx_boards[dev->model].input[nr])
 
-enum em2820_decoder {
-        EM2820_TVP5150,
-        EM2820_SAA7113,
-        EM2820_SAA7114
+enum em28xx_decoder {
+        EM28XX_TVP5150,
+        EM28XX_SAA7113,
+        EM28XX_SAA7114
 };
 
-struct em2820_board {
+struct em28xx_board {
         char *name;
         int vchannels;
         int norm;
@@ -171,12 +171,12 @@ struct em2820_board {
         unsigned int has_tuner:1;
         unsigned int has_msp34xx:1;
 
-        enum em2820_decoder decoder;
+        enum em28xx_decoder decoder;
 
-        struct em2820_input       input[MAX_EM2820_INPUT];
+        struct em28xx_input       input[MAX_EM28XX_INPUT];
 };
 
-struct em2820_eeprom {
+struct em28xx_eeprom {
         u32 id;                 /* 0x9567eb1a */
         u16 vendor_ID;
         u16 product_ID;
@@ -191,14 +191,14 @@ struct em2820_eeprom {
 };
 
 /* device states */
-enum em2820_dev_state {
+enum em28xx_dev_state {
         DEV_INITIALIZED = 0x01,
         DEV_DISCONNECTED = 0x02,
         DEV_MISCONFIGURED = 0x04,
 };
 
 /* tvnorms */
-struct em2820_tvnorm {
+struct em28xx_tvnorm {
         char *name;
         v4l2_std_id id;
         /* mode for saa7113h */
@@ -206,7 +206,7 @@ struct em2820_tvnorm {
 };
 
 /* main device struct */
-struct em2820 {
+struct em28xx {
         /* generic device properties */
         char name[30];          /* name (including minor) of the device */
         int model;              /* index in the device_data struct */
@@ -217,7 +217,7 @@ struct em2820 {
         unsigned int has_msp34xx:1;
         unsigned int has_tda9887:1;
 
-        enum em2820_decoder decoder;
+        enum em28xx_decoder decoder;
 
         int tuner_type;         /* type of the tuner */
         int tuner_addr;         /* tuner address */
@@ -229,17 +229,17 @@ struct em2820 {
         int users;              /* user count for exclusive use */
         struct video_device *vdev;      /* video for linux device struct */
         struct video_picture vpic;      /* picture settings only used to init saa7113h */
-        struct em2820_tvnorm *tvnorm;   /* selected tv norm */
+        struct em28xx_tvnorm *tvnorm;   /* selected tv norm */
         int ctl_freq;           /* selected frequency */
         unsigned int ctl_input; /* selected input */
         unsigned int ctl_ainput;        /* slected audio input */
         int mute;
         int volume;
         /* frame properties */
-        struct em2820_frame_t frame[EM2820_NUM_FRAMES]; /* list of frames */
+        struct em28xx_frame_t frame[EM28XX_NUM_FRAMES]; /* list of frames */
         int num_frames;         /* number of frames currently in use */
         unsigned int frame_count;       /* total number of transfered frames */
-        struct em2820_frame_t *frame_current;   /* the frame that is being filled */
+        struct em28xx_frame_t *frame_current;   /* the frame that is being filled */
         int width;              /* current frame width */
         int height;             /* current frame height */
         int frame_size;         /* current frame size */
@@ -251,9 +251,9 @@ struct em2820 {
         int type;
 
         /* states */
-        enum em2820_dev_state state;
-        enum em2820_stream_state stream;
-        enum em2820_io_method io;
+        enum em28xx_dev_state state;
+        enum em28xx_stream_state stream;
+        enum em28xx_io_method io;
         /* locks */
         struct semaphore lock, fileop_lock;
         spinlock_t queue_lock;
@@ -267,71 +267,71 @@ struct em2820 {
         struct usb_device *udev;        /* the usb device */
         int alt;                /* alternate */
         int max_pkt_size;       /* max packet size of isoc transaction */
-        unsigned int alt_max_pkt_size[EM2820_MAX_ALT + 1];      /* array of wMaxPacketSize */
-        struct urb *urb[EM2820_NUM_BUFS];       /* urb for isoc transfers */
-        char *transfer_buffer[EM2820_NUM_BUFS]; /* transfer buffers for isoc transfer */
+        unsigned int alt_max_pkt_size[EM28XX_MAX_ALT + 1];      /* array of wMaxPacketSize */
+        struct urb *urb[EM28XX_NUM_BUFS];       /* urb for isoc transfers */
+        char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc transfer */
         /* helper funcs that call usb_control_msg */
-        int (*em2820_write_regs) (struct em2820 * dev, u16 reg, char *buf,
+        int (*em28xx_write_regs) (struct em28xx * dev, u16 reg, char *buf,
                                   int len);
-        int (*em2820_read_reg) (struct em2820 * dev, u16 reg);
-        int (*em2820_read_reg_req_len) (struct em2820 * dev, u8 req, u16 reg,
+        int (*em28xx_read_reg) (struct em28xx * dev, u16 reg);
+        int (*em28xx_read_reg_req_len) (struct em28xx * dev, u8 req, u16 reg,
                                         char *buf, int len);
-        int (*em2820_write_regs_req) (struct em2820 * dev, u8 req, u16 reg,
+        int (*em28xx_write_regs_req) (struct em28xx * dev, u8 req, u16 reg,
                                       char *buf, int len);
-        int (*em2820_read_reg_req) (struct em2820 * dev, u8 req, u16 reg);
+        int (*em28xx_read_reg_req) (struct em28xx * dev, u8 req, u16 reg);
 };
 
-/* Provided by em2820-i2c.c */
+/* Provided by em28xx-i2c.c */
 
-void em2820_i2c_call_clients(struct em2820 *dev, unsigned int cmd, void *arg);
-int em2820_i2c_register(struct em2820 *dev);
-int em2820_i2c_unregister(struct em2820 *dev);
+void em28xx_i2c_call_clients(struct em28xx *dev, unsigned int cmd, void *arg);
+int em28xx_i2c_register(struct em28xx *dev);
+int em28xx_i2c_unregister(struct em28xx *dev);
 
-/* Provided by em2820-input.c */
+/* Provided by em28xx-input.c */
 
-void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir);
+void em28xx_set_ir(struct em28xx * dev,struct IR_i2c *ir);
 
-/* Provided by em2820-core.c */
+/* Provided by em28xx-core.c */
 
-void em2820_print_ioctl(char *name, unsigned int cmd);
+void em28xx_print_ioctl(char *name, unsigned int cmd);
 
-u32 em2820_request_buffers(struct em2820 *dev, u32 count);
-void em2820_queue_unusedframes(struct em2820 *dev);
-void em2820_release_buffers(struct em2820 *dev);
+u32 em28xx_request_buffers(struct em28xx *dev, u32 count);
+void em28xx_queue_unusedframes(struct em28xx *dev);
+void em28xx_release_buffers(struct em28xx *dev);
 
-int em2820_read_reg_req_len(struct em2820 *dev, u8 req, u16 reg,
+int em28xx_read_reg_req_len(struct em28xx *dev, u8 req, u16 reg,
                             char *buf, int len);
-int em2820_read_reg_req(struct em2820 *dev, u8 req, u16 reg);
-int em2820_read_reg(struct em2820 *dev, u16 reg);
-int em2820_write_regs_req(struct em2820 *dev, u8 req, u16 reg, char *buf,
+int em28xx_read_reg_req(struct em28xx *dev, u8 req, u16 reg);
+int em28xx_read_reg(struct em28xx *dev, u16 reg);
+int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
                           int len);
-int em2820_write_regs(struct em2820 *dev, u16 reg, char *buf, int len);
-int em2820_write_reg_bits(struct em2820 *dev, u16 reg, u8 val,
+int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len);
+int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
                           u8 bitmask);
-int em2820_write_ac97(struct em2820 *dev, u8 reg, u8 * val);
-int em2820_audio_analog_set(struct em2820 *dev);
-int em2820_colorlevels_set_default(struct em2820 *dev);
-int em2820_capture_start(struct em2820 *dev, int start);
-int em2820_outfmt_set_yuv422(struct em2820 *dev);
-int em2820_accumulator_set(struct em2820 *dev, u8 xmin, u8 xmax, u8 ymin,
+int em28xx_write_ac97(struct em28xx *dev, u8 reg, u8 * val);
+int em28xx_audio_analog_set(struct em28xx *dev);
+int em28xx_colorlevels_set_default(struct em28xx *dev);
+int em28xx_capture_start(struct em28xx *dev, int start);
+int em28xx_outfmt_set_yuv422(struct em28xx *dev);
+int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax, u8 ymin,
                            u8 ymax);
-int em2820_capture_area_set(struct em2820 *dev, u8 hstart, u8 vstart,
+int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart,
                             u16 width, u16 height);
-int em2820_scaler_set(struct em2820 *dev, u16 h, u16 v);
-int em2820_resolution_set(struct em2820 *dev);
-void em2820_isocIrq(struct urb *urb, struct pt_regs *regs);
-int em2820_init_isoc(struct em2820 *dev);
-void em2820_uninit_isoc(struct em2820 *dev);
-int em2820_set_alternate(struct em2820 *dev);
-
-/* Provided by em2820-cards.c */
+int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v);
+int em28xx_resolution_set(struct em28xx *dev);
+void em28xx_isocIrq(struct urb *urb, struct pt_regs *regs);
+int em28xx_init_isoc(struct em28xx *dev);
+void em28xx_uninit_isoc(struct em28xx *dev);
+int em28xx_set_alternate(struct em28xx *dev);
+
+/* Provided by em28xx-cards.c */
 extern int em2800_variant_detect(struct usb_device* udev,int model);
-extern void em2820_card_setup(struct em2820 *dev);
-extern struct em2820_board em2820_boards[];
-extern struct usb_device_id em2820_id_table[];
-extern const unsigned int em2820_bcount;
+extern void em28xx_card_setup(struct em28xx *dev);
+extern struct em28xx_board em28xx_boards[];
+extern struct usb_device_id em28xx_id_table[];
+extern const unsigned int em28xx_bcount;
 
-/* em2820 registers */
+/* em28xx registers */
 #define CHIPID_REG      0x0a
 #define USBSUSP_REG     0x0c    /* */
 
@@ -386,115 +386,115 @@ extern const unsigned int em2820_bcount;
 #define VIDEO_AC97      0x14
 
 /* register settings */
-#define EM2820_AUDIO_SRC_TUNER  0xc0
-#define EM2820_AUDIO_SRC_LINE   0x80
+#define EM28XX_AUDIO_SRC_TUNER  0xc0
+#define EM28XX_AUDIO_SRC_LINE   0x80
 
 /* printk macros */
 
-#define em2820_err(fmt, arg...) do {\
+#define em28xx_err(fmt, arg...) do {\
         printk(KERN_ERR fmt , ##arg); } while (0)
 
-#define em2820_errdev(fmt, arg...) do {\
+#define em28xx_errdev(fmt, arg...) do {\
         printk(KERN_ERR "%s: "fmt,\
                         dev->name , ##arg); } while (0)
 
-#define em2820_info(fmt, arg...) do {\
+#define em28xx_info(fmt, arg...) do {\
         printk(KERN_INFO "%s: "fmt,\
                         dev->name , ##arg); } while (0)
-#define em2820_warn(fmt, arg...) do {\
+#define em28xx_warn(fmt, arg...) do {\
         printk(KERN_WARNING "%s: "fmt,\
                         dev->name , ##arg); } while (0)
 
-inline static int em2820_audio_source(struct em2820 *dev, int input)
+inline static int em28xx_audio_source(struct em28xx *dev, int input)
 {
-        return em2820_write_reg_bits(dev, AUDIOSRC_REG, input, 0xc0);
+        return em28xx_write_reg_bits(dev, AUDIOSRC_REG, input, 0xc0);
 }
 
-inline static int em2820_audio_usb_mute(struct em2820 *dev, int mute)
+inline static int em28xx_audio_usb_mute(struct em28xx *dev, int mute)
 {
-        return em2820_write_reg_bits(dev, XCLK_REG, mute ? 0x00 : 0x80, 0x80);
+        return em28xx_write_reg_bits(dev, XCLK_REG, mute ? 0x00 : 0x80, 0x80);
 }
 
-inline static int em2820_audio_analog_setup(struct em2820 *dev)
+inline static int em28xx_audio_analog_setup(struct em28xx *dev)
 {
         /* unmute video mixer with default volume level */
-        return em2820_write_ac97(dev, VIDEO_AC97, "\x08\x08");
+        return em28xx_write_ac97(dev, VIDEO_AC97, "\x08\x08");
 }
 
-inline static int em2820_compression_disable(struct em2820 *dev)
+inline static int em28xx_compression_disable(struct em28xx *dev)
 {
         /* side effect of disabling scaler and mixer */
-        return em2820_write_regs(dev, COMPR_REG, "\x00", 1);
+        return em28xx_write_regs(dev, COMPR_REG, "\x00", 1);
 }
 
-inline static int em2820_contrast_get(struct em2820 *dev)
+inline static int em28xx_contrast_get(struct em28xx *dev)
 {
-        return em2820_read_reg(dev, YGAIN_REG) & 0x1f;
+        return em28xx_read_reg(dev, YGAIN_REG) & 0x1f;
 }
 
-inline static int em2820_brightness_get(struct em2820 *dev)
+inline static int em28xx_brightness_get(struct em28xx *dev)
 {
-        return em2820_read_reg(dev, YOFFSET_REG);
+        return em28xx_read_reg(dev, YOFFSET_REG);
 }
 
-inline static int em2820_saturation_get(struct em2820 *dev)
+inline static int em28xx_saturation_get(struct em28xx *dev)
 {
-        return em2820_read_reg(dev, UVGAIN_REG) & 0x1f;
+        return em28xx_read_reg(dev, UVGAIN_REG) & 0x1f;
 }
 
-inline static int em2820_u_balance_get(struct em2820 *dev)
+inline static int em28xx_u_balance_get(struct em28xx *dev)
 {
-        return em2820_read_reg(dev, UOFFSET_REG);
+        return em28xx_read_reg(dev, UOFFSET_REG);
 }
 
-inline static int em2820_v_balance_get(struct em2820 *dev)
+inline static int em28xx_v_balance_get(struct em28xx *dev)
 {
-        return em2820_read_reg(dev, VOFFSET_REG);
+        return em28xx_read_reg(dev, VOFFSET_REG);
 }
 
-inline static int em2820_gamma_get(struct em2820 *dev)
+inline static int em28xx_gamma_get(struct em28xx *dev)
 {
-        return em2820_read_reg(dev, GAMMA_REG) & 0x3f;
+        return em28xx_read_reg(dev, GAMMA_REG) & 0x3f;
 }
 
-inline static int em2820_contrast_set(struct em2820 *dev, s32 val)
+inline static int em28xx_contrast_set(struct em28xx *dev, s32 val)
 {
         u8 tmp = (u8) val;
-        return em2820_write_regs(dev, YGAIN_REG, &tmp, 1);
+        return em28xx_write_regs(dev, YGAIN_REG, &tmp, 1);
 }
 
-inline static int em2820_brightness_set(struct em2820 *dev, s32 val)
+inline static int em28xx_brightness_set(struct em28xx *dev, s32 val)
 {
         u8 tmp = (u8) val;
-        return em2820_write_regs(dev, YOFFSET_REG, &tmp, 1);
+        return em28xx_write_regs(dev, YOFFSET_REG, &tmp, 1);
 }
 
-inline static int em2820_saturation_set(struct em2820 *dev, s32 val)
+inline static int em28xx_saturation_set(struct em28xx *dev, s32 val)
 {
         u8 tmp = (u8) val;
-        return em2820_write_regs(dev, UVGAIN_REG, &tmp, 1);
+        return em28xx_write_regs(dev, UVGAIN_REG, &tmp, 1);
 }
 
-inline static int em2820_u_balance_set(struct em2820 *dev, s32 val)
+inline static int em28xx_u_balance_set(struct em28xx *dev, s32 val)
 {
         u8 tmp = (u8) val;
-        return em2820_write_regs(dev, UOFFSET_REG, &tmp, 1);
+        return em28xx_write_regs(dev, UOFFSET_REG, &tmp, 1);
 }
 
-inline static int em2820_v_balance_set(struct em2820 *dev, s32 val)
+inline static int em28xx_v_balance_set(struct em28xx *dev, s32 val)
 {
         u8 tmp = (u8) val;
-        return em2820_write_regs(dev, VOFFSET_REG, &tmp, 1);
+        return em28xx_write_regs(dev, VOFFSET_REG, &tmp, 1);
 }
 
-inline static int em2820_gamma_set(struct em2820 *dev, s32 val)
+inline static int em28xx_gamma_set(struct em28xx *dev, s32 val)
 {
         u8 tmp = (u8) val;
-        return em2820_write_regs(dev, GAMMA_REG, &tmp, 1);
+        return em28xx_write_regs(dev, GAMMA_REG, &tmp, 1);
 }
 
 /*FIXME: maxw should be dependent of alt mode */
-inline static unsigned int norm_maxw(struct em2820 *dev)
+inline static unsigned int norm_maxw(struct em28xx *dev)
 {
         switch(dev->model){
                 case (EM2820_BOARD_MSI_VOX_USB_2): return(640);
@@ -502,7 +502,7 @@ inline static unsigned int norm_maxw(struct em2820 *dev)
         }
 }
 
-inline static unsigned int norm_maxh(struct em2820 *dev)
+inline static unsigned int norm_maxh(struct em28xx *dev)
 {
         switch(dev->model){
                 case (EM2820_BOARD_MSI_VOX_USB_2): return(480);