diff options
author | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-18 07:07:12 +0000 |
---|---|---|
committer | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-18 07:07:12 +0000 |
commit | c18947b947064e7eceed8047c42d4c8dfd8ae964 (patch) | |
tree | 095162ab48bb63952b95a8d65a98d276e3d63775 /src/jtag/rlink | |
parent | 310be8a838c9db6b67bc4d6d7d3c7ff41b32af4c (diff) |
Transform 'u8' to 'uint8_t'
- Replace '\([^_]\)u8' with '\1uint8_t'.
- Replace '^u8' with 'uint8_t'.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2276 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag/rlink')
-rw-r--r-- | src/jtag/rlink/rlink.c | 46 | ||||
-rw-r--r-- | src/jtag/rlink/rlink.h | 4 | ||||
-rw-r--r-- | src/jtag/rlink/rlink_speed_table.c | 8 |
3 files changed, 29 insertions, 29 deletions
diff --git a/src/jtag/rlink/rlink.c b/src/jtag/rlink/rlink.c index 554cca29..d22b804d 100644 --- a/src/jtag/rlink/rlink.c +++ b/src/jtag/rlink/rlink.c @@ -327,17 +327,17 @@ static int dtc_load_from_buffer( usb_dev_handle *pHDev, - const u8 *buffer, + const uint8_t *buffer, size_t length ) { struct header_s { - u8 type; - u8 length; + uint8_t type; + uint8_t length; }; int usb_err; struct header_s *header; - u8 lut_start = 0xc0; + uint8_t lut_start = 0xc0; dtc_entry_download = 0; @@ -439,7 +439,7 @@ static int dtc_start_download(void) { int usb_err; - u8 ep2txr; + uint8_t ep2txr; /* set up for download mode and make sure EP2 is set up to transmit */ usb_err = ep1_generic_commandl( @@ -497,12 +497,12 @@ static int dtc_run_download( usb_dev_handle *pHDev, - u8 *command_buffer, + uint8_t *command_buffer, int command_buffer_size, - u8 *reply_buffer, + uint8_t *reply_buffer, int reply_buffer_size ) { - u8 ep2_buffer[USB_EP2IN_SIZE]; + uint8_t ep2_buffer[USB_EP2IN_SIZE]; int usb_err; int i; @@ -582,7 +582,7 @@ struct dtc_reply_queue_entry_s { jtag_command_t *cmd; /* the command that resulted in this entry */ struct { - u8 *buffer; /* the scan buffer */ + uint8_t *buffer; /* the scan buffer */ int size; /* size of the scan buffer in bits */ int offset; /* how many bits were already done before this? */ int length; /* how many bits are processed in this operation? */ @@ -602,7 +602,7 @@ struct { dtc_reply_queue_entry_t *rq_tail; u32 cmd_index; u32 reply_index; - u8 cmd_buffer[USB_EP2BANK_SIZE]; + uint8_t cmd_buffer[USB_EP2BANK_SIZE]; } dtc_queue; @@ -634,7 +634,7 @@ inline dtc_reply_queue_entry_t * dtc_queue_enqueue_reply( enum scan_type type, - u8 *buffer, + uint8_t *buffer, int size, int offset, int length, @@ -677,9 +677,9 @@ dtc_queue_run(void) { int usb_err; int bit_cnt; int x; - u8 *dtc_p, *tdo_p; - u8 dtc_mask, tdo_mask; - u8 reply_buffer[USB_EP2IN_SIZE]; + uint8_t *dtc_p, *tdo_p; + uint8_t dtc_mask, tdo_mask; + uint8_t reply_buffer[USB_EP2IN_SIZE]; retval = ERROR_OK; @@ -827,7 +827,7 @@ int tap_state_queue_run(void) { int i; int bits; - u8 byte; + uint8_t byte; int retval; retval = 0; @@ -881,7 +881,7 @@ tap_state_queue_run(void) { static int tap_state_queue_append( - u8 tms + uint8_t tms ) { int retval; @@ -916,7 +916,7 @@ static void rlink_state_move(void) { int i=0, tms=0; - u8 tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state()); + uint8_t tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state()); int tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state()); for (i = 0; i < tms_count; i++) @@ -994,7 +994,7 @@ void rlink_runtest(int num_cycles) static void rlink_reset(int trst, int srst) { - u8 bitmap; + uint8_t bitmap; int usb_err; /* Read port A for bit op */ @@ -1093,7 +1093,7 @@ int rlink_scan( jtag_command_t *cmd, enum scan_type type, - u8 *buffer, + uint8_t *buffer, int scan_size ) { bool ir_scan; @@ -1105,8 +1105,8 @@ rlink_scan( int x; int tdi_bit_offset; - u8 tdi_mask, *tdi_p; - u8 dtc_mask; + uint8_t tdi_mask, *tdi_p; + uint8_t dtc_mask; if(scan_size < 1) { LOG_ERROR("scan_size cannot be less than 1 bit\n"); @@ -1382,7 +1382,7 @@ int rlink_execute_queue(void) jtag_command_t *cmd = jtag_command_queue; /* currently processed command */ int scan_size; enum scan_type type; - u8 *buffer; + uint8_t *buffer; int retval, tmp_retval; /* return ERROR_OK, unless something goes wrong */ @@ -1622,7 +1622,7 @@ int rlink_init(void) int i, j, retries; int found=0; int success=0; - u8 reply_buffer[USB_EP1IN_SIZE]; + uint8_t reply_buffer[USB_EP1IN_SIZE]; usb_init(); usb_find_busses(); diff --git a/src/jtag/rlink/rlink.h b/src/jtag/rlink/rlink.h index d24bbe79..9948d45c 100644 --- a/src/jtag/rlink/rlink.h +++ b/src/jtag/rlink/rlink.h @@ -22,10 +22,10 @@ typedef struct rlink_speed_table_s { - u8 const *dtc; + uint8_t const *dtc; u16 dtc_size; u16 khz; - u8 prescaler; + uint8_t prescaler; } rlink_speed_table_t; extern const rlink_speed_table_t rlink_speed_table[]; diff --git a/src/jtag/rlink/rlink_speed_table.c b/src/jtag/rlink/rlink_speed_table.c index f91a58eb..1f3e973b 100644 --- a/src/jtag/rlink/rlink_speed_table.c +++ b/src/jtag/rlink/rlink_speed_table.c @@ -6,7 +6,7 @@ #include "rlink.h" #include "st7.h" -static const u8 dtc_64[] = { +static const uint8_t dtc_64[] = { 0, 2, 68, 84, 67, 2, 13, 160, 176, 151, 147, 182, 141, 152, 177, 129, 148, 191, 143, 142, 5, 3, 0, 0, 0, 2, 68, 84, 67, 4, 0, 192, 5, 15, 0, 42, 42, 42, 73, 0, 88, 0, 160, 189, 0, 0, 0, 0, 106, 9, 1, 8, 22, 100, 111, 119, @@ -27,7 +27,7 @@ static const u8 dtc_64[] = { 60, 97, 203, 8, 2, 36, 139, 124, 193, 151, 96 }; -static const u8 dtc_11[] = { +static const uint8_t dtc_11[] = { 0, 2, 68, 84, 67, 2, 13, 160, 176, 151, 147, 182, 141, 152, 177, 129, 148, 188, 143, 142, 5, 3, 0, 0, 0, 2, 68, 84, 67, 4, 0, 192, 5, 15, 0, 42, 42, 42, 73, 0, 88, 0, 154, 183, 0, 0, 0, 0, 106, 9, 1, 8, 22, 100, 111, 119, @@ -47,7 +47,7 @@ static const u8 dtc_11[] = { 203, 8, 2, 36, 139, 117, 193, 151, 96 }; -static const u8 dtc_8[] = { +static const uint8_t dtc_8[] = { 0, 2, 68, 84, 67, 2, 13, 160, 176, 151, 147, 182, 141, 152, 177, 129, 148, 187, 143, 142, 5, 3, 0, 0, 0, 2, 68, 84, 67, 4, 0, 192, 5, 15, 0, 42, 42, 42, 73, 0, 88, 0, 152, 181, 0, 0, 0, 0, 106, 9, 1, 8, 22, 100, 111, 119, @@ -67,7 +67,7 @@ static const u8 dtc_8[] = { 8, 2, 36, 139, 115, 193, 151, 96 }; -static const u8 dtc_2[] = { +static const uint8_t dtc_2[] = { 0, 2, 68, 84, 67, 2, 14, 160, 176, 151, 147, 182, 141, 152, 177, 129, 148, 186, 143, 185, 142, 5, 3, 0, 0, 0, 2, 68, 84, 67, 4, 0, 192, 5, 15, 0, 42, 42, 42, 73, 0, 88, 0, 149, 178, 0, 0, 0, 0, 106, 9, 1, 8, 22, 100, |