From 7a397d0eac294693e9ab610f7ec4bf92face3c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnim=20L=C3=A4uger?= <arniml@users.sourceforge.net>
Date: Wed, 15 Jul 2009 13:29:49 +0000
Subject: [PATCH] [ 2816643 ] Matching arguments of funcion flasherase()

git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1659 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
---
 jtag/ChangeLog                | 3 +++
 jtag/include/jtag.h           | 2 +-
 jtag/src/flash/flash.c        | 4 ++--
 urjtag/ChangeLog              | 3 +++
 urjtag/include/urjtag/flash.h | 2 +-
 urjtag/src/flash/flash.c      | 4 ++--
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index cbeee399..e4d657ab 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,5 +1,8 @@
 2009-07-15  Arnim Laeuger  <arniml>
 
+  * 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 52b452d8..d5769366 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 b4f42334..c87f9e26 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 8370a9cf..38a6276e 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -1,5 +1,8 @@
 2009-07-15  Arnim Laeuger  <arniml>
 
+  * 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 0a7ea551..38123cc7 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 2eb47ce6..b40047bd 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;