diff options
author | Uri Shkolnik <uris@siano-ms.com> | 2009-04-05 04:26:50 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 18:14:21 -0400 |
commit | 53838e4b6126b225d2705a00614bd1de42e15f1d (patch) | |
tree | 74b6ab2c9f0ab1dc94fc95eece9f5700ca84c30f /drivers/media/dvb/siano | |
parent | 7c57333dcc95b38827a78ef1660c453077bf63f8 (diff) |
V4L/DVB (11556): Siano: core header - indentation
Some more indentation for the smscoreapi.h
There are no implementation changes in this patch.
Signed-off-by: Uri Shkolnik <uris@siano-ms.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/siano')
-rw-r--r-- | drivers/media/dvb/siano/smscoreapi.h | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/drivers/media/dvb/siano/smscoreapi.h b/drivers/media/dvb/siano/smscoreapi.h index bb52d876b4b3..d7284482eced 100644 --- a/drivers/media/dvb/siano/smscoreapi.h +++ b/drivers/media/dvb/siano/smscoreapi.h | |||
@@ -46,14 +46,14 @@ | |||
46 | #define min(a, b) (((a) < (b)) ? (a) : (b)) | 46 | #define min(a, b) (((a) < (b)) ? (a) : (b)) |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | #define SMS_PROTOCOL_MAX_RAOUNDTRIP_MS (10000) | 49 | #define SMS_PROTOCOL_MAX_RAOUNDTRIP_MS (10000) |
50 | #define SMS_ALLOC_ALIGNMENT 128 | 50 | #define SMS_ALLOC_ALIGNMENT 128 |
51 | #define SMS_DMA_ALIGNMENT 16 | 51 | #define SMS_DMA_ALIGNMENT 16 |
52 | #define SMS_ALIGN_ADDRESS(addr) \ | 52 | #define SMS_ALIGN_ADDRESS(addr) \ |
53 | ((((uintptr_t)(addr)) + (SMS_DMA_ALIGNMENT-1)) & ~(SMS_DMA_ALIGNMENT-1)) | 53 | ((((uintptr_t)(addr)) + (SMS_DMA_ALIGNMENT-1)) & ~(SMS_DMA_ALIGNMENT-1)) |
54 | 54 | ||
55 | #define SMS_DEVICE_FAMILY2 1 | 55 | #define SMS_DEVICE_FAMILY2 1 |
56 | #define SMS_ROM_NO_RESPONSE 2 | 56 | #define SMS_ROM_NO_RESPONSE 2 |
57 | #define SMS_DEVICE_NOT_READY 0x8000000 | 57 | #define SMS_DEVICE_NOT_READY 0x8000000 |
58 | 58 | ||
59 | enum sms_device_type_st { | 59 | enum sms_device_type_st { |
@@ -84,13 +84,13 @@ typedef void (*onremove_t)(void *context); | |||
84 | struct smscore_buffer_t { | 84 | struct smscore_buffer_t { |
85 | /* public members, once passed to clients can be changed freely */ | 85 | /* public members, once passed to clients can be changed freely */ |
86 | struct list_head entry; | 86 | struct list_head entry; |
87 | int size; | 87 | int size; |
88 | int offset; | 88 | int offset; |
89 | 89 | ||
90 | /* private members, read-only for clients */ | 90 | /* private members, read-only for clients */ |
91 | void *p; | 91 | void *p; |
92 | dma_addr_t phys; | 92 | dma_addr_t phys; |
93 | unsigned long offset_in_common; | 93 | unsigned long offset_in_common; |
94 | }; | 94 | }; |
95 | 95 | ||
96 | struct smsdevice_params_t { | 96 | struct smsdevice_params_t { |
@@ -117,7 +117,6 @@ struct smsclient_params_t { | |||
117 | int data_type; | 117 | int data_type; |
118 | onresponse_t onresponse_handler; | 118 | onresponse_t onresponse_handler; |
119 | onremove_t onremove_handler; | 119 | onremove_t onremove_handler; |
120 | |||
121 | void *context; | 120 | void *context; |
122 | }; | 121 | }; |
123 | 122 | ||
@@ -253,13 +252,14 @@ struct smscore_device_t { | |||
253 | #define MSG_SMS_SIGNAL_DETECTED_IND 827 | 252 | #define MSG_SMS_SIGNAL_DETECTED_IND 827 |
254 | #define MSG_SMS_NO_SIGNAL_IND 828 | 253 | #define MSG_SMS_NO_SIGNAL_IND 828 |
255 | 254 | ||
256 | |||
257 | #define SMS_INIT_MSG_EX(ptr, type, src, dst, len) do { \ | 255 | #define SMS_INIT_MSG_EX(ptr, type, src, dst, len) do { \ |
258 | (ptr)->msgType = type; (ptr)->msgSrcId = src; (ptr)->msgDstId = dst; \ | 256 | (ptr)->msgType = type; (ptr)->msgSrcId = src; (ptr)->msgDstId = dst; \ |
259 | (ptr)->msgLength = len; (ptr)->msgFlags = 0; \ | 257 | (ptr)->msgLength = len; (ptr)->msgFlags = 0; \ |
260 | } while (0) | 258 | } while (0) |
259 | |||
261 | #define SMS_INIT_MSG(ptr, type, len) \ | 260 | #define SMS_INIT_MSG(ptr, type, len) \ |
262 | SMS_INIT_MSG_EX(ptr, type, 0, HIF_TASK, len) | 261 | SMS_INIT_MSG_EX(ptr, type, 0, HIF_TASK, len) |
262 | |||
263 | enum SMS_DVB3_EVENTS { | 263 | enum SMS_DVB3_EVENTS { |
264 | DVB3_EVENT_INIT = 0, | 264 | DVB3_EVENT_INIT = 0, |
265 | DVB3_EVENT_SLEEP, | 265 | DVB3_EVENT_SLEEP, |
@@ -315,11 +315,12 @@ struct SmsVersionRes_ST { | |||
315 | u8 Step; /* 0 - Step A */ | 315 | u8 Step; /* 0 - Step A */ |
316 | u8 MetalFix; /* 0 - Metal 0 */ | 316 | u8 MetalFix; /* 0 - Metal 0 */ |
317 | 317 | ||
318 | u8 FirmwareId; /* 0xFF � ROM, otherwise the | 318 | /* FirmwareId 0xFF if ROM, otherwise the |
319 | * value indicated by | 319 | * value indicated by SMSHOSTLIB_DEVICE_MODES_E */ |
320 | * SMSHOSTLIB_DEVICE_MODES_E */ | 320 | u8 FirmwareId; |
321 | u8 SupportedProtocols; /* Bitwise OR combination of | 321 | /* SupportedProtocols Bitwise OR combination of |
322 | * supported protocols */ | 322 | * supported protocols */ |
323 | u8 SupportedProtocols; | ||
323 | 324 | ||
324 | u8 VersionMajor; | 325 | u8 VersionMajor; |
325 | u8 VersionMinor; | 326 | u8 VersionMinor; |
@@ -353,10 +354,12 @@ struct SMSHOSTLIB_STATISTICS_ST { | |||
353 | s32 SNR; /* dB */ | 354 | s32 SNR; /* dB */ |
354 | u32 BER; /* Post Viterbi BER [1E-5] */ | 355 | u32 BER; /* Post Viterbi BER [1E-5] */ |
355 | u32 FIB_CRC; /* CRC errors percentage, valid only for DAB */ | 356 | u32 FIB_CRC; /* CRC errors percentage, valid only for DAB */ |
356 | u32 TS_PER; /* Transport stream PER, 0xFFFFFFFF indicate N/A, | 357 | /* Transport stream PER, 0xFFFFFFFF indicate N/A, |
357 | * valid only for DVB-T/H */ | 358 | * valid only for DVB-T/H */ |
358 | u32 MFER; /* DVB-H frame error rate in percentage, | 359 | u32 TS_PER; |
360 | /* DVB-H frame error rate in percentage, | ||
359 | * 0xFFFFFFFF indicate N/A, valid only for DVB-H */ | 361 | * 0xFFFFFFFF indicate N/A, valid only for DVB-H */ |
362 | u32 MFER; | ||
360 | s32 RSSI; /* dBm */ | 363 | s32 RSSI; /* dBm */ |
361 | s32 InBandPwr; /* In band power in dBM */ | 364 | s32 InBandPwr; /* In band power in dBM */ |
362 | s32 CarrierOffset; /* Carrier Offset in bin/1024 */ | 365 | s32 CarrierOffset; /* Carrier Offset in bin/1024 */ |
@@ -364,8 +367,9 @@ struct SMSHOSTLIB_STATISTICS_ST { | |||
364 | /* Transmission parameters, valid only for DVB-T/H */ | 367 | /* Transmission parameters, valid only for DVB-T/H */ |
365 | u32 Frequency; /* Frequency in Hz */ | 368 | u32 Frequency; /* Frequency in Hz */ |
366 | u32 Bandwidth; /* Bandwidth in MHz */ | 369 | u32 Bandwidth; /* Bandwidth in MHz */ |
367 | u32 TransmissionMode; /* Transmission Mode, for DAB modes 1-4, | 370 | /* Transmission Mode, for DAB modes 1-4, |
368 | * for DVB-T/H FFT mode carriers in Kilos */ | 371 | * for DVB-T/H FFT mode carriers in Kilos */ |
372 | u32 TransmissionMode; | ||
369 | u32 ModemState; /* from SMS_DvbModemState_ET */ | 373 | u32 ModemState; /* from SMS_DvbModemState_ET */ |
370 | u32 GuardInterval; /* Guard Interval, 1 divided by value */ | 374 | u32 GuardInterval; /* Guard Interval, 1 divided by value */ |
371 | u32 CodeRate; /* Code Rate from SMS_DvbModemState_ET */ | 375 | u32 CodeRate; /* Code Rate from SMS_DvbModemState_ET */ |