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

jtag: declare local symbols as static

Browse Source 
Functions and variables that are not used outside the file should
be declared as static.

Change-Id: I58c9f5557d4809db9ccc34d32182c3797f825da1
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5896
Tested-by: jenkins
This commit is contained in:
Antonio Borneo
2020-10-29 00:47:12 +01:00
parent 5ca2301743
commit 7beb6a4e5b
14 changed files with 119 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/jtag/drivers/ft232r.c
View File

@@ -170,7 +170,7 @@ static int ft232r_send_recv(void)
return ERROR_OK;
}
void ft232r_increase_buf_size(size_t new_buf_size)
static void ft232r_increase_buf_size(size_t new_buf_size)
{
uint8_t *new_buf_ptr;
if (new_buf_size >= ft232r_buf_size) {

2
src/jtag/drivers/gw16012.c
View File

@@ -63,7 +63,7 @@
#endif
/* configuration */
uint16_t gw16012_port;
static uint16_t gw16012_port;
/* interface variables
*/

4
src/jtag/drivers/opendous.c
View File

@@ -144,7 +144,7 @@ static int opendous_usb_write(struct opendous_jtag *opendous_jtag, int out_lengt
static int opendous_usb_read(struct opendous_jtag *opendous_jtag);
/* helper functions */
int opendous_get_version_info(void);
static int opendous_get_version_info(void);
#ifdef _DEBUG_USB_COMMS_
static void opendous_debug_buffer(uint8_t *buffer, int length);
@@ -544,7 +544,7 @@ int opendous_get_status(void)
return ERROR_OK;
}
int opendous_get_version_info(void)
static int opendous_get_version_info(void)
{
return ERROR_OK;
}

8
src/jtag/drivers/stlink_usb.c
View File

@@ -358,7 +358,7 @@ static const struct speed_map stlink_khz_to_speed_map_jtag[] = {
static void stlink_usb_init_buffer(void *handle, uint8_t direction, uint32_t size);
static int stlink_swim_status(void *handle);
void stlink_dump_speed_map(const struct speed_map *map, unsigned int map_size);
static void stlink_dump_speed_map(const struct speed_map *map, unsigned int map_size);
static int stlink_get_com_freq(void *handle, bool is_jtag, struct speed_map *map);
static int stlink_speed(void *handle, int khz, bool query);
static int stlink_usb_open_ap(void *handle, unsigned short apsel);
@@ -2577,7 +2577,7 @@ static int stlink_speed_jtag(void *handle, int khz, bool query)
return stlink_khz_to_speed_map_jtag[speed_index].speed;
}
void stlink_dump_speed_map(const struct speed_map *map, unsigned int map_size)
static void stlink_dump_speed_map(const struct speed_map *map, unsigned int map_size)
{
unsigned int i;
@@ -2725,7 +2725,7 @@ static int stlink_usb_close(void *handle)
* based on the length (0x1a = 26) we could easily decide if we have to fixup the serial
* and then we have just to convert the raw data into printable characters using sprintf
*/
char *stlink_usb_get_alternate_serial(libusb_device_handle *device,
static char *stlink_usb_get_alternate_serial(libusb_device_handle *device,
struct libusb_device_descriptor *dev_desc)
{
int usb_retval;
@@ -2982,7 +2982,7 @@ static int stlink_usb_hl_open(struct hl_interface_param_s *param, void **fd)
return stlink_usb_open(param, stlink_get_mode(param->transport), fd);
}
int stlink_config_trace(void *handle, bool enabled,
static int stlink_config_trace(void *handle, bool enabled,
enum tpiu_pin_protocol pin_protocol, uint32_t port_size,
unsigned int *trace_freq, unsigned int traceclkin_freq,
uint16_t *prescaler)

130
src/jtag/drivers/ulink.c
View File

@@ -162,34 +162,34 @@ struct ulink {
/**************************** Function Prototypes *****************************/
/* USB helper functions */
int ulink_usb_open(struct ulink **device);
int ulink_usb_close(struct ulink **device);
static int ulink_usb_open(struct ulink **device);
static int ulink_usb_close(struct ulink **device);
/* ULINK MCU (Cypress EZ-USB) specific functions */
int ulink_cpu_reset(struct ulink *device, unsigned char reset_bit);
int ulink_load_firmware_and_renumerate(struct ulink **device, const char *filename,
static int ulink_cpu_reset(struct ulink *device, unsigned char reset_bit);
static int ulink_load_firmware_and_renumerate(struct ulink **device, const char *filename,
uint32_t delay);
int ulink_load_firmware(struct ulink *device, const char *filename);
int ulink_write_firmware_section(struct ulink *device,
static int ulink_load_firmware(struct ulink *device, const char *filename);
static int ulink_write_firmware_section(struct ulink *device,
struct image *firmware_image, int section_index);
/* Generic helper functions */
void ulink_print_signal_states(uint8_t input_signals, uint8_t output_signals);
static void ulink_print_signal_states(uint8_t input_signals, uint8_t output_signals);
/* OpenULINK command generation helper functions */
int ulink_allocate_payload(struct ulink_cmd *ulink_cmd, int size,
static int ulink_allocate_payload(struct ulink_cmd *ulink_cmd, int size,
enum ulink_payload_direction direction);
/* OpenULINK command queue helper functions */
int ulink_get_queue_size(struct ulink *device,
static int ulink_get_queue_size(struct ulink *device,
enum ulink_payload_direction direction);
void ulink_clear_queue(struct ulink *device);
int ulink_append_queue(struct ulink *device, struct ulink_cmd *ulink_cmd);
int ulink_execute_queued_commands(struct ulink *device, int timeout);
static void ulink_clear_queue(struct ulink *device);
static int ulink_append_queue(struct ulink *device, struct ulink_cmd *ulink_cmd);
static int ulink_execute_queued_commands(struct ulink *device, int timeout);
static void ulink_print_queue(struct ulink *device);
int ulink_append_scan_cmd(struct ulink *device,
static int ulink_append_scan_cmd(struct ulink *device,
enum scan_type scan_type,
int scan_size_bits,
uint8_t *tdi,
@@ -201,39 +201,39 @@ int ulink_append_scan_cmd(struct ulink *device,
uint8_t tms_sequence_end,
struct jtag_command *origin,
bool postprocess);
int ulink_append_clock_tms_cmd(struct ulink *device, uint8_t count,
static int ulink_append_clock_tms_cmd(struct ulink *device, uint8_t count,
uint8_t sequence);
int ulink_append_clock_tck_cmd(struct ulink *device, uint16_t count);
int ulink_append_get_signals_cmd(struct ulink *device);
int ulink_append_set_signals_cmd(struct ulink *device, uint8_t low,
static int ulink_append_clock_tck_cmd(struct ulink *device, uint16_t count);
static int ulink_append_get_signals_cmd(struct ulink *device);
static int ulink_append_set_signals_cmd(struct ulink *device, uint8_t low,
uint8_t high);
int ulink_append_sleep_cmd(struct ulink *device, uint32_t us);
int ulink_append_configure_tck_cmd(struct ulink *device,
static int ulink_append_sleep_cmd(struct ulink *device, uint32_t us);
static int ulink_append_configure_tck_cmd(struct ulink *device,
int delay_scan_in,
int delay_scan_out,
int delay_scan_io,
int delay_tck,
int delay_tms);
int ulink_append_led_cmd(struct ulink *device, uint8_t led_state);
int ulink_append_test_cmd(struct ulink *device);
static int __attribute__((unused)) ulink_append_led_cmd(struct ulink *device, uint8_t led_state);
static int ulink_append_test_cmd(struct ulink *device);
/* OpenULINK TCK frequency helper functions */
int ulink_calculate_delay(enum ulink_delay_type type, long f, int *delay);
static int ulink_calculate_delay(enum ulink_delay_type type, long f, int *delay);
/* Interface between OpenULINK and OpenOCD */
static void ulink_set_end_state(tap_state_t endstate);
int ulink_queue_statemove(struct ulink *device);
static int ulink_queue_statemove(struct ulink *device);
int ulink_queue_scan(struct ulink *device, struct jtag_command *cmd);
int ulink_queue_tlr_reset(struct ulink *device, struct jtag_command *cmd);
int ulink_queue_runtest(struct ulink *device, struct jtag_command *cmd);
int ulink_queue_reset(struct ulink *device, struct jtag_command *cmd);
int ulink_queue_pathmove(struct ulink *device, struct jtag_command *cmd);
int ulink_queue_sleep(struct ulink *device, struct jtag_command *cmd);
int ulink_queue_stableclocks(struct ulink *device, struct jtag_command *cmd);
static int ulink_queue_scan(struct ulink *device, struct jtag_command *cmd);
static int ulink_queue_tlr_reset(struct ulink *device, struct jtag_command *cmd);
static int ulink_queue_runtest(struct ulink *device, struct jtag_command *cmd);
static int ulink_queue_reset(struct ulink *device, struct jtag_command *cmd);
static int ulink_queue_pathmove(struct ulink *device, struct jtag_command *cmd);
static int ulink_queue_sleep(struct ulink *device, struct jtag_command *cmd);
static int ulink_queue_stableclocks(struct ulink *device, struct jtag_command *cmd);
int ulink_post_process_scan(struct ulink_cmd *ulink_cmd);
int ulink_post_process_queue(struct ulink *device);
static int ulink_post_process_scan(struct ulink_cmd *ulink_cmd);
static int ulink_post_process_queue(struct ulink *device);
/* adapter driver functions */
static int ulink_execute_queue(void);
@@ -245,7 +245,7 @@ static int ulink_quit(void);
/****************************** Global Variables ******************************/
struct ulink *ulink_handle;
static struct ulink *ulink_handle;
/**************************** USB helper functions ****************************/
@@ -258,7 +258,7 @@ struct ulink *ulink_handle;
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_usb_open(struct ulink **device)
static int ulink_usb_open(struct ulink **device)
{
ssize_t num_devices, i;
bool found;
@@ -304,7 +304,7 @@ int ulink_usb_open(struct ulink **device)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_usb_close(struct ulink **device)
static int ulink_usb_close(struct ulink **device)
{
if (libusb_release_interface((*device)->usb_device_handle, 0) != 0)
return ERROR_FAIL;
@@ -327,7 +327,7 @@ int ulink_usb_close(struct ulink **device)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_cpu_reset(struct ulink *device, unsigned char reset_bit)
static int ulink_cpu_reset(struct ulink *device, unsigned char reset_bit)
{
int ret;
@@ -354,7 +354,7 @@ int ulink_cpu_reset(struct ulink *device, unsigned char reset_bit)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_load_firmware_and_renumerate(struct ulink **device,
static int ulink_load_firmware_and_renumerate(struct ulink **device,
const char *filename, uint32_t delay)
{
int ret;
@@ -390,7 +390,7 @@ int ulink_load_firmware_and_renumerate(struct ulink **device,
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_load_firmware(struct ulink *device, const char *filename)
static int ulink_load_firmware(struct ulink *device, const char *filename)
{
struct image ulink_firmware_image;
int ret, i;
@@ -439,7 +439,7 @@ int ulink_load_firmware(struct ulink *device, const char *filename)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_write_firmware_section(struct ulink *device,
static int ulink_write_firmware_section(struct ulink *device,
struct image *firmware_image, int section_index)
{
uint16_t addr, size, bytes_remaining, chunk_size;
@@ -499,7 +499,7 @@ int ulink_write_firmware_section(struct ulink *device,
* @param input_signals input signal states as returned by CMD_GET_SIGNALS
* @param output_signals output signal states as returned by CMD_GET_SIGNALS
*/
void ulink_print_signal_states(uint8_t input_signals, uint8_t output_signals)
static void ulink_print_signal_states(uint8_t input_signals, uint8_t output_signals)
{
LOG_INFO("ULINK signal states: TDI: %i, TDO: %i, TMS: %i, TCK: %i, TRST: %i,"
" SRST: %i",
@@ -522,7 +522,7 @@ void ulink_print_signal_states(uint8_t input_signals, uint8_t output_signals)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_allocate_payload(struct ulink_cmd *ulink_cmd, int size,
static int ulink_allocate_payload(struct ulink_cmd *ulink_cmd, int size,
enum ulink_payload_direction direction)
{
uint8_t *payload;
@@ -576,7 +576,7 @@ int ulink_allocate_payload(struct ulink_cmd *ulink_cmd, int size,
* @return the number of bytes currently stored in the queue for the specified
* direction.
*/
int ulink_get_queue_size(struct ulink *device,
static int ulink_get_queue_size(struct ulink *device,
enum ulink_payload_direction direction)
{
struct ulink_cmd *current = device->queue_start;
@@ -605,7 +605,7 @@ int ulink_get_queue_size(struct ulink *device,
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
void ulink_clear_queue(struct ulink *device)
static void ulink_clear_queue(struct ulink *device)
{
struct ulink_cmd *current = device->queue_start;
struct ulink_cmd *next = NULL;
@@ -647,7 +647,7 @@ void ulink_clear_queue(struct ulink *device)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_append_queue(struct ulink *device, struct ulink_cmd *ulink_cmd)
static int ulink_append_queue(struct ulink *device, struct ulink_cmd *ulink_cmd)
{
int newsize_out, newsize_in;
int ret = ERROR_OK;
@@ -698,7 +698,7 @@ int ulink_append_queue(struct ulink *device, struct ulink_cmd *ulink_cmd)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_execute_queued_commands(struct ulink *device, int timeout)
static int ulink_execute_queued_commands(struct ulink *device, int timeout)
{
struct ulink_cmd *current;
int ret, i, index_out, index_in, count_out, count_in, transferred;
@@ -865,7 +865,7 @@ static void ulink_print_queue(struct ulink *device)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_append_scan_cmd(struct ulink *device, enum scan_type scan_type,
static int ulink_append_scan_cmd(struct ulink *device, enum scan_type scan_type,
int scan_size_bits, uint8_t *tdi, uint8_t *tdo_start, uint8_t *tdo,
uint8_t tms_count_start, uint8_t tms_sequence_start, uint8_t tms_count_end,
uint8_t tms_sequence_end, struct jtag_command *origin, bool postprocess)
@@ -966,7 +966,7 @@ int ulink_append_scan_cmd(struct ulink *device, enum scan_type scan_type,
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_append_clock_tms_cmd(struct ulink *device, uint8_t count,
static int ulink_append_clock_tms_cmd(struct ulink *device, uint8_t count,
uint8_t sequence)
{
struct ulink_cmd *cmd = calloc(1, sizeof(struct ulink_cmd));
@@ -1003,7 +1003,7 @@ int ulink_append_clock_tms_cmd(struct ulink *device, uint8_t count,
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_append_clock_tck_cmd(struct ulink *device, uint16_t count)
static int ulink_append_clock_tck_cmd(struct ulink *device, uint16_t count)
{
struct ulink_cmd *cmd = calloc(1, sizeof(struct ulink_cmd));
int ret;
@@ -1036,7 +1036,7 @@ int ulink_append_clock_tck_cmd(struct ulink *device, uint16_t count)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_append_get_signals_cmd(struct ulink *device)
static int ulink_append_get_signals_cmd(struct ulink *device)
{
struct ulink_cmd *cmd = calloc(1, sizeof(struct ulink_cmd));
int ret;
@@ -1075,7 +1075,7 @@ int ulink_append_get_signals_cmd(struct ulink *device)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_append_set_signals_cmd(struct ulink *device, uint8_t low,
static int ulink_append_set_signals_cmd(struct ulink *device, uint8_t low,
uint8_t high)
{
struct ulink_cmd *cmd = calloc(1, sizeof(struct ulink_cmd));
@@ -1108,7 +1108,7 @@ int ulink_append_set_signals_cmd(struct ulink *device, uint8_t low,
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_append_sleep_cmd(struct ulink *device, uint32_t us)
static int ulink_append_sleep_cmd(struct ulink *device, uint32_t us)
{
struct ulink_cmd *cmd = calloc(1, sizeof(struct ulink_cmd));
int ret;
@@ -1144,7 +1144,7 @@ int ulink_append_sleep_cmd(struct ulink *device, uint32_t us)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_append_configure_tck_cmd(struct ulink *device, int delay_scan_in,
static int ulink_append_configure_tck_cmd(struct ulink *device, int delay_scan_in,
int delay_scan_out, int delay_scan_io, int delay_tck, int delay_tms)
{
struct ulink_cmd *cmd = calloc(1, sizeof(struct ulink_cmd));
@@ -1206,7 +1206,7 @@ int ulink_append_configure_tck_cmd(struct ulink *device, int delay_scan_in,
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_append_led_cmd(struct ulink *device, uint8_t led_state)
static int ulink_append_led_cmd(struct ulink *device, uint8_t led_state)
{
struct ulink_cmd *cmd = calloc(1, sizeof(struct ulink_cmd));
int ret;
@@ -1236,7 +1236,7 @@ int ulink_append_led_cmd(struct ulink *device, uint8_t led_state)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_append_test_cmd(struct ulink *device)
static int ulink_append_test_cmd(struct ulink *device)
{
struct ulink_cmd *cmd = calloc(1, sizeof(struct ulink_cmd));
int ret;
@@ -1292,7 +1292,7 @@ int ulink_append_test_cmd(struct ulink *device)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_calculate_delay(enum ulink_delay_type type, long f, int *delay)
static int ulink_calculate_delay(enum ulink_delay_type type, long f, int *delay)
{
float t, x, x_ceil;
@@ -1423,7 +1423,7 @@ static void ulink_set_end_state(tap_state_t endstate)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_queue_statemove(struct ulink *device)
static int ulink_queue_statemove(struct ulink *device)
{
uint8_t tms_sequence, tms_count;
int ret;
@@ -1452,7 +1452,7 @@ int ulink_queue_statemove(struct ulink *device)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_queue_scan(struct ulink *device, struct jtag_command *cmd)
static int ulink_queue_scan(struct ulink *device, struct jtag_command *cmd)
{
uint32_t scan_size_bits, scan_size_bytes, bits_last_scan;
uint32_t scans_max_payload, bytecount;
@@ -1631,7 +1631,7 @@ int ulink_queue_scan(struct ulink *device, struct jtag_command *cmd)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_queue_tlr_reset(struct ulink *device, struct jtag_command *cmd)
static int ulink_queue_tlr_reset(struct ulink *device, struct jtag_command *cmd)
{
int ret;
@@ -1654,7 +1654,7 @@ int ulink_queue_tlr_reset(struct ulink *device, struct jtag_command *cmd)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_queue_runtest(struct ulink *device, struct jtag_command *cmd)
static int ulink_queue_runtest(struct ulink *device, struct jtag_command *cmd)
{
int ret;
@@ -1685,7 +1685,7 @@ int ulink_queue_runtest(struct ulink *device, struct jtag_command *cmd)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_queue_reset(struct ulink *device, struct jtag_command *cmd)
static int ulink_queue_reset(struct ulink *device, struct jtag_command *cmd)
{
uint8_t low = 0, high = 0;
@@ -1711,7 +1711,7 @@ int ulink_queue_reset(struct ulink *device, struct jtag_command *cmd)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_queue_pathmove(struct ulink *device, struct jtag_command *cmd)
static int ulink_queue_pathmove(struct ulink *device, struct jtag_command *cmd)
{
int ret, i, num_states, batch_size, state_count;
tap_state_t *path;
@@ -1770,7 +1770,7 @@ int ulink_queue_pathmove(struct ulink *device, struct jtag_command *cmd)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_queue_sleep(struct ulink *device, struct jtag_command *cmd)
static int ulink_queue_sleep(struct ulink *device, struct jtag_command *cmd)
{
/* IMPORTANT! Due to the time offset in command execution introduced by
* command queueing, this needs to be implemented in the ULINK device */
@@ -1783,7 +1783,7 @@ int ulink_queue_sleep(struct ulink *device, struct jtag_command *cmd)
* @param device pointer to struct ulink identifying ULINK driver instance.
* @param cmd pointer to the command that shall be executed.
*/
int ulink_queue_stableclocks(struct ulink *device, struct jtag_command *cmd)
static int ulink_queue_stableclocks(struct ulink *device, struct jtag_command *cmd)
{
int ret;
unsigned num_cycles;
@@ -1828,7 +1828,7 @@ int ulink_queue_stableclocks(struct ulink *device, struct jtag_command *cmd)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_post_process_scan(struct ulink_cmd *ulink_cmd)
static int ulink_post_process_scan(struct ulink_cmd *ulink_cmd)
{
struct jtag_command *cmd = ulink_cmd->cmd_origin;
int ret;
@@ -1859,7 +1859,7 @@ int ulink_post_process_scan(struct ulink_cmd *ulink_cmd)
* @return on success: ERROR_OK
* @return on failure: ERROR_FAIL
*/
int ulink_post_process_queue(struct ulink *device)
static int ulink_post_process_queue(struct ulink *device)
{
struct ulink_cmd *current;
struct jtag_command *openocd_cmd;

2
src/jtag/drivers/usb_blaster/usb_blaster.c
View File

@@ -275,7 +275,7 @@ static void ublast_queue_byte(uint8_t abyte)
*
* Returns pin value (1 means driven high, 0 mean driven low)
*/
bool ublast_compute_pin(enum gpio_steer steer)
static bool ublast_compute_pin(enum gpio_steer steer)
{
switch (steer) {
case FIXED_0:

4
src/jtag/drivers/versaloon/usbtoxxx/usbtoswd.c
View File

@@ -28,7 +28,7 @@
#include "usbtoxxx.h"
#include "usbtoxxx_internal.h"
RESULT usbtoswd_read_callback(void *p, uint8_t *src, uint8_t *processed)
static RESULT usbtoswd_read_callback(void *p, uint8_t *src, uint8_t *processed)
{
struct versaloon_pending_t *pending = (struct versaloon_pending_t *)p;
@@ -38,7 +38,7 @@ RESULT usbtoswd_read_callback(void *p, uint8_t *src, uint8_t *processed)
return ERROR_OK;
}
RESULT usbtoswd_write_callback(void *p, uint8_t *src, uint8_t *processed)
static RESULT usbtoswd_write_callback(void *p, uint8_t *src, uint8_t *processed)
{
struct versaloon_pending_t *pending = (struct versaloon_pending_t *)p;

10
src/jtag/drivers/versaloon/usbtoxxx/usbtoxxx.c
View File

@@ -29,7 +29,7 @@
#define N_A "n/a"
const char *types_name[96] = {
static const char *types_name[96] = {
"usbtousart", "usbtospi", "usbtoi2c", "usbtogpio", "usbtocan", "usbtopwm",
"usbtoadc", "usbtodac",
"usbtomicrowire", "usbtoswim", "usbtodusi", N_A, N_A, N_A, "usbtopower", "usbtodelay",
@@ -55,8 +55,8 @@ static uint16_t usbtoxxx_buffer_index;
static uint16_t usbtoxxx_current_cmd_index;
static uint8_t *usbtoxxx_buffer;
uint16_t collect_index;
uint8_t collect_cmd;
static uint16_t collect_index;
static uint8_t collect_cmd;
static uint8_t poll_nesting;
struct usbtoxxx_context_t {
@@ -86,7 +86,7 @@ static void usbtoxxx_pop_context(struct usbtoxxx_context_t *c)
versaloon_pending_idx = c->versaloon_pending_idx;
}
RESULT usbtoxxx_validate_current_command_type(void)
static RESULT usbtoxxx_validate_current_command_type(void)
{
if (type_pre > 0) {
/* not the first command */
@@ -272,7 +272,7 @@ bool usbtoxxx_interface_supported(uint8_t cmd)
return (usbtoxxx_abilities[cmd / 8] & (1 << (cmd % 8))) > 0;
}
RESULT usbtoxxx_ensure_buffer_size(uint16_t cmdlen)
static RESULT usbtoxxx_ensure_buffer_size(uint16_t cmdlen)
{
/* check free space, commit if not enough */
if (((usbtoxxx_buffer_index + usbtoxxx_current_cmd_index + cmdlen)

24
src/jtag/drivers/versaloon/versaloon.c
View File

@@ -38,12 +38,12 @@ uint16_t versaloon_pending_idx;
libusb_device_handle *versaloon_usb_device_handle;
static uint32_t versaloon_usb_to = VERSALOON_TIMEOUT;
RESULT versaloon_init(void);
RESULT versaloon_fini(void);
RESULT versaloon_get_target_voltage(uint16_t *voltage);
RESULT versaloon_set_target_voltage(uint16_t voltage);
RESULT versaloon_delay_ms(uint16_t ms);
RESULT versaloon_delay_us(uint16_t us);
static RESULT versaloon_init(void);
static RESULT versaloon_fini(void);
static RESULT versaloon_get_target_voltage(uint16_t *voltage);
static RESULT versaloon_set_target_voltage(uint16_t voltage);
static RESULT versaloon_delay_ms(uint16_t ms);
static RESULT versaloon_delay_us(uint16_t us);
struct versaloon_interface_t versaloon_interface = {
.init = versaloon_init,
@@ -233,7 +233,7 @@ RESULT versaloon_send_command(uint16_t out_len, uint16_t *inlen)
}
#define VERSALOON_RETRY_CNT 10
RESULT versaloon_init(void)
static RESULT versaloon_init(void)
{
uint16_t ret = 0;
uint8_t retry;
@@ -291,7 +291,7 @@ RESULT versaloon_init(void)
return versaloon_get_target_voltage(&ret);
}
RESULT versaloon_fini(void)
static RESULT versaloon_fini(void)
{
if (versaloon_usb_device_handle != NULL) {
usbtoxxx_fini();
@@ -309,7 +309,7 @@ RESULT versaloon_fini(void)
return ERROR_OK;
}
RESULT versaloon_set_target_voltage(uint16_t voltage)
static RESULT versaloon_set_target_voltage(uint16_t voltage)
{
usbtopwr_init(0);
usbtopwr_config(0);
@@ -319,7 +319,7 @@ RESULT versaloon_set_target_voltage(uint16_t voltage)
return usbtoxxx_execute_command();
}
RESULT versaloon_get_target_voltage(uint16_t *voltage)
static RESULT versaloon_get_target_voltage(uint16_t *voltage)
{
uint16_t inlen;
@@ -345,12 +345,12 @@ RESULT versaloon_get_target_voltage(uint16_t *voltage)
}
}
RESULT versaloon_delay_ms(uint16_t ms)
static RESULT versaloon_delay_ms(uint16_t ms)
{
return usbtodelay_delay(ms | 0x8000);
}
RESULT versaloon_delay_us(uint16_t us)
static RESULT versaloon_delay_us(uint16_t us)
{
return usbtodelay_delay(us & 0x7FFF);
}

2
src/jtag/drivers/xds110.c
View File

@@ -186,7 +186,7 @@
#define CMD_STABLECLOCKS 4
/* Array to convert from OpenOCD tap_state_t to XDS JTAG state */
const uint32_t xds_jtag_state[] = {
static const uint32_t xds_jtag_state[] = {
XDS_JTAG_STATE_EXIT2_DR, /* TAP_DREXIT2 = 0x0 */
XDS_JTAG_STATE_EXIT1_DR, /* TAP_DREXIT1 = 0x1 */
XDS_JTAG_STATE_SHIFT_DR, /* TAP_DRSHIFT = 0x2 */