Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 366633
b: refs/heads/master
c: 9041424
h: refs/heads/master
i:
  366631: 0849a30
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Mar 21, 2013
1 parent c8c9f2a commit 18408d1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cf0e9cfcc70d8aaeabf19356f42041f8a5495301
refs/heads/master: 90414248bf23ba3c96811f48053b47bfc330fce3
14 changes: 9 additions & 5 deletions trunk/drivers/media/common/siano/smscoreapi.h
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,11 @@ enum msg_types {
};

#define SMS_INIT_MSG_EX(ptr, type, src, dst, len) do { \
(ptr)->msg_type = type; (ptr)->msg_src_id = src; (ptr)->msg_dst_id = dst; \
(ptr)->msg_length = len; (ptr)->msg_flags = 0; \
(ptr)->msg_type = type; \
(ptr)->msg_src_id = src; \
(ptr)->msg_dst_id = dst; \
(ptr)->msg_length = len; \
(ptr)->msg_flags = 0; \
} while (0)

#define SMS_INIT_MSG(ptr, type, len) \
Expand Down Expand Up @@ -704,7 +707,7 @@ struct sms_stats {
u32 modem_state; /* from SMSHOSTLIB_DVB_MODEM_STATE_ET,
valid only for DVB-T/H */
u32 guard_interval; /* Guard Interval from
SMSHOSTLIB_GUARD_INTERVALS_ET, valid only for DVB-T/H */
SMSHOSTLIB_GUARD_INTERVALS_ET, valid only for DVB-T/H */
u32 code_rate; /* Code Rate from SMSHOSTLIB_CODE_RATE_ET,
valid only for DVB-T/H */
u32 lp_code_rate; /* Low Priority Code Rate from
Expand Down Expand Up @@ -746,7 +749,7 @@ struct sms_stats {
u32 sms_to_host_tx_errors; /* Total number of transmission errors. */

/* DAB/T-DMB */
u32 pre_ber; /* DAB/T-DMB only: Pre Viterbi BER [1E-5] */
u32 pre_ber; /* DAB/T-DMB only: Pre Viterbi BER [1E-5] */

/* DVB-H TPS parameters */
u32 cell_id; /* TPS Cell ID in bits 15..0, bits 31..16 zero;
Expand Down Expand Up @@ -1177,7 +1180,8 @@ int smscore_led_state(struct smscore_device_t *core, int led);

#define dprintk(kern, lvl, fmt, arg...) do {\
if (sms_dbg & lvl) \
sms_printk(kern, fmt, ##arg); } while (0)
sms_printk(kern, fmt, ##arg); \
} while (0)

#define sms_log(fmt, arg...) sms_printk(KERN_INFO, fmt, ##arg)
#define sms_err(fmt, arg...) \
Expand Down

0 comments on commit 18408d1

Please sign in to comment.