V4L/DVB (8281): sms1xxx: remove INT / UINT typedefs

Signed-off-by: NMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>

drivers/media/dvb/siano/smscoreapi.c

@@ -472,7 +472,7 @@ int smscore_load_firmware_family2(smscore_device_t *coredev, void *buffer,
 {
 	SmsFirmware_ST *firmware = (SmsFirmware_ST *) buffer;
 	SmsMsgHdr_ST *msg;
-	UINT32 mem_address = firmware->StartAddress;
+	u32 mem_address = firmware->StartAddress;
 	u8 *payload = firmware->Payload;
 	int rc = 0;
 
@@ -496,7 +496,7 @@ int smscore_load_firmware_family2(smscore_device_t *coredev, void *buffer,
 		rc = smscore_sendrequest_and_wait(coredev, msg,
 						  msg->msgLength,
 						  &coredev->reload_start_done);
-		mem_address = *(UINT32*) &payload[20];
+		mem_address = *(u32 *) &payload[20];
 	}
 
 	while (size && rc >= 0)
@@ -505,8 +505,8 @@ int smscore_load_firmware_family2(smscore_device_t *coredev, void *buffer,
 		int payload_size = min((int) size, SMS_MAX_PAYLOAD_SIZE);
 
 		SMS_INIT_MSG(msg, MSG_SMS_DATA_DOWNLOAD_REQ,
-			     (UINT16)(sizeof(SmsMsgHdr_ST) +
-				      sizeof(UINT32) + payload_size));
+			     (u16)(sizeof(SmsMsgHdr_ST) +
+				      sizeof(u32) + payload_size));
 
 		DataMsg->MemAddr = mem_address;
 		memcpy(DataMsg->Payload, payload, payload_size);
@@ -528,7 +528,7 @@ int smscore_load_firmware_family2(smscore_device_t *coredev, void *buffer,
 
 			SMS_INIT_MSG(msg, MSG_SMS_SWDOWNLOAD_TRIGGER_REQ,
 				     sizeof(SmsMsgHdr_ST) +
-				     sizeof(UINT32) * 5);
+				     sizeof(u32) * 5);
 
 			TriggerMsg->msgData[0] = firmware->StartAddress;	// Entry point
 			TriggerMsg->msgData[1] = 5;							// Priority

drivers/media/dvb/siano/smscoreapi.h

@@ -213,276 +213,271 @@ typedef enum
 	DEVICE_MODE_MAX,
 } SMS_DEVICE_MODE;
 
-typedef unsigned char UINT8;
-typedef unsigned short UINT16;
-typedef unsigned int UINT32;
-typedef int INT32;
-
 typedef struct SmsMsgHdr_S
 {
-	UINT16	msgType;
-	UINT8	msgSrcId;
-	UINT8	msgDstId;
-	UINT16	msgLength; /* Length of entire message, including header */
-	UINT16	msgFlags;
+	u16	msgType;
+	u8	msgSrcId;
+	u8	msgDstId;
+	u16	msgLength; /* Length of entire message, including header */
+	u16	msgFlags;
 } SmsMsgHdr_ST;
 
 typedef struct SmsMsgData_S
 {
 	SmsMsgHdr_ST	xMsgHeader;
-	UINT32			msgData[1];
+	u32			msgData[1];
 } SmsMsgData_ST;
 
 typedef struct SmsDataDownload_S
 {
 	SmsMsgHdr_ST	xMsgHeader;
-	UINT32			MemAddr;
-	UINT8			Payload[SMS_MAX_PAYLOAD_SIZE];
+	u32			MemAddr;
+	u8			Payload[SMS_MAX_PAYLOAD_SIZE];
 } SmsDataDownload_ST;
 
 typedef struct SmsVersionRes_S
 {
 	SmsMsgHdr_ST	xMsgHeader;
 
-	UINT16		ChipModel; /* e.g. 0x1102 for SMS-1102 "Nova" */
-	UINT8		Step; /* 0 - Step A */
-	UINT8		MetalFix; /* 0 - Metal 0 */
+	u16		ChipModel; /* e.g. 0x1102 for SMS-1102 "Nova" */
+	u8		Step; /* 0 - Step A */
+	u8		MetalFix; /* 0 - Metal 0 */
 
-	UINT8		FirmwareId; /* 0xFF � ROM, otherwise the value indicated by SMSHOSTLIB_DEVICE_MODES_E */
-	UINT8		SupportedProtocols; /* Bitwise OR combination of supported protocols */
+	u8		FirmwareId; /* 0xFF � ROM, otherwise the value indicated by SMSHOSTLIB_DEVICE_MODES_E */
+	u8		SupportedProtocols; /* Bitwise OR combination of supported protocols */
 
-	UINT8		VersionMajor;
-	UINT8		VersionMinor;
-	UINT8		VersionPatch;
-	UINT8		VersionFieldPatch;
+	u8		VersionMajor;
+	u8		VersionMinor;
+	u8		VersionPatch;
+	u8		VersionFieldPatch;
 
-	UINT8		RomVersionMajor;
-	UINT8		RomVersionMinor;
-	UINT8		RomVersionPatch;
-	UINT8		RomVersionFieldPatch;
+	u8		RomVersionMajor;
+	u8		RomVersionMinor;
+	u8		RomVersionPatch;
+	u8		RomVersionFieldPatch;
 
-	UINT8		TextLabel[34];
+	u8		TextLabel[34];
 } SmsVersionRes_ST;
 
 typedef struct SmsFirmware_S
 {
-	UINT32			CheckSum;
-	UINT32			Length;
-	UINT32			StartAddress;
-	UINT8			Payload[1];
+	u32			CheckSum;
+	u32			Length;
+	u32			StartAddress;
+	u8			Payload[1];
 } SmsFirmware_ST;
 
 typedef struct SMSHOSTLIB_STATISTICS_S
 {
-	UINT32 Reserved; /* Reserved */
+	u32 Reserved; /* Reserved */
 
 	/* Common parameters */
-	UINT32 IsRfLocked; /* 0 - not locked, 1 - locked */
-	UINT32 IsDemodLocked; /* 0 - not locked, 1 - locked */
-	UINT32 IsExternalLNAOn; /* 0 - external LNA off, 1 - external LNA on */
+	u32 IsRfLocked; /* 0 - not locked, 1 - locked */
+	u32 IsDemodLocked; /* 0 - not locked, 1 - locked */
+	u32 IsExternalLNAOn; /* 0 - external LNA off, 1 - external LNA on */
 
 	/* Reception quality */
-	INT32  SNR; /* dB */
-	UINT32 BER; /* Post Viterbi BER [1E-5] */
-	UINT32 FIB_CRC;	/* CRC errors percentage, valid only for DAB */
-	UINT32 TS_PER; /* Transport stream PER, 0xFFFFFFFF indicate N/A, valid only for DVB-T/H */
-	UINT32 MFER; /* DVB-H frame error rate in percentage, 0xFFFFFFFF indicate N/A, valid only for DVB-H */
-	INT32  RSSI; /* dBm */
-	INT32  InBandPwr; /* In band power in dBM */
-	INT32  CarrierOffset; /* Carrier Offset in bin/1024 */
+	s32  SNR; /* dB */
+	u32 BER; /* Post Viterbi BER [1E-5] */
+	u32 FIB_CRC;	/* CRC errors percentage, valid only for DAB */
+	u32 TS_PER; /* Transport stream PER, 0xFFFFFFFF indicate N/A, valid only for DVB-T/H */
+	u32 MFER; /* DVB-H frame error rate in percentage, 0xFFFFFFFF indicate N/A, valid only for DVB-H */
+	s32  RSSI; /* dBm */
+	s32  InBandPwr; /* In band power in dBM */
+	s32  CarrierOffset; /* Carrier Offset in bin/1024 */
 
 	/* Transmission parameters */
-	UINT32 Frequency; /* Frequency in Hz */
-	UINT32 Bandwidth; /* Bandwidth in MHz, valid only for DVB-T/H */
-	UINT32 TransmissionMode; /* Transmission Mode, for DAB modes 1-4, for DVB-T/H FFT mode carriers in Kilos */
-	UINT32 ModemState; /* from SMS_DvbModemState_ET , valid only for DVB-T/H */
-	UINT32 GuardInterval; /* Guard Interval, 1 divided by value , valid only for DVB-T/H */
-	UINT32 CodeRate; /* Code Rate from SMS_DvbModemState_ET, valid only for DVB-T/H */
-	UINT32 LPCodeRate; /* Low Priority Code Rate from SMS_DvbModemState_ET, valid only for DVB-T/H */
-	UINT32 Hierarchy; /* Hierarchy from SMS_Hierarchy_ET, valid only for DVB-T/H */
-	UINT32 Constellation; /* Constellation from SMS_Constellation_ET, valid only for DVB-T/H */
+	u32 Frequency; /* Frequency in Hz */
+	u32 Bandwidth; /* Bandwidth in MHz, valid only for DVB-T/H */
+	u32 TransmissionMode; /* Transmission Mode, for DAB modes 1-4, for DVB-T/H FFT mode carriers in Kilos */
+	u32 ModemState; /* from SMS_DvbModemState_ET , valid only for DVB-T/H */
+	u32 GuardInterval; /* Guard Interval, 1 divided by value , valid only for DVB-T/H */
+	u32 CodeRate; /* Code Rate from SMS_DvbModemState_ET, valid only for DVB-T/H */
+	u32 LPCodeRate; /* Low Priority Code Rate from SMS_DvbModemState_ET, valid only for DVB-T/H */
+	u32 Hierarchy; /* Hierarchy from SMS_Hierarchy_ET, valid only for DVB-T/H */
+	u32 Constellation; /* Constellation from SMS_Constellation_ET, valid only for DVB-T/H */
 
 	/* Burst parameters, valid only for DVB-H */
-	UINT32 BurstSize; /* Current burst size in bytes, valid only for DVB-H */
-	UINT32 BurstDuration; /* Current burst duration in mSec, valid only for DVB-H */
-	UINT32 BurstCycleTime; /* Current burst cycle time in mSec, valid only for DVB-H */
-	UINT32 CalculatedBurstCycleTime; /* Current burst cycle time in mSec, as calculated by demodulator, valid only for DVB-H */
-	UINT32 NumOfRows; /* Number of rows in MPE table, valid only for DVB-H */
-	UINT32 NumOfPaddCols; /* Number of padding columns in MPE table, valid only for DVB-H */
-	UINT32 NumOfPunctCols; /* Number of puncturing columns in MPE table, valid only for DVB-H */
-	UINT32 ErrorTSPackets; /* Number of erroneous transport-stream packets */
-	UINT32 TotalTSPackets; /* Total number of transport-stream packets */
-	UINT32 NumOfValidMpeTlbs; /* Number of MPE tables which do not include errors after MPE RS decoding */
-	UINT32 NumOfInvalidMpeTlbs; /* Number of MPE tables which include errors after MPE RS decoding */
-	UINT32 NumOfCorrectedMpeTlbs; /* Number of MPE tables which were corrected by MPE RS decoding */
+	u32 BurstSize; /* Current burst size in bytes, valid only for DVB-H */
+	u32 BurstDuration; /* Current burst duration in mSec, valid only for DVB-H */
+	u32 BurstCycleTime; /* Current burst cycle time in mSec, valid only for DVB-H */
+	u32 CalculatedBurstCycleTime; /* Current burst cycle time in mSec, as calculated by demodulator, valid only for DVB-H */
+	u32 NumOfRows; /* Number of rows in MPE table, valid only for DVB-H */
+	u32 NumOfPaddCols; /* Number of padding columns in MPE table, valid only for DVB-H */
+	u32 NumOfPunctCols; /* Number of puncturing columns in MPE table, valid only for DVB-H */
+	u32 ErrorTSPackets; /* Number of erroneous transport-stream packets */
+	u32 TotalTSPackets; /* Total number of transport-stream packets */
+	u32 NumOfValidMpeTlbs; /* Number of MPE tables which do not include errors after MPE RS decoding */
+	u32 NumOfInvalidMpeTlbs; /* Number of MPE tables which include errors after MPE RS decoding */
+	u32 NumOfCorrectedMpeTlbs; /* Number of MPE tables which were corrected by MPE RS decoding */
 
 	/* Common params */
-	UINT32 BERErrorCount; /* Number of errornous SYNC bits. */
-	UINT32 BERBitCount; /* Total number of SYNC bits. */
+	u32 BERErrorCount; /* Number of errornous SYNC bits. */
+	u32 BERBitCount; /* Total number of SYNC bits. */
 
 	/* Interface information */
-	UINT32 SmsToHostTxErrors; /* Total number of transmission errors. */
+	u32 SmsToHostTxErrors; /* Total number of transmission errors. */
 
 	/* DAB/T-DMB */
-	UINT32 PreBER; /* DAB/T-DMB only: Pre Viterbi BER [1E-5] */
+	u32 PreBER; /* DAB/T-DMB only: Pre Viterbi BER [1E-5] */
 
 	/* DVB-H TPS parameters */
-	UINT32 CellId; /* TPS Cell ID in bits 15..0, bits 31..16 zero; if set to 0xFFFFFFFF cell_id not yet recovered */
+	u32 CellId; /* TPS Cell ID in bits 15..0, bits 31..16 zero; if set to 0xFFFFFFFF cell_id not yet recovered */
 
 } SMSHOSTLIB_STATISTICS_ST;
 
 typedef struct
 {
-	UINT32 RequestResult;
+	u32 RequestResult;
 
 	SMSHOSTLIB_STATISTICS_ST Stat;
 
 	/* Split the calc of the SNR in DAB */
-	UINT32 Signal; /* dB */
-	UINT32 Noise; /* dB */
+	u32 Signal; /* dB */
+	u32 Noise; /* dB */
 
 } SmsMsgStatisticsInfo_ST;
 
 typedef struct SMSHOSTLIB_ISDBT_LAYER_STAT_S
 {
 	/* Per-layer information */
-	UINT32 CodeRate; /* Code Rate from SMSHOSTLIB_CODE_RATE_ET, 255 means layer does not exist */
-	UINT32 Constellation; /* Constellation from SMSHOSTLIB_CONSTELLATION_ET, 255 means layer does not exist */
-	UINT32 BER; /* Post Viterbi BER [1E-5], 0xFFFFFFFF indicate N/A */
-	UINT32 BERErrorCount; /* Post Viterbi Error Bits Count */
-	UINT32 BERBitCount; /* Post Viterbi Total Bits Count */
-	UINT32 PreBER; /* Pre Viterbi BER [1E-5], 0xFFFFFFFF indicate N/A */
-	UINT32 TS_PER; /* Transport stream PER [%], 0xFFFFFFFF indicate N/A */
-	UINT32 ErrorTSPackets; /* Number of erroneous transport-stream packets */
-	UINT32 TotalTSPackets; /* Total number of transport-stream packets */
-	UINT32 TILdepthI; /* Time interleaver depth I parameter, 255 means layer does not exist */
-	UINT32 NumberOfSegments; /* Number of segments in layer A, 255 means layer does not exist */
-	UINT32 TMCCErrors; /* TMCC errors */
+	u32 CodeRate; /* Code Rate from SMSHOSTLIB_CODE_RATE_ET, 255 means layer does not exist */
+	u32 Constellation; /* Constellation from SMSHOSTLIB_CONSTELLATION_ET, 255 means layer does not exist */
+	u32 BER; /* Post Viterbi BER [1E-5], 0xFFFFFFFF indicate N/A */
+	u32 BERErrorCount; /* Post Viterbi Error Bits Count */
+	u32 BERBitCount; /* Post Viterbi Total Bits Count */
+	u32 PreBER; /* Pre Viterbi BER [1E-5], 0xFFFFFFFF indicate N/A */
+	u32 TS_PER; /* Transport stream PER [%], 0xFFFFFFFF indicate N/A */
+	u32 ErrorTSPackets; /* Number of erroneous transport-stream packets */
+	u32 TotalTSPackets; /* Total number of transport-stream packets */
+	u32 TILdepthI; /* Time interleaver depth I parameter, 255 means layer does not exist */
+	u32 NumberOfSegments; /* Number of segments in layer A, 255 means layer does not exist */
+	u32 TMCCErrors; /* TMCC errors */
 } SMSHOSTLIB_ISDBT_LAYER_STAT_ST;
 
 typedef struct SMSHOSTLIB_STATISTICS_ISDBT_S
 {
-	UINT32 StatisticsType; /* Enumerator identifying the type of the
+	u32 StatisticsType; /* Enumerator identifying the type of the
 				* structure.  Values are the same as
 				* SMSHOSTLIB_DEVICE_MODES_E
 				*
 				* This field MUST always be first in any
 				* statistics structure */
 
-	UINT32 FullSize; /* Total size of the structure returned by the modem.  If the size requested by
+	u32 FullSize; /* Total size of the structure returned by the modem.  If the size requested by
 			  * the host is smaller than FullSize, the struct will be truncated */
 
 	/* Common parameters */
-	UINT32 IsRfLocked; /* 0 - not locked, 1 - locked */
-	UINT32 IsDemodLocked; /* 0 - not locked, 1 - locked */
-	UINT32 IsExternalLNAOn; /* 0 - external LNA off, 1 - external LNA on */
+	u32 IsRfLocked; /* 0 - not locked, 1 - locked */
+	u32 IsDemodLocked; /* 0 - not locked, 1 - locked */
+	u32 IsExternalLNAOn; /* 0 - external LNA off, 1 - external LNA on */
 
 	/* Reception quality */
-	INT32  SNR; /* dB */
-	INT32  RSSI; /* dBm */
-	INT32  InBandPwr; /* In band power in dBM */
-	INT32  CarrierOffset; /* Carrier Offset in Hz */
+	s32  SNR; /* dB */
+	s32  RSSI; /* dBm */
+	s32  InBandPwr; /* In band power in dBM */
+	s32  CarrierOffset; /* Carrier Offset in Hz */
 
 	/* Transmission parameters */
-	UINT32 Frequency; /* Frequency in Hz */
-	UINT32 Bandwidth; /* Bandwidth in MHz */
-	UINT32 TransmissionMode; /* ISDB-T transmission mode */
-	UINT32 ModemState; /* 0 - Acquisition, 1 - Locked */
-	UINT32 GuardInterval; /* Guard Interval, 1 divided by value */
-	UINT32 SystemType; /* ISDB-T system type (ISDB-T / ISDB-Tsb) */
-	UINT32 PartialReception; /* TRUE - partial reception, FALSE otherwise */
-	UINT32 NumOfLayers; /* Number of ISDB-T layers in the network */
+	u32 Frequency; /* Frequency in Hz */
+	u32 Bandwidth; /* Bandwidth in MHz */
+	u32 TransmissionMode; /* ISDB-T transmission mode */
+	u32 ModemState; /* 0 - Acquisition, 1 - Locked */
+	u32 GuardInterval; /* Guard Interval, 1 divided by value */
+	u32 SystemType; /* ISDB-T system type (ISDB-T / ISDB-Tsb) */
+	u32 PartialReception; /* TRUE - partial reception, FALSE otherwise */
+	u32 NumOfLayers; /* Number of ISDB-T layers in the network */
 
 	/* Per-layer information */
 	/* Layers A, B and C */
 	SMSHOSTLIB_ISDBT_LAYER_STAT_ST	LayerInfo[3]; /* Per-layer statistics, see SMSHOSTLIB_ISDBT_LAYER_STAT_ST */
 
 	/* Interface information */
-	UINT32 SmsToHostTxErrors; /* Total number of transmission errors. */
+	u32 SmsToHostTxErrors; /* Total number of transmission errors. */
 
 } SMSHOSTLIB_STATISTICS_ISDBT_ST;
 
 typedef struct SMSHOSTLIB_STATISTICS_DVB_S
 {
-	UINT32 StatisticsType; /* Enumerator identifying the type of the structure.  Values are the same as SMSHOSTLIB_DEVICE_MODES_E
+	u32 StatisticsType; /* Enumerator identifying the type of the structure.  Values are the same as SMSHOSTLIB_DEVICE_MODES_E
 				* This fiels MUST always first in any statistics structure */
 
-	UINT32 FullSize; /* Total size of the structure returned by the modem.  If the size requested by
+	u32 FullSize; /* Total size of the structure returned by the modem.  If the size requested by
 			  * the host is smaller than FullSize, the struct will be truncated */
 	/* Common parameters */
-	UINT32 IsRfLocked; /* 0 - not locked, 1 - locked */
-	UINT32 IsDemodLocked; /* 0 - not locked, 1 - locked */
-	UINT32 IsExternalLNAOn; /* 0 - external LNA off, 1 - external LNA on */
+	u32 IsRfLocked; /* 0 - not locked, 1 - locked */
+	u32 IsDemodLocked; /* 0 - not locked, 1 - locked */
+	u32 IsExternalLNAOn; /* 0 - external LNA off, 1 - external LNA on */
 
 	/* Reception quality */
-	INT32  SNR; /* dB */
-	UINT32 BER; /* Post Viterbi BER [1E-5] */
-	UINT32 BERErrorCount; /* Number of errornous SYNC bits. */
-	UINT32 BERBitCount; /* Total number of SYNC bits. */
-	UINT32 TS_PER; /* Transport stream PER, 0xFFFFFFFF indicate N/A */
-	UINT32 MFER; /* DVB-H frame error rate in percentage, 0xFFFFFFFF indicate N/A, valid only for DVB-H */
-	INT32  RSSI; /* dBm */
-	INT32  InBandPwr; /* In band power in dBM */
-	INT32  CarrierOffset; /* Carrier Offset in bin/1024 */
+	s32  SNR; /* dB */
+	u32 BER; /* Post Viterbi BER [1E-5] */
+	u32 BERErrorCount; /* Number of errornous SYNC bits. */
+	u32 BERBitCount; /* Total number of SYNC bits. */
+	u32 TS_PER; /* Transport stream PER, 0xFFFFFFFF indicate N/A */
+	u32 MFER; /* DVB-H frame error rate in percentage, 0xFFFFFFFF indicate N/A, valid only for DVB-H */
+	s32  RSSI; /* dBm */
+	s32  InBandPwr; /* In band power in dBM */
+	s32  CarrierOffset; /* Carrier Offset in bin/1024 */
 
 	/* Transmission parameters */
-	UINT32 Frequency; /* Frequency in Hz */
-	UINT32 Bandwidth; /* Bandwidth in MHz */
-	UINT32 ModemState; /* from SMSHOSTLIB_DVB_MODEM_STATE_ET */
-	UINT32 TransmissionMode; /* FFT mode carriers in Kilos */
-	UINT32 GuardInterval; /* Guard Interval, 1 divided by value */
-	UINT32 CodeRate; /* Code Rate from SMSHOSTLIB_CODE_RATE_ET */
-	UINT32 LPCodeRate; /* Low Priority Code Rate from SMSHOSTLIB_CODE_RATE_ET */
-	UINT32 Hierarchy; /* Hierarchy from SMSHOSTLIB_HIERARCHY_ET */
-	UINT32 Constellation; /* Constellation from SMSHOSTLIB_CONSTELLATION_ET */
+	u32 Frequency; /* Frequency in Hz */
+	u32 Bandwidth; /* Bandwidth in MHz */
+	u32 ModemState; /* from SMSHOSTLIB_DVB_MODEM_STATE_ET */
+	u32 TransmissionMode; /* FFT mode carriers in Kilos */
+	u32 GuardInterval; /* Guard Interval, 1 divided by value */
+	u32 CodeRate; /* Code Rate from SMSHOSTLIB_CODE_RATE_ET */
+	u32 LPCodeRate; /* Low Priority Code Rate from SMSHOSTLIB_CODE_RATE_ET */
+	u32 Hierarchy; /* Hierarchy from SMSHOSTLIB_HIERARCHY_ET */
+	u32 Constellation; /* Constellation from SMSHOSTLIB_CONSTELLATION_ET */
 
 	/* Burst parameters, valid only for DVB-H */
-	UINT32 BurstSize; /* Current burst size in bytes, valid only for DVB-H */
-	UINT32 BurstDuration; /* Current burst duration in mSec, valid only for DVB-H */
-	UINT32 BurstCycleTime; /* Current burst cycle time in mSec, valid only for DVB-H */
-	UINT32 CalculatedBurstCycleTime; /* Current burst cycle time in mSec, as calculated by demodulator, valid only for DVB-H */
-	UINT32 NumOfRows; /* Number of rows in MPE table, valid only for DVB-H */
-	UINT32 NumOfPaddCols; /* Number of padding columns in MPE table, valid only for DVB-H */
-	UINT32 NumOfPunctCols; /* Number of puncturing columns in MPE table, valid only for DVB-H */
-	UINT32 ErrorTSPackets; /* Number of erroneous transport-stream packets */
-	UINT32 TotalTSPackets; /* Total number of transport-stream packets */
-	UINT32 NumOfValidMpeTlbs; /* Number of MPE tables which do not include errors after MPE RS decoding, valid only for DVB-H */
-	UINT32 NumOfInvalidMpeTlbs; /* Number of MPE tables which include errors after MPE RS decoding, valid only for DVB-H */
-	UINT32 NumOfCorrectedMpeTlbs; /* Number of MPE tables which were corrected by MPE RS decoding, valid only for DVB-H */
-	UINT32 NumMPEReceived; /* DVB-H, Num MPE section received */
+	u32 BurstSize; /* Current burst size in bytes, valid only for DVB-H */
+	u32 BurstDuration; /* Current burst duration in mSec, valid only for DVB-H */
+	u32 BurstCycleTime; /* Current burst cycle time in mSec, valid only for DVB-H */
+	u32 CalculatedBurstCycleTime; /* Current burst cycle time in mSec, as calculated by demodulator, valid only for DVB-H */
+	u32 NumOfRows; /* Number of rows in MPE table, valid only for DVB-H */
+	u32 NumOfPaddCols; /* Number of padding columns in MPE table, valid only for DVB-H */
+	u32 NumOfPunctCols; /* Number of puncturing columns in MPE table, valid only for DVB-H */
+	u32 ErrorTSPackets; /* Number of erroneous transport-stream packets */
+	u32 TotalTSPackets; /* Total number of transport-stream packets */
+	u32 NumOfValidMpeTlbs; /* Number of MPE tables which do not include errors after MPE RS decoding, valid only for DVB-H */
+	u32 NumOfInvalidMpeTlbs; /* Number of MPE tables which include errors after MPE RS decoding, valid only for DVB-H */
+	u32 NumOfCorrectedMpeTlbs; /* Number of MPE tables which were corrected by MPE RS decoding, valid only for DVB-H */
+	u32 NumMPEReceived; /* DVB-H, Num MPE section received */
 
 	/* DVB-H TPS parameters */
-	UINT32 CellId; /* TPS Cell ID in bits 15..0, bits 31..16 zero; if set to 0xFFFFFFFF cell_id not yet recovered */
-	UINT32 DvbhSrvIndHP; /* DVB-H service indication info, bit 1 - Time Slicing indicator, bit 0 - MPE-FEC indicator */
-	UINT32 DvbhSrvIndLP; /* DVB-H service indication info, bit 1 - Time Slicing indicator, bit 0 - MPE-FEC indicator */
+	u32 CellId; /* TPS Cell ID in bits 15..0, bits 31..16 zero; if set to 0xFFFFFFFF cell_id not yet recovered */
+	u32 DvbhSrvIndHP; /* DVB-H service indication info, bit 1 - Time Slicing indicator, bit 0 - MPE-FEC indicator */
+	u32 DvbhSrvIndLP; /* DVB-H service indication info, bit 1 - Time Slicing indicator, bit 0 - MPE-FEC indicator */
 
 	/* Interface information */
-	UINT32 SmsToHostTxErrors; /* Total number of transmission errors. */
+	u32 SmsToHostTxErrors; /* Total number of transmission errors. */
 
 } SMSHOSTLIB_STATISTICS_DVB_ST;
 
 typedef struct SMSHOSTLIB_GPIO_CONFIG_S
 {
-	UINT8	Direction; /* GPIO direction: Input - 0, Output - 1 */
-	UINT8	PullUpDown; /* PullUp/PullDown: None - 0, PullDown - 1, PullUp - 2, Keeper - 3 */
-	UINT8	InputCharacteristics; /* Input Characteristics: Normal - 0, Schmitt trigger - 1 */
-	UINT8	OutputSlewRate; /* Output Slew Rate:	Fast slew rate - 0, Slow slew rate - 1 */
-	UINT8	OutputDriving; /* Output driving capability: 4mA - 0, 8mA - 1, 12mA - 2, 16mA - 3 */
+	u8	Direction; /* GPIO direction: Input - 0, Output - 1 */
+	u8	PullUpDown; /* PullUp/PullDown: None - 0, PullDown - 1, PullUp - 2, Keeper - 3 */
+	u8	InputCharacteristics; /* Input Characteristics: Normal - 0, Schmitt trigger - 1 */
+	u8	OutputSlewRate; /* Output Slew Rate:	Fast slew rate - 0, Slow slew rate - 1 */
+	u8	OutputDriving; /* Output driving capability: 4mA - 0, 8mA - 1, 12mA - 2, 16mA - 3 */
 } SMSHOSTLIB_GPIO_CONFIG_ST;
 
 typedef struct SMSHOSTLIB_I2C_REQ_S
 {
-	UINT32	DeviceAddress; /* I2c device address */
-	UINT32	WriteCount; /* number of bytes to write */
-	UINT32	ReadCount; /* number of bytes to read */
-	UINT8	Data[1];
+	u32	DeviceAddress; /* I2c device address */
+	u32	WriteCount; /* number of bytes to write */
+	u32	ReadCount; /* number of bytes to read */
+	u8	Data[1];
 } SMSHOSTLIB_I2C_REQ_ST;
 
 typedef struct SMSHOSTLIB_I2C_RES_S
 {
-	UINT32	Status; /* non-zero value in case of failure */
-	UINT32	ReadCount; /* number of bytes read */
-	UINT8	Data[1];
+	u32	Status; /* non-zero value in case of failure */
+	u32	ReadCount; /* number of bytes read */
+	u8	Data[1];
 } SMSHOSTLIB_I2C_RES_ST;
 
 typedef struct _smsdvb_client