Add dataflashOffset_t typedef, and use it where is needed.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@964 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/drv/dataflash.c b/drv/dataflash.c
index 9089fa978d588556537f5306b67b735f86608cab..2c185083658ca34428418472312d7f0b52c8acf1 100644 (file)
--- a/drv/dataflash.c
+++ b/drv/dataflash.c
@@ -64,7 +64,7 @@ static bool page_modified = false;
  * This function send only 4 byte, for opcode, page address and
  * byte address.
  */
-static void send_cmd(dataflash_t page_addr, dataflash_t byte_addr, DataFlashOpcode opcode)
+static void send_cmd(dataflash_t page_addr, dataflashOffset_t byte_addr, DataFlashOpcode opcode)
 {
 
        /*
@@ -192,7 +192,7 @@ static uint8_t dataflash_stat(void)
  * return status register value.
  *
  */
-static uint8_t dataflash_cmd(dataflash_t page_addr, dataflash_t byte_addr, DataFlashOpcode opcode)
+static uint8_t dataflash_cmd(dataflash_t page_addr, dataflashOffset_t byte_addr, DataFlashOpcode opcode)
 {
 
        send_cmd(page_addr, byte_addr, opcode);
@@ -213,7 +213,7 @@ static uint8_t dataflash_cmd(dataflash_t page_addr, dataflash_t byte_addr, DataF
  * Read one byte from main data flash memory or buffer data
  * flash memory.
  */
-static uint8_t dataflash_read_byte(dataflash_t page_addr, dataflash_t byte_addr, DataFlashOpcode opcode)
+static uint8_t dataflash_read_byte(dataflash_t page_addr, dataflashOffset_t byte_addr, DataFlashOpcode opcode)
 {
        uint8_t data;
 
@@ -243,7 +243,7 @@ static uint8_t dataflash_read_byte(dataflash_t page_addr, dataflash_t byte_addr,
  * Read \a len bytes from main data flash memory or buffer data
  * flash memory, and put it in \a *block.
  */
-static void dataflash_read_block(dataflash_t page_addr, dataflash_t byte_addr, DataFlashOpcode opcode, uint8_t *block, dataflashSize_t len)
+static void dataflash_read_block(dataflash_t page_addr, dataflashOffset_t byte_addr, DataFlashOpcode opcode, uint8_t *block, dataflashSize_t len)
 {
 
        send_cmd(page_addr, byte_addr, opcode);
@@ -275,7 +275,7 @@ static void dataflash_read_block(dataflash_t page_addr, dataflash_t byte_addr, D
  * flash. To perform write in main memory you must before write in buffer
  * data flash memory, an then send command to write page in main memory.
  */
-static void dataflash_write_block(dataflash_t byte_addr, DataFlashOpcode opcode, uint8_t *block, dataflashSize_t len)
+static void dataflash_write_block(dataflashOffset_t byte_addr, DataFlashOpcode opcode, uint8_t *block, dataflashSize_t len)
 {
 
        send_cmd(0x00, byte_addr, opcode);
@@ -389,7 +389,7 @@ static int32_t dataflash_seek(struct _KFile *fd, int32_t offset, KSeekMode whenc
  */
 static size_t dataflash_read(struct _KFile *fd, void *buf, size_t size)
 {
-       dataflashAddr_t byte_addr;
+       dataflashOffset_t byte_addr;
        dataflashAddr_t page_addr;
        uin8_t *data = (uint8_t *)buf;
 
@@ -434,7 +434,7 @@ static size_t dataflash_read(struct _KFile *fd, void *buf, size_t size)
 static size_t dataflash_write(struct _KFile *fd, const void *_buf, size_t size)
 {
 
-       dataflashAddr_t byte_addr;
+       dataflashOffset_t byte_addr;
        dataflashAddr_t current_page;
 
        uint8_t *data = (uint8_t *) _buf;

diff --git a/drv/dataflash.h b/drv/dataflash.h
index 0cd943923ba9fa8bd17ce2d9b3e938bc7b961a5b..b739883ca3cf984ec63ca7c815b25142fffc9212 100644 (file)
--- a/drv/dataflash.h
+++ b/drv/dataflash.h
@@ -52,6 +52,7 @@
  * Type definition for dflash memory.
  */
 typedef uint32_t dataflashAddr_t;
+typedef uint32_t dataflashOffset_t;
 typedef uint32_t dataflashSize_t;
 
 #define RESET_PULSE_WIDTH     10 // Width of reset pulse in usec.