aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorSteven Toth <stoth@hauppauge.com>2005-12-01 03:51:27 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-01 18:48:57 -0500
commit3ca0ea980697d3b3c3d5c13ba7e525ed6c434756 (patch)
treedb5d423db74e88ce836588bb77ab8ae77649b5f8 /include/media
parent759324c3c4b8d63203d7ea41b56553330bc0df06 (diff)
[PATCH] V4L: tveeprom MAC address parsing/cleanup
- Added a mac address field to the tveeprom structure. - allow callers to query the MAC address. - removed some redundant eeprom parsing code in cx88-cards.c (specific to Hauppauge DVB products) Instead, placed calls directly to the single eeprom parsing function in tveeprom.c Signed-off-by: Steven Toth <stoth@hauppauge.com> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/tveeprom.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/tveeprom.h b/include/media/tveeprom.h
index e2035c7da094..97930081699f 100644
--- a/include/media/tveeprom.h
+++ b/include/media/tveeprom.h
@@ -4,6 +4,7 @@
4struct tveeprom { 4struct tveeprom {
5 u32 has_radio; 5 u32 has_radio;
6 u32 has_ir; /* 0: no IR, 1: IR present, 2: unknown */ 6 u32 has_ir; /* 0: no IR, 1: IR present, 2: unknown */
7 u32 has_MAC_address; /* 0: no MAC, 1: MAC present, 2: unknown */
7 8
8 u32 tuner_type; 9 u32 tuner_type;
9 u32 tuner_formats; 10 u32 tuner_formats;
@@ -21,6 +22,7 @@ struct tveeprom {
21 u32 revision; 22 u32 revision;
22 u32 serial_number; 23 u32 serial_number;
23 char rev_str[5]; 24 char rev_str[5];
25 u8 MAC_address[6];
24}; 26};
25 27
26void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, 28void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,