- remove build warning from keep_alive
- remove surplus linefeeds git-svn-id: svn://svn.berlios.de/openocd/trunk@831 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
parent
60ba4476df
commit
2c3f0ebae9
|
@ -356,7 +356,7 @@ void keep_alive()
|
|||
current_time=timeval_ms();
|
||||
if (current_time-last_time>1000)
|
||||
{
|
||||
LOG_WARNING("keep_alive() was not invoked in the 1000ms timelimit. GDB alive packet not sent! (%d)", current_time-last_time);
|
||||
LOG_WARNING("keep_alive() was not invoked in the 1000ms timelimit. GDB alive packet not sent! (%lld)", current_time-last_time);
|
||||
last_time=current_time;
|
||||
} else if (current_time-last_time>500)
|
||||
{
|
||||
|
|
|
@ -110,9 +110,6 @@ int duration_stop_measure(duration_t *duration, char **text)
|
|||
return ERROR_OK;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
long long timeval_ms()
|
||||
{
|
||||
struct timeval now;
|
||||
|
|
24
src/main.c
24
src/main.c
|
@ -29,24 +29,18 @@ void openocd_sleep_postlude()
|
|||
{
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
This is the main entry for developer PC hosted OpenOCD.
|
||||
|
||||
OpenOCD can also be used as a library that is linked with
|
||||
another application(not mainstream yet, but possible), e.g.
|
||||
w/as an embedded application.
|
||||
|
||||
Those applications will have their own main() implementation
|
||||
and use bits and pieces from openocd.c.
|
||||
|
||||
*/
|
||||
|
||||
/* This is the main entry for developer PC hosted OpenOCD.
|
||||
*
|
||||
* OpenOCD can also be used as a library that is linked with
|
||||
* another application(not mainstream yet, but possible), e.g.
|
||||
* w/as an embedded application.
|
||||
*
|
||||
* Those applications will have their own main() implementation
|
||||
* and use bits and pieces from openocd.c. */
|
||||
|
||||
extern int openocd_main(int argc, char *argv[]);
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
return openocd_main(argc, argv);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue