2010-08-16 12:46:08

by Kusanagi Kouichi

[permalink] [raw]
Subject: [PATCH] cx23885: Use enum for board type definitions.

Signed-off-by: Kusanagi Kouichi <[email protected]>
---
drivers/media/video/cx23885/cx23885.h | 62 +++++++++++++++++----------------
1 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index ed94b17..55dc282 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -54,36 +54,38 @@

#define BUFFER_TIMEOUT (HZ) /* 0.5 seconds */

-#define CX23885_BOARD_NOAUTO UNSET
-#define CX23885_BOARD_UNKNOWN 0
-#define CX23885_BOARD_HAUPPAUGE_HVR1800lp 1
-#define CX23885_BOARD_HAUPPAUGE_HVR1800 2
-#define CX23885_BOARD_HAUPPAUGE_HVR1250 3
-#define CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP 4
-#define CX23885_BOARD_HAUPPAUGE_HVR1500Q 5
-#define CX23885_BOARD_HAUPPAUGE_HVR1500 6
-#define CX23885_BOARD_HAUPPAUGE_HVR1200 7
-#define CX23885_BOARD_HAUPPAUGE_HVR1700 8
-#define CX23885_BOARD_HAUPPAUGE_HVR1400 9
-#define CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP 10
-#define CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP 11
-#define CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H 12
-#define CX23885_BOARD_COMPRO_VIDEOMATE_E650F 13
-#define CX23885_BOARD_TBS_6920 14
-#define CX23885_BOARD_TEVII_S470 15
-#define CX23885_BOARD_DVBWORLD_2005 16
-#define CX23885_BOARD_NETUP_DUAL_DVBS2_CI 17
-#define CX23885_BOARD_HAUPPAUGE_HVR1270 18
-#define CX23885_BOARD_HAUPPAUGE_HVR1275 19
-#define CX23885_BOARD_HAUPPAUGE_HVR1255 20
-#define CX23885_BOARD_HAUPPAUGE_HVR1210 21
-#define CX23885_BOARD_MYGICA_X8506 22
-#define CX23885_BOARD_MAGICPRO_PROHDTVE2 23
-#define CX23885_BOARD_HAUPPAUGE_HVR1850 24
-#define CX23885_BOARD_COMPRO_VIDEOMATE_E800 25
-#define CX23885_BOARD_HAUPPAUGE_HVR1290 26
-#define CX23885_BOARD_MYGICA_X8558PRO 27
-#define CX23885_BOARD_LEADTEK_WINFAST_PXTV1200 28
+enum {
+ CX23885_BOARD_NOAUTO = UNSET,
+ CX23885_BOARD_UNKNOWN = 0,
+ CX23885_BOARD_HAUPPAUGE_HVR1800lp,
+ CX23885_BOARD_HAUPPAUGE_HVR1800,
+ CX23885_BOARD_HAUPPAUGE_HVR1250,
+ CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP,
+ CX23885_BOARD_HAUPPAUGE_HVR1500Q,
+ CX23885_BOARD_HAUPPAUGE_HVR1500,
+ CX23885_BOARD_HAUPPAUGE_HVR1200,
+ CX23885_BOARD_HAUPPAUGE_HVR1700,
+ CX23885_BOARD_HAUPPAUGE_HVR1400,
+ CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP,
+ CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP,
+ CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H,
+ CX23885_BOARD_COMPRO_VIDEOMATE_E650F,
+ CX23885_BOARD_TBS_6920,
+ CX23885_BOARD_TEVII_S470,
+ CX23885_BOARD_DVBWORLD_2005,
+ CX23885_BOARD_NETUP_DUAL_DVBS2_CI,
+ CX23885_BOARD_HAUPPAUGE_HVR1270,
+ CX23885_BOARD_HAUPPAUGE_HVR1275,
+ CX23885_BOARD_HAUPPAUGE_HVR1255,
+ CX23885_BOARD_HAUPPAUGE_HVR1210,
+ CX23885_BOARD_MYGICA_X8506,
+ CX23885_BOARD_MAGICPRO_PROHDTVE2,
+ CX23885_BOARD_HAUPPAUGE_HVR1850,
+ CX23885_BOARD_COMPRO_VIDEOMATE_E800,
+ CX23885_BOARD_HAUPPAUGE_HVR1290,
+ CX23885_BOARD_MYGICA_X8558PRO,
+ CX23885_BOARD_LEADTEK_WINFAST_PXTV1200
+};

#define GPIO_0 0x00000001
#define GPIO_1 0x00000002
--
1.7.1