projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for more i2c devices.
[bertos.git]
/
bertos
/
cpu
/
avr
/
drv
/
flash_avr.h
diff --git
a/bertos/cpu/avr/drv/flash_avr.h
b/bertos/cpu/avr/drv/flash_avr.h
index bb7698aba42bb9072f9b1457d332edb7c5d60519..ecbe1b772cccda9f8e038b10b13eaa75e0e27e5f 100644
(file)
--- a/
bertos/cpu/avr/drv/flash_avr.h
+++ b/
bertos/cpu/avr/drv/flash_avr.h
@@
-30,67
+30,78
@@
*
* -->
*
*
* -->
*
- * \brief Self programming routines (interface).
- *
- * \version $Id$
* \author Francesco Sacchi <batt@develer.com>
* \author Daniele Basile <asterix@develer.com>
* \author Francesco Sacchi <batt@develer.com>
* \author Daniele Basile <asterix@develer.com>
+ *
+ * \brief AVR Internal flash read/write driver.
+ *
+ *
*/
*/
-#ifndef DRV_FLASH_AVR_H
-#define DRV_FLASH_AVR_H
+#ifndef FLASH_AT91_H
+#define FLASH_AT91_H
+
+#include <cpu/types.h>
#include <cfg/compiler.h>
#include <cfg/compiler.h>
-#include <kern/kfile.h>
+#include <io/kfile.h>
+
+#include <avr/io.h>
+
+
+#define FLASH_PAGE_SIZE SPM_PAGESIZE
/**
* Definition of type for avr flash module.
*/
/**
* Definition of type for avr flash module.
*/
-typedef uint16_t
avr_
page_t;
+typedef uint16_t page_t;
+/* Forward declaration */
+struct Flash;
/**
* FlashAvr KFile context structure.
/**
* FlashAvr KFile context structure.
+ * DEPREACTED STRUCTURE!
+ * Use Flash instead
+ *
+ * \{
*/
*/
-typedef struct
KFile
FlashAvr
+typedef struct FlashAvr
{
/**
{
/**
- * File descriptor.
- */
+
* File descriptor.
+
*/
KFile fd;
/**
KFile fd;
/**
-
* Current buffered page
.
- */
-
avr_page_t curr_page
;
+
* Flag for checking if current page is modified
.
+
*/
+
bool page_dirty
;
/**
/**
- * Flag for checking if current page is modified.
- */
- bool page_modified;
-
-} KFileFlashAvr;
-
+ * Current buffered page.
+ */
+ page_t curr_page;
+ /**
+ * Temporary buffer cointaing data block to
+ * write on flash.
+ */
+ uint8_t page_buf[SPM_PAGESIZE];
+} FlashAvr;
+/* \} */
-/**
- * ID for FlashAvr
- */
-#define KFT_FLASHAVR MAKE_ID('F', 'L', 'A', 'V')
+void flash_hw_init(struct Flash *fd);
/**
/**
- * Convert + ASSERT from generic KFile to KFileFlashAvr.
+ * WARNING!
+ * This function is DEPRECADED!
+ * use the flash module instead.
*/
*/
-INLINE
KFileFlashAvr * KFILEFLASHAVR(KFile
*fd)
+INLINE
void flash_avr_init(struct FlashAvr
*fd)
{
{
- ASSERT(fd->_type == KFT_FLASHAVR);
- return (KFileFlashAvr *)fd;
+ flash_hw_init((struct Flash *)fd);
}
}
-
-void flash_avr_init(struct KFileFlashAvr *fd);
-
-
-
#endif /* DRV_FLASH_AVR_H */
#endif /* DRV_FLASH_AVR_H */