Merge contributed patch to extend support of atxmega.

[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 f078c38e6be99359a50aaee49ba51bf9655b291d..b75a38b8b3ef1f80654116b8a0dbd0865abc1566 100644 (file)
--- a/bertos/cpu/avr/drv/flash_avr.h
+++ b/bertos/cpu/avr/drv/flash_avr.h
@@ -30,47 +30,22 @@
  *
  * -->
  *
- * \brief Self programming routines (interface).
- *
- * \version $Id$
  * \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
-
-#include <cfg/compiler.h>
-#include <kern/kfile.h>
-
-
-/**
- * FlashAvr KFile context structure.
- */
-typedef struct KFileFlashAvr
-{
-       KFile fd;               ///< File descriptor.
-} KFileFlashAvr;
-
-
-
-/**
- * ID for FlashAvr
- */
-#define KFT_FLASHAVR MAKE_ID('F', 'L', 'A', 'V')
-
-/**
- * Convert + ASSERT from generic KFile to KFileFlashAvr.
- */
-INLINE KFileFlashAvr * KFILEFLASHAVR(KFile *fd)
-{
-       ASSERT(fd->_type == KFT_FLASHAVR);
-       return (KFileFlashAvr *)fd;
-}
-
+#ifndef FLASH_AVR_H
+#define FLASH_AVR_H
 
-void flash_avr_init(struct KFileFlashAvr *fd);
+#include "cfg/cfg_emb_flash.h"
 
+#if !CONFIG_FLASH_DISABLE_OLD_API
 
+       /* For backwards compatibility */
+       #define FlashAvr  Flash
+       #define flash_avr_init(fls)   flash_init(fls);
+#endif /* !CONFIG_FLASH_DISABLE_OLD_API */
 
 #endif /* DRV_FLASH_AVR_H */