diff options
| -rw-r--r-- | linux/drivers/media/video/tveeprom.c | 24 | ||||
| -rw-r--r-- | v4l/ChangeLog | 11 |
2 files changed, 23 insertions, 12 deletions
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c index 3dc0e6f89..3b66f1642 100644 --- a/linux/drivers/media/video/tveeprom.c +++ b/linux/drivers/media/video/tveeprom.c @@ -78,10 +78,10 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); c->addr , ##arg); } while (0) #endif - -/* ----------------------------------------------------------------------- */ -/* some hauppauge specific stuff */ - +/* + * The Hauppauge eeprom uses an 8bit field to determine which + * tuner formats the tuner supports. + */ static struct HAUPPAUGE_TUNER_FMT { int id; @@ -89,14 +89,14 @@ static struct HAUPPAUGE_TUNER_FMT } hauppauge_tuner_fmt[] = { - { 0x00000000, " unknown1" }, - { 0x00000000, " unknown2" }, - { 0x00000007, " PAL(B/G)" }, - { 0x00001000, " NTSC(M)" }, - { 0x00000010, " PAL(I)" }, - { 0x00400000, " SECAM(L/L')" }, - { 0x00000e00, " PAL(D/K)" }, - { 0x03000000, " ATSC/DVB Digital" }, + { V4L2_STD_UNKNOWN," UNKNOWN" }, + { V4L2_STD_UNKNOWN," FM" }, + { V4L2_STD_PAL_BG, " PAL(B/G)" }, + { V4L2_STD_NTSC_M, " NTSC(M)" }, + { V4L2_STD_PAL_I, " PAL(I)" }, + { V4L2_STD_SECAM_L," SECAM(L/L')" }, + { V4L2_STD_PAL_DK, " PAL(D/D1/K)" }, + { V4L2_STD_ATSC, " ATSC/DVB Digital" }, }; /* This is the full list of possible tuners. Many thanks to Hauppauge for diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 48baac420..06ac924e3 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2005-12-04 19:30 mkrufky + + * linux/drivers/media/video/tveeprom.c: + - tveeprom cleanup of hardcoded tuner format values. + - cleaned up the structure to use the V4L2_STD_xxx definitions + rather than a one off set of hardcoded values - which could + change in the future. + + Signed-off-by: Steven Toth <stoth@hauppauge.com> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-12-04 19:20 mkrufky * Makefile: |