1 files changed, 83 insertions, 37 deletions

diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index f8726ad5d0a8..32d8a4bb7961 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -26,6 +26,9 @@
 #ifndef _EM28XX_H
 #define _EM28XX_H
 
+#define EM28XX_VERSION "0.2.1"
+#define DRIVER_DESC    "Empia em28xx device driver"
+
 #include <linux/workqueue.h>
 #include <linux/i2c.h>
 #include <linux/mutex.h>
@@ -132,6 +135,8 @@
 #define EM2884_BOARD_C3TECH_DIGITAL_DUO           88
 #define EM2874_BOARD_DELOCK_61959                 89
 #define EM2874_BOARD_KWORLD_UB435Q_V2             90
+#define EM2765_BOARD_SPEEDLINK_VAD_LAPLACE        91
+#define EM28178_BOARD_PCTV_461E                   92
 
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4
@@ -178,8 +183,27 @@
 
 #define EM28XX_INTERLACED_DEFAULT 1
 
-/* time in msecs to wait for i2c writes to finish */
-#define EM2800_I2C_XFER_TIMEOUT         20
+/*
+ * Time in msecs to wait for i2c xfers to finish.
+ * 35ms is the maximum time a SMBUS device could wait when
+ * clock stretching is used. As the transfer itself will take
+ * some time to happen, set it to 35 ms.
+ *
+ * Ok, I2C doesn't specify any limit. So, eventually, we may need
+ * to increase this timeout.
+ *
+ * FIXME: this assumes that an I2C message is not longer than 1ms.
+ * This is actually dependent on the I2C bus speed, although most
+ * devices use a 100kHz clock. So, this assumtion is true most of
+ * the time.
+ */
+#define EM28XX_I2C_XFER_TIMEOUT         36
+
+/* time in msecs to wait for AC97 xfers to finish */
+#define EM28XX_AC97_XFER_TIMEOUT        100
+
+/* max. number of button state polling addresses */
+#define EM28XX_NUM_BUTTON_ADDRESSES_MAX         5
 
 enum em28xx_mode {
         EM28XX_SUSPEND,
@@ -287,8 +311,7 @@ struct em28xx_audio_mode {
 
         unsigned int has_audio:1;
 
-        unsigned int i2s_3rates:1;
-        unsigned int i2s_5rates:1;
+        u8 i2s_samplerates;
 };
 
 /* em28xx has two audio inputs: tuner and line in.
@@ -374,6 +397,33 @@ enum em28xx_adecoder {
         EM28XX_TVAUDIO,
 };
 
+enum em28xx_led_role {
+        EM28XX_LED_ANALOG_CAPTURING = 0,
+        EM28XX_LED_ILLUMINATION,
+        EM28XX_NUM_LED_ROLES, /* must be the last */
+};
+
+struct em28xx_led {
+        enum em28xx_led_role role;
+        u8 gpio_reg;
+        u8 gpio_mask;
+        bool inverted;
+};
+
+enum em28xx_button_role {
+        EM28XX_BUTTON_SNAPSHOT = 0,
+        EM28XX_BUTTON_ILLUMINATION,
+        EM28XX_NUM_BUTTON_ROLES, /* must be the last */
+};
+
+struct em28xx_button {
+        enum em28xx_button_role role;
+        u8 reg_r;
+        u8 reg_clearing;
+        u8 mask;
+        bool inverted;
+};
+
 struct em28xx_board {
         char *name;
         int vchannels;
@@ -395,7 +445,6 @@ struct em28xx_board {
         unsigned int mts_firmware:1;
         unsigned int max_range_640_480:1;
         unsigned int has_dvb:1;
-        unsigned int has_snapshot_button:1;
         unsigned int is_webcam:1;
         unsigned int valid:1;
         unsigned int has_ir_i2c:1;
@@ -410,6 +459,12 @@ struct em28xx_board {
         struct em28xx_input       input[MAX_EM28XX_INPUT];
         struct em28xx_input       radio;
         char                      *ir_codes;
+
+        /* LEDs that need to be controlled explicitly */
+        struct em28xx_led         *leds;
+
+        /* Buttons */
+        struct em28xx_button      *buttons;
 };
 
 struct em28xx_eeprom {
@@ -426,15 +481,13 @@ struct em28xx_eeprom {
         u8 string_idx_table;
 };
 
-#define EM28XX_AUDIO_BUFS 5
-#define EM28XX_NUM_AUDIO_PACKETS 64
-#define EM28XX_AUDIO_MAX_PACKET_SIZE 196 /* static value */
 #define EM28XX_CAPTURE_STREAM_EN 1
 
 /* em28xx extensions */
 #define EM28XX_AUDIO   0x10
 #define EM28XX_DVB     0x20
 #define EM28XX_RC      0x30
+#define EM28XX_V4L2    0x40
 
 /* em28xx resource types (used for res_get/res_lock etc */
 #define EM28XX_RESOURCE_VIDEO 0x01
@@ -442,8 +495,9 @@ struct em28xx_eeprom {
 
 struct em28xx_audio {
         char name[50];
-        char *transfer_buffer[EM28XX_AUDIO_BUFS];
-        struct urb *urb[EM28XX_AUDIO_BUFS];
+        unsigned num_urb;
+        char **transfer_buffer;
+        struct urb **urb;
         struct usb_device *udev;
         unsigned int capture_transfer_done;
         struct snd_pcm_substream   *capture_pcm_substream;
@@ -451,6 +505,8 @@ struct em28xx_audio {
         unsigned int hwptr_done_capture;
         struct snd_card            *sndcard;
 
+        size_t period;
+
         int users;
         spinlock_t slock;
 };
@@ -485,11 +541,13 @@ struct em28xx {
         int model;              /* index in the device_data struct */
         int devno;              /* marks the number of this device */
         enum em28xx_chip_id chip_id;
-        unsigned int is_em25xx:1;       /* em25xx/em276x/7x/8x family bridge */
 
+        unsigned int is_em25xx:1;       /* em25xx/em276x/7x/8x family bridge */
         unsigned char disconnected:1;   /* device has been diconnected */
-
-        int audio_ifnum;
+        unsigned int has_video:1;
+        unsigned int has_audio_class:1;
+        unsigned int has_alsa_audio:1;
+        unsigned int is_audio_only:1;
 
         struct v4l2_device v4l2_dev;
         struct v4l2_ctrl_handler ctrl_handler;
@@ -507,10 +565,6 @@ struct em28xx {
         /* Vinmode/Vinctl used at the driver */
         int vinmode, vinctl;
 
-        unsigned int has_audio_class:1;
-        unsigned int has_alsa_audio:1;
-        unsigned int is_audio_only:1;
-
         /* Controls audio streaming */
         struct work_struct wq_trigger;  /* Trigger to start/stop audio for alsa module */
         atomic_t       stream_started;  /* stream should be running if true */
@@ -608,6 +662,7 @@ struct em28xx {
 
         /* usb transfer */
         struct usb_device *udev;        /* the usb device */
+        u8 ifnum;               /* number of the assigned usb interface */
         u8 analog_ep_isoc;      /* address of isoc endpoint for analog */
         u8 analog_ep_bulk;      /* address of bulk endpoint for analog */
         u8 dvb_ep_isoc;         /* address of isoc endpoint for DVB */
@@ -639,10 +694,15 @@ struct em28xx {
 
         enum em28xx_mode mode;
 
-        /* Snapshot button */
+        /* Button state polling */
+        struct delayed_work buttons_query_work;
+        u8 button_polling_addresses[EM28XX_NUM_BUTTON_ADDRESSES_MAX];
+        u8 button_polling_last_values[EM28XX_NUM_BUTTON_ADDRESSES_MAX];
+        u8 num_button_polling_addresses;
+        u16 button_polling_interval; /* [ms] */
+        /* Snapshot button input device */
         char snapshot_button_path[30];  /* path of the input dev */
         struct input_dev *sbutton_input_dev;
-        struct delayed_work sbutton_query_work;
 
         struct em28xx_dvb *dvb;
 };
@@ -672,6 +732,7 @@ int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len);
 int em28xx_write_reg(struct em28xx *dev, u16 reg, u8 val);
 int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
                                  u8 bitmask);
+int em28xx_toggle_reg_bits(struct em28xx *dev, u16 reg, u8 bitmask);
 
 int em28xx_read_ac97(struct em28xx *dev, u8 reg);
 int em28xx_write_ac97(struct em28xx *dev, u8 reg, u16 val);
@@ -679,12 +740,9 @@ int em28xx_write_ac97(struct em28xx *dev, u8 reg, u16 val);
 int em28xx_audio_analog_set(struct em28xx *dev);
 int em28xx_audio_setup(struct em28xx *dev);
 
-int em28xx_colorlevels_set_default(struct em28xx *dev);
+const struct em28xx_led *em28xx_find_led(struct em28xx *dev,
+                                         enum em28xx_led_role role);
 int em28xx_capture_start(struct em28xx *dev, int start);
-int em28xx_vbi_supported(struct em28xx *dev);
-int em28xx_set_outfmt(struct em28xx *dev);
-int em28xx_resolution_set(struct em28xx *dev);
-int em28xx_set_alternate(struct em28xx *dev);
 int em28xx_alloc_urbs(struct em28xx *dev, enum em28xx_mode mode, int xfer_bulk,
                       int num_bufs, int max_pkt_size, int packet_multiplier);
 int em28xx_init_usb_xfer(struct em28xx *dev, enum em28xx_mode mode,
@@ -696,30 +754,18 @@ void em28xx_uninit_usb_xfer(struct em28xx *dev, enum em28xx_mode mode);
 void em28xx_stop_urbs(struct em28xx *dev);
 int em28xx_set_mode(struct em28xx *dev, enum em28xx_mode set_mode);
 int em28xx_gpio_set(struct em28xx *dev, struct em28xx_reg_seq *gpio);
-void em28xx_wake_i2c(struct em28xx *dev);
 int em28xx_register_extension(struct em28xx_ops *dev);
 void em28xx_unregister_extension(struct em28xx_ops *dev);
 void em28xx_init_extension(struct em28xx *dev);
 void em28xx_close_extension(struct em28xx *dev);
 
-/* Provided by em28xx-video.c */
-int em28xx_vb2_setup(struct em28xx *dev);
-int em28xx_register_analog_devices(struct em28xx *dev);
-void em28xx_release_analog_resources(struct em28xx *dev);
-void em28xx_ctrl_notify(struct v4l2_ctrl *ctrl, void *priv);
-int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count);
-int em28xx_stop_vbi_streaming(struct vb2_queue *vq);
-extern const struct v4l2_ctrl_ops em28xx_ctrl_ops;
-
 /* Provided by em28xx-cards.c */
 extern struct em28xx_board em28xx_boards[];
 extern struct usb_device_id em28xx_id_table[];
 int em28xx_tuner_callback(void *ptr, int component, int command, int arg);
+void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl);
 void em28xx_release_resources(struct em28xx *dev);
 
-/* Provided by em28xx-vbi.c */
-extern struct vb2_ops em28xx_vbi_qops;
-
 /* Provided by em28xx-camera.c */
 int em28xx_detect_sensor(struct em28xx *dev);
 int em28xx_init_camera(struct em28xx *dev);