Browse Source

fixed warnings + added zy1000 jtag_add_clocks support.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1309 b42882b7-edfa-0310-969c-e2dbd0fdcd60
tags/v0.1.0
oharboe 13 years ago
parent
commit
42532ddeaa
3 changed files with 29 additions and 17 deletions
  1. +7
    -7
      src/ecosboard.c
  2. +1
    -1
      src/jtag/jtag.c
  3. +21
    -9
      src/jtag/zy1000.c

+ 7
- 7
src/ecosboard.c View File

@@ -190,7 +190,7 @@ int zy1000_configuration_output_handler_log(struct command_context_s *context,
}

#ifdef CYGPKG_PROFILE_GPROF
extern void start_profile();
extern void start_profile(void);

int eCosBoard_handle_eCosBoard_profile_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
@@ -201,13 +201,13 @@ int eCosBoard_handle_eCosBoard_profile_command(struct command_context_s *cmd_ctx

#endif

externC void phi_init_all_network_interfaces();
externC void phi_init_all_network_interfaces(void);

command_context_t *cmd_ctx;

static bool webRunning = false;

void keep_webserver()
void keep_webserver(void)
{
// Target initialisation is only attempted at startup, so we sleep forever and
// let the http server bail us out(i.e. get config files set up).
@@ -261,12 +261,12 @@ MTAB_ENTRY( romfs_mte1,
(CYG_ADDRWORD) &filedata[0] );
#endif

void openocd_sleep_prelude()
void openocd_sleep_prelude(void)
{
cyg_mutex_unlock(&httpstate.jim_lock);
}

void openocd_sleep_postlude()
void openocd_sleep_postlude(void)
{
cyg_mutex_lock(&httpstate.jim_lock);
}
@@ -422,7 +422,7 @@ static int zylinjtag_Jim_Command_reboot(Jim_Interp *interp, int argc,

extern Jim_Interp *interp;

static void zylinjtag_startNetwork()
static void zylinjtag_startNetwork(void)
{
// Bring TCP/IP up immediately before we're ready to accept commands.
//
@@ -857,7 +857,7 @@ bool logAllToSerial = false;
int boolParam(char *var);


command_context_t *setup_command_handler();
command_context_t *setup_command_handler(void);

extern const char *zylin_config_dir;



+ 1
- 1
src/jtag/jtag.c View File

@@ -969,7 +969,7 @@ void jtag_add_tlr(void)
jtag_error=retval;
}

int MINIDRIVER(interface_jtag_add_tlr)()
int MINIDRIVER(interface_jtag_add_tlr)(void)
{
enum tap_state state = TAP_RESET;
jtag_command_t **last_cmd = jtag_get_last_command_p();


+ 21
- 9
src/jtag/zy1000.c View File

@@ -83,7 +83,7 @@ static int zy1000_speed_div(int speed, int *khz)
return ERROR_OK;
}

static bool readPowerDropout()
static bool readPowerDropout(void)
{
cyg_uint32 state;
// sample and clear power dropout
@@ -95,7 +95,7 @@ static bool readPowerDropout()
}


static bool readSRST()
static bool readSRST(void)
{
cyg_uint32 state;
// sample and clear SRST sensing
@@ -152,7 +152,7 @@ int zy1000_read(void)
return -1;
}

extern bool readSRST();
extern bool readSRST(void);

void zy1000_reset(int trst, int srst)
{
@@ -404,7 +404,7 @@ int interface_jtag_execute_queue(void)



static cyg_uint32 getShiftValue()
static cyg_uint32 getShiftValue(void)
{
cyg_uint32 value;
waitIdle();
@@ -413,7 +413,7 @@ static cyg_uint32 getShiftValue()
return value;
}
#if 0
static cyg_uint32 getShiftValueFlip()
static cyg_uint32 getShiftValueFlip(void)
{
cyg_uint32 value;
waitIdle();
@@ -438,7 +438,7 @@ static void shiftValueInnerFlip(const enum tap_state state, const enum tap_state

extern int jtag_check_value(u8 *captured, void *priv);

static void gotoEndState()
static void gotoEndState(void)
{
setCurrentState(cmd_queue_end_state);
}
@@ -693,10 +693,10 @@ int interface_jtag_add_reset(int req_trst, int req_srst)
return ERROR_OK;
}

int interface_jtag_add_runtest(int num_cycles, enum tap_state state)
static int zy1000_jtag_add_clocks(int num_cycles, enum tap_state state, enum tap_state clockstate)
{
/* num_cycles can be 0 */
setCurrentState(TAP_IDLE);
setCurrentState(clockstate);

/* execute num_cycles, 32 at the time. */
int i;
@@ -708,7 +708,7 @@ int interface_jtag_add_runtest(int num_cycles, enum tap_state state)
{
num=num_cycles-i;
}
shiftValueInner(TAP_IDLE, TAP_IDLE, num, 0);
shiftValueInner(clockstate, clockstate, num, 0);
}

#if !TEST_MANUAL()
@@ -734,6 +734,16 @@ int interface_jtag_add_runtest(int num_cycles, enum tap_state state)
return ERROR_OK;
}

int interface_jtag_add_runtest(int num_cycles, enum tap_state state)
{
return zy1000_jtag_add_clocks(num_cycles, state, TAP_IDLE);
}

int interface_jtag_add_clocks(int num_cycles)
{
return zy1000_jtag_add_clocks(num_cycles, cmd_queue_cur_state, cmd_queue_end_state);
}

int interface_jtag_add_sleep(u32 us)
{
jtag_sleep(us);
@@ -843,3 +853,5 @@ int boolParam(char *var)
free(name);
return result;
}



Loading…
Cancel
Save