V4L/DVB (3214): Calculate the saa7115 AMCLK regs instead of using fixed values

[linux-2.6] / drivers / media / video / cx25840 / cx25840.h

diff --git a/drivers/media/video/cx25840/cx25840.h b/drivers/media/video/cx25840/cx25840.h
index 5c3f0639fb779a4da987a9d6632cc7c5d59e0f62..4731a19092a6558cba1d301edbeec23b8bd778fd 100644 (file)
--- a/drivers/media/video/cx25840/cx25840.h
+++ b/drivers/media/video/cx25840/cx25840.h
@@ -27,22 +27,30 @@
 extern int cx25840_debug;
 
 #define cx25840_dbg(fmt, arg...) do { if (cx25840_debug) \
-       printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+       printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+              client->driver->driver.name, \
               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 #define cx25840_err(fmt, arg...) do { \
-       printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+       printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 #define cx25840_info(fmt, arg...) do { \
-       printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+       printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
               i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 #define CX25840_CID_CARDTYPE (V4L2_CID_PRIVATE_BASE+0)
 
+/* The CARDTYPE_PVR150_WORKAROUND cardtype activates a workaround for a
+   hardware bug that is present in PVR150 (and possible PVR500) cards that
+   have certain NTSC tuners (tveeprom model numbers 85, 99 and 112). The
+   audio autodetect fails on some channels for these models and the workaround
+   is to select the audio standard explicitly. Many thanks to Hauppauge for
+   providing this information. */
 enum cx25840_cardtype {
        CARDTYPE_PVR150,
-       CARDTYPE_PG600
+       CARDTYPE_PG600,
+       CARDTYPE_PVR150_WORKAROUND,
 };
 
 enum cx25840_input {
@@ -57,7 +65,7 @@ struct cx25840_state {
        enum cx25840_cardtype cardtype;
        enum cx25840_input input;
        int audio_input;
-       enum v4l2_audio_clock_freq audclk_freq;
+       u32 audclk_freq;
 };
 
 /* ----------------------------------------------------------------------- */