Fix Luminary LM3S detection.

[bertos.git] / bertos / drv / flash25.h

diff --git a/bertos/drv/flash25.h b/bertos/drv/flash25.h
index 09579c0ef2af0423c165ad018ab50cf354860fab..27c6411fca2872d194bc89d67aabd4b4f8a91581 100644 (file)
--- a/bertos/drv/flash25.h
+++ b/bertos/drv/flash25.h
@@ -42,7 +42,7 @@
 #define DRV_FLASH25_H
 
 #include <cfg/compiler.h>
-#include <cfg/cfg_flash25.h>
+#include "cfg/cfg_flash25.h"
 
 #include <kern/kfile.h>
 
@@ -56,11 +56,11 @@ typedef uint8_t flash25Offset_t;
 /**
  * Flash25 KFile context structure.
  */
-typedef struct KFileFlash25
+typedef struct Flash25
 {
        KFile fd;                       ///< File descriptor.
        KFile *channel;                 ///< Dataflash comm channel (usually SPI).
-} KFileFlash25;
+} Flash25;
 
 /**
  * ID for dataflash.
@@ -69,12 +69,12 @@ typedef struct KFileFlash25
 
 
 /**
- * Convert + ASSERT from generic KFile to KFileFlash25.
+ * Convert + ASSERT from generic KFile to Flash25.
  */
-INLINE KFileFlash25 * KFILEFLASH25(KFile *fd)
+INLINE Flash25 * FLASH25_CAST(KFile *fd)
 {
        ASSERT(fd->_type == KFT_FLASH25);
-       return (KFileFlash25 *)fd;
+       return (Flash25 *)fd;
 }
 
 /**
@@ -131,9 +131,9 @@ typedef enum {
        FLASH25_SECT4            = 0x30000,  ///< Sector 4 (0x30000 -0x3FFFF)
 } Flash25Sector;
 
-void flash25_init(KFileFlash25 *fd, KFile *ch);
-void flash25_chipErase(KFileFlash25 *fd);
-void flash25_sectorErase(KFileFlash25 *fd, Flash25Sector sector);
+void flash25_init(Flash25 *fd, KFile *ch);
+void flash25_chipErase(Flash25 *fd);
+void flash25_sectorErase(Flash25 *fd, Flash25Sector sector);
 bool flash25_test(KFile *channel);
 
 #endif /* DRV_FLASH25_H */