altos: Replace ao_xmem functions with direct mem calls

[fw/altos] / src / drivers / ao_at45db161d.c

diff --git a/src/drivers/ao_at45db161d.c b/src/drivers/ao_at45db161d.c
index e7e74153db6c46298eba0556e088380d24351f8f..e04baaf63a9fc3c919c7042ac44ca0c8f7fefa63 100644 (file)
--- a/src/drivers/ao_at45db161d.c
+++ b/src/drivers/ao_at45db161d.c
@@ -3,7 +3,8 @@
  *
  * 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; version 2 of the License.
+ * 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
@@ -19,23 +20,23 @@
 #include "ao_at45db161d.h"
 
 /* Total bytes of available storage */
-__pdata uint32_t       ao_storage_total;
+uint32_t       ao_storage_total;
 
 /* Block size - device is erased in these units. At least 256 bytes */
-__pdata uint32_t       ao_storage_block;
+uint32_t       ao_storage_block;
 
 /* Byte offset of config block. Will be ao_storage_block bytes long */
-__pdata uint32_t       ao_storage_config;
+uint32_t       ao_storage_config;
 
 /* Storage unit size - device reads and writes must be within blocks of this size. Usually 256 bytes. */
-__pdata uint16_t       ao_storage_unit;
+uint16_t       ao_storage_unit;
 
 #define FLASH_CS               P1_1
 #define FLASH_CS_INDEX         1
 
 #define FLASH_BLOCK_SIZE_MAX   512
 
-__xdata uint8_t ao_flash_mutex;
+uint8_t ao_flash_mutex;
 
 #define ao_flash_delay() do { \
        _asm nop _endasm; \
@@ -50,7 +51,7 @@ __xdata uint8_t ao_flash_mutex;
 struct ao_flash_instruction {
        uint8_t instruction;
        uint8_t address[3];
-} __xdata ao_flash_instruction;
+} ao_flash_instruction;
 
 static void
 ao_flash_set_pagesize_512(void)
@@ -78,17 +79,17 @@ ao_flash_read_status(void)
 
 #define FLASH_BLOCK_NONE       0xffff
 
-static __xdata uint8_t ao_flash_data[FLASH_BLOCK_SIZE_MAX];
-static __pdata uint16_t ao_flash_block = FLASH_BLOCK_NONE;
-static __pdata uint8_t ao_flash_block_dirty;
-static __pdata uint8_t  ao_flash_write_pending;
-static __pdata uint8_t ao_flash_setup_done;
-static __pdata uint8_t ao_flash_block_shift;
-static __pdata uint16_t        ao_flash_block_size;
-static __pdata uint16_t        ao_flash_block_mask;
+static uint8_t ao_flash_data[FLASH_BLOCK_SIZE_MAX];
+static uint16_t ao_flash_block = FLASH_BLOCK_NONE;
+static uint8_t ao_flash_block_dirty;
+static uint8_t  ao_flash_write_pending;
+static uint8_t ao_flash_setup_done;
+static uint8_t ao_flash_block_shift;
+static uint16_t        ao_flash_block_size;
+static uint16_t        ao_flash_block_mask;
 
 void
-ao_storage_setup(void) __reentrant
+ao_storage_setup(void) 
 {
        uint8_t status;
 
@@ -233,7 +234,7 @@ ao_flash_fill(uint16_t block)
 }
 
 uint8_t
-ao_storage_device_write(uint32_t pos, __xdata void *buf, uint16_t len) __reentrant
+ao_storage_device_write(uint32_t pos, void *buf, uint16_t len) 
 {
        uint16_t block = (uint16_t) (pos >> ao_flash_block_shift);
 
@@ -245,7 +246,7 @@ ao_storage_device_write(uint32_t pos, __xdata void *buf, uint16_t len) __reentra
                        ao_flash_flush_internal();
                        ao_flash_block = block;
                }
-               ao_xmemcpy(ao_flash_data + (uint16_t) (pos & ao_flash_block_mask),
+               memcpy(ao_flash_data + (uint16_t) (pos & ao_flash_block_mask),
                       buf,
                       len);
                ao_flash_block_dirty = 1;
@@ -254,14 +255,14 @@ ao_storage_device_write(uint32_t pos, __xdata void *buf, uint16_t len) __reentra
 }
 
 uint8_t
-ao_storage_device_read(uint32_t pos, __xdata void *buf, uint16_t len) __reentrant
+ao_storage_device_read(uint32_t pos, void *buf, uint16_t len) 
 {
        uint16_t block = (uint16_t) (pos >> ao_flash_block_shift);
 
        /* Transfer the data */
        ao_mutex_get(&ao_flash_mutex); {
                ao_flash_fill(block);
-               ao_xmemcpy(buf,
+               memcpy(buf,
                       ao_flash_data + (uint16_t) (pos & ao_flash_block_mask),
                       len);
        } ao_mutex_put(&ao_flash_mutex);
@@ -269,7 +270,7 @@ ao_storage_device_read(uint32_t pos, __xdata void *buf, uint16_t len) __reentran
 }
 
 void
-ao_storage_flush(void) __reentrant
+ao_storage_flush(void) 
 {
        ao_mutex_get(&ao_flash_mutex); {
                ao_flash_flush_internal();
@@ -277,19 +278,19 @@ ao_storage_flush(void) __reentrant
 }
 
 uint8_t
-ao_storage_erase(uint32_t pos) __reentrant
+ao_storage_erase(uint32_t pos) 
 {
        ao_mutex_get(&ao_flash_mutex); {
                ao_flash_flush_internal();
                ao_flash_block = (uint16_t) (pos >> ao_flash_block_shift);
-               ao_xmemset(ao_flash_data, 0xff, ao_flash_block_size);
+               memset(ao_flash_data, 0xff, ao_flash_block_size);
                ao_flash_block_dirty = 1;
        } ao_mutex_put(&ao_flash_mutex);
        return 1;
 }
 
 void
-ao_storage_device_info(void) __reentrant
+ao_storage_device_info(void) 
 {
        uint8_t status;