projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'telescience-v0.2'
[fw/altos]
/
src
/
core
/
ao_storage.c
diff --git
a/src/core/ao_storage.c
b/src/core/ao_storage.c
index ff4747d0ec2bd2099b8a6e4c783fc19cf5be673b..adf7e4d4949491f99a5609b2f22dc4fd650466b4 100644
(file)
--- a/
src/core/ao_storage.c
+++ b/
src/core/ao_storage.c
@@
-15,10
+15,11
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "ao.h"
+#include <ao.h>
+#include <ao_storage.h>
uint8_t
uint8_t
-ao_storage_read(
uint32
_t pos, __xdata void *buf, uint16_t len) __reentrant
+ao_storage_read(
ao_pos
_t pos, __xdata void *buf, uint16_t len) __reentrant
{
uint16_t this_len;
uint16_t this_off;
{
uint16_t this_len;
uint16_t this_off;
@@
-48,7
+49,7
@@
ao_storage_read(uint32_t pos, __xdata void *buf, uint16_t len) __reentrant
}
uint8_t
}
uint8_t
-ao_storage_write(
uint32
_t pos, __xdata void *buf, uint16_t len) __reentrant
+ao_storage_write(
ao_pos
_t pos, __xdata void *buf, uint16_t len) __reentrant
{
uint16_t this_len;
uint16_t this_off;
{
uint16_t this_len;
uint16_t this_off;
@@
-161,8
+162,8
@@
void
ao_storage_info(void) __reentrant
{
ao_storage_setup();
ao_storage_info(void) __reentrant
{
ao_storage_setup();
- printf("Storage size: %ld\n", ao_storage_total);
- printf("Storage erase unit: %ld\n", ao_storage_block);
+ printf("Storage size: %ld\n",
(long)
ao_storage_total);
+ printf("Storage erase unit: %ld\n",
(long)
ao_storage_block);
ao_storage_device_info();
}
ao_storage_device_info();
}