summaryrefslogtreecommitdiff
path: root/drivers/staging/ti-st
diff options
context:
space:
mode:
authorPavan Savoy <pavan_savoy@ti.com>2010-09-17 12:06:10 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-09-20 17:02:54 -0700
commit5d702ea3191ea8ab3efd3f203e88dba1d8016eba (patch)
treead758eb59cf21335d9fdcfedda5031b5f49aff55 /drivers/staging/ti-st
parent9b906a33e0a459ea4d51c8d243154c6998be2a1d (diff)
staging: ti-st: set right the data types
replace uint and family by a much more proper u8/u16 types. This is required specifically for data members of structures coming in from the chip and data members parsed from the binary firmware file. Signed-off-by: Pavan Savoy <pavan_savoy@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ti-st')
-rw-r--r--drivers/staging/ti-st/fm.h6
-rw-r--r--drivers/staging/ti-st/st_kim.h36
2 files changed, 21 insertions, 21 deletions
diff --git a/drivers/staging/ti-st/fm.h b/drivers/staging/ti-st/fm.h
index be41453649ed..962ccd60c785 100644
--- a/drivers/staging/ti-st/fm.h
+++ b/drivers/staging/ti-st/fm.h
@@ -1,5 +1,5 @@
struct fm_event_hdr {
- unsigned char plen;
+ u8 plen;
} __attribute__ ((packed));
#define FM_MAX_FRAME_SIZE 0xFF /* TODO: */
@@ -8,6 +8,6 @@ struct fm_event_hdr {
/* gps stuff */
struct gps_event_hdr {
-unsigned char opcode;
-unsigned short plen;
+ u8 opcode;
+ u16 plen;
} __attribute__ ((packed));
diff --git a/drivers/staging/ti-st/st_kim.h b/drivers/staging/ti-st/st_kim.h
index 7de2541f2dea..e09cdf35fdb4 100644
--- a/drivers/staging/ti-st/st_kim.h
+++ b/drivers/staging/ti-st/st_kim.h
@@ -128,10 +128,10 @@ void kim_st_list_protocols(struct st_data_s *, void *);
* relevant procedure to be called.
*/
struct bts_header {
- uint32_t magic;
- uint32_t version;
- uint8_t future[24];
- uint8_t actions[0];
+ u32 magic;
+ u32 version;
+ u8 future[24];
+ u8 actions[0];
} __attribute__ ((packed));
/**
@@ -139,28 +139,28 @@ struct bts_header {
* data.
*/
struct bts_action {
- uint16_t type;
- uint16_t size;
- uint8_t data[0];
+ u16 type;
+ u16 size;
+ u8 data[0];
} __attribute__ ((packed));
struct bts_action_send {
- uint8_t data[0];
+ u8 data[0];
} __attribute__ ((packed));
struct bts_action_wait {
- uint32_t msec;
- uint32_t size;
- uint8_t data[0];
+ u32 msec;
+ u32 size;
+ u8 data[0];
} __attribute__ ((packed));
struct bts_action_delay {
- uint32_t msec;
+ u32 msec;
} __attribute__ ((packed));
struct bts_action_serial {
- uint32_t baud;
- uint32_t flow_control;
+ u32 baud;
+ u32 flow_control;
} __attribute__ ((packed));
/**
@@ -170,10 +170,10 @@ struct bts_action_serial {
* when it receives request from KIM for ldisc installation.
*/
struct hci_command {
- uint8_t prefix;
- uint16_t opcode;
- uint8_t plen;
- uint32_t speed;
+ u8 prefix;
+ u16 opcode;
+ u8 plen;
+ u32 speed;
} __attribute__ ((packed));