[media] saa7134: Get rid of struct saa7134_input.tv field

[deliverable/linux.git] / drivers / media / pci / saa7134 / saa7134.h

diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
index 5938bc7819998dfa6b741822143801f327662d33..e3e2392f87d61143b979ee8d01ca7142ed3f2804 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134.h
+++ b/drivers/media/pci/saa7134/saa7134.h
@@ -361,12 +361,29 @@ struct saa7134_card_ir {
 #define SET_CLOCK_INVERTED                     (1 << 2)
 #define SET_VSYNC_OFF                          (1 << 3)
 
+enum saa7134_input_types {
+       SAA7134_NO_INPUT = 0,
+       SAA7134_INPUT_MUTE,
+       SAA7134_INPUT_RADIO,
+       SAA7134_INPUT_TV,
+       SAA7134_INPUT_TV_MONO,
+       SAA7134_INPUT_COMPOSITE,
+       SAA7134_INPUT_COMPOSITE0,
+       SAA7134_INPUT_COMPOSITE1,
+       SAA7134_INPUT_COMPOSITE2,
+       SAA7134_INPUT_COMPOSITE3,
+       SAA7134_INPUT_COMPOSITE4,
+       SAA7134_INPUT_SVIDEO,
+       SAA7134_INPUT_SVIDEO0,
+       SAA7134_INPUT_SVIDEO1,
+       SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
+};
+
 struct saa7134_input {
-       char                    *name;
-       unsigned int            vmux;
-       enum saa7134_audio_in   amux;
-       unsigned int            gpio;
-       unsigned int            tv:1;
+       enum saa7134_input_types type;
+       unsigned int             vmux;
+       enum saa7134_audio_in    amux;
+       unsigned int             gpio;
 };
 
 enum saa7134_mpeg_type {
@@ -410,7 +427,7 @@ struct saa7134_board {
        unsigned int            ts_force_val:1;
 };
 
-#define card_has_radio(dev)   (NULL != saa7134_boards[dev->board].radio.name)
+#define card_has_radio(dev)   (SAA7134_NO_INPUT != saa7134_boards[dev->board].radio.type)
 #define card_is_empress(dev)  (SAA7134_MPEG_EMPRESS == saa7134_boards[dev->board].mpeg)
 #define card_is_dvb(dev)      (SAA7134_MPEG_DVB     == saa7134_boards[dev->board].mpeg)
 #define card_is_go7007(dev)   (SAA7134_MPEG_GO7007  == saa7134_boards[dev->board].mpeg)
@@ -727,7 +744,7 @@ extern struct mutex saa7134_devlist_lock;
 extern int saa7134_no_overlay;
 extern bool saa7134_userptr;
 
-void saa7134_track_gpio(struct saa7134_dev *dev, char *msg);
+void saa7134_track_gpio(struct saa7134_dev *dev, const char *msg);
 void saa7134_set_gpio(struct saa7134_dev *dev, int bit_no, int value);
 
 #define SAA7134_PGTABLE_SIZE 4096
@@ -760,6 +777,7 @@ extern int (*saa7134_dmasound_exit)(struct saa7134_dev *dev);
 /* saa7134-cards.c                                             */
 
 extern struct saa7134_board saa7134_boards[];
+extern const char * const saa7134_input_name[];
 extern const unsigned int saa7134_bcount;
 extern struct pci_device_id saa7134_pci_tbl[];