some enum warrnings compil fixes

Origin commit data
------------------
Commit: 051fb7c008
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-15 (Sun, 15 Feb 2015)
This commit is contained in:
Jacek Jendrzej
2015-02-15 22:16:47 +01:00
parent f781defc64
commit 44a7c3703c
10 changed files with 27 additions and 27 deletions

View File

@@ -33,7 +33,7 @@ enum CS_LOG_MODULE {
CS_LOG_POWER_CLK, CS_LOG_POWER_CLK,
CS_LOG_MEM, CS_LOG_MEM,
CS_LOG_API, CS_LOG_API,
CS_LOG_CA, CS_LOG_CA
}; };
// Initialization // Initialization

View File

@@ -62,7 +62,7 @@ typedef enum {
FP_FLAG_ALIGN_LEFT = 0x10, /* align the text in display from the left (default) */ FP_FLAG_ALIGN_LEFT = 0x10, /* align the text in display from the left (default) */
FP_FLAG_ALIGN_RIGHT = 0x20, /* align the text in display from the right (arabic) */ FP_FLAG_ALIGN_RIGHT = 0x20, /* align the text in display from the right (arabic) */
FP_FLAG_UPDATE_SCROLL_POS = 0x40, /* update the current position for scrolling (internal use only) */ FP_FLAG_UPDATE_SCROLL_POS = 0x40, /* update the current position for scrolling (internal use only) */
FP_FLAG_USER = 0x80, /* user flags set (internal use only) */ FP_FLAG_USER = 0x80 /* user flags set (internal use only) */
} fp_flag; } fp_flag;
typedef struct { typedef struct {
@@ -80,7 +80,7 @@ typedef enum {
FP_LED_3_ON = 0x88, FP_LED_3_ON = 0x88,
FP_LED_1_OFF = 0x01, FP_LED_1_OFF = 0x01,
FP_LED_2_OFF = 0x02, FP_LED_2_OFF = 0x02,
FP_LED_3_OFF = 0x08, FP_LED_3_OFF = 0x08
} fp_led_ctrl_t; } fp_led_ctrl_t;
typedef struct { typedef struct {
@@ -105,7 +105,7 @@ typedef struct {
typedef enum { typedef enum {
FP_DISPLAY_TEXT_NONE = 0, FP_DISPLAY_TEXT_NONE = 0,
FP_DISPLAY_TEXT_LIMITED, FP_DISPLAY_TEXT_LIMITED,
FP_DISPLAY_TEXT_ALL, FP_DISPLAY_TEXT_ALL
} fp_display_text_type_t; } fp_display_text_type_t;
typedef enum { typedef enum {

View File

@@ -27,7 +27,7 @@
typedef enum { typedef enum {
DMX_TS = 0, DMX_TS = 0,
DMX_DMA, DMX_DMA
} DMX_TYPE; } DMX_TYPE;
typedef enum { typedef enum {

View File

@@ -32,7 +32,7 @@ typedef enum {
// Output types // Output types
ANALOG_xD_SCART = (1 << 8), // Output is SCART ANALOG_xD_SCART = (1 << 8), // Output is SCART
ANALOG_xD_CINCH = (1 << 9), // Output is Cinch ANALOG_xD_CINCH = (1 << 9), // Output is Cinch
ANALOG_xD_BOTH = (3 << 8), // Output cannot individually control scart, cinch outputs ANALOG_xD_BOTH = (3 << 8) // Output cannot individually control scart, cinch outputs
// due to limited amount of DACs (ie TANK, Trinity) // due to limited amount of DACs (ie TANK, Trinity)
} analog_mode_t; } analog_mode_t;

View File

@@ -66,7 +66,7 @@ class CBuildInfo : public CMenuTarget, public CComponentsWindow
BI_TYPE_ID_CREATOR, BI_TYPE_ID_CREATOR,
#endif #endif
BI_TYPE_IDS, BI_TYPE_IDS
}; };
CBuildInfo(); CBuildInfo();

View File

@@ -123,7 +123,7 @@ class CComponentsForm : public CComponentsItem
{ {
PG_SCROLL_M_UP_DOWN_KEY = 1, PG_SCROLL_M_UP_DOWN_KEY = 1,
PG_SCROLL_M_LEFT_RIGHT_KEY = 2, PG_SCROLL_M_LEFT_RIGHT_KEY = 2,
PG_SCROLL_M_OFF = 4, PG_SCROLL_M_OFF = 4
}; };
///enable/disable page scroll, parameter1 default enabled for up/down keys ///enable/disable page scroll, parameter1 default enabled for up/down keys
virtual void enablePageScroll(const int& mode = PG_SCROLL_M_UP_DOWN_KEY){page_scroll_mode = mode;}; virtual void enablePageScroll(const int& mode = PG_SCROLL_M_UP_DOWN_KEY){page_scroll_mode = mode;};

View File

@@ -77,7 +77,7 @@ void CComponentsFrmChain::setDirection(int direction)
{ {
chn_direction = direction; chn_direction = direction;
initChainItems(); initChainItems();
}; }
void CComponentsFrmChain::initChainItems() void CComponentsFrmChain::initChainItems()
{ {

View File

@@ -137,13 +137,13 @@ class CProgressBar : public CComponentsItem
PB_MATRIX, /* 0 */ PB_MATRIX, /* 0 */
PB_LINES_V, /* 1 */ PB_LINES_V, /* 1 */
PB_LINES_H, /* 2 */ PB_LINES_H, /* 2 */
PB_COLOR, /* 3 */ PB_COLOR /* 3 */
}; };
enum pb_type_t { enum pb_type_t {
PB_REDLEFT = 0, PB_REDLEFT = 0,
PB_REDRIGHT, PB_REDRIGHT,
PB_TIMESCALE, PB_TIMESCALE
}; };
void setType(pb_type_t type); void setType(pb_type_t type);

View File

@@ -141,7 +141,7 @@ typedef enum fe_status {
FE_HAS_SYNC = 0x08, FE_HAS_SYNC = 0x08,
FE_HAS_LOCK = 0x10, FE_HAS_LOCK = 0x10,
FE_TIMEDOUT = 0x20, FE_TIMEDOUT = 0x20,
FE_REINIT = 0x40, FE_REINIT = 0x40
} fe_status_t; } fe_status_t;
typedef enum fe_spectral_inversion { typedef enum fe_spectral_inversion {
@@ -164,7 +164,7 @@ typedef enum fe_code_rate {
FEC_AUTO, FEC_AUTO,
FEC_3_5, FEC_3_5,
FEC_9_10, FEC_9_10,
FEC_2_5, FEC_2_5
} fe_code_rate_t; } fe_code_rate_t;
@@ -182,7 +182,7 @@ typedef enum fe_modulation {
APSK_16, APSK_16,
APSK_32, APSK_32,
DQPSK, DQPSK,
QAM_4_NR, QAM_4_NR
} fe_modulation_t; } fe_modulation_t;
typedef enum fe_transmit_mode { typedef enum fe_transmit_mode {
@@ -194,7 +194,7 @@ typedef enum fe_transmit_mode {
TRANSMISSION_MODE_16K, TRANSMISSION_MODE_16K,
TRANSMISSION_MODE_32K, TRANSMISSION_MODE_32K,
TRANSMISSION_MODE_C1, TRANSMISSION_MODE_C1,
TRANSMISSION_MODE_C3780, TRANSMISSION_MODE_C3780
} fe_transmit_mode_t; } fe_transmit_mode_t;
#if defined(__DVB_CORE__) || !defined (__KERNEL__) #if defined(__DVB_CORE__) || !defined (__KERNEL__)
@@ -205,7 +205,7 @@ typedef enum fe_bandwidth {
BANDWIDTH_AUTO, BANDWIDTH_AUTO,
BANDWIDTH_5_MHZ, BANDWIDTH_5_MHZ,
BANDWIDTH_10_MHZ, BANDWIDTH_10_MHZ,
BANDWIDTH_1_712_MHZ, BANDWIDTH_1_712_MHZ
} fe_bandwidth_t; } fe_bandwidth_t;
#endif #endif
@@ -220,7 +220,7 @@ typedef enum fe_guard_interval {
GUARD_INTERVAL_19_256, GUARD_INTERVAL_19_256,
GUARD_INTERVAL_PN420, GUARD_INTERVAL_PN420,
GUARD_INTERVAL_PN595, GUARD_INTERVAL_PN595,
GUARD_INTERVAL_PN945, GUARD_INTERVAL_PN945
} fe_guard_interval_t; } fe_guard_interval_t;
@@ -236,7 +236,7 @@ enum fe_interleaving {
INTERLEAVING_NONE, INTERLEAVING_NONE,
INTERLEAVING_AUTO, INTERLEAVING_AUTO,
INTERLEAVING_240, INTERLEAVING_240,
INTERLEAVING_720, INTERLEAVING_720
}; };
#if defined(__DVB_CORE__) || !defined (__KERNEL__) #if defined(__DVB_CORE__) || !defined (__KERNEL__)
@@ -380,14 +380,14 @@ struct dvb_frontend_event {
typedef enum fe_pilot { typedef enum fe_pilot {
PILOT_ON, PILOT_ON,
PILOT_OFF, PILOT_OFF,
PILOT_AUTO, PILOT_AUTO
} fe_pilot_t; } fe_pilot_t;
typedef enum fe_rolloff { typedef enum fe_rolloff {
ROLLOFF_35, /* Implied value in DVB-S, default for DVB-S2 */ ROLLOFF_35, /* Implied value in DVB-S, default for DVB-S2 */
ROLLOFF_20, ROLLOFF_20,
ROLLOFF_25, ROLLOFF_25,
ROLLOFF_AUTO, ROLLOFF_AUTO
} fe_rolloff_t; } fe_rolloff_t;
typedef enum fe_delivery_system { typedef enum fe_delivery_system {
@@ -409,7 +409,7 @@ typedef enum fe_delivery_system {
SYS_DAB, SYS_DAB,
SYS_DVBT2, SYS_DVBT2,
SYS_TURBO, SYS_TURBO,
SYS_DVBC_ANNEX_C, SYS_DVBC_ANNEX_C
} fe_delivery_system_t; } fe_delivery_system_t;
/* backward compatibility */ /* backward compatibility */
@@ -421,31 +421,31 @@ typedef enum fe_delivery_system {
enum atscmh_sccc_block_mode { enum atscmh_sccc_block_mode {
ATSCMH_SCCC_BLK_SEP = 0, ATSCMH_SCCC_BLK_SEP = 0,
ATSCMH_SCCC_BLK_COMB = 1, ATSCMH_SCCC_BLK_COMB = 1,
ATSCMH_SCCC_BLK_RES = 2, ATSCMH_SCCC_BLK_RES = 2
}; };
enum atscmh_sccc_code_mode { enum atscmh_sccc_code_mode {
ATSCMH_SCCC_CODE_HLF = 0, ATSCMH_SCCC_CODE_HLF = 0,
ATSCMH_SCCC_CODE_QTR = 1, ATSCMH_SCCC_CODE_QTR = 1,
ATSCMH_SCCC_CODE_RES = 2, ATSCMH_SCCC_CODE_RES = 2
}; };
enum atscmh_rs_frame_ensemble { enum atscmh_rs_frame_ensemble {
ATSCMH_RSFRAME_ENS_PRI = 0, ATSCMH_RSFRAME_ENS_PRI = 0,
ATSCMH_RSFRAME_ENS_SEC = 1, ATSCMH_RSFRAME_ENS_SEC = 1
}; };
enum atscmh_rs_frame_mode { enum atscmh_rs_frame_mode {
ATSCMH_RSFRAME_PRI_ONLY = 0, ATSCMH_RSFRAME_PRI_ONLY = 0,
ATSCMH_RSFRAME_PRI_SEC = 1, ATSCMH_RSFRAME_PRI_SEC = 1,
ATSCMH_RSFRAME_RES = 2, ATSCMH_RSFRAME_RES = 2
}; };
enum atscmh_rs_code_mode { enum atscmh_rs_code_mode {
ATSCMH_RSCODE_211_187 = 0, ATSCMH_RSCODE_211_187 = 0,
ATSCMH_RSCODE_223_187 = 1, ATSCMH_RSCODE_223_187 = 1,
ATSCMH_RSCODE_235_187 = 2, ATSCMH_RSCODE_235_187 = 2,
ATSCMH_RSCODE_RES = 3, ATSCMH_RSCODE_RES = 3
}; };
#define NO_STREAM_ID_FILTER (~0U) #define NO_STREAM_ID_FILTER (~0U)

View File

@@ -76,7 +76,7 @@ typedef enum {
// //
ALL_SAT = ZAPIT_DM_SAT, ALL_SAT = ZAPIT_DM_SAT,
ALL_CABLE = ZAPIT_DM_CABLE, ALL_CABLE = ZAPIT_DM_CABLE,
ALL_TERR = ZAPIT_DM_TERR, ALL_TERR = ZAPIT_DM_TERR
} delivery_system_t; } delivery_system_t;
typedef enum { typedef enum {