From fa35d259032dffe483428ba8c6d3100bbc185bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= <mfro@mubf.de>
Date: Mon, 29 Jul 2013 21:06:18 +0000
Subject: [PATCH] modified callback type

---
 include/s19reader.h |  2 +-
 sources/basflash.c  | 16 ++--------------
 sources/s19reader.c | 12 +-----------
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/include/s19reader.h b/include/s19reader.h
index 5944240..af0c3ec 100644
--- a/include/s19reader.h
+++ b/include/s19reader.h
@@ -39,7 +39,7 @@ typedef enum
 	ILLEGAL_SECTOR	/* flash sector number invalid */
 } err_t;
 
-typedef err_t (*memcpy_callback_t)(uint8_t *dst, uint8_t *src, uint32_t length);
+typedef err_t (*memcpy_callback_t)(uint8_t *dst, uint8_t *src, size_t length);
 
 extern void srec_execute(char *filename);
 extern err_t read_srecords(char *filename, void **start_address, uint32_t *actual_length, memcpy_callback_t callback);
diff --git a/sources/basflash.c b/sources/basflash.c
index 3473fa1..122cec1 100644
--- a/sources/basflash.c
+++ b/sources/basflash.c
@@ -75,18 +75,6 @@ static err_t simulate()
 	return ret;
 }
 
-static err_t memcpy(uint8_t *dst, uint8_t *src, uint32_t length)
-{
-	uint8_t *end = src + length;
-
-	do
-	{
-		*dst++ = *src++;
-	} while (src < end);
-
-	return OK;
-}
-
 #ifdef _NOT_USED_
 static err_t flash(uint8_t *dst, uint8_t *src, uint32_t length)
 {
@@ -101,7 +89,7 @@ static err_t flash(uint8_t *dst, uint8_t *src, uint32_t length)
 /*
  * this callback verifies the data against the S-record file contents after a write to destination
  */
-static err_t verify(uint8_t *dst, uint8_t *src, uint32_t length)
+static err_t verify(uint8_t *dst, uint8_t *src, size_t length)
 {
 	uint8_t *end = src + length;
 
@@ -164,7 +152,7 @@ err_t erase_flash_sector(int sector_num)
 	return ILLEGAL_SECTOR;
 }
 
-err_t erase_flash_region(void *start_address, uint32_t length)
+err_t erase_flash_region(void *start_address, size_t length)
 {
 	err_t err;
 	int sector = -1;
diff --git a/sources/s19reader.c b/sources/s19reader.c
index ae824e8..cf345e4 100644
--- a/sources/s19reader.c
+++ b/sources/s19reader.c
@@ -27,6 +27,7 @@
 #include <stdbool.h>
 
 #include "bas_printf.h"
+#include "bas_string.h"
 #include "sd_card.h"
 #include "diskio.h"
 #include "ff.h"
@@ -309,17 +310,6 @@ static err_t simulate()
 	return ret;
 }
 
-static err_t memcpy(uint8_t *dst, uint8_t *src, uint32_t length)
-{
-	uint8_t *end = src + length;
-
-	do
-	{
-		*dst++ = *src++;
-	} while (src < end);
-
-	return OK;
-}
 
 #ifdef _NOT_USED_
 static err_t flash(uint8_t *dst, uint8_t *src, uint32_t length)