auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish transforming 'u32' to 'uint32_t'.

Browse Source 
- Replace '\([^_]\)u32' with '\1uint32_t'.
- Replace '^u32' with 'uint32_t'.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2281 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
zwelch
2009-06-18 07:11:11 +00:00
parent 1840226d55
commit 86e4324f1b
28 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/jtag/at91rm9200.c
View File

@@ -82,17 +82,17 @@ struct device_t
{
char* name;
int TDO_PIO; /* PIO holding TDO */
u32 TDO_MASK; /* TDO bitmask */
uint32_t TDO_MASK; /* TDO bitmask */
int TRST_PIO; /* PIO holding TRST */
u32 TRST_MASK; /* TRST bitmask */
uint32_t TRST_MASK; /* TRST bitmask */
int TMS_PIO; /* PIO holding TMS */
u32 TMS_MASK; /* TMS bitmask */
uint32_t TMS_MASK; /* TMS bitmask */
int TCK_PIO; /* PIO holding TCK */
u32 TCK_MASK; /* TCK bitmask */
uint32_t TCK_MASK; /* TCK bitmask */
int TDI_PIO; /* PIO holding TDI */
u32 TDI_MASK; /* TDI bitmask */
uint32_t TDI_MASK; /* TDI bitmask */
int SRST_PIO; /* PIO holding SRST */
u32 SRST_MASK; /* SRST bitmask */
uint32_t SRST_MASK; /* SRST bitmask */
};
static struct device_t devices[] =
@@ -109,7 +109,7 @@ static char* at91rm9200_device;
static struct device_t* device;
static int dev_mem_fd;
static void *sys_controller;
static u32* pio_base;
static uint32_t* pio_base;
/* low level command set
*/
@@ -250,7 +250,7 @@ static int at91rm9200_init(void)
close(dev_mem_fd);
return ERROR_JTAG_INIT_FAILED;
}
pio_base = (u32*)sys_controller + 0x100;
pio_base = (uint32_t*)sys_controller + 0x100;
/*
* Configure TDO as an input, and TDI, TCK, TMS, TRST, SRST

2
src/jtag/commands.h
View File

@@ -105,7 +105,7 @@ typedef struct end_state_command_s
typedef struct sleep_command_s
{
/// number of microseconds to sleep
u32 us;
uint32_t us;
} sleep_command_t;
/**

14
src/jtag/core.c
View File

@@ -442,7 +442,7 @@ void jtag_add_plain_dr_scan(int in_num_fields, const scan_field_t *in_fields,
}
void jtag_add_dr_out(jtag_tap_t* tap,
int num_fields, const int* num_bits, const u32* value,
int num_fields, const int* num_bits, const uint32_t* value,
tap_state_t end_state)
{
assert(end_state != TAP_INVALID);
@@ -686,7 +686,7 @@ tap_state_t jtag_get_end_state(void)
return cmd_queue_end_state;
}
void jtag_add_sleep(u32 us)
void jtag_add_sleep(uint32_t us)
{
/// @todo Here, keep_alive() appears to be a layering violation!!!
keep_alive();
@@ -807,7 +807,7 @@ static int jtag_reset_callback(enum jtag_event event, void *priv)
return ERROR_OK;
}
void jtag_sleep(u32 us)
void jtag_sleep(uint32_t us)
{
alive_sleep(us/1000);
}
@@ -859,7 +859,7 @@ static bool jtag_examine_chain_check(uint8_t *idcodes, unsigned count)
}
static void jtag_examine_chain_display(enum log_levels level, const char *msg,
const char *name, u32 idcode)
const char *name, uint32_t idcode)
{
log_printf_lf(level, __FILE__, __LINE__, __FUNCTION__,
"JTAG tap: %s %16.16s: 0x%08x "
@@ -868,7 +868,7 @@ static void jtag_examine_chain_display(enum log_levels level, const char *msg,
EXTRACT_MFG(idcode), EXTRACT_PART(idcode), EXTRACT_VER(idcode) );
}
static bool jtag_idcode_is_final(u32 idcode)
static bool jtag_idcode_is_final(uint32_t idcode)
{
return idcode == 0x000000FF || idcode == 0xFFFFFFFF;
}
@@ -884,7 +884,7 @@ static void jtag_examine_chain_end(uint8_t *idcodes, unsigned count, unsigned ma
bool triggered = false;
for ( ; count < max - 31; count += 32)
{
u32 idcode = buf_get_u32(idcodes, count, 32);
uint32_t idcode = buf_get_u32(idcodes, count, 32);
// do not trigger the warning if the data looks good
if (!triggered && jtag_idcode_is_final(idcode))
continue;
@@ -955,7 +955,7 @@ int jtag_examine_chain(void)
for (unsigned bit_count = 0; bit_count < (JTAG_MAX_CHAIN_SIZE * 32) - 31;)
{
u32 idcode = buf_get_u32(idcode_buffer, bit_count, 32);
uint32_t idcode = buf_get_u32(idcode_buffer, bit_count, 32);
if ((idcode & 1) == 0)
{
/* LSB must not be 0, this indicates a device in bypass */

4
src/jtag/driver.c
View File

@@ -264,7 +264,7 @@ int interface_jtag_add_dr_scan(int in_num_fields, const scan_field_t *in_fields,
void interface_jtag_add_dr_out(jtag_tap_t *target_tap,
int in_num_fields,
const int *num_bits,
const u32 *value,
const uint32_t *value,
tap_state_t end_state)
{
/* count devices in bypass */
@@ -449,7 +449,7 @@ int interface_jtag_add_reset(int req_trst, int req_srst)
return ERROR_OK;
}
int interface_jtag_add_sleep(u32 us)
int interface_jtag_add_sleep(uint32_t us)
{
/* allocate memory for a new list member */
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));

2
src/jtag/dummy.c
View File

@@ -32,7 +32,7 @@ static int dummy_clock; /* edge detector */
static int clock_count; /* count clocks in any stable state, only stable states */
static u32 dummy_data;
static uint32_t dummy_data;
static int dummy_speed(int speed);

2
src/jtag/ep93xx.c
View File

@@ -131,7 +131,7 @@ static int ep93xx_register_commands(struct command_context_s *cmd_ctx)
static int set_gonk_mode(void)
{
void *syscon;
u32 devicecfg;
uint32_t devicecfg;
syscon = mmap(NULL, 4096, PROT_READ | PROT_WRITE,
MAP_SHARED, dev_mem_fd, 0x80930000);

42
src/jtag/ft2232.c
View File

@@ -338,7 +338,7 @@ jtag_interface_t ft2232_interface =
.quit = ft2232_quit,
};
static int ft2232_write(uint8_t* buf, int size, u32* bytes_written)
static int ft2232_write(uint8_t* buf, int size, uint32_t* bytes_written)
{
#if BUILD_FT2232_FTD2XX == 1
FT_STATUS status;
@@ -371,7 +371,7 @@ static int ft2232_write(uint8_t* buf, int size, u32* bytes_written)
}
static int ft2232_read(uint8_t* buf, u32 size, u32* bytes_read)
static int ft2232_read(uint8_t* buf, uint32_t size, uint32_t* bytes_read)
{
#if BUILD_FT2232_FTD2XX == 1
DWORD dw_bytes_read;
@@ -441,7 +441,7 @@ static int ft2232_adaptive_clocking(int speed)
uint8_t buf = use_adaptive_clocking ? 0x96 : 0x97;
LOG_DEBUG("%2.2x", buf);
u32 bytes_written;
uint32_t bytes_written;
int retval = ft2232_write(&buf, 1, &bytes_written);
if (ERROR_OK != retval || bytes_written != 1)
{
@@ -463,7 +463,7 @@ static int ft2232_speed(int speed)
{
uint8_t buf[3];
int retval;
u32 bytes_written;
uint32_t bytes_written;
ft2232_adaptive_clocking(speed);
@@ -621,8 +621,8 @@ static int ft2232_send_and_recv(jtag_command_t* first, jtag_command_t* last)
int scan_size;
enum scan_type type;
int retval;
u32 bytes_written=0;
u32 bytes_read=0;
uint32_t bytes_written=0;
uint32_t bytes_read=0;
#ifdef _DEBUG_USB_IO_
struct timeval start, inter, inter2, end;
@@ -942,8 +942,8 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
int last_bit;
uint8_t* receive_buffer = malloc(CEIL(scan_size, 8));
uint8_t* receive_pointer = receive_buffer;
u32 bytes_written;
u32 bytes_read;
uint32_t bytes_written;
uint32_t bytes_read;
int retval;
int thisrun_read = 0;
@@ -1860,7 +1860,7 @@ static int ft2232_init_ftd2xx(uint16_t vid, uint16_t pid, int more, int* try_mor
if (status == FT_OK)
{
char** desc_array = malloc(sizeof(char*) * (num_devices + 1));
u32 i;
uint32_t i;
for (i = 0; i < num_devices; i++)
desc_array[i] = malloc(64);
@@ -2034,7 +2034,7 @@ static int ft2232_init(void)
{
uint8_t buf[1];
int retval;
u32 bytes_written;
uint32_t bytes_written;
const ft2232_layout_t* cur_layout = ft2232_layouts;
int i;
@@ -2124,7 +2124,7 @@ static int ft2232_init(void)
static int usbjtag_init(void)
{
uint8_t buf[3];
u32 bytes_written;
uint32_t bytes_written;
low_output = 0x08;
low_direction = 0x0b;
@@ -2200,7 +2200,7 @@ static int usbjtag_init(void)
static int axm0432_jtag_init(void)
{
uint8_t buf[3];
u32 bytes_written;
uint32_t bytes_written;
low_output = 0x08;
low_direction = 0x2b;
@@ -2271,7 +2271,7 @@ static int axm0432_jtag_init(void)
static int jtagkey_init(void)
{
uint8_t buf[3];
u32 bytes_written;
uint32_t bytes_written;
low_output = 0x08;
low_direction = 0x1b;
@@ -2354,7 +2354,7 @@ static int jtagkey_init(void)
static int olimex_jtag_init(void)
{
uint8_t buf[3];
u32 bytes_written;
uint32_t bytes_written;
low_output = 0x08;
low_direction = 0x1b;
@@ -2422,7 +2422,7 @@ static int olimex_jtag_init(void)
static int flyswatter_init(void)
{
uint8_t buf[3];
u32 bytes_written;
uint32_t bytes_written;
low_output = 0x18;
low_direction = 0xfb;
@@ -2469,7 +2469,7 @@ static int flyswatter_init(void)
static int turtle_init(void)
{
uint8_t buf[3];
u32 bytes_written;
uint32_t bytes_written;
low_output = 0x08;
low_direction = 0x5b;
@@ -2510,7 +2510,7 @@ static int turtle_init(void)
static int comstick_init(void)
{
uint8_t buf[3];
u32 bytes_written;
uint32_t bytes_written;
low_output = 0x08;
low_direction = 0x0b;
@@ -2554,7 +2554,7 @@ static int comstick_init(void)
static int stm32stick_init(void)
{
uint8_t buf[3];
u32 bytes_written;
uint32_t bytes_written;
low_output = 0x88;
low_direction = 0x8b;
@@ -2598,7 +2598,7 @@ static int stm32stick_init(void)
static int sheevaplug_init(void)
{
uint8_t buf[3];
u32 bytes_written;
uint32_t bytes_written;
low_output = 0x08;
low_direction = 0x1b;
@@ -2649,7 +2649,7 @@ static int sheevaplug_init(void)
static int cortino_jtag_init(void)
{
uint8_t buf[3];
u32 bytes_written;
uint32_t bytes_written;
low_output = 0x08;
low_direction = 0x1b;
@@ -2950,7 +2950,7 @@ static int ft2232_stableclocks(int num_cycles, jtag_command_t* cmd)
*/
static int icebear_jtag_init(void) {
uint8_t buf[3];
u32 bytes_written;
uint32_t bytes_written;
low_direction = 0x0b; /* output: TCK TDI TMS; input: TDO */
low_output = 0x08; /* high: TMS; low: TCK TDI */

8
src/jtag/jlink.c
View File

@@ -549,7 +549,7 @@ static int jlink_get_version_info(void)
{
int result;
int len;
u32 jlink_caps, jlink_max_size;
uint32_t jlink_caps, jlink_max_size;
/* query hardware version */
jlink_simple_command(EMU_CMD_VERSION);
@@ -603,8 +603,8 @@ static int jlink_get_version_info(void)
return ERROR_JTAG_DEVICE_ERROR;
}
u32 jlink_hw_version = buf_get_u32(usb_in_buffer, 0, 32);
u32 major_revision = (jlink_hw_version / 10000) % 100;
uint32_t jlink_hw_version = buf_get_u32(usb_in_buffer, 0, 32);
uint32_t major_revision = (jlink_hw_version / 10000) % 100;
if (major_revision >= 5)
jlink_hw_jtag_version = 3;
@@ -711,7 +711,7 @@ static void jlink_tap_append_step(int tms, int tdi)
if (index >= JLINK_TAP_BUFFER_SIZE)
{
LOG_ERROR("jlink_tap_append_step: overflow");
*(u32 *)0xFFFFFFFF = 0;
*(uint32_t *)0xFFFFFFFF = 0;
exit(-1);
}

14
src/jtag/jtag.h
View File

@@ -156,15 +156,15 @@ struct jtag_tap_s
/// Is this TAP currently enabled?
bool enabled;
int ir_length; /**< size of instruction register */
u32 ir_capture_value;
uint32_t ir_capture_value;
uint8_t* expected; /**< Capture-IR expected value */
u32 ir_capture_mask;
uint32_t ir_capture_mask;
uint8_t* expected_mask; /**< Capture-IR expected mask */
u32 idcode;
uint32_t idcode;
/**< device identification code */
/// Array of expected identification codes */
u32* expected_ids;
uint32_t* expected_ids;
/// Number of expected identification codes
uint8_t expected_ids_cnt;
@@ -593,7 +593,7 @@ extern tap_state_t jtag_set_end_state(tap_state_t state);
*
**/
extern tap_state_t jtag_get_end_state(void);
extern void jtag_add_sleep(u32 us);
extern void jtag_add_sleep(uint32_t us);
/**
@@ -648,7 +648,7 @@ extern int jtag_srst_asserted(int* srst_asserted);
*/
extern void jtag_check_value_mask(scan_field_t *field, uint8_t *value, uint8_t *mask);
extern void jtag_sleep(u32 us);
extern void jtag_sleep(uint32_t us);
/*
* The JTAG subsystem defines a number of error codes,
@@ -691,7 +691,7 @@ extern void jtag_sleep(u32 us);
* clocking data back in. Patches gladly accepted!
*/
extern void jtag_add_dr_out(jtag_tap_t* tap,
int num_fields, const int* num_bits, const u32* value,
int num_fields, const int* num_bits, const uint32_t* value,
tap_state_t end_state);

4
src/jtag/minidriver.h
View File

@@ -82,7 +82,7 @@ static inline void interface_jtag_add_scan_check_alloc(scan_field_t *field)
}
extern void interface_jtag_add_dr_out(jtag_tap_t* tap,
int num_fields, const int* num_bits, const u32* value,
int num_fields, const int* num_bits, const uint32_t* value,
tap_state_t end_state);
extern void interface_jtag_add_callback(jtag_callback1_t f, uint8_t *in);
@@ -121,7 +121,7 @@ extern int interface_jtag_add_runtest(int num_cycles, tap_state_t endstate);
*/
extern int interface_jtag_add_reset(int trst, int srst);
extern int interface_jtag_set_end_state(tap_state_t endstate);
extern int interface_jtag_add_sleep(u32 us);
extern int interface_jtag_add_sleep(uint32_t us);
extern int interface_jtag_add_clocks(int num_cycles);
extern int interface_jtag_execute_queue(void);

4
src/jtag/minidummy/jtag_minidriver.h
View File

@@ -23,7 +23,7 @@
static __inline__ void interface_jtag_add_dr_out_core(jtag_tap_t *target_tap,
int num_fields,
const int *num_bits,
const u32 *value,
const uint32_t *value,
enum tap_state end_state)
{
/* synchronously do the operation here */
@@ -32,7 +32,7 @@ static __inline__ void interface_jtag_add_dr_out_core(jtag_tap_t *target_tap,
static __inline__ void interface_jtag_add_dr_out(jtag_tap_t *target_tap,
int num_fields,
const int *num_bits,
const u32 *value,
const uint32_t *value,
enum tap_state end_state)
{
/* synchronously do the operation here */

2
src/jtag/minidummy/minidummy.c
View File

@@ -132,7 +132,7 @@ int interface_jtag_add_clocks(int num_cycles)
return ERROR_OK;
}
int interface_jtag_add_sleep(u32 us)
int interface_jtag_add_sleep(uint32_t us)
{
jtag_sleep(us);
return ERROR_OK;

14
src/jtag/presto.c
View File

@@ -128,7 +128,7 @@ static uint8_t presto_init_seq[] =
0x80, 0xA0, 0xA8, 0xB0, 0xC0, 0xE0
};
static int presto_write(uint8_t *buf, u32 size)
static int presto_write(uint8_t *buf, uint32_t size)
{
#if BUILD_PRESTO_FTD2XX == 1
DWORD ftbytes;
@@ -139,7 +139,7 @@ static int presto_write(uint8_t *buf, u32 size)
}
#elif BUILD_PRESTO_LIBFTDI == 1
u32 ftbytes;
uint32_t ftbytes;
if ((presto->retval = ftdi_write_data(&presto->ftdic, buf, size)) < 0)
{
LOG_ERROR("ftdi_write_data: %s", ftdi_get_error_string(&presto->ftdic));
@@ -150,14 +150,14 @@ static int presto_write(uint8_t *buf, u32 size)
if (ftbytes != size)
{
LOG_ERROR("couldn't write the requested number of bytes to PRESTO (%u < %u)", (u32)ftbytes, size);
LOG_ERROR("couldn't write the requested number of bytes to PRESTO (%u < %u)", (uint32_t)ftbytes, size);
return ERROR_JTAG_DEVICE_ERROR;
}
return ERROR_OK;
}
static int presto_read(uint8_t* buf, u32 size)
static int presto_read(uint8_t* buf, uint32_t size)
{
#if BUILD_PRESTO_FTD2XX == 1
DWORD ftbytes;
@@ -168,7 +168,7 @@ static int presto_read(uint8_t* buf, u32 size)
}
#elif BUILD_PRESTO_LIBFTDI == 1
u32 ftbytes = 0;
uint32_t ftbytes = 0;
struct timeval timeout, now;
gettimeofday(&timeout, NULL);
@@ -192,7 +192,7 @@ static int presto_read(uint8_t* buf, u32 size)
if (ftbytes != size)
{
/* this is just a warning, there might have been timeout when detecting PRESTO, which is not fatal */
LOG_WARNING("couldn't read the requested number of bytes from PRESTO (%u < %u)", (u32)ftbytes, size);
LOG_WARNING("couldn't read the requested number of bytes from PRESTO (%u < %u)", (uint32_t)ftbytes, size);
return ERROR_JTAG_DEVICE_ERROR;
}
@@ -202,7 +202,7 @@ static int presto_read(uint8_t* buf, u32 size)
#if BUILD_PRESTO_FTD2XX == 1
static int presto_open_ftd2xx(char *req_serial)
{
u32 i;
uint32_t i;
DWORD numdevs;
DWORD vidpid;
char devname[FT_DEVICE_NAME_LEN];

8
src/jtag/rlink/rlink.c
View File

@@ -600,8 +600,8 @@ static
struct {
dtc_reply_queue_entry_t *rq_head;
dtc_reply_queue_entry_t *rq_tail;
u32 cmd_index;
u32 reply_index;
uint32_t cmd_index;
uint32_t reply_index;
uint8_t cmd_buffer[USB_EP2BANK_SIZE];
} dtc_queue;
@@ -612,8 +612,8 @@ struct {
static
struct {
u32 length;
u32 buffer;
uint32_t length;
uint32_t buffer;
} tap_state_queue;

10
src/jtag/tcl.c
View File

@@ -383,7 +383,7 @@ static int jim_newtap_cmd( Jim_GetOptInfo *goi )
break;
case NTAP_OPT_EXPECTED_ID:
{
u32 *new_expected_ids;
uint32_t *new_expected_ids;
e = Jim_GetOpt_Wide( goi, &w );
if( e != JIM_OK) {
@@ -391,13 +391,13 @@ static int jim_newtap_cmd( Jim_GetOptInfo *goi )
return e;
}
new_expected_ids = malloc(sizeof(u32) * (pTap->expected_ids_cnt + 1));
new_expected_ids = malloc(sizeof(uint32_t) * (pTap->expected_ids_cnt + 1));
if (new_expected_ids == NULL) {
Jim_SetResult_sprintf( goi->interp, "no memory");
return JIM_ERR;
}
memcpy(new_expected_ids, pTap->expected_ids, sizeof(u32) * pTap->expected_ids_cnt);
memcpy(new_expected_ids, pTap->expected_ids, sizeof(uint32_t) * pTap->expected_ids_cnt);
new_expected_ids[pTap->expected_ids_cnt] = w;
@@ -862,7 +862,7 @@ static int handle_scan_chain_command(struct command_context_s *cmd_ctx, char *cm
command_print(cmd_ctx, "---|--------------------|---------|------------|------------|------|------|------|---------");
while( tap ){
u32 expected, expected_mask, cur_instr, ii;
uint32_t expected, expected_mask, cur_instr, ii;
expected = buf_get_u32(tap->expected, 0, tap->ir_length);
expected_mask = buf_get_u32(tap->expected_mask, 0, tap->ir_length);
cur_instr = buf_get_u32(tap->cur_instr, 0, tap->ir_length);
@@ -1218,7 +1218,7 @@ static int handle_irscan_command(struct command_context_s *cmd_ctx, char *cmd, c
fields[i].num_bits = field_size;
fields[i].out_value = malloc(CEIL(field_size, 8));
u32 value;
uint32_t value;
retval = parse_u32(args[i * 2 + 1], &value);
if (ERROR_OK != retval)
goto error_return;

4
src/jtag/zy1000/jtag_minidriver.h
View File

@@ -151,7 +151,7 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta
static __inline__ void interface_jtag_add_dr_out_core(jtag_tap_t *target_tap,
int num_fields,
const int *num_bits,
const u32 *value,
const uint32_t *value,
enum tap_state end_state)
{
enum tap_state pause_state = TAP_DRSHIFT;
@@ -183,7 +183,7 @@ static __inline__ void interface_jtag_add_dr_out_core(jtag_tap_t *target_tap,
static __inline__ void interface_jtag_add_dr_out(jtag_tap_t *target_tap,
int num_fields,
const int *num_bits,
const u32 *value,
const uint32_t *value,
enum tap_state end_state)
{

4
src/jtag/zy1000/zy1000.c
View File

@@ -477,7 +477,7 @@ static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_
}
}
/* mask away unused bits for easier debugging */
value&=~(((u32)0xffffffff)<<k);
value&=~(((uint32_t)0xffffffff)<<k);
shiftValueInner(shiftState, pause_state, k, value);
@@ -695,7 +695,7 @@ int interface_jtag_add_clocks(int num_cycles)
return zy1000_jtag_add_clocks(num_cycles, cmd_queue_cur_state, cmd_queue_cur_state);
}
int interface_jtag_add_sleep(u32 us)
int interface_jtag_add_sleep(uint32_t us)
{
jtag_sleep(us);
return ERROR_OK;