zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Added support for native MinGW builds (thanks to Spencer Oliver and Michael Fischer) - you still need to install GiveIO (not part of OpenOCD) 

- Added state-move support to ftd2xx and bitbang JTAG drivers (required for XScale, possibly useful for other targets, too)
- various fixes


git-svn-id: svn://svn.berlios.de/openocd/trunk@78 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
drath 2006-07-17 14:13:27 +00:00
parent 1960973baf
commit 82d2633b5f
48 changed files with 1432 additions and 579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
configure.in
View File

@ -7,9 +7,14 @@ AC_CANONICAL_HOST
AC_C_BIGENDIAN AC_C_BIGENDIAN
AC_CHECK_FUNCS(strndup) AC_CHECK_FUNCS(strndup)
AC_CHECK_FUNCS(strnlen)
AC_CHECK_FUNCS(gettimeofday)
AC_CHECK_FUNCS(usleep)
build_bitbang=no build_bitbang=no
is_cygwin=no is_cygwin=no
is_mingw=no
is_win32=no
AC_ARG_ENABLE(parport, AC_ARG_ENABLE(parport,
AS_HELP_STRING([--enable-parport], [Enable building the pc parallel port driver]), AS_HELP_STRING([--enable-parport], [Enable building the pc parallel port driver]),
@ -41,6 +46,34 @@ AC_ARG_WITH(ftd2xx,
[], [],
with_ftd2xx=search) with_ftd2xx=search)
case $host in
*-*-cygwin*)
is_cygwin=yes
is_win32=yes
AC_ARG_ENABLE(parport_giveio,
AS_HELP_STRING([--enable-parport_giveio], [Enable use of giveio for parport instead of ioperm]),
[parport_use_giveio=$enableval], [parport_use_giveio=no])
AC_DEFINE(IS_CYGWIN, 1, [1 if building for Cygwin.])
AC_DEFINE(IS_WIN32, 1, [1 if building for Win32.])
;;
*-*-mingw*)
is_mingw=yes
is_win32=yes
parport_use_giveio=yes
AC_DEFINE(IS_MINGW, 1, [1 if building for MinGW.])
AC_DEFINE(IS_WIN32, 1, [1 if building for Win32.])
;;
*)
parport_use_giveio=no
AC_DEFINE(IS_CYGWIN, 0, [0 if not building for Cygwin.])
AC_DEFINE(IS_WIN32, 0, [0 if not building for Win32.])
;;
esac
if test $build_parport = yes; then if test $build_parport = yes; then
build_bitbang=yes build_bitbang=yes
AC_DEFINE(BUILD_PARPORT, 1, [1 if you want parport.]) AC_DEFINE(BUILD_PARPORT, 1, [1 if you want parport.])
@ -61,6 +94,12 @@ else
AC_DEFINE(PARPORT_USE_PPDEV, 0, [0 if you don't want parport to use ppdev.]) AC_DEFINE(PARPORT_USE_PPDEV, 0, [0 if you don't want parport to use ppdev.])
fi fi
if test $parport_use_giveio = yes; then
AC_DEFINE(PARPORT_USE_GIVEIO, 1, [1 if you want parport to use giveio.])
else
AC_DEFINE(PARPORT_USE_GIVEIO, 0, [0 if you don't want parport to use giveio.])
fi
if test $build_bitbang = yes; then if test $build_bitbang = yes; then
AC_DEFINE(BUILD_BITBANG, 1, [1 if you want a bitbang interface.]) AC_DEFINE(BUILD_BITBANG, 1, [1 if you want a bitbang interface.])
else else
@ -85,26 +124,19 @@ else
AC_DEFINE(BUILD_AMTJTAGACCEL, 0, [0 if you don't want the Amontec JTAG-Accelerator driver.]) AC_DEFINE(BUILD_AMTJTAGACCEL, 0, [0 if you don't want the Amontec JTAG-Accelerator driver.])
fi fi
case $host in
*-*-cygwin*)
is_cygwin=yes
AC_DEFINE(IS_CYGWIN, 1, [1 if building for Cygwin.])
;;
*)
AC_DEFINE(IS_CYGWIN, 0, [0 if not building for Cygwin.])
;;
esac
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(openocd, 0.1) AM_INIT_AUTOMAKE(openocd, 0.1)
AM_CONDITIONAL(PARPORT, test $build_parport = yes) AM_CONDITIONAL(PARPORT, test $build_parport = yes)
AM_CONDITIONAL(GIVEIO, test $parport_use_giveio = yes)
AM_CONDITIONAL(EP93XX, test $build_ep93xx = yes) AM_CONDITIONAL(EP93XX, test $build_ep93xx = yes)
AM_CONDITIONAL(BITBANG, test $build_bitbang = yes) AM_CONDITIONAL(BITBANG, test $build_bitbang = yes)
AM_CONDITIONAL(FTDI2232, test $build_ftdi2232 = yes) AM_CONDITIONAL(FTDI2232, test $build_ftdi2232 = yes)
AM_CONDITIONAL(FTD2XX, test $build_ftd2xx = yes) AM_CONDITIONAL(FTD2XX, test $build_ftd2xx = yes)
AM_CONDITIONAL(AMTJTAGACCEL, test $build_amtjtagaccel = yes) AM_CONDITIONAL(AMTJTAGACCEL, test $build_amtjtagaccel = yes)
AM_CONDITIONAL(IS_CYGWIN, test $is_cygwin = yes) AM_CONDITIONAL(IS_CYGWIN, test $is_cygwin = yes)
AM_CONDITIONAL(IS_MINGW, test $is_mingw = yes)
AM_CONDITIONAL(IS_WIN32, test $is_win32 = yes)
AM_CONDITIONAL(FTD2XXDIR, test $with_ftd2xx != search) AM_CONDITIONAL(FTD2XXDIR, test $with_ftd2xx != search)
AC_LANG_C AC_LANG_C

10
src/Makefile.am
View File

@ -10,13 +10,19 @@ INCLUDES = -I$(top_srcdir)/src/helper \
openocd_LDFLAGS = $(all_libraries) openocd_LDFLAGS = $(all_libraries)
SUBDIRS = helper jtag xsvf target server flash SUBDIRS = helper jtag xsvf target server flash
if IS_MINGW
MINGWLDADD = -lwsock32
else
MINGWLDADD =
endif
if FTDI2232 if FTDI2232
FTDI2232LIB = -lftdi FTDI2232LIB = -lftdi
else else
FTDI2232LIB = FTDI2232LIB =
endif endif
if IS_CYGWIN if IS_WIN32
if FTD2XXDIR if FTD2XXDIR
FTD2XXLDADD = @WITH_FTD2XX@/FTD2XX.lib FTD2XXLDADD = @WITH_FTD2XX@/FTD2XX.lib
else else
@ -37,4 +43,4 @@ openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
$(top_builddir)/src/helper/libhelper.a \ $(top_builddir)/src/helper/libhelper.a \
$(top_builddir)/src/server/libserver.a $(top_builddir)/src/helper/libhelper.a \ $(top_builddir)/src/server/libserver.a $(top_builddir)/src/helper/libhelper.a \
$(top_builddir)/src/flash/libflash.a $(top_builddir)/src/target/libtarget.a \ $(top_builddir)/src/flash/libflash.a $(top_builddir)/src/target/libtarget.a \
$(FTDI2232LIB) $(FTD2XXLIB) $(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD)

231
src/flash/at91sam7.c
View File

@ -33,6 +33,11 @@ There are some things to notice
* Lock regions (sectors) are 32 or 64 pages * Lock regions (sectors) are 32 or 64 pages
* *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "replacements.h"
#include "at91sam7.h" #include "at91sam7.h"
@ -59,7 +64,7 @@ int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size);
u32 at91sam7_get_flash_status(flash_bank_t *bank); u32 at91sam7_get_flash_status(flash_bank_t *bank);
void at91sam7_set_flash_mode(flash_bank_t *bank,int mode); void at91sam7_set_flash_mode(flash_bank_t *bank,int mode);
u8 at91sam7_wait_status_busy(flash_bank_t *bank, int timeout); u8 at91sam7_wait_status_busy(flash_bank_t *bank, int timeout);
int at91sam7_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int at91sam7_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
flash_driver_t at91sam7_flash = flash_driver_t at91sam7_flash =
{ {
@ -115,6 +120,15 @@ long SRAMSIZ[16] = {
0x80000, /* 512K */ 0x80000, /* 512K */
}; };
int at91sam7_register_commands(struct command_context_s *cmd_ctx)
{
command_t *at91sam7_cmd = register_command(cmd_ctx, NULL, "at91sam7", NULL, COMMAND_ANY, NULL);
register_command(cmd_ctx, at91sam7_cmd, "gpnvm", at91sam7_handle_gpnvm_command, COMMAND_EXEC,
"at91sam7 gpnvm <num> <bit> set|clear, set or clear at91sam7 gpnvm bit");
return ERROR_OK;
}
u32 at91sam7_get_flash_status(flash_bank_t *bank) u32 at91sam7_get_flash_status(flash_bank_t *bank)
{ {
at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv; at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
@ -126,6 +140,69 @@ u32 at91sam7_get_flash_status(flash_bank_t *bank)
return fsr; return fsr;
} }
/** Read clock configuration and set at91sam7_info->usec_clocks*/
void at91sam7_read_clock_info(flash_bank_t *bank)
{
at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
target_t *target = at91sam7_info->target;
unsigned long mckr, mcfr, pllr, tmp, status, mainfreq;
unsigned int css, pres, mul, div;
/* Read main clock freqency register */
target->type->read_memory(target, CKGR_MCFR, 4, 1, (u8 *)&mcfr);
/* Read master clock register */
target->type->read_memory(target, PMC_MCKR, 4, 1, (u8 *)&mckr);
/* Read Clock Generator PLL Register */
target->type->read_memory(target, CKGR_PLLR, 4, 1, (u8 *)&pllr);
pres = (mckr>>2)&0x7;
mul = (pllr>>16)&0x7FF;
div = pllr&0xFF;
at91sam7_info->mck_valid = 0;
switch (mckr & PMC_MCKR_CSS) {
case 0: /* Slow Clock */
at91sam7_info->mck_valid = 1;
tmp = RC_FREQ;
break;
case 1: /* Main Clock */
if (mcfr & CKGR_MCFR_MAINRDY)
{
at91sam7_info->mck_valid = 1;
mainfreq = RC_FREQ / 16ul * (mcfr & 0xffff);
tmp = mainfreq;
}
break;
case 2: /* Reserved */
break;
case 3: /* PLL Clock */
if (mcfr & CKGR_MCFR_MAINRDY)
{
target->type->read_memory(target, CKGR_PLLR, 4, 1,
(u8 *)&pllr);
if (!(pllr & CKGR_PLLR_DIV))
break; /* 0 Hz */
at91sam7_info->mck_valid = 1;
mainfreq = RC_FREQ / 16ul * (mcfr & 0xffff);
/* Integer arithmetic should have sufficient precision
as long as PLL is properly configured. */
tmp = mainfreq / (pllr & CKGR_PLLR_DIV) *
(((pllr & CKGR_PLLR_MUL) >> 16) + 1);
}
break;
}
/* Prescaler adjust */
if (((mckr & PMC_MCKR_PRES) >> 2) == 7)
at91sam7_info->mck_valid = 0;
else
at91sam7_info->mck_freq = tmp >> ((mckr & PMC_MCKR_PRES) >> 2);
/* Forget old flash timing */
at91sam7_set_flash_mode(bank,0);
}
/* Setup the timimg registers for nvbits or normal flash */ /* Setup the timimg registers for nvbits or normal flash */
void at91sam7_set_flash_mode(flash_bank_t *bank,int mode) void at91sam7_set_flash_mode(flash_bank_t *bank,int mode)
{ {
@ -133,19 +210,24 @@ void at91sam7_set_flash_mode(flash_bank_t *bank,int mode)
at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv; at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
target_t *target = at91sam7_info->target; target_t *target = at91sam7_info->target;
if (mode != at91sam7_info->flashmode) { if (mode && (mode != at91sam7_info->flashmode)) {
/* mainf contains the number of main clocks in approx 500uS */ /* Always round up (ceil) */
if (mode==1) if (mode==1)
/* main clocks in 1uS */ /* main clocks in 1uS */
fmcn = (at91sam7_info->mainf>>9)+1; fmcn = (at91sam7_info->mck_freq/1000000ul)+1;
else else if (mode==2)
/* main clocks in 1.5uS */ /* main clocks in 1.5uS */
fmcn = (at91sam7_info->mainf>>9)+(at91sam7_info->mainf>>10)+1; fmcn = (at91sam7_info->mck_freq/666666ul)+1;
/* Only allow fmcn=0 if clock period is > 30 us. */
if (at91sam7_info->mck_freq <= 33333)
fmcn = 0;
DEBUG("fmcn: %i", fmcn); DEBUG("fmcn: %i", fmcn);
fmr = fmcn<<16; fmr = fmcn<<16;
target->type->write_memory(target, MC_FSR, 4, 1, (u8 *)&fmr); target->type->write_memory(target, MC_FSR, 4, 1, (u8 *)&fmr);
at91sam7_info->flashmode = mode;
} }
at91sam7_info->flashmode = mode;
} }
u8 at91sam7_wait_status_busy(flash_bank_t *bank, int timeout) u8 at91sam7_wait_status_busy(flash_bank_t *bank, int timeout)
@ -174,6 +256,7 @@ u8 at91sam7_wait_status_busy(flash_bank_t *bank, int timeout)
return status; return status;
} }
/* Send one command to the AT91SAM flash controller */
int at91sam7_flash_command(struct flash_bank_s *bank,u8 cmd,u16 pagen) int at91sam7_flash_command(struct flash_bank_s *bank,u8 cmd,u16 pagen)
{ {
u32 fcr; u32 fcr;
@ -222,23 +305,12 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
at91sam7_info->cidr_eproc = (cidr>>5)&0x0007; at91sam7_info->cidr_eproc = (cidr>>5)&0x0007;
at91sam7_info->cidr_version = cidr&0x001F; at91sam7_info->cidr_version = cidr&0x001F;
bank->size = NVPSIZ[at91sam7_info->cidr_nvpsiz]; bank->size = NVPSIZ[at91sam7_info->cidr_nvpsiz];
at91sam7_info->target_name = "Unknown";
DEBUG("nvptyp: 0x%3.3x, arch: 0x%4.4x, alt_id: 0x%4.4x, alt_addr: 0x%4.4x", at91sam7_info->cidr_nvptyp, at91sam7_info->cidr_arch ); DEBUG("nvptyp: 0x%3.3x, arch: 0x%4.4x, alt_id: 0x%4.4x, alt_addr: 0x%4.4x", at91sam7_info->cidr_nvptyp, at91sam7_info->cidr_arch );
/* Read main clock freqency register */ /* Read main and master clock freqency register */
target->type->read_memory(target, CKGR_MCFR, 4, 1, (u8 *)&mcfr); at91sam7_read_clock_info(bank);
if (mcfr&0x10000)
{
at91sam7_info->mainrdy = 1;
at91sam7_info->mainf = mcfr&0xFFFF;
at91sam7_info->usec_clocks = mcfr>>9;
}
else
{
at91sam7_info->mainrdy = 0;
at91sam7_info->mainf = 0;
at91sam7_info->usec_clocks = 0;
}
status = at91sam7_get_flash_status(bank); status = at91sam7_get_flash_status(bank);
at91sam7_info->lockbits = status>>16; at91sam7_info->lockbits = status>>16;
@ -252,6 +324,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
bank->bus_width = 4; bank->bus_width = 4;
if (bank->size==0x40000) /* AT91SAM7S256 */ if (bank->size==0x40000) /* AT91SAM7S256 */
{ {
at91sam7_info->target_name = "AT91SAM7S256";
at91sam7_info->num_lockbits = 16; at91sam7_info->num_lockbits = 16;
at91sam7_info->pagesize = 256; at91sam7_info->pagesize = 256;
at91sam7_info->pages_in_lockregion = 64; at91sam7_info->pages_in_lockregion = 64;
@ -259,6 +332,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
} }
if (bank->size==0x20000) /* AT91SAM7S128 */ if (bank->size==0x20000) /* AT91SAM7S128 */
{ {
at91sam7_info->target_name = "AT91SAM7S128";
at91sam7_info->num_lockbits = 8; at91sam7_info->num_lockbits = 8;
at91sam7_info->pagesize = 256; at91sam7_info->pagesize = 256;
at91sam7_info->pages_in_lockregion = 64; at91sam7_info->pages_in_lockregion = 64;
@ -266,6 +340,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
} }
if (bank->size==0x10000) /* AT91SAM7S64 */ if (bank->size==0x10000) /* AT91SAM7S64 */
{ {
at91sam7_info->target_name = "AT91SAM7S64";
at91sam7_info->num_lockbits = 16; at91sam7_info->num_lockbits = 16;
at91sam7_info->pagesize = 128; at91sam7_info->pagesize = 128;
at91sam7_info->pages_in_lockregion = 32; at91sam7_info->pages_in_lockregion = 32;
@ -273,6 +348,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
} }
if (bank->size==0x08000) /* AT91SAM7S321/32 */ if (bank->size==0x08000) /* AT91SAM7S321/32 */
{ {
at91sam7_info->target_name = "AT91SAM7S321/32";
at91sam7_info->num_lockbits = 8; at91sam7_info->num_lockbits = 8;
at91sam7_info->pagesize = 128; at91sam7_info->pagesize = 128;
at91sam7_info->pages_in_lockregion = 32; at91sam7_info->pages_in_lockregion = 32;
@ -290,6 +366,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
bank->bus_width = 4; bank->bus_width = 4;
if (bank->size==0x40000) /* AT91SAM7XC256 */ if (bank->size==0x40000) /* AT91SAM7XC256 */
{ {
at91sam7_info->target_name = "AT91SAM7XC256";
at91sam7_info->num_lockbits = 16; at91sam7_info->num_lockbits = 16;
at91sam7_info->pagesize = 256; at91sam7_info->pagesize = 256;
at91sam7_info->pages_in_lockregion = 64; at91sam7_info->pages_in_lockregion = 64;
@ -297,6 +374,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
} }
if (bank->size==0x20000) /* AT91SAM7XC128 */ if (bank->size==0x20000) /* AT91SAM7XC128 */
{ {
at91sam7_info->target_name = "AT91SAM7XC128";
at91sam7_info->num_lockbits = 8; at91sam7_info->num_lockbits = 8;
at91sam7_info->pagesize = 256; at91sam7_info->pagesize = 256;
at91sam7_info->pages_in_lockregion = 64; at91sam7_info->pages_in_lockregion = 64;
@ -314,6 +392,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
bank->bus_width = 4; bank->bus_width = 4;
if (bank->size==0x40000) /* AT91SAM7X256 */ if (bank->size==0x40000) /* AT91SAM7X256 */
{ {
at91sam7_info->target_name = "AT91SAM7X256";
at91sam7_info->num_lockbits = 16; at91sam7_info->num_lockbits = 16;
at91sam7_info->pagesize = 256; at91sam7_info->pagesize = 256;
at91sam7_info->pages_in_lockregion = 64; at91sam7_info->pages_in_lockregion = 64;
@ -321,6 +400,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
} }
if (bank->size==0x20000) /* AT91SAM7X128 */ if (bank->size==0x20000) /* AT91SAM7X128 */
{ {
at91sam7_info->target_name = "AT91SAM7X128";
at91sam7_info->num_lockbits = 8; at91sam7_info->num_lockbits = 8;
at91sam7_info->pagesize = 256; at91sam7_info->pagesize = 256;
at91sam7_info->pages_in_lockregion = 64; at91sam7_info->pages_in_lockregion = 64;
@ -339,6 +419,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
if (bank->size == 0x40000) /* AT91SAM7A3 */ if (bank->size == 0x40000) /* AT91SAM7A3 */
{ {
at91sam7_info->target_name = "AT91SAM7A3";
at91sam7_info->num_lockbits = 16; at91sam7_info->num_lockbits = 16;
at91sam7_info->pagesize = 256; at91sam7_info->pagesize = 256;
at91sam7_info->pages_in_lockregion = 64; at91sam7_info->pages_in_lockregion = 64;
@ -392,14 +473,6 @@ int at91sam7_protect_check(struct flash_bank_s *bank)
return ERROR_OK; return ERROR_OK;
} }
int at91sam7_register_commands(struct command_context_s *cmd_ctx)
{
command_t *at91sam7_cmd = register_command(cmd_ctx, NULL, "at91sam7", NULL, COMMAND_ANY, "at91sam7 specific commands");
return ERROR_OK;
}
int at91sam7_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank) int at91sam7_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
{ {
at91sam7_flash_bank_t *at91sam7_info; at91sam7_flash_bank_t *at91sam7_info;
@ -452,6 +525,10 @@ int at91sam7_erase(struct flash_bank_s *bank, int first, int last)
return ERROR_FLASH_SECTOR_INVALID; return ERROR_FLASH_SECTOR_INVALID;
} }
/* Configure the flash controller timing */
at91sam7_read_clock_info(bank);
at91sam7_set_flash_mode(bank,2);
if ((first == 0) && (last == (at91sam7_info->num_lockbits-1))) if ((first == 0) && (last == (at91sam7_info->num_lockbits-1)))
{ {
return at91sam7_flash_command(bank, EA, 0); return at91sam7_flash_command(bank, EA, 0);
@ -491,6 +568,7 @@ int at91sam7_protect(struct flash_bank_s *bank, int set, int first, int last)
} }
/* Configure the flash controller timing */ /* Configure the flash controller timing */
at91sam7_read_clock_info(bank);
at91sam7_set_flash_mode(bank,1); at91sam7_set_flash_mode(bank,1);
for (lockregion=first;lockregion<=last;lockregion++) for (lockregion=first;lockregion<=last;lockregion++)
@ -560,6 +638,7 @@ int at91sam7_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
DEBUG("first_page: %i, last_page: %i, count %i", first_page, last_page, count); DEBUG("first_page: %i, last_page: %i, count %i", first_page, last_page, count);
/* Configure the flash controller timing */ /* Configure the flash controller timing */
at91sam7_read_clock_info(bank);
at91sam7_set_flash_mode(bank,2); at91sam7_set_flash_mode(bank,2);
for (pagen=first_page; pagen<last_page; pagen++) { for (pagen=first_page; pagen<last_page; pagen++) {
@ -611,10 +690,7 @@ int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size)
int printed; int printed;
at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv; at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
if (at91sam7_info->cidr == 0)
{
at91sam7_read_part_info(bank); at91sam7_read_part_info(bank);
}
if (at91sam7_info->cidr == 0) if (at91sam7_info->cidr == 0)
{ {
@ -632,7 +708,7 @@ int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size)
buf += printed; buf += printed;
buf_size -= printed; buf_size -= printed;
printed = snprintf(buf, buf_size, "main clock(estimated): %ikHz \n", at91sam7_info->mainf*2); printed = snprintf(buf, buf_size, "master clock(estimated): %ikHz \n", at91sam7_info->mck_freq / 1000);
buf += printed; buf += printed;
buf_size -= printed; buf_size -= printed;
@ -648,3 +724,92 @@ int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size)
return ERROR_OK; return ERROR_OK;
} }
/*
* On AT91SAM7S: When the gpnmv bits are set with
* > at91sam7 gpnvm 0 bitnr set
* the changes are not visible in the flash controller status register MC_FSR
* until the processor has been reset.
* On the Olimex board this requires a power cycle.
* Note that the AT91SAM7S has the following errata (doc6175.pdf sec 14.1.3):
* The maximum number of write/erase cycles for Non Volatile Memory bits is 100. This includes
* Lock Bits (LOCKx), General Purpose NVM bits (GPNVMx) and the Security Bit.
*/
int at91sam7_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
flash_bank_t *bank;
int bit;
u8 flashcmd;
u32 status;
char *value;
at91sam7_flash_bank_t *at91sam7_info;
if (argc < 3)
{
command_print(cmd_ctx, "at91sam7 gpnvm <num> <bit> <set|clear>");
return ERROR_OK;
}
bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
bit = atoi(args[1]);
value = args[2];
if (!bank)
{
command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
return ERROR_OK;
}
at91sam7_info = bank->driver_priv;
if (at91sam7_info->target->state != TARGET_HALTED)
{
return ERROR_TARGET_NOT_HALTED;
}
if (at91sam7_info->cidr == 0)
{
at91sam7_read_part_info(bank);
}
if (at91sam7_info->cidr == 0)
{
WARNING("Cannot identify target as an AT91SAM");
return ERROR_FLASH_OPERATION_FAILED;
}
if ((bit<0) || (at91sam7_info->num_nvmbits <= bit))
{
command_print(cmd_ctx, "gpnvm bit '#%s' is out of bounds for target %s", args[1],at91sam7_info->target_name);
return ERROR_OK;
}
if (strcmp(value, "set") == 0)
{
flashcmd = SGPB;
}
else if (strcmp(value, "clear") == 0)
{
flashcmd = CGPB;
}
else
{
command_print(cmd_ctx, "usage: at91sam7 gpnvm <num> <bit> <set|clear>");
return ERROR_OK;
}
/* Configure the flash controller timing */
at91sam7_read_clock_info(bank);
at91sam7_set_flash_mode(bank,1);
if (at91sam7_flash_command(bank, flashcmd, (u16)(bit)) != ERROR_OK)
{
return ERROR_FLASH_OPERATION_FAILED;
}
status = at91sam7_get_flash_status(bank);
DEBUG("at91sam7_handle_gpnvm_command: cmd 0x%x, value 0x%x, status 0x%x \n",flashcmd,bit,status);
at91sam7_info->nvmbits = (status>>8)&((1<<at91sam7_info->num_nvmbits)-1);
return ERROR_OK;
}

15
src/flash/at91sam7.h
View File

@ -39,6 +39,7 @@ typedef struct at91sam7_flash_bank_s
u16 cidr_nvpsiz2; u16 cidr_nvpsiz2;
u16 cidr_eproc; u16 cidr_eproc;
u16 cidr_version; u16 cidr_version;
char * target_name;
/* flash geometry */ /* flash geometry */
u16 num_pages; u16 num_pages;
@ -56,15 +57,21 @@ typedef struct at91sam7_flash_bank_s
u8 flashmode; /* 0: not init, 1: fmcn for nvbits (1uS), 2: fmcn for flash (1.5uS) */ u8 flashmode; /* 0: not init, 1: fmcn for nvbits (1uS), 2: fmcn for flash (1.5uS) */
/* main clock status */ /* main clock status */
u8 mainrdy; u8 mck_valid;
u16 mainf; u32 mck_freq;
u16 usec_clocks;
} at91sam7_flash_bank_t; } at91sam7_flash_bank_t;
/* AT91SAM7 control registers */ /* AT91SAM7 control registers */
#define DBGU_CIDR 0xFFFFF240 #define DBGU_CIDR 0xFFFFF240
#define CKGR_MCFR 0xFFFFFC24 #define CKGR_MCFR 0xFFFFFC24
#define CKGR_MCFR_MAINRDY 0x10000
#define CKGR_PLLR 0xFFFFFC2c
#define CKGR_PLLR_DIV 0xff
#define CKGR_PLLR_MUL 0x07ff0000
#define PMC_MCKR 0xFFFFFC30
#define PMC_MCKR_CSS 0x03
#define PMC_MCKR_PRES 0x1c
#define MC_FMR 0xFFFFFF60 #define MC_FMR 0xFFFFFF60
#define MC_FCR 0xFFFFFF64 #define MC_FCR 0xFFFFFF64
#define MC_FSR 0xFFFFFF68 #define MC_FSR 0xFFFFFF68
@ -79,5 +86,7 @@ typedef struct at91sam7_flash_bank_s
#define CGPB 0x0D #define CGPB 0x0D
#define SSB 0x0F #define SSB 0x0F
/* AT91SAM7 constants */
#define RC_FREQ 32000
#endif /* AT91SAM7_H */ #endif /* AT91SAM7_H */

6
src/flash/cfi.c
View File

@ -17,6 +17,12 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "replacements.h"
#include "cfi.h" #include "cfi.h"
#include "flash.h" #include "flash.h"

6
src/flash/flash.c
View File

@ -17,6 +17,10 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "flash.h" #include "flash.h"
#include "command.h" #include "command.h"
#include "log.h" #include "log.h"
@ -506,7 +510,7 @@ int handle_flash_write_command(struct command_context_s *cmd_ctx, char *cmd, cha
return ERROR_OK; return ERROR_OK;
} }
if (!(binary = fopen(args[1], "r"))) if (!(binary = fopen(args[1], "rb")))
{ {
ERROR("couldn't open %s: %s", args[1], strerror(errno)); ERROR("couldn't open %s: %s", args[1], strerror(errno));
command_print(cmd_ctx, "couldn't open %s", args[1]); command_print(cmd_ctx, "couldn't open %s", args[1]);

4
src/flash/lpc2000.c
View File

@ -17,6 +17,10 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "lpc2000.h" #include "lpc2000.h"
#include "flash.h" #include "flash.h"

5
src/flash/str7x.c
View File

@ -17,6 +17,11 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "replacements.h"
#include "str7x.h" #include "str7x.h"
#include "flash.h" #include "flash.h"

4
src/helper/Makefile.am
View File

@ -1,6 +1,6 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
noinst_LIBRARIES = libhelper.a noinst_LIBRARIES = libhelper.a
libhelper_a_SOURCES = binarybuffer.c configuration.c log.c interpreter.c command.c time_support.c libhelper_a_SOURCES = binarybuffer.c configuration.c log.c interpreter.c command.c time_support.c replacements.c
noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \ noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
interpreter.h time_support.h interpreter.h time_support.h replacements.h

24
src/helper/binarybuffer.c
View File

@ -17,6 +17,9 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -111,10 +114,20 @@ int buf_cmp(u8 *buf1, u8 *buf2, int size)
return 1; return 1;
for (i = 0; i < num_bytes; i++) for (i = 0; i < num_bytes; i++)
{
/* last byte */
/* mask out bits that don't really belong to the buffer if size isn't a multiple of 8 bits */
if ((size % 8) && (i == num_bytes -1 ))
{
if ((buf1[i] & ((1 << (size % 8)) - 1)) != (buf2[i] & ((1 << (size % 8)) - 1)))
return 1;
}
else
{ {
if (buf1[i] != buf2[i]) if (buf1[i] != buf2[i])
return 1; return 1;
} }
}
return 0; return 0;
} }
@ -125,10 +138,21 @@ int buf_cmp_mask(u8 *buf1, u8 *buf2, u8 *mask, int size)
int i; int i;
for (i = 0; i < num_bytes; i++) for (i = 0; i < num_bytes; i++)
{
/* last byte */
/* mask out bits that don't really belong to the buffer if size isn't a multiple of 8 bits */
if ((size % 8) && (i == num_bytes -1 ))
{
if (((buf1[i] & ((1 << (size % 8)) - 1)) & ((1 << (size % 8)) - 1)) !=
((buf2[i] & ((1 << (size % 8)) - 1)) & ((1 << (size % 8)) - 1)))
return 1;
}
else
{ {
if ((buf1[i] & mask[i]) != (buf2[i] & mask[i])) if ((buf1[i] & mask[i]) != (buf2[i] & mask[i]))
return 1; return 1;
} }
}
return 0; return 0;
} }

6
src/helper/command.c
View File

@ -20,6 +20,12 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "replacements.h"
#include "command.h" #include "command.h"
#include "log.h" #include "log.h"

2
src/helper/configuration.c
View File

@ -18,7 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include "config.h"
#endif #endif
#include "types.h" #include "types.h"

4
src/helper/interpreter.c
View File

@ -17,6 +17,10 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "interpreter.h" #include "interpreter.h"
#include "binarybuffer.h" #include "binarybuffer.h"

4
src/helper/log.c
View File

@ -17,6 +17,10 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "log.h" #include "log.h"
#include "configuration.h" #include "configuration.h"

96
src/helper/replacements.c Normal file
View File

@ -0,0 +1,96 @@
/***************************************************************************
* Copyright (C) 2006 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "replacements.h"
#include <stdio.h>
/* replacements for gettimeofday */
#ifndef HAVE_GETTIMEOFDAY
/* Windows */
#ifdef _WIN32
#ifndef __GNUC__
#define EPOCHFILETIME (116444736000000000i64)
#else
#define EPOCHFILETIME (116444736000000000LL)
#endif
int gettimeofday(struct timeval *tv, struct timezone *tz)
{
FILETIME ft;
LARGE_INTEGER li;
__int64 t;
static int tzflag;
if (tv)
{
GetSystemTimeAsFileTime(&ft);
li.LowPart = ft.dwLowDateTime;
li.HighPart = ft.dwHighDateTime;
t = li.QuadPart; /* In 100-nanosecond intervals */
t -= EPOCHFILETIME; /* Offset to the Epoch time */
t /= 10; /* In microseconds */
tv->tv_sec = (long)(t / 1000000);
tv->tv_usec = (long)(t % 1000000);
}
if (tz)
{
if (!tzflag)
{
_tzset();
tzflag++;
}
tz->tz_minuteswest = _timezone / 60;
tz->tz_dsttime = _daylight;
}
return 0;
}
#endif /* _WIN32 */
#endif /* HAVE_GETTIMEOFDAY */
#ifndef HAVE_STRNLEN
size_t strnlen(const char *s, size_t maxlen)
{
const char *end= (const char *)memchr(s, '\0', maxlen);
return end ? (size_t) (end - s) : maxlen;
}
#endif
#ifndef HAVE_STRNDUP
char* strndup(const char *s, size_t n)
{
size_t len = strnlen (s, n);
char *new = (char *) malloc (len + 1);
if (new == NULL)
return NULL;
new[len] = '\0';
return (char *) memcpy (new, s, len);
}
#endif

143
src/helper/replacements.h Normal file
View File

@ -0,0 +1,143 @@
/***************************************************************************
* Copyright (C) 2006 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifndef REPLACEMENTS_H
#define REPLACEMENTS_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
/* include necessary headers for socket functionality */
#ifdef _WIN32
#include <winsock2.h>
#else
#include <sys/socket.h>
#include <sys/poll.h>
#include <netinet/in.h>
#include <unistd.h>
#include <fcntl.h>
#endif
/* gettimeofday() */
#ifndef HAVE_GETTIMEOFDAY
#ifndef _TIMEVAL_DEFINED
#define _TIMEVAL_DEFINED
struct timeval {
long tv_sec;
long tv_usec;
};
#endif /* _TIMEVAL_DEFINED */
struct timezone {
int tz_minuteswest;
int tz_dsttime;
};
extern int gettimeofday(struct timeval *tv, struct timezone *tz);
#endif
/* GNU extensions to the C library that may be missing on some systems */
#ifndef HAVE_STRNDUP
extern char* strndup(const char *s, size_t n);
#endif /* HAVE_STRNDUP */
#ifndef HAVE_STRNLEN
extern size_t strnlen(const char *s, size_t maxlen);
#endif /* HAVE_STRNLEN */
#ifndef HAVE_USLEEP
static __inline unsigned usleep(unsigned int usecs)
{
#ifdef _WIN32
Sleep((usecs/1000));
return 0;
#else
#error no usleep defined for your platform
#endif
}
#endif /* HAVE_USLEEP */
/* Windows specific */
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <time.h>
#undef ERROR
#if IS_MINGW == 1
static __inline unsigned char inb(unsigned short int port)
{
unsigned char _v;
__asm__ __volatile__ ("inb %w1,%0":"=a" (_v):"Nd" (port));
return _v;
}
static __inline void outb(unsigned char value, unsigned short int port)
{
__asm__ __volatile__ ("outb %b0,%w1": :"a" (value), "Nd" (port));
}
#endif /* IS_MINGW */
#endif /* _WIN32 */
/* generic socket functions for Windows and Posix */
static __inline int write_socket( int handle, const void *buffer, unsigned int count )
{
#ifdef _WIN32
return send(handle, buffer, count, 0);
#else
return write(handle, buffer, count);
#endif
}
static __inline int read_socket( int handle, void *buffer, unsigned int count )
{
#ifdef _WIN32
return recv(handle, buffer, count, 0);
#else
return read(handle, buffer, count);
#endif
}
static __inline int close_socket(int sock)
{
#ifdef _WIN32
return closesocket(sock);
#else
return close(sock);
#endif
}
static __inline void socket_nonblock(int fd)
{
#ifdef _WIN32
long nonblock = 1;
ioctlsocket(fd, FIONBIO, &nonblock );
#else
int oldopts = fcntl(fd, F_GETFL, 0);
fcntl(fd, F_SETFL, oldopts | O_NONBLOCK);
#endif
}
#endif /* REPLACEMENTS_H */

2
src/helper/time_support.c
View File

@ -17,7 +17,9 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "time_support.h" #include "time_support.h"

4
src/jtag/Makefile.am
View File

@ -1,6 +1,10 @@
if FTD2XXDIR if FTD2XXDIR
if IS_MINGW
FTD2XXINC = -I@WITH_FTD2XX@
else
FTD2XXINC = -I@WITH_FTD2XX@/ FTD2XXINC = -I@WITH_FTD2XX@/
endif
else else
FTD2XXINC = FTD2XXINC =
endif endif

3
src/jtag/amt_jtagaccel.c
View File

@ -17,7 +17,10 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "log.h" #include "log.h"
#include "jtag.h" #include "jtag.h"

41
src/jtag/bitbang.c
View File

@ -17,6 +17,9 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "bitbang.h" #include "bitbang.h"
@ -65,6 +68,38 @@ void bitbang_state_move(void) {
cur_state = end_state; cur_state = end_state;
} }
void bitbang_path_move(pathmove_command_t *cmd)
{
int num_states = cmd->num_states;
int state_count;
state_count = 0;
while (num_states)
{
if (tap_transitions[cur_state].low == cmd->path[state_count])
{
bitbang_interface->write(0, 0, 0);
bitbang_interface->write(1, 0, 0);
}
else if (tap_transitions[cur_state].high == cmd->path[state_count])
{
bitbang_interface->write(0, 1, 0);
bitbang_interface->write(1, 1, 0);
}
else
{
ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_strings[cur_state], tap_state_strings[cmd->path[state_count]]);
exit(-1);
}
cur_state = cmd->path[state_count];
state_count++;
num_states--;
}
end_state = cur_state;
}
void bitbang_runtest(int num_cycles) void bitbang_runtest(int num_cycles)
{ {
int i; int i;
@ -187,6 +222,12 @@ int bitbang_execute_queue(void)
bitbang_end_state(cmd->cmd.statemove->end_state); bitbang_end_state(cmd->cmd.statemove->end_state);
bitbang_state_move(); bitbang_state_move();
break; break;
case JTAG_PATHMOVE:
#ifdef _DEBUG_JTAG_IO_
DEBUG("pathmove: %i states, end in %i", cmd->cmd.pathmove->num_states, cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
#endif
bitbang_path_move(cmd->cmd.pathmove);
break;
case JTAG_SCAN: case JTAG_SCAN:
#ifdef _DEBUG_JTAG_IO_ #ifdef _DEBUG_JTAG_IO_
DEBUG("scan end in %i", cmd->cmd.scan->end_state); DEBUG("scan end in %i", cmd->cmd.scan->end_state);

3
src/jtag/ep93xx.c
View File

@ -17,7 +17,10 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "log.h" #include "log.h"
#include "jtag.h" #include "jtag.h"
#include "bitbang.h" #include "bitbang.h"

102
src/jtag/ftd2xx.c
View File

@ -17,17 +17,23 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#if IS_CYGWIN == 1 #if IS_CYGWIN == 1
#include "windows.h" #include "windows.h"
#undef ERROR #undef ERROR
#endif #endif
#include "replacements.h"
/* project specific includes */ /* project specific includes */
#include "log.h" #include "log.h"
#include "types.h" #include "types.h"
#include "jtag.h" #include "jtag.h"
#include "configuration.h" #include "configuration.h"
#include "time_support.h"
/* system includes */ /* system includes */
#include <string.h> #include <string.h>
@ -222,6 +228,7 @@ int ftd2xx_send_and_recv(jtag_command_t *first, jtag_command_t *last)
#ifdef _DEBUG_USB_IO_ #ifdef _DEBUG_USB_IO_
struct timeval start, inter, inter2, end; struct timeval start, inter, inter2, end;
struct timeval d_inter, d_inter2, d_end;
#endif #endif
#ifdef _DEBUG_USB_COMMS_ #ifdef _DEBUG_USB_COMMS_
@ -272,9 +279,11 @@ int ftd2xx_send_and_recv(jtag_command_t *first, jtag_command_t *last)
#ifdef _DEBUG_USB_IO_ #ifdef _DEBUG_USB_IO_
gettimeofday(&end, NULL); gettimeofday(&end, NULL);
INFO("inter: %i.%i, inter2: %i.%i end: %i.%i", inter.tv_sec - start.tv_sec, inter.tv_usec - start.tv_usec, timeval_subtract(&d_inter, &inter, &start);
inter2.tv_sec - start.tv_sec, inter2.tv_usec - start.tv_usec, timeval_subtract(&d_inter2, &inter2, &start);
end.tv_sec - start.tv_sec, end.tv_usec - start.tv_usec); timeval_subtract(&d_end, &end, &start);
INFO("inter: %i.%i, inter2: %i.%i end: %i.%i", d_inter.tv_sec, d_inter.tv_usec, d_inter2.tv_sec, d_inter2.tv_usec, d_end.tv_sec, d_end.tv_usec);
#endif #endif
@ -324,6 +333,46 @@ int ftd2xx_send_and_recv(jtag_command_t *first, jtag_command_t *last)
return ERROR_OK; return ERROR_OK;
} }
void ftd2xx_add_pathmove(pathmove_command_t *cmd)
{
int num_states = cmd->num_states;
u8 tms_byte;
int state_count;
state_count = 0;
while (num_states)
{
tms_byte = 0x0;
int bit_count = 0;
/* command "Clock Data to TMS/CS Pin (no Read)" */
BUFFER_ADD = 0x4b;
/* number of states remaining */
BUFFER_ADD = (num_states % 7) - 1;
while (num_states % 7)
{
if (tap_transitions[cur_state].low == cmd->path[state_count])
buf_set_u32(&tms_byte, bit_count++, 1, 0x0);
else if (tap_transitions[cur_state].high == cmd->path[state_count])
buf_set_u32(&tms_byte, bit_count++, 1, 0x1);
else
{
ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_strings[cur_state], tap_state_strings[cmd->path[state_count]]);
exit(-1);
}
cur_state = cmd->path[state_count];
state_count++;
num_states--;
}
BUFFER_ADD = tms_byte;
}
end_state = cur_state;
}
void ftd2xx_add_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size) void ftd2xx_add_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size)
{ {
int num_bytes = (scan_size + 7) / 8; int num_bytes = (scan_size + 7) / 8;
@ -331,6 +380,8 @@ void ftd2xx_add_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size
int cur_byte = 0; int cur_byte = 0;
int last_bit; int last_bit;
if ((!ir_scan && (cur_state != TAP_SD)) || (ir_scan && (cur_state != TAP_SI)))
{
/* command "Clock Data to TMS/CS Pin (no Read)" */ /* command "Clock Data to TMS/CS Pin (no Read)" */
BUFFER_ADD = 0x4b; BUFFER_ADD = 0x4b;
/* scan 7 bit */ /* scan 7 bit */
@ -347,6 +398,7 @@ void ftd2xx_add_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size
cur_state = TAP_SD; cur_state = TAP_SD;
} }
//DEBUG("added TMS scan (no read)"); //DEBUG("added TMS scan (no read)");
}
/* add command for complete bytes */ /* add command for complete bytes */
if (num_bytes > 1) if (num_bytes > 1)
@ -370,7 +422,7 @@ void ftd2xx_add_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size
//DEBUG("added TDI bytes (i %i)", num_bytes); //DEBUG("added TDI bytes (i %i)", num_bytes);
} }
BUFFER_ADD = (num_bytes-2) & 0xff; BUFFER_ADD = (num_bytes-2) & 0xff;
BUFFER_ADD = (num_bytes >> 8) & 0xff; BUFFER_ADD = ((num_bytes-2) >> 8) & 0xff;
} }
if (type != SCAN_IN) if (type != SCAN_IN)
{ {
@ -440,15 +492,23 @@ void ftd2xx_add_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size
int ftd2xx_predict_scan_out(int scan_size, enum scan_type type) int ftd2xx_predict_scan_out(int scan_size, enum scan_type type)
{ {
int predicted_size = 6; int predicted_size = 3;
if (cur_state != TAP_SD)
predicted_size += 3;
if (type == SCAN_IN) /* only from device to host */ if (type == SCAN_IN) /* only from device to host */
{ {
/* complete bytes */
predicted_size += (CEIL(scan_size, 8) > 1) ? 3 : 0; predicted_size += (CEIL(scan_size, 8) > 1) ? 3 : 0;
/* remaining bits - 1 (up to 7) */
predicted_size += ((scan_size - 1) % 8) ? 2 : 0; predicted_size += ((scan_size - 1) % 8) ? 2 : 0;
} }
else /* host to device, or bidirectional */ else /* host to device, or bidirectional */
{ {
/* complete bytes */
predicted_size += (CEIL(scan_size, 8) > 1) ? (CEIL(scan_size, 8) + 3 - 1) : 0; predicted_size += (CEIL(scan_size, 8) > 1) ? (CEIL(scan_size, 8) + 3 - 1) : 0;
/* remaining bits -1 (up to 7) */
predicted_size += ((scan_size - 1) % 8) ? 3 : 0; predicted_size += ((scan_size - 1) % 8) ? 3 : 0;
} }
@ -589,6 +649,9 @@ int ftd2xx_execute_queue()
layout->reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst); layout->reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
require_send = 1; require_send = 1;
#ifdef _DEBUG_JTAG_IO_
DEBUG("trst: %i, srst: %i", cmd->cmd.reset->trst, cmd->cmd.reset->srst);
#endif
break; break;
case JTAG_RUNTEST: case JTAG_RUNTEST:
/* only send the maximum buffer size that FT2232C can handle */ /* only send the maximum buffer size that FT2232C can handle */
@ -644,6 +707,9 @@ int ftd2xx_execute_queue()
//DEBUG("added TMS scan (no read)"); //DEBUG("added TMS scan (no read)");
} }
require_send = 1; require_send = 1;
#ifdef _DEBUG_JTAG_IO_
DEBUG("runtest: %i, end in %i", cmd->cmd.runtest->num_cycles, end_state);
#endif
break; break;
case JTAG_STATEMOVE: case JTAG_STATEMOVE:
/* only send the maximum buffer size that FT2232C can handle */ /* only send the maximum buffer size that FT2232C can handle */
@ -665,6 +731,24 @@ int ftd2xx_execute_queue()
//DEBUG("added TMS scan (no read)"); //DEBUG("added TMS scan (no read)");
cur_state = end_state; cur_state = end_state;
require_send = 1; require_send = 1;
#ifdef _DEBUG_JTAG_IO_
DEBUG("statemove: %i", end_state);
#endif
break;
case JTAG_PATHMOVE:
/* only send the maximum buffer size that FT2232C can handle */
predicted_size = 3 * CEIL(cmd->cmd.pathmove->num_states, 7);
if (ftd2xx_buffer_size + predicted_size + 1 > FTD2XX_BUFFER_SIZE)
{
ftd2xx_send_and_recv(first_unsent, cmd);
require_send = 0;
first_unsent = cmd;
}
ftd2xx_add_pathmove(cmd->cmd.pathmove);
require_send = 1;
#ifdef _DEBUG_JTAG_IO_
DEBUG("pathmove: %i states, end in %i", cmd->cmd.pathmove->num_states, cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
#endif
break; break;
case JTAG_SCAN: case JTAG_SCAN:
scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer); scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer);
@ -685,11 +769,17 @@ int ftd2xx_execute_queue()
require_send = 1; require_send = 1;
if (buffer) if (buffer)
free(buffer); free(buffer);
#ifdef _DEBUG_JTAG_IO_
DEBUG("%s scan, %i bit, end in %i", (cmd->cmd.scan->ir_scan) ? "IR" : "DR", scan_size, end_state);
#endif
break; break;
case JTAG_SLEEP: case JTAG_SLEEP:
ftd2xx_send_and_recv(first_unsent, cmd); ftd2xx_send_and_recv(first_unsent, cmd);
first_unsent = cmd->next; first_unsent = cmd->next;
jtag_sleep(cmd->cmd.sleep->us); jtag_sleep(cmd->cmd.sleep->us);
#ifdef _DEBUG_JTAG_IO_
DEBUG("sleep %i usec", cmd->cmd.sleep->us);
#endif
break; break;
default: default:
ERROR("BUG: unknown JTAG command type encountered"); ERROR("BUG: unknown JTAG command type encountered");
@ -740,7 +830,7 @@ int ftd2xx_init(void)
ftd2xx_device_desc = "Dual RS232"; ftd2xx_device_desc = "Dual RS232";
} }
#if IS_CYGWIN != 1 #if IS_WIN32 == 0
/* Add JTAGkey Vid/Pid to the linux driver */ /* Add JTAGkey Vid/Pid to the linux driver */
if ((status = FT_SetVIDPID(ftd2xx_vid, ftd2xx_pid)) != FT_OK) if ((status = FT_SetVIDPID(ftd2xx_vid, ftd2xx_pid)) != FT_OK)
{ {

3
src/jtag/ftdi2232.c
View File

@ -17,6 +17,9 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
/* project specific includes */ /* project specific includes */
#include "log.h" #include "log.h"

5
src/jtag/jtag.c
View File

@ -17,7 +17,12 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "replacements.h"
#include "jtag.h" #include "jtag.h"
#include "command.h" #include "command.h"

61
src/jtag/parport.c
View File

@ -17,22 +17,34 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#include "log.h" #endif
#include "replacements.h"
#include "jtag.h" #include "jtag.h"
#include "bitbang.h" #include "bitbang.h"
/* system includes */ /* system includes */
// -ino: 060521-1036 // -ino: 060521-1036
#ifdef __FreeBSD__ #ifdef __FreeBSD__
#include <sys/types.h> #include <sys/types.h>
#include <machine/sysarch.h> #include <machine/sysarch.h>
#include <machine/cpufunc.h> #include <machine/cpufunc.h>
#define ioperm(startport,length,enable)\ #define ioperm(startport,length,enable)\
i386_set_ioperm((startport), (length), (enable)) i386_set_ioperm((startport), (length), (enable))
#else #else
#ifndef _WIN32
#include <sys/io.h> #include <sys/io.h>
#endif #else
#include "errno.h"
#endif /* _WIN32 */
#endif /* __FreeBSD__ */
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -45,6 +57,16 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
#if PARPORT_USE_GIVEIO == 1
#if IS_CYGWIN == 1
#include <windows.h>
#include <errno.h>
#undef ERROR
#endif
#endif
#include "log.h"
/* parallel port cable description /* parallel port cable description
*/ */
typedef struct cable_s typedef struct cable_s
@ -221,6 +243,32 @@ int parport_register_commands(struct command_context_s *cmd_ctx)
return ERROR_OK; return ERROR_OK;
} }
#if PARPORT_USE_GIVEIO == 1
int parport_get_giveio_access()
{
HANDLE h;
OSVERSIONINFO version;
version.dwOSVersionInfoSize = sizeof version;
if (!GetVersionEx( &version )) {
errno = EINVAL;
return -1;
}
if (version.dwPlatformId != VER_PLATFORM_WIN32_NT)
return 0;
h = CreateFile( "\\\\.\\giveio", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
if (h == INVALID_HANDLE_VALUE) {
errno = ENODEV;
return -1;
}
CloseHandle( h );
return 0;
}
#endif
int parport_init(void) int parport_init(void)
{ {
cable_t *cur_cable; cable_t *cur_cable;
@ -303,11 +351,16 @@ int parport_init(void)
dataport = parport_port; dataport = parport_port;
statusport = parport_port + 1; statusport = parport_port + 1;
if (ioperm(dataport, 3, 1) != 0) { #if PARPORT_USE_GIVEIO == 1
if (parport_get_giveio_access() != 0)
#else /* PARPORT_USE_GIVEIO */
if (ioperm(dataport, 3, 1) != 0)
#endif /* PARPORT_USE_GIVEIO */
{
ERROR("missing privileges for direct i/o"); ERROR("missing privileges for direct i/o");
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
} }
#endif #endif /* PARPORT_USE_PPDEV */
parport_reset(0, 0); parport_reset(0, 0);
parport_write(0, 0, 0); parport_write(0, 0, 0);

8
src/openocd.c
View File

@ -18,10 +18,10 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#define OPENOCD_VERSION "Open On-Chip Debugger (2006-06-25 23:00 CEST)" #define OPENOCD_VERSION "Open On-Chip Debugger (2006-07-15 12:00 CEST)"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include "config.h"
#endif #endif
#include "log.h" #include "log.h"
@ -40,13 +40,9 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>
#include <sys/poll.h>
#include <strings.h> #include <strings.h>
#include <netinet/in.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <signal.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>

50
src/server/gdb_server.c
View File

@ -17,7 +17,11 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "replacements.h"
#include "gdb_server.h" #include "gdb_server.h"
@ -32,21 +36,6 @@
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#ifndef HAVE_STRNDUP
#include <stdio.h>
char* strndup(const char *s, size_t n)
{
size_t len = strnlen (s, n);
char *new = (char *) malloc (len + 1);
if (new == NULL)
return NULL;
new[len] = '\0';
return (char *) memcpy (new, s, len);
}
#endif
#if 0 #if 0
#define _DEBUG_GDB_IO_ #define _DEBUG_GDB_IO_
#endif #endif
@ -93,11 +82,26 @@ int gdb_get_char(connection_t *connection, int* next_char)
return ERROR_OK; return ERROR_OK;
} }
while ((gdb_con->buf_cnt = read(connection->fd, gdb_con->buffer, GDB_BUFFER_SIZE)) <= 0) while ((gdb_con->buf_cnt = read_socket(connection->fd, gdb_con->buffer, GDB_BUFFER_SIZE)) <= 0)
{ {
if (gdb_con->buf_cnt == 0) if (gdb_con->buf_cnt == 0)
return ERROR_SERVER_REMOTE_CLOSED; return ERROR_SERVER_REMOTE_CLOSED;
#ifdef _WIN32
errno = WSAGetLastError();
switch(errno)
{
case WSAEWOULDBLOCK:
usleep(1000);
break;
case WSAECONNABORTED:
return ERROR_SERVER_REMOTE_CLOSED;
default:
ERROR("read: %d", strerror(errno));
exit(-1);
}
#else
switch(errno) switch(errno)
{ {
case EAGAIN: case EAGAIN:
@ -111,6 +115,7 @@ int gdb_get_char(connection_t *connection, int* next_char)
ERROR("read: %s", strerror(errno)); ERROR("read: %s", strerror(errno));
exit(-1); exit(-1);
} }
#endif
} }
debug_buffer = malloc(gdb_con->buf_cnt + 1); debug_buffer = malloc(gdb_con->buf_cnt + 1);
@ -155,14 +160,14 @@ int gdb_put_packet(connection_t *connection, char *buffer, int len)
DEBUG("sending packet '$%s#%2.2x'", debug_buffer, my_checksum); DEBUG("sending packet '$%s#%2.2x'", debug_buffer, my_checksum);
free(debug_buffer); free(debug_buffer);
write(connection->fd, "$", 1); write_socket(connection->fd, "$", 1);
if (len > 0) if (len > 0)
write(connection->fd, buffer, len); write_socket(connection->fd, buffer, len);
write(connection->fd, "#", 1); write_socket(connection->fd, "#", 1);
snprintf(checksum, 3, "%2.2x", my_checksum); snprintf(checksum, 3, "%2.2x", my_checksum);
write(connection->fd, checksum, 2); write_socket(connection->fd, checksum, 2);
if ((retval = gdb_get_char(connection, &reply)) != ERROR_OK) if ((retval = gdb_get_char(connection, &reply)) != ERROR_OK)
return retval; return retval;
@ -310,12 +315,12 @@ int gdb_get_packet(connection_t *connection, char *buffer, int *len)
if (my_checksum == strtoul(checksum, NULL, 16)) if (my_checksum == strtoul(checksum, NULL, 16))
{ {
write (connection->fd, "+", 1); write_socket(connection->fd, "+", 1);
break; break;
} }
WARNING("checksum error, requesting retransmission"); WARNING("checksum error, requesting retransmission");
write(connection->fd, "-", 1); write_socket(connection->fd, "-", 1);
} }
return ERROR_OK; return ERROR_OK;
@ -1087,6 +1092,7 @@ int gdb_init()
DEBUG("gdb service for target %s at port %i", target->type->name, gdb_port + i); DEBUG("gdb service for target %s at port %i", target->type->name, gdb_port + i);
i++;
target = target->next; target = target->next;
} }

99
src/server/server.c
View File

@ -17,6 +17,12 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "replacements.h"
#include "server.h" #include "server.h"
#include "log.h" #include "log.h"
@ -29,7 +35,6 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>
#include <fcntl.h> #include <fcntl.h>
#include <signal.h> #include <signal.h>
@ -63,7 +68,7 @@ int add_connection(service_t *service, command_context_t *cmd_ctx)
} }
else else
{ {
close(c->fd); close_socket(c->fd);
INFO("attempted '%s' connection rejected", service->name); INFO("attempted '%s' connection rejected", service->name);
free(c); free(c);
} }
@ -97,7 +102,7 @@ int remove_connection(service_t *service, connection_t *connection)
{ {
service->connections = next; service->connections = next;
service->connection_closed(c); service->connection_closed(c);
close(c->fd); close_socket(c->fd);
command_done(c->cmd_ctx); command_done(c->cmd_ctx);
@ -119,7 +124,6 @@ int add_service(char *name, enum connection_type type, unsigned short port, int
{ {
service_t *c, *p; service_t *c, *p;
int so_reuseaddr_option = 1; int so_reuseaddr_option = 1;
int oldopts;
c = malloc(sizeof(service_t)); c = malloc(sizeof(service_t));
@ -141,10 +145,9 @@ int add_service(char *name, enum connection_type type, unsigned short port, int
exit(-1); exit(-1);
} }
setsockopt(c->fd, SOL_SOCKET, SO_REUSEADDR, &so_reuseaddr_option, sizeof(int)); setsockopt(c->fd, SOL_SOCKET, SO_REUSEADDR, (void*)&so_reuseaddr_option, sizeof(int));
oldopts = fcntl(c->fd, F_GETFL, 0); socket_nonblock(c->fd);
fcntl(c->fd, F_SETFL, oldopts | O_NONBLOCK);
memset(&c->sin, 0, sizeof(c->sin)); memset(&c->sin, 0, sizeof(c->sin));
c->sin.sin_family = AF_INET; c->sin.sin_family = AF_INET;
@ -205,6 +208,31 @@ int remove_service(unsigned short port)
return ERROR_OK; return ERROR_OK;
} }
int remove_services()
{
service_t *c = services;
/* loop service */
while(c)
{
service_t *next = c->next;
if (c->name)
free(c->name);
if (c->priv)
free(c->priv);
/* delete service */
free(c);
/* remember the last service for unlinking */
c = next;
}
return ERROR_OK;
}
int server_loop(command_context_t *command_context) int server_loop(command_context_t *command_context)
{ {
service_t *service; service_t *service;
@ -217,8 +245,10 @@ int server_loop(command_context_t *command_context)
/* used in accept() */ /* used in accept() */
int retval; int retval;
#ifndef _WIN32
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
ERROR("couldn't set SIGPIPE to SIG_IGN"); ERROR("couldn't set SIGPIPE to SIG_IGN");
#endif
/* do regular tasks after at most 10ms */ /* do regular tasks after at most 10ms */
tv.tv_sec = 0; tv.tv_sec = 0;
@ -256,11 +286,26 @@ int server_loop(command_context_t *command_context)
} }
} }
#ifndef _WIN32
/* add STDIN to read_fds */ /* add STDIN to read_fds */
FD_SET(fileno(stdin), &read_fds); FD_SET(fileno(stdin), &read_fds);
#endif
if ((retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv)) == -1) if ((retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv)) == -1)
{ {
#ifdef _WIN32
errno = WSAGetLastError();
if (errno == WSAEINTR)
FD_ZERO(&read_fds);
else
{
ERROR("error during select: %d", strerror(errno));
exit(-1);
}
#else
if (errno == EINTR) if (errno == EINTR)
FD_ZERO(&read_fds); FD_ZERO(&read_fds);
else else
@ -268,6 +313,7 @@ int server_loop(command_context_t *command_context)
ERROR("error during select: %s", strerror(errno)); ERROR("error during select: %s", strerror(errno));
exit(-1); exit(-1);
} }
#endif
} }
target_call_timer_callbacks(); target_call_timer_callbacks();
@ -300,7 +346,7 @@ int server_loop(command_context_t *command_context)
unsigned int address_size = sizeof(sin); unsigned int address_size = sizeof(sin);
int tmp_fd; int tmp_fd;
tmp_fd = accept(service->fd, (struct sockaddr *)&service->sin, &address_size); tmp_fd = accept(service->fd, (struct sockaddr *)&service->sin, &address_size);
close(tmp_fd); close_socket(tmp_fd);
INFO("rejected '%s' connection, no more connections allowed", service->name); INFO("rejected '%s' connection, no more connections allowed", service->name);
} }
} }
@ -328,6 +374,7 @@ int server_loop(command_context_t *command_context)
} }
} }
#ifndef _WIN32
if (FD_ISSET(fileno(stdin), &read_fds)) if (FD_ISSET(fileno(stdin), &read_fds))
{ {
if (getc(stdin) == 'x') if (getc(stdin) == 'x')
@ -335,13 +382,49 @@ int server_loop(command_context_t *command_context)
shutdown_openocd = 1; shutdown_openocd = 1;
} }
} }
#endif
} }
return ERROR_OK; return ERROR_OK;
} }
#ifdef _WIN32
BOOL WINAPI ControlHandler(DWORD dwCtrlType)
{
shutdown_openocd = 1;
return TRUE;
}
#endif
int server_init() int server_init()
{ {
#ifdef _WIN32
WORD wVersionRequested;
WSADATA wsaData;
wVersionRequested = MAKEWORD( 2, 2 );
if (WSAStartup(wVersionRequested, &wsaData) != 0)
{
ERROR("Failed to Open Winsock");
exit(-1);
}
SetConsoleCtrlHandler( ControlHandler, TRUE );
#endif
return ERROR_OK;
}
int server_close()
{
remove_services();
#ifdef _WIN32
WSACleanup();
SetConsoleCtrlHandler( ControlHandler, FALSE );
#endif
return ERROR_OK; return ERROR_OK;
} }

3
src/server/server.h
View File

@ -22,10 +22,9 @@
#include "command.h" #include "command.h"
#include "binarybuffer.h" #include "binarybuffer.h"
#include "replacements.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
enum connection_type enum connection_type
{ {

64
src/server/telnet_server.c
View File

@ -17,6 +17,12 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "replacements.h"
#include "telnet_server.h" #include "telnet_server.h"
#include "server.h" #include "server.h"
@ -47,15 +53,15 @@ void telnet_prompt(connection_t *connection)
{ {
telnet_connection_t *t_con = connection->priv; telnet_connection_t *t_con = connection->priv;
write(connection->fd, t_con->prompt, strlen(t_con->prompt)); write_socket(connection->fd, t_con->prompt, strlen(t_con->prompt));
} }
int telnet_output(struct command_context_s *cmd_ctx, char* line) int telnet_output(struct command_context_s *cmd_ctx, char* line)
{ {
connection_t *connection = cmd_ctx->output_handler_priv; connection_t *connection = cmd_ctx->output_handler_priv;
write(connection->fd, line, strlen(line)); write_socket(connection->fd, line, strlen(line));
write(connection->fd, "\r\n\0", 3); write_socket(connection->fd, "\r\n\0", 3);
return ERROR_OK; return ERROR_OK;
} }
@ -109,13 +115,13 @@ int telnet_new_connection(connection_t *connection)
command_set_output_handler(connection->cmd_ctx, telnet_output, connection); command_set_output_handler(connection->cmd_ctx, telnet_output, connection);
/* negotiate telnet options */ /* negotiate telnet options */
write(connection->fd, negotiate, strlen(negotiate)); write_socket(connection->fd, negotiate, strlen(negotiate));
/* print connection banner */ /* print connection banner */
if (telnet_service->banner) if (telnet_service->banner)
{ {
write(connection->fd, telnet_service->banner, strlen(telnet_service->banner)); write_socket(connection->fd, telnet_service->banner, strlen(telnet_service->banner));
write(connection->fd, "\r\n\0", 3); write_socket(connection->fd, "\r\n\0", 3);
} }
telnet_prompt(connection); telnet_prompt(connection);
@ -138,13 +144,13 @@ void telnet_clear_line(connection_t *connection, telnet_connection_t *t_con)
/* move to end of line */ /* move to end of line */
if (t_con->line_cursor < t_con->line_size) if (t_con->line_cursor < t_con->line_size)
{ {
write(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); write_socket(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor);
} }
/* backspace, overwrite with space, backspace */ /* backspace, overwrite with space, backspace */
while (t_con->line_size > 0) while (t_con->line_size > 0)
{ {
write(connection->fd, "\b \b", 3); write_socket(connection->fd, "\b \b", 3);
t_con->line_size--; t_con->line_size--;
} }
t_con->line_cursor = 0; t_con->line_cursor = 0;
@ -158,7 +164,7 @@ int telnet_input(connection_t *connection)
telnet_connection_t *t_con = connection->priv; telnet_connection_t *t_con = connection->priv;
command_context_t *command_context = connection->cmd_ctx; command_context_t *command_context = connection->cmd_ctx;
bytes_read = read(connection->fd, buffer, TELNET_BUFFER_SIZE); bytes_read = read_socket(connection->fd, buffer, TELNET_BUFFER_SIZE);
if (bytes_read == 0) if (bytes_read == 0)
return ERROR_SERVER_REMOTE_CLOSED; return ERROR_SERVER_REMOTE_CLOSED;
@ -182,7 +188,7 @@ int telnet_input(connection_t *connection)
{ {
if (isprint(*buf_p)) /* printable character */ if (isprint(*buf_p)) /* printable character */
{ {
write(connection->fd, buf_p, 1); write_socket(connection->fd, buf_p, 1);
if (t_con->line_cursor == t_con->line_size) if (t_con->line_cursor == t_con->line_size)
{ {
t_con->line[t_con->line_size++] = *buf_p; t_con->line[t_con->line_size++] = *buf_p;
@ -194,10 +200,10 @@ int telnet_input(connection_t *connection)
memmove(t_con->line + t_con->line_cursor + 1, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); memmove(t_con->line + t_con->line_cursor + 1, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor);
t_con->line[t_con->line_cursor++] = *buf_p; t_con->line[t_con->line_cursor++] = *buf_p;
t_con->line_size++; t_con->line_size++;
write(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); write_socket(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor);
for (i = t_con->line_cursor; i < t_con->line_size; i++) for (i = t_con->line_cursor; i < t_con->line_size; i++)
{ {
write(connection->fd, "\b", 1); write_socket(connection->fd, "\b", 1);
} }
} }
} }
@ -225,7 +231,7 @@ int telnet_input(connection_t *connection)
} }
t_con->line[t_con->line_size] = 0; t_con->line[t_con->line_size] = 0;
write(connection->fd, "\r\n\x00", 3); write_socket(connection->fd, "\r\n\x00", 3);
if (strcmp(t_con->line, "history") == 0) if (strcmp(t_con->line, "history") == 0)
{ {
@ -234,8 +240,8 @@ int telnet_input(connection_t *connection)
{ {
if (t_con->history[i]) if (t_con->history[i])
{ {
write(connection->fd, t_con->history[i], strlen(t_con->history[i])); write_socket(connection->fd, t_con->history[i], strlen(t_con->history[i]));
write(connection->fd, "\r\n\x00", 3); write_socket(connection->fd, "\r\n\x00", 3);
} }
} }
telnet_prompt(connection); telnet_prompt(connection);
@ -299,16 +305,16 @@ int telnet_input(connection_t *connection)
if (t_con->line_cursor != t_con->line_size) if (t_con->line_cursor != t_con->line_size)
{ {
int i; int i;
write(connection->fd, "\b", 1); write_socket(connection->fd, "\b", 1);
t_con->line_cursor--; t_con->line_cursor--;
t_con->line_size--; t_con->line_size--;
memmove(t_con->line + t_con->line_cursor, t_con->line + t_con->line_cursor + 1, t_con->line_size - t_con->line_cursor); memmove(t_con->line + t_con->line_cursor, t_con->line + t_con->line_cursor + 1, t_con->line_size - t_con->line_cursor);
write(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); write_socket(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor);
write(connection->fd, " \b", 2); write_socket(connection->fd, " \b", 2);
for (i = t_con->line_cursor; i < t_con->line_size; i++) for (i = t_con->line_cursor; i < t_con->line_size; i++)
{ {
write(connection->fd, "\b", 1); write_socket(connection->fd, "\b", 1);
} }
} }
else else
@ -316,7 +322,7 @@ int telnet_input(connection_t *connection)
t_con->line_size--; t_con->line_size--;
t_con->line_cursor--; t_con->line_cursor--;
/* back space: move the 'printer' head one char back, overwrite with space, move back again */ /* back space: move the 'printer' head one char back, overwrite with space, move back again */
write(connection->fd, "\b \b", 3); write_socket(connection->fd, "\b \b", 3);
} }
} }
} }
@ -328,7 +334,7 @@ int telnet_input(connection_t *connection)
{ {
if (t_con->line_cursor > 0) if (t_con->line_cursor > 0)
{ {
write(connection->fd, "\b", 1); write_socket(connection->fd, "\b", 1);
t_con->line_cursor--; t_con->line_cursor--;
} }
t_con->state = TELNET_STATE_DATA; t_con->state = TELNET_STATE_DATA;
@ -337,7 +343,7 @@ int telnet_input(connection_t *connection)
{ {
if (t_con->line_cursor < t_con->line_size) if (t_con->line_cursor < t_con->line_size)
{ {
write(connection->fd, t_con->line + t_con->line_cursor++, 1); write_socket(connection->fd, t_con->line + t_con->line_cursor++, 1);
} }
t_con->state = TELNET_STATE_DATA; t_con->state = TELNET_STATE_DATA;
} }
@ -382,7 +388,7 @@ int telnet_input(connection_t *connection)
{ {
if (t_con->line_cursor > 0) if (t_con->line_cursor > 0)
{ {
write(connection->fd, "\b", 1); write_socket(connection->fd, "\b", 1);
t_con->line_cursor--; t_con->line_cursor--;
} }
t_con->state = TELNET_STATE_DATA; t_con->state = TELNET_STATE_DATA;
@ -391,7 +397,7 @@ int telnet_input(connection_t *connection)
{ {
if (t_con->line_cursor < t_con->line_size) if (t_con->line_cursor < t_con->line_size)
{ {
write(connection->fd, t_con->line + t_con->line_cursor++, 1); write_socket(connection->fd, t_con->line + t_con->line_cursor++, 1);
} }
t_con->state = TELNET_STATE_DATA; t_con->state = TELNET_STATE_DATA;
} }
@ -404,7 +410,7 @@ int telnet_input(connection_t *connection)
t_con->line_size = strlen(t_con->history[last_history]); t_con->line_size = strlen(t_con->history[last_history]);
t_con->line_cursor = t_con->line_size; t_con->line_cursor = t_con->line_size;
memcpy(t_con->line, t_con->history[last_history], t_con->line_size + 1); memcpy(t_con->line, t_con->history[last_history], t_con->line_size + 1);
write(connection->fd, t_con->line, t_con->line_size); write_socket(connection->fd, t_con->line, t_con->line_size);
t_con->current_history = last_history; t_con->current_history = last_history;
} }
t_con->state = TELNET_STATE_DATA; t_con->state = TELNET_STATE_DATA;
@ -418,7 +424,7 @@ int telnet_input(connection_t *connection)
t_con->line_size = strlen(t_con->history[next_history]); t_con->line_size = strlen(t_con->history[next_history]);
t_con->line_cursor = t_con->line_size; t_con->line_cursor = t_con->line_size;
memcpy(t_con->line, t_con->history[next_history], t_con->line_size + 1); memcpy(t_con->line, t_con->history[next_history], t_con->line_size + 1);
write(connection->fd, t_con->line, t_con->line_size); write_socket(connection->fd, t_con->line, t_con->line_size);
t_con->current_history = next_history; t_con->current_history = next_history;
} }
t_con->state = TELNET_STATE_DATA; t_con->state = TELNET_STATE_DATA;
@ -445,14 +451,14 @@ int telnet_input(connection_t *connection)
memmove(t_con->line + t_con->line_cursor, t_con->line + t_con->line_cursor + 1, t_con->line_size - t_con->line_cursor); memmove(t_con->line + t_con->line_cursor, t_con->line + t_con->line_cursor + 1, t_con->line_size - t_con->line_cursor);
/* print remainder of buffer */ /* print remainder of buffer */
write(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor); write_socket(connection->fd, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor);
/* overwrite last char with whitespace */ /* overwrite last char with whitespace */
write(connection->fd, " \b", 2); write_socket(connection->fd, " \b", 2);
/* move back to cursor position*/ /* move back to cursor position*/
for (i = t_con->line_cursor; i < t_con->line_size; i++) for (i = t_con->line_cursor; i < t_con->line_size; i++)
{ {
write(connection->fd, "\b", 1); write_socket(connection->fd, "\b", 1);
} }
} }

3
src/target/algorithm.c
View File

@ -17,7 +17,10 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "algorithm.h" #include "algorithm.h"
#include "log.h" #include "log.h"

2
src/target/arm720t.c
View File

@ -17,7 +17,9 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "arm720t.h" #include "arm720t.h"
#include "jtag.h" #include "jtag.h"

6
src/target/arm7_9_common.c
View File

@ -17,7 +17,11 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "replacements.h"
#include "embeddedice.h" #include "embeddedice.h"
#include "target.h" #include "target.h"
@ -186,7 +190,7 @@ int arm7_9_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
else else
{ {
target->type->read_memory(target, breakpoint->address, 2, 1, breakpoint->orig_instr); target->type->read_memory(target, breakpoint->address, 2, 1, breakpoint->orig_instr);
target->type->write_memory(target, breakpoint->address, 2, 1, (u8*)(&arm7_9->arm_bkpt)); target->type->write_memory(target, breakpoint->address, 2, 1, (u8*)(&arm7_9->thumb_bkpt));
} }
breakpoint->set = 1; breakpoint->set = 1;
} }

2
src/target/arm7tdmi.c
View File

@ -17,7 +17,9 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "arm7tdmi.h" #include "arm7tdmi.h"

2
src/target/arm920t.c
View File

@ -17,7 +17,9 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "arm920t.h" #include "arm920t.h"
#include "jtag.h" #include "jtag.h"

2
src/target/arm9tdmi.c
View File

@ -17,7 +17,9 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "arm9tdmi.h" #include "arm9tdmi.h"

4
src/target/arm_disassembler.c
View File

@ -17,6 +17,10 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "arm_disassembler.h" #include "arm_disassembler.h"
#include "log.h" #include "log.h"

2
src/target/arm_jtag.c
View File

@ -17,7 +17,9 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "arm_jtag.h" #include "arm_jtag.h"

4
src/target/armv4_5.c
View File

@ -17,7 +17,11 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "replacements.h"
#include "arm_disassembler.h" #include "arm_disassembler.h"

4
src/target/armv4_5_cache.c
View File

@ -17,6 +17,10 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "armv4_5_cache.h" #include "armv4_5_cache.h"
#include "log.h" #include "log.h"

4
src/target/armv4_5_mmu.c
View File

@ -17,6 +17,10 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "arm7_9_common.h" #include "arm7_9_common.h"
#include "log.h" #include "log.h"
#include "command.h" #include "command.h"

2
src/target/breakpoints.c
View File

@ -17,7 +17,9 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>

2
src/target/embeddedice.c
View File

@ -17,7 +17,9 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "embeddedice.h" #include "embeddedice.h"

2
src/target/etm.c
View File

@ -17,7 +17,9 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "etm.h" #include "etm.h"

4
src/target/register.c
View File

@ -17,6 +17,10 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "register.h" #include "register.h"
#include "log.h" #include "log.h"

12
src/target/target.c
View File

@ -17,7 +17,10 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "target.h" #include "target.h"
#include "log.h" #include "log.h"
@ -1507,7 +1510,7 @@ int handle_load_binary_command(struct command_context_s *cmd_ctx, char *cmd, cha
u8 *buffer; u8 *buffer;
u32 buf_cnt; u32 buf_cnt;
struct timeval start, end; struct timeval start, end, duration;
target_t *target = get_current_target(cmd_ctx); target_t *target = get_current_target(cmd_ctx);
@ -1526,7 +1529,7 @@ int handle_load_binary_command(struct command_context_s *cmd_ctx, char *cmd, cha
return ERROR_OK; return ERROR_OK;
} }
if (!(binary = fopen(args[0], "r"))) if (!(binary = fopen(args[0], "rb")))
{ {
ERROR("couldn't open %s: %s", args[0], strerror(errno)); ERROR("couldn't open %s: %s", args[0], strerror(errno));
command_print(cmd_ctx, "error accessing file %s", args[0]); command_print(cmd_ctx, "error accessing file %s", args[0]);
@ -1550,7 +1553,8 @@ int handle_load_binary_command(struct command_context_s *cmd_ctx, char *cmd, cha
free(buffer); free(buffer);
command_print(cmd_ctx, "downloaded %lli byte in %is %ius", (long long) binary_stat.st_size, end.tv_sec - start.tv_sec, end.tv_usec - start.tv_usec); timeval_subtract(&duration, &end, &start);
command_print(cmd_ctx, "downloaded %lli byte in %is %ius", (long long) binary_stat.st_size, duration.tv_sec, duration.tv_usec);
fclose(binary); fclose(binary);
@ -1576,7 +1580,7 @@ int handle_dump_binary_command(struct command_context_s *cmd_ctx, char *cmd, cha
address = strtoul(args[1], NULL, 0); address = strtoul(args[1], NULL, 0);
size = strtoul(args[2], NULL, 0); size = strtoul(args[2], NULL, 0);
if (!(binary = fopen(args[0], "w"))) if (!(binary = fopen(args[0], "wb")))
{ {
ERROR("couldn't open %s for writing: %s", args[0], strerror(errno)); ERROR("couldn't open %s for writing: %s", args[0], strerror(errno));
command_print(cmd_ctx, "error accessing file %s", args[0]); command_print(cmd_ctx, "error accessing file %s", args[0]);

2
src/xsvf/Makefile.am
View File

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/src/gdb -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag $(all_includes) INCLUDES = -I$(top_srcdir)/src/server -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
noinst_LIBRARIES = libxsvf.a noinst_LIBRARIES = libxsvf.a
noinst_HEADERS = xsvf.h noinst_HEADERS = xsvf.h

22
src/xsvf/xsvf.c
View File

@ -17,6 +17,10 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "xsvf.h" #include "xsvf.h"
#include "jtag.h" #include "jtag.h"
@ -28,7 +32,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <netinet/in.h>
#include <string.h> #include <string.h>
#include <sys/time.h> #include <sys/time.h>
@ -111,6 +114,7 @@ int xsvf_read_xstates(int fd, enum tap_state *path, int max_path, int *path_len)
int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{ {
char c; char c;
u8 buf4[4], buf2[2];
unsigned char uc, uc2; unsigned char uc, uc2;
unsigned int ui; unsigned int ui;
unsigned short us; unsigned short us;
@ -252,11 +256,11 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
break; break;
case 0x04: /* XRUNTEST */ case 0x04: /* XRUNTEST */
DEBUG("XRUNTEST"); DEBUG("XRUNTEST");
if (read(xsvf_fd, &ui, 4) < 0) if (read(xsvf_fd, buf4, 4) < 0)
do_abort = 1; do_abort = 1;
else else
{ {
xruntest = ntohl(ui); xruntest = be_to_h_u32(buf4);
} }
break; break;
case 0x07: /* XREPEAT */ case 0x07: /* XREPEAT */
@ -270,11 +274,11 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
break; break;
case 0x08: /* XSDRSIZE */ case 0x08: /* XSDRSIZE */
DEBUG("XSDRSIZE"); DEBUG("XSDRSIZE");
if (read(xsvf_fd, &ui, 4) < 0) if (read(xsvf_fd, buf4, 4) < 0)
do_abort = 1; do_abort = 1;
else else
{ {
xsdrsize = ntohl(ui); xsdrsize = be_to_h_u32(buf4);
free(dr_out_buf); free(dr_out_buf);
free(dr_in_buf); free(dr_in_buf);
free(dr_in_mask); free(dr_in_mask);
@ -408,12 +412,12 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
break; break;
case 0x15: /* XSIR2 */ case 0x15: /* XSIR2 */
DEBUG("XSIR2"); DEBUG("XSIR2");
if (read(xsvf_fd, &us, 2) < 0) if (read(xsvf_fd, buf2, 2) < 0)
do_abort = 1; do_abort = 1;
else else
{ {
u8 *ir_buf; u8 *ir_buf;
us = ntohs(us); us = be_to_h_u16(buf2);
ir_buf = malloc((us + 7) / 8); ir_buf = malloc((us + 7) / 8);
if (xsvf_read_buffer(us, xsvf_fd, ir_buf) != ERROR_OK) if (xsvf_read_buffer(us, xsvf_fd, ir_buf) != ERROR_OK)
do_abort = 1; do_abort = 1;
@ -449,12 +453,12 @@ int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
break; break;
case 0x17: /* XWAIT */ case 0x17: /* XWAIT */
DEBUG("XWAIT"); DEBUG("XWAIT");
if ((read(xsvf_fd, &uc, 1) < 0) || (read(xsvf_fd, &uc2, 1) < 0) || (read(xsvf_fd, &ui, 4) < 0)) if ((read(xsvf_fd, &uc, 1) < 0) || (read(xsvf_fd, &uc2, 1) < 0) || (read(xsvf_fd, buf4, 4) < 0))
do_abort = 1; do_abort = 1;
else else
{ {
jtag_add_statemove(xsvf_to_tap[uc]); jtag_add_statemove(xsvf_to_tap[uc]);
ui = ntohl(ui); ui = be_to_h_u32(buf4);
jtag_add_sleep(ui); jtag_add_sleep(ui);
jtag_add_statemove(xsvf_to_tap[uc2]); jtag_add_statemove(xsvf_to_tap[uc2]);
} }