V4L/DVB (6021): cx88: Copy board information into card state

[linux-2.6-omap-h63xx.git] / drivers / media / video / cx88 / cx88.h

diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 78486f90327a5bfba7eef475d286ff6cfa941579..3636ec26de5926faacd36128924249a5dd453fbd 100644 (file)
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -250,7 +250,7 @@ struct cx88_subid {
        u32     card;
 };
 
-#define INPUT(nr) (&cx88_boards[core->board].input[nr])
+#define INPUT(nr) (core->board.input[nr])
 
 /* ----------------------------------------------------------- */
 /* device / file handle status                                 */
@@ -304,13 +304,8 @@ struct cx88_core {
        u32                        i2c_state, i2c_rc;
 
        /* config info -- analog */
-       unsigned int               board;
-       unsigned int               tuner_type;
-       unsigned int               radio_type;
-       unsigned char              tuner_addr;
-       unsigned char              radio_addr;
-       unsigned int               tda9887_conf;
-       unsigned int               has_radio;
+       unsigned int               boardnr;
+       struct cx88_board          board;
 
        /* Supported V4L _STD_ tuner formats */
        unsigned int               tuner_formats;
@@ -585,7 +580,7 @@ extern void cx88_call_i2c_clients(struct cx88_core *core,
 /* ----------------------------------------------------------- */
 /* cx88-cards.c                                                */
 
-extern struct cx88_board cx88_boards[];
+extern const struct cx88_board cx88_boards[];
 extern const unsigned int cx88_bcount;
 
 extern struct cx88_subid cx88_subids[];