Diff: src/RamDisk.cpp

Revision:

9:7e71c20c96e4

Parent:

7:acfd2dbff157

--- a/src/RamDisk.cpp	Tue Feb 18 09:32:40 2014 +0000
+++ b/src/RamDisk.cpp	Thu Feb 20 09:43:03 2014 +0000
@@ -6,15 +6,10 @@
 #define RAMDISK_DBG(...)
 #endif
 
-RamDisk::RamDisk()
+RamDisk::RamDisk(int sectors):_sectors(sectors)
 {
+    onUpdate = NULL;
     format();
-    _sectors = 128; // 128*512 64Kbytes
-}
-
-/* virtual */ int RamDisk::storage_initialize()
-{
-    return 0;
 }
 
 /* virtual */ uint32_t RamDisk::storage_sectors()
@@ -27,28 +22,20 @@
     return _sectors * 512;
 }
 
-/* virtual */ int RamDisk::storage_status()
-{
-    return 0;
-}
-
 /* virtual */ int RamDisk::storage_read(uint8_t * data, uint32_t block)
 {
     RAMDISK_DBG("R block=%d", block);
+    update();
     memset(data, 0x00, 512);
     if (_sector_image.count(block) > 0) {
         uint8_t* buf = _sector_image[block];
         int size = buf[0]|(buf[1]<<8);
+        size &= 0x7fff; // remove ROM area bit
         memcpy(data, buf + 2, size);
     }
     return 0;
 }
 
-bool is_romdata(uint8_t* data)
-{
-    return data < (uint8_t*)0x1ffff000;
-}
-
 static int block_size(const uint8_t* data)
 {
     for(int i = 512-1; i >= 0; i--) {
@@ -61,10 +48,11 @@
 
 /* virtual */ int RamDisk::storage_write(const uint8_t * data, uint32_t block)
 {
+    update();
     int size = block_size(data);
     if (_sector_image.count(block) > 0) {
         uint8_t* buf = _sector_image[block];
-        if (!is_romdata(buf)) {
+        if (!(buf[1] & 0x80)) { // ROM area
             free(buf);
         }
         buf = (uint8_t*)malloc(size + 2);
@@ -104,7 +92,8 @@
         int block = _sector_image.getKey(i);
         uint8_t* buf = _sector_image[block];
         int size = buf[0]|(buf[1]<<8);
-        printf("0x%02x,0x%02x,0x%02x, // block=%d, size=%d\n", 
+        size &= 0x7fff;
+        printf("0x%02x,0x%02x,0x%02x|0x80, // block=%d, size=%d, ROM area\n", 
                                 block, buf[0], buf[1], block, size);
         if (mode == 1) {
             for(int j = 0; j < size; j++) {