2 files changed, 30 insertions, 6 deletions

diff --git a/firmware/target/arm/ata-nand-telechips.c b/firmware/target/arm/ata-nand-telechips.c
index 81dde33938..2ae425f4c6 100644
--- a/firmware/target/arm/ata-nand-telechips.c
+++ b/firmware/target/arm/ata-nand-telechips.c
@@ -26,7 +26,6 @@
 #include "panic.h"
 #include "nand_id.h"
 #include "storage.h"
-#include "buffer.h"
 
 #define SECTOR_SIZE 512
 
@@ -122,8 +121,9 @@ struct lpt_entry
 #ifdef BOOTLOADER
 static struct lpt_entry lpt_lookup[MAX_SEGMENTS];
 #else
-/* buffer_alloc'd in nand_init() when the correct size has been determined */
-static struct lpt_entry* lpt_lookup = NULL;
+/* core_alloc()'d in nand_init() when the correct size has been determined */
+#include "core_alloc.h"
+static int lpt_handle;
 #endif
 
 /* Write Caches */
@@ -607,6 +607,9 @@ static bool nand_read_sector_of_logical_segment(int log_segment, int sector,
     int page_in_segment = sector / sectors_per_page;
     int sector_in_page  = sector % sectors_per_page;
 
+#ifndef BOOTLOADER
+    struct lpt_entry* lpt_lookup = core_get_data(lpt_handle);
+#endif
     int bank = lpt_lookup[log_segment].bank;
     int phys_segment = lpt_lookup[log_segment].phys_segment;
 
@@ -918,7 +921,8 @@ int nand_init(void)
 #ifndef BOOTLOADER
     /* Use chip info to allocate the correct size LPT buffer */
     lptbuf_size = sizeof(struct lpt_entry) * segments_per_bank * total_banks;
-    lpt_lookup = buffer_alloc(lptbuf_size);
+    lpt_handle = core_alloc("lpt lookup", lptbuf_size);
+    struct lpt_entry* lpt_lookup = core_get_data(lpt_handle);
 #else
     /* Use a static array in the bootloader */
     lptbuf_size = sizeof(lpt_lookup);
@@ -968,6 +972,9 @@ int nand_init(void)
 
                     if (log_segment < segments_per_bank * total_banks)
                     {
+#ifndef BOOTLOADER
+                        lpt_lookup = core_get_data(lpt_handle);
+#endif
                         if (lpt_lookup[log_segment].bank == -1 ||
                             lpt_lookup[log_segment].phys_segment == -1)
                         {
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c
index afb8d5cf62..ad10502f2d 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c
@@ -30,7 +30,7 @@
 #include "dm320.h"
 #include "ata.h"
 #include "string.h"
-#include "buffer.h"
+#include "core_alloc.h"
 #include "logf.h"
 #include "ata-defines.h"
 
@@ -202,7 +202,11 @@ struct cfs_direntry_item
 
 static bool cfs_inited = false;
 static unsigned long cfs_start;
+#ifdef BOOTLOADER
 static unsigned long *sectors;
+#else
+static int sectors_handle;
+#endif
 
 #define CFS_START              ( ((hdr->partitions[1].start*hdr->sector_size) & ~0xFFFF) + 0x10000 )
 #define CFS_CLUSTER2CLUSTER(x) ( (CFS_START/512)+((x)-1)*64 )
@@ -299,7 +303,8 @@ static void cfs_init(void)
         _ata_read_sectors(CFS_CLUSTER2CLUSTER(vfat_inodes_nr[1]), 1, &sector);
         inode = (struct cfs_inode*)&sector;
 #ifndef BOOTLOADER
-        sectors = (unsigned long*)buffer_alloc(VFAT_SECTOR_SIZE(inode->filesize));
+        sectors_handle = core_alloc("ata sectors", VFAT_SECTOR_SIZE(inode->filesize));
+        unsigned long *sectors = core_get_data(sectors_handle);
 #else
         static unsigned long _sector[VFAT_SECTOR_SIZE(1024*1024*1024)]; /* 1GB guess */
         sectors = _sector;
@@ -322,6 +327,9 @@ static void cfs_init(void)
             _ata_read_sectors(CFS_CLUSTER2CLUSTER(inode->second_class_chain_second_cluster), 64, &vfat_data[1]);
 
             /* First class chain */
+#ifndef BOOTLOADER
+            sectors = core_get_data(sectors_handle);
+#endif
             for(j=0; j<12; j++)
             {
                 if( (inode->first_class_chain[j] & 0xFFFF) != 0xFFFF &&
@@ -331,6 +339,9 @@ static void cfs_init(void)
             }
 
             /* Second class chain */
+#ifndef BOOTLOADER
+            sectors = core_get_data(sectors_handle);
+#endif
             for(j=0; j<0x8000/4; j++)
             {
                 if( (vfat_data[0][j] & 0xFFFF) != 0xFFFF &&
@@ -351,6 +362,9 @@ static void cfs_init(void)
                     /* Read third class subchain(s) */
                     _ata_read_sectors(CFS_CLUSTER2CLUSTER(vfat_data[1][j]), 64, &vfat_data[0]);
 
+#ifndef BOOTLOADER
+                    sectors = core_get_data(sectors_handle);
+#endif
                     for(k=0; k<0x8000/4; k++)
                     {
                         if( (vfat_data[0][k] & 0xFFFF) != 0xFFFF &&
@@ -376,6 +390,9 @@ static inline unsigned long map_sector(unsigned long sector)
      *  Sector mapping: start of CFS + FAT_SECTOR2CFS_SECTOR(sector) + missing part
      *  FAT works with sectors of 0x200 bytes, CFS with sectors of 0x8000 bytes.
      */
+#ifndef BOOTLOADER
+    unsigned long *sectors = core_get_data(sectors_handle);
+#endif
     return cfs_start+sectors[sector/64]*64+sector%64;
 }