Merge by hand (whitespace conflicts in libata.h)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 261 insertions, 197 deletions

diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 5344d5592199..72e8741e8b59 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -6,12 +6,12 @@
  * which are:
 
     Copyright (C) 1996,97,98 Ralph  Metzler (rjkm@thp.uni-koeln.de)
-                           & Marcus Metzler (mocm@thp.uni-koeln.de)
+                           & Marcus Metzler (mocm@thp.uni-koeln.de)
     (c) 1999-2001 Gerd Knorr <kraxel@goldbach.in-berlin.de>
 
  * Adjustments to fit a more general model and all bugs:
 
-        Copyright (C) 2003 John Klar <linpvr at projectplasma.com>
+        Copyright (C) 2003 John Klar <linpvr at projectplasma.com>
 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@
 
 #include <media/tuner.h>
 #include <media/tveeprom.h>
+#include <media/audiochip.h>
 
 MODULE_DESCRIPTION("i2c Hauppauge eeprom decoder driver");
 MODULE_AUTHOR("John Klar");
@@ -53,14 +54,14 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 #define tveeprom_info(fmt, arg...) do {\
         printk(KERN_INFO "tveeprom %d-%04x: " fmt, \
-                        c->adapter->nr, c->addr , ##arg); } while (0)
+                        c->adapter->nr, c->addr , ##arg); } while (0)
 #define tveeprom_warn(fmt, arg...) do {\
         printk(KERN_WARNING "tveeprom %d-%04x: " fmt, \
-                        c->adapter->nr, c->addr , ##arg); } while (0)
+                        c->adapter->nr, c->addr , ##arg); } while (0)
 #define tveeprom_dbg(fmt, arg...) do {\
         if (debug) \
-                printk(KERN_INFO "tveeprom %d-%04x: " fmt, \
-                        c->adapter->nr, c->addr , ##arg); } while (0)
+                printk(KERN_INFO "tveeprom %d-%04x: " fmt, \
+                        c->adapter->nr, c->addr , ##arg); } while (0)
 
 
 /* ----------------------------------------------------------------------- */
@@ -134,8 +135,8 @@ hauppauge_tuner[] =
         { TUNER_TEMIC_4039FR5_NTSC, "Temic 4039FR5" },
         { TUNER_PHILIPS_FQ1216ME,   "Philips FQ1216 ME" },
         { TUNER_TEMIC_4066FY5_PAL_I, "Temic 4066FY5" },
-        { TUNER_PHILIPS_NTSC,        "Philips TD1536" },
-        { TUNER_PHILIPS_NTSC,        "Philips TD1536D" },
+        { TUNER_PHILIPS_NTSC,        "Philips TD1536" },
+        { TUNER_PHILIPS_NTSC,        "Philips TD1536D" },
         { TUNER_PHILIPS_NTSC,  "Philips FMR1236" }, /* mono radio */
         { TUNER_ABSENT,        "Philips FI1256MP" },
         /* 40-49 */
@@ -189,7 +190,7 @@ hauppauge_tuner[] =
         { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MB 3"},
         { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MI 3"},
         { TUNER_TCL_2002N,     "TCL 2002N 6A"},
-        { TUNER_ABSENT,        "Philips FQ1236 MK3"},
+        { TUNER_PHILIPS_FM1236_MK3, "Philips FQ1236 MK3"},
         { TUNER_ABSENT,        "Samsung TCPN 2121P30A"},
         { TUNER_ABSENT,        "Samsung TCPE 4121P30A"},
         { TUNER_PHILIPS_FM1216ME_MK3, "TCL MFPE05 2"},
@@ -200,95 +201,137 @@ hauppauge_tuner[] =
         { TUNER_ABSENT,        "Philips FQ1286A MK4"},
         { TUNER_ABSENT,        "Philips FQ1216ME MK5"},
         { TUNER_ABSENT,        "Philips FQ1236 MK5"},
-        { TUNER_ABSENT,        "Unspecified"},
-        { TUNER_LG_PAL_TAPE,   "LG PAL (TAPE Series)"},
-        { TUNER_ABSENT,        "Unspecified"},
-        { TUNER_TCL_2002N,     "TCL 2002N 5H"},
-        /* 100-103 */
-        { TUNER_ABSENT,        "Unspecified"},
-        { TUNER_TEA5767,       "Philips TEA5767HN FM Radio"},
-        { TUNER_ABSENT,        "Unspecified"},
-        { TUNER_PHILIPS_FM1236_MK3, "TCL MFNM05 4"},
+        { TUNER_ABSENT,        "Samsung TCPG_6121P30A"},
+        { TUNER_TCL_2002MB,    "TCL 2002MB_3H"},
+        { TUNER_ABSENT,        "TCL 2002MI_3H"},
+        { TUNER_TCL_2002N,     "TCL 2002N 5H"},
+        /* 100-109 */
+        { TUNER_ABSENT,        "Philips FMD1216ME"},
+        { TUNER_TEA5767,       "Philips TEA5768HL FM Radio"},
+        { TUNER_ABSENT,        "Panasonic ENV57H12D5"},
+        { TUNER_ABSENT,        "TCL MFNM05-4"},
+        { TUNER_ABSENT,        "TCL MNM05-4"},
+        { TUNER_PHILIPS_FM1216ME_MK3, "TCL MPE05-2"},
+        { TUNER_ABSENT,        "TCL MQNM05-4"},
+        { TUNER_ABSENT,        "LG TAPC-W701D"},
+        { TUNER_ABSENT,        "TCL 9886P-WM"},
+        { TUNER_ABSENT,        "TCL 1676NM-WM"},
 };
 
-/* This list is supplied by Hauppauge. Thanks! */
-static const char *audioIC[] = {
-        /* 0-4 */
-        "None", "TEA6300", "TEA6320", "TDA9850", "MSP3400C",
-        /* 5-9 */
-        "MSP3410D", "MSP3415", "MSP3430", "MSP3438", "CS5331",
-        /* 10-14 */
-        "MSP3435", "MSP3440", "MSP3445", "MSP3411", "MSP3416",
-        /* 15-19 */
-        "MSP3425", "MSP3451", "MSP3418", "Type 0x12", "OKI7716",
-        /* 20-24 */
-        "MSP4410", "MSP4420", "MSP4440", "MSP4450", "MSP4408",
-        /* 25-29 */
-        "MSP4418", "MSP4428", "MSP4448", "MSP4458", "Type 0x1d",
-        /* 30-34 */
-        "CX880", "CX881", "CX883", "CX882", "CX25840",
-        /* 35-38 */
-        "CX25841", "CX25842", "CX25843", "CX23418",
+static struct HAUPPAUGE_AUDIOIC
+{
+        enum audiochip  id;
+        char *name;
+}
+audioIC[] =
+{
+        /* 0-4 */
+        {AUDIO_CHIP_NONE,     "None"},
+        {AUDIO_CHIP_TEA6300,  "TEA6300"},
+        {AUDIO_CHIP_TEA6300,  "TEA6320"},
+        {AUDIO_CHIP_TDA985X,  "TDA9850"},
+        {AUDIO_CHIP_MSP34XX,  "MSP3400C"},
+        /* 5-9 */
+        {AUDIO_CHIP_MSP34XX,  "MSP3410D"},
+        {AUDIO_CHIP_MSP34XX,  "MSP3415"},
+        {AUDIO_CHIP_MSP34XX,  "MSP3430"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP3438"},
+        {AUDIO_CHIP_UNKNOWN,  "CS5331"},
+        /* 10-14 */
+        {AUDIO_CHIP_MSP34XX,  "MSP3435"},
+        {AUDIO_CHIP_MSP34XX,  "MSP3440"},
+        {AUDIO_CHIP_MSP34XX,  "MSP3445"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP3411"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP3416"},
+        /* 15-19 */
+        {AUDIO_CHIP_MSP34XX,  "MSP3425"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP3451"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP3418"},
+        {AUDIO_CHIP_UNKNOWN,  "Type 0x12"},
+        {AUDIO_CHIP_UNKNOWN,  "OKI7716"},
+        /* 20-24 */
+        {AUDIO_CHIP_UNKNOWN,  "MSP4410"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP4420"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP4440"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP4450"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP4408"},
+        /* 25-29 */
+        {AUDIO_CHIP_UNKNOWN,  "MSP4418"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP4428"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP4448"},
+        {AUDIO_CHIP_UNKNOWN,  "MSP4458"},
+        {AUDIO_CHIP_UNKNOWN,  "Type 0x1d"},
+        /* 30-34 */
+        {AUDIO_CHIP_INTERNAL, "CX880"},
+        {AUDIO_CHIP_INTERNAL, "CX881"},
+        {AUDIO_CHIP_INTERNAL, "CX883"},
+        {AUDIO_CHIP_INTERNAL, "CX882"},
+        {AUDIO_CHIP_INTERNAL, "CX25840"},
+        /* 35-38 */
+        {AUDIO_CHIP_INTERNAL, "CX25841"},
+        {AUDIO_CHIP_INTERNAL, "CX25842"},
+        {AUDIO_CHIP_INTERNAL, "CX25843"},
+        {AUDIO_CHIP_INTERNAL, "CX23418"},
 };
 
 /* This list is supplied by Hauppauge. Thanks! */
 static const char *decoderIC[] = {
-        /* 0-4 */
-        "None", "BT815", "BT817", "BT819", "BT815A",
-        /* 5-9 */
-        "BT817A", "BT819A", "BT827", "BT829", "BT848",
-        /* 10-14 */
-        "BT848A", "BT849A", "BT829A", "BT827A", "BT878",
-        /* 15-19 */
-        "BT879", "BT880", "VPX3226E", "SAA7114", "SAA7115",
-        /* 20-24 */
-        "CX880", "CX881", "CX883", "SAA7111", "SAA7113",
-        /* 25-29 */
-        "CX882", "TVP5150A", "CX25840", "CX25841", "CX25842",
-        /* 30-31 */
-        "CX25843", "CX23418",
+        /* 0-4 */
+        "None", "BT815", "BT817", "BT819", "BT815A",
+        /* 5-9 */
+        "BT817A", "BT819A", "BT827", "BT829", "BT848",
+        /* 10-14 */
+        "BT848A", "BT849A", "BT829A", "BT827A", "BT878",
+        /* 15-19 */
+        "BT879", "BT880", "VPX3226E", "SAA7114", "SAA7115",
+        /* 20-24 */
+        "CX880", "CX881", "CX883", "SAA7111", "SAA7113",
+        /* 25-29 */
+        "CX882", "TVP5150A", "CX25840", "CX25841", "CX25842",
+        /* 30-31 */
+        "CX25843", "CX23418",
 };
 
 static int hasRadioTuner(int tunerType)
 {
-        switch (tunerType) {
-                case 18: //PNPEnv_TUNER_FR1236_MK2:
-                case 23: //PNPEnv_TUNER_FM1236:
-                case 38: //PNPEnv_TUNER_FMR1236:
-                case 16: //PNPEnv_TUNER_FR1216_MK2:
-                case 19: //PNPEnv_TUNER_FR1246_MK2:
-                case 21: //PNPEnv_TUNER_FM1216:
-                case 24: //PNPEnv_TUNER_FM1246:
-                case 17: //PNPEnv_TUNER_FR1216MF_MK2:
-                case 22: //PNPEnv_TUNER_FM1216MF:
-                case 20: //PNPEnv_TUNER_FR1256_MK2:
-                case 25: //PNPEnv_TUNER_FM1256:
-                case 33: //PNPEnv_TUNER_4039FR5:
-                case 42: //PNPEnv_TUNER_4009FR5:
-                case 52: //PNPEnv_TUNER_4049FM5:
-                case 54: //PNPEnv_TUNER_4049FM5_AltI2C:
-                case 44: //PNPEnv_TUNER_4009FN5:
-                case 31: //PNPEnv_TUNER_TCPB9085P:
-                case 30: //PNPEnv_TUNER_TCPN9085D:
-                case 46: //PNPEnv_TUNER_TP18NSR01F:
-                case 47: //PNPEnv_TUNER_TP18PSB01D:
-                case 49: //PNPEnv_TUNER_TAPC_I001D:
-                case 60: //PNPEnv_TUNER_TAPE_S001D_MK3:
-                case 57: //PNPEnv_TUNER_FM1216ME_MK3:
-                case 59: //PNPEnv_TUNER_FM1216MP_MK3:
-                case 58: //PNPEnv_TUNER_FM1236_MK3:
-                case 68: //PNPEnv_TUNER_TAPE_H001F_MK3:
-                case 61: //PNPEnv_TUNER_TAPE_M001D_MK3:
-                case 78: //PNPEnv_TUNER_TDA8275C1_8290_FM:
-                case 89: //PNPEnv_TUNER_TCL_MFPE05_2:
-                case 92: //PNPEnv_TUNER_PHILIPS_FQ1236A_MK4:
-                    return 1;
-        }
-        return 0;
+        switch (tunerType) {
+                case 18: //PNPEnv_TUNER_FR1236_MK2:
+                case 23: //PNPEnv_TUNER_FM1236:
+                case 38: //PNPEnv_TUNER_FMR1236:
+                case 16: //PNPEnv_TUNER_FR1216_MK2:
+                case 19: //PNPEnv_TUNER_FR1246_MK2:
+                case 21: //PNPEnv_TUNER_FM1216:
+                case 24: //PNPEnv_TUNER_FM1246:
+                case 17: //PNPEnv_TUNER_FR1216MF_MK2:
+                case 22: //PNPEnv_TUNER_FM1216MF:
+                case 20: //PNPEnv_TUNER_FR1256_MK2:
+                case 25: //PNPEnv_TUNER_FM1256:
+                case 33: //PNPEnv_TUNER_4039FR5:
+                case 42: //PNPEnv_TUNER_4009FR5:
+                case 52: //PNPEnv_TUNER_4049FM5:
+                case 54: //PNPEnv_TUNER_4049FM5_AltI2C:
+                case 44: //PNPEnv_TUNER_4009FN5:
+                case 31: //PNPEnv_TUNER_TCPB9085P:
+                case 30: //PNPEnv_TUNER_TCPN9085D:
+                case 46: //PNPEnv_TUNER_TP18NSR01F:
+                case 47: //PNPEnv_TUNER_TP18PSB01D:
+                case 49: //PNPEnv_TUNER_TAPC_I001D:
+                case 60: //PNPEnv_TUNER_TAPE_S001D_MK3:
+                case 57: //PNPEnv_TUNER_FM1216ME_MK3:
+                case 59: //PNPEnv_TUNER_FM1216MP_MK3:
+                case 58: //PNPEnv_TUNER_FM1236_MK3:
+                case 68: //PNPEnv_TUNER_TAPE_H001F_MK3:
+                case 61: //PNPEnv_TUNER_TAPE_M001D_MK3:
+                case 78: //PNPEnv_TUNER_TDA8275C1_8290_FM:
+                case 89: //PNPEnv_TUNER_TCL_MFPE05_2:
+                case 92: //PNPEnv_TUNER_PHILIPS_FQ1236A_MK4:
+                return 1;
+        }
+        return 0;
 }
 
 void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
-                                unsigned char *eeprom_data)
+                                unsigned char *eeprom_data)
 {
         /* ----------------------------------------------
         ** The hauppauge eeprom format is tagged
@@ -312,19 +355,27 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
         ** # of inputs/outputs ???
         */
 
-        int i, j, len, done, beenhere, tag;
+        int i, j, len, done, beenhere, tag,start;
 
-        int tuner1 = 0, t_format1 = 0;
+        int tuner1 = 0, t_format1 = 0, audioic=-1;
         char *t_name1 = NULL;
-        const char *t_fmt_name1[8] = { " none", "", "", "", "", "", "", "" };
+        const char *t_fmt_name1[8] = { " none", "", "", "", "", "", "", "" };
 
-        int tuner2 = 0, t_format2 = 0;
+        int tuner2 = 0, t_format2 = 0;
         char *t_name2 = NULL;
-        const char *t_fmt_name2[8] = { " none", "", "", "", "", "", "", "" };
+        const char *t_fmt_name2[8] = { " none", "", "", "", "", "", "", "" };
 
-        memset(tvee, 0, sizeof(*tvee));
+        memset(tvee, 0, sizeof(*tvee));
         done = len = beenhere = 0;
-        for (i = 0; !done && i < 256; i += len) {
+
+        /* Hack for processing eeprom for em28xx */
+        if ((eeprom_data[0]==0x1a)&&(eeprom_data[1]==0xeb)&&
+                                (eeprom_data[2]==0x67)&&(eeprom_data[3]==0x95))
+                start=0xa0;
+        else
+                start=0;
+
+        for (i = start; !done && i < 256; i += len) {
                 if (eeprom_data[i] == 0x84) {
                         len = eeprom_data[i + 1] + (eeprom_data[i + 2] << 8);
                         i += 3;
@@ -338,28 +389,28 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         ++i;
                 } else {
                         tveeprom_warn("Encountered bad packet header [%02x]. "
-                                   "Corrupt or not a Hauppauge eeprom.\n", eeprom_data[i]);
+                                "Corrupt or not a Hauppauge eeprom.\n", eeprom_data[i]);
                         return;
                 }
 
-                if (debug) {
-                        tveeprom_info("Tag [%02x] + %d bytes:", eeprom_data[i], len - 1);
-                        for(j = 1; j < len; j++) {
-                                printk(" %02x", eeprom_data[i + j]);
-                        }
-                        printk("\n");
-                }
+                if (debug) {
+                        tveeprom_info("Tag [%02x] + %d bytes:", eeprom_data[i], len - 1);
+                        for(j = 1; j < len; j++) {
+                                printk(" %02x", eeprom_data[i + j]);
+                        }
+                        printk("\n");
+                }
 
                 /* process by tag */
                 tag = eeprom_data[i];
                 switch (tag) {
                 case 0x00:
-                        /* tag: 'Comprehensive' */
+                        /* tag: 'Comprehensive' */
                         tuner1 = eeprom_data[i+6];
                         t_format1 = eeprom_data[i+5];
                         tvee->has_radio = eeprom_data[i+len-1];
-                        /* old style tag, don't know how to detect
-                           IR presence, mark as unknown. */
+                        /* old style tag, don't know how to detect
+                        IR presence, mark as unknown. */
                         tvee->has_ir = 2;
                         tvee->model =
                                 eeprom_data[i+8] +
@@ -370,7 +421,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         break;
 
                 case 0x01:
-                        /* tag: 'SerialID' */
+                        /* tag: 'SerialID' */
                         tvee->serial_number =
                                 eeprom_data[i+6] +
                                 (eeprom_data[i+7] << 8) +
@@ -378,17 +429,21 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         break;
 
                 case 0x02:
-                        /* tag 'AudioInfo'
-                           Note mask with 0x7F, high bit used on some older models
-                           to indicate 4052 mux was removed in favor of using MSP
-                           inputs directly. */
-                        tvee->audio_processor = eeprom_data[i+2] & 0x7f;
+                        /* tag 'AudioInfo'
+                        Note mask with 0x7F, high bit used on some older models
+                        to indicate 4052 mux was removed in favor of using MSP
+                        inputs directly. */
+                        audioic = eeprom_data[i+2] & 0x7f;
+                        if (audioic < sizeof(audioIC)/sizeof(*audioIC))
+                                tvee->audio_processor = audioIC[audioic].id;
+                        else
+                                tvee->audio_processor = AUDIO_CHIP_UNKNOWN;
                         break;
 
-                /* case 0x03: tag 'EEInfo' */
+                /* case 0x03: tag 'EEInfo' */
 
                 case 0x04:
-                        /* tag 'SerialID2' */
+                        /* tag 'SerialID2' */
                         tvee->serial_number =
                                 eeprom_data[i+5] +
                                 (eeprom_data[i+6] << 8) +
@@ -396,15 +451,20 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         break;
 
                 case 0x05:
-                        /* tag 'Audio2'
-                           Note mask with 0x7F, high bit used on some older models
-                           to indicate 4052 mux was removed in favor of using MSP
-                           inputs directly. */
-                        tvee->audio_processor = eeprom_data[i+1] & 0x7f;
+                        /* tag 'Audio2'
+                        Note mask with 0x7F, high bit used on some older models
+                        to indicate 4052 mux was removed in favor of using MSP
+                        inputs directly. */
+                        audioic = eeprom_data[i+1] & 0x7f;
+                        if (audioic < sizeof(audioIC)/sizeof(*audioIC))
+                                tvee->audio_processor = audioIC[audioic].id;
+                        else
+                                tvee->audio_processor = AUDIO_CHIP_UNKNOWN;
+
                         break;
 
                 case 0x06:
-                        /* tag 'ModelRev' */
+                        /* tag 'ModelRev' */
                         tvee->model =
                                 eeprom_data[i+1] +
                                 (eeprom_data[i+2] << 8);
@@ -414,55 +474,55 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         break;
 
                 case 0x07:
-                        /* tag 'Details': according to Hauppauge not interesting
-                           on any PCI-era or later boards. */
+                        /* tag 'Details': according to Hauppauge not interesting
+                        on any PCI-era or later boards. */
                         break;
 
-                /* there is no tag 0x08 defined */
+                /* there is no tag 0x08 defined */
 
                 case 0x09:
-                        /* tag 'Video' */
+                        /* tag 'Video' */
                         tvee->decoder_processor = eeprom_data[i + 1];
                         break;
 
                 case 0x0a:
-                        /* tag 'Tuner' */
+                        /* tag 'Tuner' */
                         if (beenhere == 0) {
                                 tuner1 = eeprom_data[i+2];
                                 t_format1 = eeprom_data[i+1];
                                 beenhere = 1;
                         } else {
-                                /* a second (radio) tuner may be present */
+                                /* a second (radio) tuner may be present */
                                 tuner2 = eeprom_data[i+2];
                                 t_format2 = eeprom_data[i+1];
-                                if (t_format2 == 0) {  /* not a TV tuner? */
-                                        tvee->has_radio = 1; /* must be radio */
-                                }
-                        }
+                                if (t_format2 == 0) {  /* not a TV tuner? */
+                                        tvee->has_radio = 1; /* must be radio */
+                                }
+                        }
                         break;
 
-                case 0x0b:
-                        /* tag 'Inputs': according to Hauppauge this is specific
-                           to each driver family, so no good assumptions can be
-                           made. */
-                        break;
+                case 0x0b:
+                        /* tag 'Inputs': according to Hauppauge this is specific
+                        to each driver family, so no good assumptions can be
+                        made. */
+                        break;
 
-                /* case 0x0c: tag 'Balun' */
-                /* case 0x0d: tag 'Teletext' */
+                /* case 0x0c: tag 'Balun' */
+                /* case 0x0d: tag 'Teletext' */
 
                 case 0x0e:
-                        /* tag: 'Radio' */
+                        /* tag: 'Radio' */
                         tvee->has_radio = eeprom_data[i+1];
                         break;
 
-                case 0x0f:
-                        /* tag 'IRInfo' */
-                        tvee->has_ir = eeprom_data[i+1];
-                        break;
+                case 0x0f:
+                        /* tag 'IRInfo' */
+                        tvee->has_ir = eeprom_data[i+1];
+                        break;
 
-                /* case 0x10: tag 'VBIInfo' */
-                /* case 0x11: tag 'QCInfo' */
-                /* case 0x12: tag 'InfoBits' */
+                /* case 0x10: tag 'VBIInfo' */
+                /* case 0x11: tag 'QCInfo' */
+                /* case 0x12: tag 'InfoBits' */
 
                 default:
                         tveeprom_dbg("Not sure what to do with tag [%02x]\n", tag);
@@ -483,11 +543,11 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                 tvee->rev_str[4] = 0;
         }
 
-        if (hasRadioTuner(tuner1) && !tvee->has_radio) {
-            tveeprom_info("The eeprom says no radio is present, but the tuner type\n");
-            tveeprom_info("indicates otherwise. I will assume that radio is present.\n");
-            tvee->has_radio = 1;
-        }
+        if (hasRadioTuner(tuner1) && !tvee->has_radio) {
+                tveeprom_info("The eeprom says no radio is present, but the tuner type\n");
+                tveeprom_info("indicates otherwise. I will assume that radio is present.\n");
+                tvee->has_radio = 1;
+        }
 
         if (tuner1 < sizeof(hauppauge_tuner)/sizeof(struct HAUPPAUGE_TUNER)) {
                 tvee->tuner_type = hauppauge_tuner[tuner1].id;
@@ -510,45 +570,53 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         tvee->tuner_formats |= hauppauge_tuner_fmt[i].id;
                         t_fmt_name1[j++] = hauppauge_tuner_fmt[i].name;
                 }
-                if (t_format2 & (1 << i)) {
-                        tvee->tuner2_formats |= hauppauge_tuner_fmt[i].id;
-                        t_fmt_name2[j++] = hauppauge_tuner_fmt[i].name;
-                }
+                if (t_format2 & (1 << i)) {
+                        tvee->tuner2_formats |= hauppauge_tuner_fmt[i].id;
+                        t_fmt_name2[j++] = hauppauge_tuner_fmt[i].name;
+                }
         }
 
         tveeprom_info("Hauppauge model %d, rev %s, serial# %d\n",
-                   tvee->model, tvee->rev_str, tvee->serial_number);
+                tvee->model, tvee->rev_str, tvee->serial_number);
         tveeprom_info("tuner model is %s (idx %d, type %d)\n",
-                   t_name1, tuner1, tvee->tuner_type);
+                t_name1, tuner1, tvee->tuner_type);
         tveeprom_info("TV standards%s%s%s%s%s%s%s%s (eeprom 0x%02x)\n",
-                   t_fmt_name1[0], t_fmt_name1[1], t_fmt_name1[2], t_fmt_name1[3],
-                   t_fmt_name1[4], t_fmt_name1[5], t_fmt_name1[6], t_fmt_name1[7],
-                   t_format1);
-        if (tuner2) {
-                tveeprom_info("second tuner model is %s (idx %d, type %d)\n",
-                           t_name2, tuner2, tvee->tuner2_type);
-        }
-        if (t_format2) {
-                tveeprom_info("TV standards%s%s%s%s%s%s%s%s (eeprom 0x%02x)\n",
-                           t_fmt_name2[0], t_fmt_name2[1], t_fmt_name2[2], t_fmt_name2[3],
-                           t_fmt_name2[4], t_fmt_name2[5], t_fmt_name2[6], t_fmt_name2[7],
-                           t_format2);
-        }
-        tveeprom_info("audio processor is %s (idx %d)\n",
-                   STRM(audioIC, tvee->audio_processor),
-                   tvee->audio_processor);
-        if (tvee->decoder_processor) {
-                tveeprom_info("decoder processor is %s (idx %d)\n",
-                           STRM(decoderIC, tvee->decoder_processor),
-                           tvee->decoder_processor);
-        }
-        if (tvee->has_ir == 2)
-                tveeprom_info("has %sradio\n",
-                                tvee->has_radio ? "" : "no ");
-        else
-                tveeprom_info("has %sradio, has %sIR remote\n",
-                                tvee->has_radio ? "" : "no ",
-                                tvee->has_ir ? "" : "no ");
+                t_fmt_name1[0], t_fmt_name1[1], t_fmt_name1[2], t_fmt_name1[3],
+                t_fmt_name1[4], t_fmt_name1[5], t_fmt_name1[6], t_fmt_name1[7],
+                t_format1);
+        if (tuner2) {
+                tveeprom_info("second tuner model is %s (idx %d, type %d)\n",
+                                        t_name2, tuner2, tvee->tuner2_type);
+        }
+        if (t_format2) {
+                tveeprom_info("TV standards%s%s%s%s%s%s%s%s (eeprom 0x%02x)\n",
+                        t_fmt_name2[0], t_fmt_name2[1], t_fmt_name2[2], t_fmt_name2[3],
+                        t_fmt_name2[4], t_fmt_name2[5], t_fmt_name2[6], t_fmt_name2[7],
+                        t_format2);
+        }
+        if (audioic<0) {
+                tveeprom_info("audio processor is unknown (no idx)\n");
+                tvee->audio_processor=AUDIO_CHIP_UNKNOWN;
+        } else {
+                if (audioic < sizeof(audioIC)/sizeof(*audioIC))
+                        tveeprom_info("audio processor is %s (idx %d)\n",
+                                        audioIC[audioic].name,audioic);
+                else
+                        tveeprom_info("audio processor is unknown (idx %d)\n",
+                                                                audioic);
+        }
+        if (tvee->decoder_processor) {
+                tveeprom_info("decoder processor is %s (idx %d)\n",
+                        STRM(decoderIC, tvee->decoder_processor),
+                        tvee->decoder_processor);
+        }
+        if (tvee->has_ir == 2)
+                tveeprom_info("has %sradio\n",
+                                tvee->has_radio ? "" : "no ");
+        else
+                tveeprom_info("has %sradio, has %sIR remote\n",
+                                tvee->has_radio ? "" : "no ",
+                                tvee->has_ir ? "" : "no ");
 }
 EXPORT_SYMBOL(tveeprom_hauppauge_analog);
 
@@ -569,18 +637,18 @@ int tveeprom_read(struct i2c_client *c, unsigned char *eedata, int len)
                 tveeprom_warn("i2c eeprom read error (err=%d)\n", err);
                 return -1;
         }
-        if (debug) {
-                int i;
-
-                tveeprom_info("full 256-byte eeprom dump:\n");
-                for (i = 0; i < len; i++) {
-                        if (0 == (i % 16))
-                                tveeprom_info("%02x:", i);
-                        printk(" %02x", eedata[i]);
-                        if (15 == (i % 16))
-                                printk("\n");
-                }
-        }
+        if (debug) {
+                int i;
+
+                tveeprom_info("full 256-byte eeprom dump:\n");
+                for (i = 0; i < len; i++) {
+                        if (0 == (i % 16))
+                                tveeprom_info("%02x:", i);
+                        printk(" %02x", eedata[i]);
+                        if (15 == (i % 16))
+                                printk("\n");
+                }
+        }
         return 0;
 }
 EXPORT_SYMBOL(tveeprom_read);
@@ -590,10 +658,6 @@ EXPORT_SYMBOL(tveeprom_read);
 /* run, just call the exported tveeprom_* directly, there is no point in   */
 /* using the indirect way via i2c_driver->command()                        */
 
-#ifndef I2C_DRIVERID_TVEEPROM
-# define I2C_DRIVERID_TVEEPROM I2C_DRIVERID_EXP2
-#endif
-
 static unsigned short normal_i2c[] = {
         0xa0 >> 1,
         I2C_CLIENT_END,