From: arniml Date: Wed, 15 Jul 2009 13:29:49 +0000 (+0000) Subject: [ 2816643 ] Matching arguments of funcion flasherase() X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4b1626a149908c7053ff7a2b1a88aca3dbfd42b6;p=pf3gnuchains%2Furjtag.git [ 2816643 ] Matching arguments of funcion flasherase() git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1659 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- diff --git a/jtag/ChangeLog b/jtag/ChangeLog index cbeee39..e4d657a 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,5 +1,8 @@ 2009-07-15 Arnim Laeuger + * src/flash/flash.c, include/jtag.h: + [ 2816643 ] Matching arguments of funcion flasherase() + * autogen.sh: forward command line parameters * configure.ac, src/Makefile.am: first issue of diff --git a/jtag/include/jtag.h b/jtag/include/jtag.h index 52b452d..d576936 100644 --- a/jtag/include/jtag.h +++ b/jtag/include/jtag.h @@ -58,6 +58,6 @@ void idcode( chain_t *chain , unsigned int bytes); void readmem( bus_t *bus, FILE *f, uint32_t addr, uint32_t len ); void writemem( bus_t *bus, FILE *f, uint32_t addr, uint32_t len ); -void flasherase( bus_t *bus, uint32_t addr, int number ); +void flasherase( bus_t *bus, uint32_t addr, uint32_t number ); #endif /* JTAG_H */ diff --git a/jtag/src/flash/flash.c b/jtag/src/flash/flash.c index b4f4233..c87f9e2 100644 --- a/jtag/src/flash/flash.c +++ b/jtag/src/flash/flash.c @@ -380,10 +380,10 @@ flashmem( bus_t *bus, FILE *f, uint32_t addr, int noverify ) } void -flasherase( bus_t *bus, uint32_t addr, int number ) +flasherase( bus_t *bus, uint32_t addr, uint32_t number ) { cfi_query_structure_t *cfi; - int i; + uint32_t i; int status = 0; int bus_width; int chip_width; diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog index 8370a9c..38a6276 100644 --- a/urjtag/ChangeLog +++ b/urjtag/ChangeLog @@ -1,5 +1,8 @@ 2009-07-15 Arnim Laeuger + * src/flash/flash.c, include/urjtag/flash.h: + [ 2816643 ] Matching arguments of funcion flasherase() + * configure.ac, Makefile.am: first issue of [ 2807343 ] urjtag dependencies missing autoconf checks disabled SVF or disabled BSDL prevents potfile creation diff --git a/urjtag/include/urjtag/flash.h b/urjtag/include/urjtag/flash.h index 0a7ea55..38123cc 100644 --- a/urjtag/include/urjtag/flash.h +++ b/urjtag/include/urjtag/flash.h @@ -72,6 +72,6 @@ int urj_flashmem (urj_bus_t *bus, FILE *f, uint32_t addr, int); int urj_flashmsbin (urj_bus_t *bus, FILE *f, int); /** @return URJ_STATUS_OK on success; URJ_STATUS_FAIL on error */ -int urj_flasherase (urj_bus_t *bus, uint32_t addr, int number); +int urj_flasherase (urj_bus_t *bus, uint32_t addr, uint32_t number); #endif /* URJ_FLASH_H */ diff --git a/urjtag/src/flash/flash.c b/urjtag/src/flash/flash.c index 2eb47ce..b40047b 100644 --- a/urjtag/src/flash/flash.c +++ b/urjtag/src/flash/flash.c @@ -470,10 +470,10 @@ urj_flashmem (urj_bus_t *bus, FILE *f, uint32_t addr, int noverify) } int -urj_flasherase (urj_bus_t *bus, uint32_t addr, int number) +urj_flasherase (urj_bus_t *bus, uint32_t addr, uint32_t number) { urj_flash_cfi_query_structure_t *cfi; - int i; + uint32_t i; int status = URJ_STATUS_OK; int bus_width; int chip_width;