78 files changed, 827 insertions, 553 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 75ea8b136e..4e6fcbf70c 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1646,9 +1646,9 @@ target/mips/ingenic_jz47xx/kernel-jz4760.c
 target/mips/ingenic_jz47xx/i2c-jz4760.c
 target/mips/ingenic_jz47xx/lcd-jz4760.c
 target/mips/ingenic_jz47xx/system-jz4760.c
-target/mips/ingenic_jz47xx/usb-jz4760.c
 target/mips/ingenic_jz47xx/timer-jz4760.c
 #ifndef BOOTLOADER
+target/mips/ingenic_jz47xx/usb-jz4760.c
 target/mips/ingenic_jz47xx/codec-jz4760.c
 target/mips/ingenic_jz47xx/pcm-jz4760.c
 #endif /* BOOTLOADER */
diff --git a/firmware/common/disk.c b/firmware/common/disk.c
index 9b6454c9a2..576eede143 100644
--- a/firmware/common/disk.c
+++ b/firmware/common/disk.c
@@ -172,6 +172,8 @@ bool disk_init(IF_MD_NONVOID(int drive))
             }
         }
 
+        // XXX backup GPT header at final LBA of drive...
+
         while (is_gpt) {
             /* Re-start partition parsing using GPT */
             uint64_t part_lba;
@@ -243,20 +245,24 @@ reload:
                     goto skip; /* Any flag makes us ignore this */
                 }
                 tmp = BYTES2INT64(pptr, 32); /* FIRST LBA */
-                if (tmp > UINT32_MAX) { // XXX revisit when we resize struct partinfo!
-                    DEBUGF("GPT: partition starts after 2GiB mark\n");
+#ifndef STORAGE_64BIT_SECTOR
+                if (tmp > UINT32_MAX) {
+                    DEBUGF("GPT: partition starts after 2TiB mark\n");
                     goto skip;
                 }
+#endif
                 if (tmp < 34) {
                     DEBUGF("GPT: Invalid start LBA\n");
                     goto skip;
                 }
                 pinfo[part].start = tmp;
                 tmp = BYTES2INT64(pptr, 40); /* LAST LBA */
-                if (tmp > UINT32_MAX) { // XXX revisit when we resize struct partinfo!
-                    DEBUGF("GPT: partition ends after 2GiB mark\n");
+#ifndef STORAGE_64BIT_SECTOR
+                if (tmp > UINT32_MAX) {
+                    DEBUGF("GPT: partition ends after 2TiB mark\n");
                     goto skip;
                 }
+#endif
                 if (tmp <= pinfo[part].start) {
                     DEBUGF("GPT: Invalid end LBA\n");
                     goto skip;
@@ -264,7 +270,7 @@ reload:
                 pinfo[part].size = tmp - pinfo[part].start + 1;
                 pinfo[part].type = PARTITION_TYPE_FAT32_LBA;
 
-                DEBUGF("GPart%d: start: %08lx size: %08lx\n",
+                DEBUGF("GPart%d: start: %016lx size: %016lx\n",
                        part,pinfo[part].start,pinfo[part].size);
                 part++;
 
@@ -499,13 +505,13 @@ unsigned int volume_get_cluster_size(IF_MV_NONVOID(int volume))
     return clustersize;
 }
 
-void volume_size(IF_MV(int volume,) unsigned long *sizep, unsigned long *freep)
+void volume_size(IF_MV(int volume,) sector_t *sizep, sector_t *freep)
 {
     disk_reader_lock();
 
     if (!CHECK_VOL(volume) || !fat_size(IF_MV(volume,) sizep, freep))
     {
-        if (freep) *sizep = 0;
+        if (sizep) *sizep = 0;
         if (freep) *freep = 0;
     }
 
diff --git a/firmware/common/disk_cache.c b/firmware/common/disk_cache.c
index 9e4dee6a91..74c4d5f35b 100644
--- a/firmware/common/disk_cache.c
+++ b/firmware/common/disk_cache.c
@@ -71,12 +71,12 @@ struct disk_cache_entry
 #ifdef HAVE_MULTIVOLUME
     unsigned char volume;   /* volume of sector */
 #endif
-    unsigned long sector;   /* cached disk sector number */
+    sector_t sector;   /* cached disk sector number */
 };
 
 BITARRAY_TYPE_DECLARE(cache_map_entry_t, cache_map, DC_NUM_ENTRIES)
 
-static inline unsigned int map_sector(unsigned long sector)
+static inline unsigned int map_sector(sector_t sector)
 {
     /* keep sector hash simple for now */
     return sector % DC_MAP_NUM_ENTRIES;
@@ -172,7 +172,7 @@ static inline void cache_discard_entry(struct disk_cache_entry *dce,
 /* search the cache for the specified sector, returning a buffer, either
    to the specified sector, if it exists, or a new/evicted entry that must
    be filled */
-void * dc_cache_probe(IF_MV(int volume,) unsigned long sector,
+void * dc_cache_probe(IF_MV(int volume,) sector_t sector,
                       unsigned int *flagsp)
 {
     unsigned int mapnum = map_sector(sector);
@@ -200,7 +200,7 @@ void * dc_cache_probe(IF_MV(int volume,) unsigned long sector,
     if (old_flags)
     {
         int old_volume = IF_MV_VOL(dce->volume);
-        unsigned long sector = dce->sector;
+        sector_t sector = dce->sector;
         unsigned int old_mapnum = map_sector(sector);
 
         if (old_flags & DCE_DIRTY)
diff --git a/firmware/common/pathfuncs.c b/firmware/common/pathfuncs.c
index db3abe6940..b5e5ecb0cf 100644
--- a/firmware/common/pathfuncs.c
+++ b/firmware/common/pathfuncs.c
@@ -24,10 +24,14 @@
 #include "pathfuncs.h"
 #include "string-extra.h"
 #include <stdio.h>
+#include "file_internal.h"
+#include "debug.h"
 
 #ifdef HAVE_MULTIVOLUME
 #include "storage.h"
 
+static char vol_dec_strings[NUM_VOLUMES][ALIGN_UP(VOL_MAX_LEN+2, 4)] = {{0}};
+
 enum storage_name_dec_indexes
 {
 #if (CONFIG_STORAGE & STORAGE_ATA)
@@ -106,6 +110,54 @@ static const unsigned char storage_dec_indexes[STORAGE_NUM_TYPES+1] =
 #endif
 };
 
+/* builds a list of drive/volume specifiers <volstr#> */
+void init_volume_names(void)
+{
+    DEBUGF("%s: ", __func__);
+    FOR_EACH_VOLUME(-1, volume)
+    {
+        const char *voldec = "";
+        char *buffer = vol_dec_strings[volume];
+
+        int type = storage_driver_type(volume_drive(volume));
+        if (type < 0 || type > STORAGE_NUM_TYPES)
+            type = STORAGE_NUM_TYPES;
+        voldec = storage_dec_names[storage_dec_indexes[type]];
+        snprintf(buffer, VOL_MAX_LEN + 1, "%c%s%d%c",
+                VOL_START_TOK, voldec, volume, VOL_END_TOK);
+        DEBUGF("vol<%d> = %s ", volume, buffer);
+    }
+    DEBUGF("\n");
+}
+
+#include <stdio.h>
+
+int path_get_volume_id(const char *name)
+{
+    int v = -1;
+
+    if (!name || *name != VOL_START_TOK)
+        goto bail;
+
+    do {
+        switch (*name)
+        {
+        case '0' ... '9':       /* digit; parse volume number */
+            v = (v * 10 + *name - '0') % VOL_NUM_MAX;
+            break;
+        case '\0':
+        case PATH_SEPCH:        /* no closing bracket; no volume */
+            v = -1;
+            goto bail;
+        default:                /* something else; reset volume */
+            v = 0;
+        }
+    } while (*++name != VOL_END_TOK);  /* found end token? */
+
+bail:
+    return v;
+}
+
 /* Returns on which volume this is and sets *nameptr to the portion of the
  * path after the volume specifier, which could be the null if the path is
  * just a volume root. If *nameptr > name, then a volume specifier was
@@ -203,7 +255,8 @@ int path_strip_last_volume(const char *name, const char **nameptr, bool greedy)
 }
 
 /* Returns the volume specifier decorated with the storage type name.
- * Assumes the supplied buffer size is at least {VOL_MAX_LEN}+1.
+ * Assumes the supplied buffer size is at least {VOL_MAX_LEN}+1,
+ * vol_dec_strings has been initialized by init_volume_names().
  */
 int get_volume_name(int volume, char *buffer)
 {
@@ -218,17 +271,12 @@ int get_volume_name(int volume, char *buffer)
 
     volume %= VOL_NUM_MAX; /* as path parser would have it */
 
-    int type = storage_driver_type(volume_drive(volume));
-    if (type < 0 || type > STORAGE_NUM_TYPES)
-        type = STORAGE_NUM_TYPES;
-
-    const char *voldec = storage_dec_names[storage_dec_indexes[type]];
-    return snprintf(buffer, VOL_MAX_LEN + 1, "%c%s%d%c",
-                    VOL_START_TOK, voldec, volume, VOL_END_TOK);
+    return strlcpy(buffer, vol_dec_strings[volume], VOL_MAX_LEN + 1);
 }
 
 /* Returns volume name formatted with the root. Assumes buffer size is at
- * least {VOL_MAX_LEN}+2 */
+ * least {VOL_MAX_LEN}+2, vol_dec_strings has been initialized by init_volume_names().
+ */
 int make_volume_root(int volume, char *buffer)
 {
     char *t = buffer;
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index d82fb173cc..7b9c4910cf 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -109,15 +109,15 @@ static long last_disk_activity = -1;
 static long power_off_tick = 0;
 #endif
 
-static unsigned long total_sectors;
+static sector_t total_sectors;
 static int multisectors; /* number of supported multisectors */
-static unsigned short identify_info[SECTOR_SIZE/2];
+static unsigned short identify_info[ATA_IDENTIFY_WORDS];
 
 #ifdef MAX_PHYS_SECTOR_SIZE
 
 struct sector_cache_entry {
     bool inuse;
-    unsigned long sectornum;  /* logical sector */
+    sector_t sectornum;  /* logical sector */
     unsigned char data[MAX_PHYS_SECTOR_SIZE];
 };
 /* buffer for reading and writing large physical sectors */
@@ -381,7 +381,7 @@ static ICODE_ATTR void copy_write_sectors(const unsigned char* buf,
 }
 #endif /* !ATA_OPTIMIZED_WRITING */
 
-static int ata_transfer_sectors(unsigned long start,
+static int ata_transfer_sectors(uint64_t start,
                                 int incount,
                                 void* inbuf,
                                 int write)
@@ -443,9 +443,9 @@ static int ata_transfer_sectors(unsigned long start,
             ATA_OUT8(ATA_NSECTOR, count & 0xff);
             ATA_OUT8(ATA_SECTOR, (start >> 24) & 0xff); /* 31:24 */
             ATA_OUT8(ATA_SECTOR, start & 0xff); /* 7:0 */
-            ATA_OUT8(ATA_LCYL, 0); /* 39:32 */
+            ATA_OUT8(ATA_LCYL, (start >> 32) & 0xff); /* 39:32 */
             ATA_OUT8(ATA_LCYL, (start >> 8) & 0xff); /* 15:8 */
-            ATA_OUT8(ATA_HCYL, 0); /* 47:40 */
+            ATA_OUT8(ATA_HCYL, (start >> 40) & 0xff); /* 47:40 */
             ATA_OUT8(ATA_HCYL, (start >> 16) & 0xff); /* 23:16 */
             ATA_OUT8(ATA_SELECT, SELECT_LBA | ata_device);
 #ifdef HAVE_ATA_DMA
@@ -592,7 +592,7 @@ static int ata_transfer_sectors(unsigned long start,
 
 #ifndef MAX_PHYS_SECTOR_SIZE
 int ata_read_sectors(IF_MD(int drive,)
-                     unsigned long start,
+                     sector_t start,
                      int incount,
                      void* inbuf)
 {
@@ -607,7 +607,7 @@ int ata_read_sectors(IF_MD(int drive,)
 }
 
 int ata_write_sectors(IF_MD(int drive,)
-                      unsigned long start,
+                      sector_t start,
                       int count,
                       const void* buf)
 {
@@ -623,7 +623,7 @@ int ata_write_sectors(IF_MD(int drive,)
 #endif /* ndef MAX_PHYS_SECTOR_SIZE */
 
 #ifdef MAX_PHYS_SECTOR_SIZE
-static int cache_sector(unsigned long sector)
+static int cache_sector(sector_t sector)
 {
     int rc;
 
@@ -652,7 +652,7 @@ static inline int flush_current_sector(void)
 }
 
 int ata_read_sectors(IF_MD(int drive,)
-                     unsigned long start,
+                     sector_t start,
                      int incount,
                      void* inbuf)
 {
@@ -718,7 +718,7 @@ int ata_read_sectors(IF_MD(int drive,)
 }
 
 int ata_write_sectors(IF_MD(int drive,)
-                      unsigned long start,
+                      sector_t start,
                       int count,
                       const void* buf)
 {
@@ -916,7 +916,7 @@ static int identify(void)
         return -2;
     }
 
-    for (i=0; i<SECTOR_SIZE/2; i++) {
+    for (i=0; i<ATA_IDENTIFY_WORDS; i++) {
         /* the IDENTIFY words are already swapped, so we need to treat
            this info differently that normal sector data */
         identify_info[i] = ATA_SWAP_IDENTIFY(ATA_IN16(ATA_DATA));
@@ -1269,10 +1269,8 @@ int STORAGE_INIT_ATTR ata_init(void)
         if (identify_info[83] & 0x0400       /* 48 bit address support */
             && total_sectors == 0x0FFFFFFF)  /* and disk size >= 128 GiB */
         {                                    /* (needs BigLBA addressing) */
-            if (identify_info[102] || identify_info[103])
-                panicf("Unsupported disk size: >= 2^32 sectors");
+            total_sectors = identify_info[100] | (identify_info[101] << 16) | ((uint64_t)identify_info[102] << 32) | ((uint64_t)identify_info[103] << 48);
 
-            total_sectors = identify_info[100] | (identify_info[101] << 16);
             lba48 = true; /* use BigLBA */
         }
 #endif /* HAVE_LBA48 */
@@ -1360,7 +1358,13 @@ void ata_get_info(IF_MD(int drive,)struct storage_info *info)
     (void)drive; /* unused for now */
 #endif
     int i;
-    info->sector_size = SECTOR_SIZE;
+
+    /* Logical sector size */
+    if ((identify_info[106] & 0xd000) == 0x5000)
+        info->sector_size = identify_info[117] | (identify_info[118] << 16);
+    else
+        info->sector_size = SECTOR_SIZE;
+
     info->num_sectors = total_sectors;
 
     src = (unsigned short*)&identify_info[27];
diff --git a/firmware/drivers/fat.c b/firmware/drivers/fat.c
index ebf0f92798..f3c273cc05 100644
--- a/firmware/drivers/fat.c
+++ b/firmware/drivers/fat.c
@@ -173,9 +173,9 @@ union raw_dirent
 
 struct fsinfo
 {
-    unsigned long freecount; /* last known free cluster count */
-    unsigned long nextfree;  /* first cluster to start looking for free
-                                clusters, or 0xffffffff for no hint */
+    sector_t freecount; /* last known free cluster count */
+    sector_t nextfree;  /* first cluster to start looking for free
+                           clusters, or 0xffffffff for no hint */
 };
 /* fsinfo offsets */
 #define FSINFO_SIGNATURE 0
@@ -233,7 +233,7 @@ static struct bpb
     unsigned long totalsectors;
     unsigned long rootdirsector;
     unsigned long firstdatasector;
-    unsigned long startsector;
+    sector_t startsector;
     unsigned long dataclusters;
     unsigned long fatrgnstart;
     unsigned long fatrgnend;
@@ -241,8 +241,8 @@ static struct bpb
 #ifdef HAVE_FAT16SUPPORT
     unsigned int bpb_rootentcnt;    /* Number of dir entries in the root */
     /* internals for FAT16 support */
-    unsigned long rootdirsectornum; /* sector offset of root dir relative to start
-                                     * of first pseudo cluster */
+    sector_t rootdirsectornum; /* sector offset of root dir relative to start
+                                * of first pseudo cluster */
 #endif /* HAVE_FAT16SUPPORT */
 
     /** Additional information kept for each volume **/
@@ -329,7 +329,7 @@ static void cache_discard(IF_MV_NONVOID(struct bpb *fat_bpb))
 }
 
 /* caches a FAT or data area sector */
-static void * cache_sector(struct bpb *fat_bpb, unsigned long secnum)
+static void * cache_sector(struct bpb *fat_bpb, sector_t secnum)
 {
     unsigned int flags;
     void *buf = dc_cache_probe(IF_MV(fat_bpb->volume,) secnum, &flags);
@@ -340,8 +340,8 @@ static void * cache_sector(struct bpb *fat_bpb, unsigned long secnum)
                                       secnum + fat_bpb->startsector, 1, buf);
         if (UNLIKELY(rc < 0))
         {
-            DEBUGF("%s() - Could not read sector %ld"
-                   " (error %d)\n", __func__, secnum, rc);
+            DEBUGF("%s() - Could not read sector %llu"
+                   " (error %d)\n", __func__, (uint64_t)secnum, rc);
             dc_discard_buf(buf);
             return NULL;
         }
@@ -354,14 +354,14 @@ static void * cache_sector(struct bpb *fat_bpb, unsigned long secnum)
  * contents are NOT loaded before returning - use when completely overwriting
  * a sector's contents in order to avoid a fill */
 static void * cache_sector_buffer(IF_MV(struct bpb *fat_bpb,)
-                                  unsigned long secnum)
+                                  sector_t secnum)
 {
     unsigned int flags;
     return dc_cache_probe(IF_MV(fat_bpb->volume,) secnum, &flags);
 }
 
 /* flush a cache buffer to storage */
-void dc_writeback_callback(IF_MV(int volume,) unsigned long sector, void *buf)
+void dc_writeback_callback(IF_MV(int volume,) sector_t sector, void *buf)
 {
     struct bpb * const fat_bpb = &fat_bpbs[IF_MV_VOL(volume)];
     unsigned int copies = !IS_FAT_SECTOR(fat_bpb, sector) ?
@@ -374,8 +374,8 @@ void dc_writeback_callback(IF_MV(int volume,) unsigned long sector, void *buf)
         int rc = storage_write_sectors(IF_MD(fat_bpb->drive,) sector, 1, buf);
         if (rc < 0)
         {
-            panicf("%s() - Could not write sector %ld"
-                   " (error %d)\n", __func__, sector, rc);
+            panicf("%s() - Could not write sector %llu"
+                   " (error %d)\n", __func__, (uint64_t)sector, rc);
         }
 
         if (--copies == 0)
@@ -2397,12 +2397,12 @@ unsigned long fat_query_sectornum(const struct fat_filestr *filestr)
 }
 
 /* helper for fat_readwrite */
-static long transfer(struct bpb *fat_bpb, unsigned long start, long count,
+static long transfer(struct bpb *fat_bpb, sector_t start, long count,
                      char *buf, bool write)
 {
     long rc = 0;
 
-    DEBUGF("%s(s=%lx, c=%lx, wr=%u)\n", __func__,
+    DEBUGF("%s(s=%llx, c=%lx, wr=%u)\n", __func__,
            start + fat_bpb->startsector, count, write ? 1 : 0);
 
     if (write)
@@ -2416,12 +2416,12 @@ static long transfer(struct bpb *fat_bpb, unsigned long start, long count,
             firstallowed = fat_bpb->firstdatasector;
 
         if (start < firstallowed)
-            panicf("Write %ld before data\n", firstallowed - start);
+            panicf("Write %llu before data\n", (uint64_t)(firstallowed - start));
 
         if (start + count > fat_bpb->totalsectors)
         {
-            panicf("Write %ld after data\n",
-                   start + count - fat_bpb->totalsectors);
+            panicf("Write %llu after data\n",
+                   (uint64_t)(start + count - fat_bpb->totalsectors));
         }
     }
 
@@ -2487,14 +2487,14 @@ long fat_readwrite(struct fat_filestr *filestr, unsigned long sectorcount,
     long rc;
 
     long          cluster    = filestr->lastcluster;
-    unsigned long sector     = filestr->lastsector;
+    sector_t sector     = filestr->lastsector;
     long          clusternum = filestr->clusternum;
     unsigned long sectornum  = filestr->sectornum;
 
     DEBUGF("%s(file:%lx,count:0x%lx,buf:%lx,%s)\n", __func__,
            file->firstcluster, sectorcount, (long)buf,
            write ? "write":"read");
-    DEBUGF("%s: sec:%lx numsec:%ld eof:%d\n", __func__,
+    DEBUGF("%s: sec:%llx numsec:%ld eof:%d\n", __func__,
            sector, (long)sectornum, eof ? 1 : 0);
 
     eof = false;
@@ -2534,7 +2534,7 @@ long fat_readwrite(struct fat_filestr *filestr, unsigned long sectorcount,
 
     unsigned long transferred = 0;
     unsigned long count = 0;
-    unsigned long last = sector;
+    sector_t last = sector;
 
     while (transferred + count < sectorcount)
     {
@@ -2961,7 +2961,7 @@ void fat_recalc_free(IF_MV_NONVOID(int volume))
     dc_unlock_cache();
 }
 
-bool fat_size(IF_MV(int volume,) unsigned long *size, unsigned long *free)
+bool fat_size(IF_MV(int volume,) sector_t *size, sector_t *free)
 {
     struct bpb * const fat_bpb = FAT_BPB(volume);
     if (!fat_bpb)
diff --git a/firmware/drivers/ramdisk.c b/firmware/drivers/ramdisk.c
index 9f73b6b5c3..cecc943352 100644
--- a/firmware/drivers/ramdisk.c
+++ b/firmware/drivers/ramdisk.c
@@ -32,7 +32,7 @@ static unsigned char ramdisk[SECTOR_SIZE * NUM_SECTORS];
 static long last_disk_activity = -1;
 
 int ramdisk_read_sectors(IF_MD(int drive,)
-                     unsigned long start,
+                     sector_t start,
                      int count,
                      void* buf)
 {
@@ -48,7 +48,7 @@ int ramdisk_read_sectors(IF_MD(int drive,)
 }
 
 int ramdisk_write_sectors(IF_MD(int drive,)
-                      unsigned long start,
+                      sector_t start,
                       int count,
                       const void* buf)
 {
@@ -134,7 +134,7 @@ int ramdisk_num_drives(int first_drive)
 {
     /* We don't care which logical drive number(s) we have been assigned */
     (void)first_drive;
-    
+
     return 1;
 }
 #endif
diff --git a/firmware/drivers/sd.c b/firmware/drivers/sd.c
index 6185d5382d..ca83498087 100644
--- a/firmware/drivers/sd.c
+++ b/firmware/drivers/sd.c
@@ -49,6 +49,13 @@ void sd_parse_csd(tCardInfo *card)
         c_size = card_extract_bits(card->csd, 69, 22) + 1;
         card->numblocks = c_size << 10;
     }
+    else if(csd_version == 2)
+    {
+        /* CSD version 3.0 */
+        c_size = card_extract_bits(card->csd, 75, 28) + 1;
+        card->numblocks = c_size << 10;
+    }
+    card->sd2plus = csd_version >= 1;
 
     card->blocksize = 512;  /* Always use 512 byte blocks */
 
@@ -62,7 +69,9 @@ void sd_parse_csd(tCardInfo *card)
 
     card->r2w_factor = card_extract_bits(card->csd, 28, 3);
 
-    logf("CSD%d.0 numblocks:%ld speed:%ld", csd_version+1, card->numblocks, card->speed);
+
+
+    logf("CSD%d.0 numblocks:%lld speed:%ld", csd_version+1, card->numblocks, card->speed);
     logf("nsac: %d taac: %ld r2w: %d", card->nsac, card->taac, card->r2w_factor);
 }
 
@@ -99,4 +108,3 @@ void sd_get_info(IF_MD(int drive,) struct storage_info *info)
     info->revision="0.00";
 }
 #endif
-
diff --git a/firmware/export/ata.h b/firmware/export/ata.h
index 62c9467643..6165eaf633 100644
--- a/firmware/export/ata.h
+++ b/firmware/export/ata.h
@@ -140,8 +140,8 @@ bool ata_disk_is_active(void);
 int ata_soft_reset(void);
 int ata_init(void) STORAGE_INIT_ATTR;
 void ata_close(void);
-int ata_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf);
-int ata_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf);
+int ata_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf);
+int ata_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf);
 void ata_spin(void);
 #if (CONFIG_LED == LED_REAL)
 void ata_set_led_enabled(bool enabled);
@@ -191,22 +191,22 @@ static inline int ata_disk_isssd(void)
         However microdrives pose a problem as they support CFA but are not
         SSD.
 
+       Offset 163 shows CF Advanced timing modes; microdrives all seems to
+        report 0, but all others (including iFlash) report higher!  This
+        is often present even when the "CFA supported" bit is 0.
+
        Offset 160 b15 indicates support for CF+ power level 1, if not set
         then device is standard flash CF.  However this is not foolproof
-        as newer CF cards may support it for extra performance.
-
-       Offset 163 shows CF Advanced timing modes; microdrive seems to
-        report 0, but all others (including iFlash) report higher!
+        as newer CF cards (and those CF->SD adapters) may report this.
 
-       So if device support CFA _AND_ reports higher speeds modes, it is SSD.
 
      */
     return ( (identify_info[217] == 0x0001 || identify_info[217] == 0x0100) /* "Solid state" rotational rate */
              || ((identify_info[168] & 0x0f) >= 0x06)                       /* Explicit SSD form factors */
              || (identify_info[169] & (1<<0))                               /* TRIM supported */
+             || (identify_info[163] > 0)                                    /* CF Advanced timing modes */
              || ((identify_info[83] & (1<<2)) &&                            /* CFA compliant */
-                 (((identify_info[160] & (1<<15)) == 0) ||                     /* CF level 0 */
-                  (identify_info[163] > 0)))                                   /* Advanced timing modes */
+                 ((identify_info[160] & (1<<15)) == 0))                       /* CF power level 0 */
            );
 }
 
@@ -233,4 +233,6 @@ int ata_read_smart(struct ata_smart_values*);
 #define STORAGE_CLOSE
 #endif
 
+#define ATA_IDENTIFY_WORDS 256
+
 #endif /* __ATA_H__ */
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 5ea5c71c70..ede1825f88 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -868,22 +868,41 @@ Lyre prototype 1 */
 #define CONFIG_STORAGE_MULTI
 #endif
 
-/* Explicit HAVE_MULTIVOLUME in the config file. Allow the maximum number */
-#ifdef HAVE_MULTIVOLUME
-#define NUM_VOLUMES_PER_DRIVE 4
-#else
-#define NUM_VOLUMES_PER_DRIVE 1
-#endif
 #if defined(CONFIG_STORAGE_MULTI) && !defined(HAVE_MULTIDRIVE)
 #define HAVE_MULTIDRIVE
 #endif
 
-#if defined(HAVE_MULTIDRIVE) && !defined(HAVE_MULTIVOLUME)
+#if defined(HAVE_MULTIDRIVE) && !defined(NUM_DRIVES)
+#error HAVE_MULTIDRIVE needs to have an explicit NUM_DRIVES
+#endif
+
+#ifndef NUM_DRIVES
+#define NUM_DRIVES 1
+#endif
+
+#if !defined(HAVE_MULTIVOLUME)
+#if defined(HAVE_MULTIDRIVE)
+/* Multidrive strongly implies multivolume */
+#define HAVE_MULTIVOLUME
+#elif (CONFIG_STORAGE & STORAGE_SD)
+/* SD routinely have multiple partitions */
+#elif (CONFIG_STORAGE & STORAGE_ATA) && defined(HAVE_LBA48)
+/* ATA routinely haves multiple partitions, but don't bother if we can't do LBA48 */
 #define HAVE_MULTIVOLUME
 #endif
+#endif
 
-#if defined(HAVE_MULTIDRIVE) && !defined(NUM_DRIVES)
-#error HAVE_MULTIDRIVE needs to have an explicit NUM_DRIVES
+/* Bootloaders don't need multivolume awareness */
+#if defined(BOOTLOADER) && defined(HAVE_MULTIVOLUME) \
+    && !(CONFIG_PLATFORM & PLATFORM_HOSTED) && !defined(BOOT_REDIR)
+#undef HAVE_MULTIVOLUME
+#endif
+
+/* Number of volumes per drive */
+#if defined(HAVE_MULTIVOLUME) && !defined(SIMULATOR) && !(CONFIG_PLATFORM & PLATFORM_HOSTED)
+#define NUM_VOLUMES_PER_DRIVE 4
+#else
+#define NUM_VOLUMES_PER_DRIVE 1
 #endif
 
 /* note to remove multi-partition booting this could be changed to MULTIDRIVE */
@@ -897,10 +916,6 @@ Lyre prototype 1 */
 # define MULTIBOOT_MIN_VOLUME 0
 #endif
 
-#ifndef NUM_DRIVES
-#define NUM_DRIVES 1
-#endif
-
 #define NUM_VOLUMES (NUM_DRIVES * NUM_VOLUMES_PER_DRIVE)
 
 #if defined(BOOTLOADER) && defined(HAVE_ADJUSTABLE_CPU_FREQ)
@@ -934,31 +949,35 @@ Lyre prototype 1 */
 #ifdef HAVE_BOOTLOADER_USB_MODE
 /* Priority in bootloader is wanted */
 #define HAVE_PRIORITY_SCHEDULING
+
 #if (CONFIG_CPU == S5L8702)
 #define USB_DRIVER_CLOSE
 #else
 #define USB_STATUS_BY_EVENT
 #define USB_DETECT_BY_REQUEST
 #endif
+
 #if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_ARC
 #define INCLUDE_TIMEOUT_API
 #define USB_DRIVER_CLOSE
 #endif
+
 #if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_TNETV105
 #define INCLUDE_TIMEOUT_API
 #define USB_DRIVER_CLOSE
 #endif
+
 #if CONFIG_CPU == X1000
 #define USB_DRIVER_CLOSE
 #endif
-#endif
+
+#endif /* BOOTLOADER_USB_MODE */
 
 #else /* !BOOTLOADER */
 
 #define HAVE_EXTENDED_MESSAGING_AND_NAME
 #define HAVE_WAKEUP_EXT_CB
 
-
 #if defined(ASSEMBLER_THREADS) \
     || defined(HAVE_WIN32_FIBER_THREADS) \
     || defined(HAVE_SIGALTSTACK_THREADS)
@@ -993,7 +1012,7 @@ Lyre prototype 1 */
 #endif /* CONFIG_USB == */
 #endif /* HAVE_USBSTACK */
 
-#endif /* BOOTLOADER */
+#endif /* !BOOTLOADER */
 
 #if defined(HAVE_USBSTACK) || (CONFIG_CPU == JZ4732) || (CONFIG_CPU == JZ4760B) \
     || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) \
diff --git a/firmware/export/config/cowond2.h b/firmware/export/config/cowond2.h
index 5912fb63eb..fbfcc2c089 100644
--- a/firmware/export/config/cowond2.h
+++ b/firmware/export/config/cowond2.h
@@ -61,9 +61,8 @@
 /* NAND is broken. */
 //#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD)
 #define CONFIG_STORAGE STORAGE_SD
-#define HAVE_MULTIDRIVE
+#define HAVE_MULTIVOLUME
 #define HAVE_HOTSWAP
-#define NUM_DRIVES 1
 
 #define CONFIG_NAND NAND_TCC
 
diff --git a/firmware/export/config/creativezen.h b/firmware/export/config/creativezen.h
index b1f438c354..d70749e59f 100644
--- a/firmware/export/config/creativezen.h
+++ b/firmware/export/config/creativezen.h
@@ -133,7 +133,6 @@
 #define CONFIG_STORAGE STORAGE_SD
 #define NUM_DRIVES 2
 #define HAVE_MULTIDRIVE
-#define HAVE_MULTIVOLUME
 #define HAVE_HOTSWAP
 
 /* todo */
diff --git a/firmware/export/config/creativezenxfi.h b/firmware/export/config/creativezenxfi.h
index 34cde37d9a..489dea80b7 100644
--- a/firmware/export/config/creativezenxfi.h
+++ b/firmware/export/config/creativezenxfi.h
@@ -138,7 +138,6 @@
 #define CONFIG_STORAGE STORAGE_SD
 #define NUM_DRIVES 2
 #define HAVE_MULTIDRIVE
-#define HAVE_MULTIVOLUME
 #define HAVE_HOTSWAP
 
 /* todo */
diff --git a/firmware/export/config/creativezenxfi2.h b/firmware/export/config/creativezenxfi2.h
index 47a600e8f5..5db228e559 100644
--- a/firmware/export/config/creativezenxfi2.h
+++ b/firmware/export/config/creativezenxfi2.h
@@ -140,7 +140,6 @@
 #define CONFIG_STORAGE (/*STORAGE_NAND |*/ STORAGE_SD)
 #define NUM_DRIVES 2
 #define HAVE_MULTIDRIVE
-#define HAVE_MULTIVOLUME
 #define HAVE_HOTSWAP_STORAGE_AS_MAIN
 #define HAVE_HOTSWAP
 #define CONFIG_NAND NAND_IMX233
diff --git a/firmware/export/config/creativezenxfi3.h b/firmware/export/config/creativezenxfi3.h
index a558c2a7df..5ff5d889c7 100644
--- a/firmware/export/config/creativezenxfi3.h
+++ b/firmware/export/config/creativezenxfi3.h
@@ -144,7 +144,6 @@
 #define CONFIG_STORAGE STORAGE_SD
 #define NUM_DRIVES 2
 #define HAVE_MULTIDRIVE
-#define HAVE_MULTIVOLUME
 #define HAVE_HOTSWAP
 
 /* Extra threads: touchpad */
diff --git a/firmware/export/config/erosqnative.h b/firmware/export/config/erosqnative.h
index f6e5b0d55e..26073a5f34 100644
--- a/firmware/export/config/erosqnative.h
+++ b/firmware/export/config/erosqnative.h
@@ -77,9 +77,7 @@
 #define CONFIG_STORAGE  STORAGE_SD
 #define HAVE_HOTSWAP
 #define HAVE_HOTSWAP_STORAGE_AS_MAIN
-#define HAVE_MULTIDRIVE
 #define HAVE_MULTIVOLUME
-#define NUM_DRIVES 1
 #define STORAGE_WANTS_ALIGN
 #define STORAGE_NEEDS_BOUNCE_BUFFER
 
diff --git a/firmware/export/config/fiiom3k.h b/firmware/export/config/fiiom3k.h
index cf8509405f..a5e32af2a0 100644
--- a/firmware/export/config/fiiom3k.h
+++ b/firmware/export/config/fiiom3k.h
@@ -81,9 +81,7 @@
 #define CONFIG_STORAGE  STORAGE_SD
 #define HAVE_HOTSWAP
 #define HAVE_HOTSWAP_STORAGE_AS_MAIN
-#define HAVE_MULTIDRIVE
 #define HAVE_MULTIVOLUME
-#define NUM_DRIVES 1
 #define STORAGE_WANTS_ALIGN
 #define STORAGE_NEEDS_BOUNCE_BUFFER
 
diff --git a/firmware/export/config/ihifi760.h b/firmware/export/config/ihifi760.h
index cc4152f5d8..ca62948bd2 100644
--- a/firmware/export/config/ihifi760.h
+++ b/firmware/export/config/ihifi760.h
@@ -49,6 +49,7 @@
 #define HAVE_FLASH_STORAGE
 
 #define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
+#define NUM_DRIVES 1  /* NAND doesn't work yet */
 
 #define CONFIG_NAND NAND_RK27XX
 #define HAVE_SW_TONE_CONTROLS
@@ -57,8 +58,6 @@
 
 /* commented for now */
 /* #define HAVE_HOTSWAP */
-
-#define NUM_DRIVES 1
 #define SECTOR_SIZE 512
 
 /* for small(ish) SD cards */
diff --git a/firmware/export/config/ihifi770.h b/firmware/export/config/ihifi770.h
index 74b12de994..68f6c71b90 100644
--- a/firmware/export/config/ihifi770.h
+++ b/firmware/export/config/ihifi770.h
@@ -50,13 +50,13 @@
 #define HAVE_FLASH_STORAGE
 
 #define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
+#define NUM_DRIVES 1  /* NAND doesn't work yet */
 
 #define CONFIG_NAND NAND_RK27XX
 #define HAVE_SW_TONE_CONTROLS
 
-#define HAVE_HOTSWAP
+// #define HAVE_HOTSWAP
 
-#define NUM_DRIVES 1
 #define SECTOR_SIZE 512
 
 /* for small(ish) SD cards */
@@ -183,7 +183,4 @@
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
 
-/* disabled for now */
-#undef HAVE_HOTSWAP
-
 #endif /* SIMULATOR */
diff --git a/firmware/export/config/ihifi770c.h b/firmware/export/config/ihifi770c.h
index 8224e2f368..a34d1b85c2 100644
--- a/firmware/export/config/ihifi770c.h
+++ b/firmware/export/config/ihifi770c.h
@@ -50,13 +50,13 @@
 #define HAVE_FLASH_STORAGE
 
 #define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
+#define NUM_DRIVES 1  /* NAND doesn't work yet */
 
 #define CONFIG_NAND NAND_RK27XX
 #define HAVE_SW_TONE_CONTROLS
 
-#define HAVE_HOTSWAP
+// #define HAVE_HOTSWAP
 
-#define NUM_DRIVES 1
 #define SECTOR_SIZE 512
 
 /* for small(ish) SD cards */
@@ -183,7 +183,4 @@
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
 
-/* disabled for now */
-#undef HAVE_HOTSWAP
-
 #endif /* SIMULATOR */
diff --git a/firmware/export/config/ihifi800.h b/firmware/export/config/ihifi800.h
index 91981682c1..e0cd1e1161 100644
--- a/firmware/export/config/ihifi800.h
+++ b/firmware/export/config/ihifi800.h
@@ -50,13 +50,13 @@
 #define HAVE_FLASH_STORAGE
 
 #define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
+#define NUM_DRIVES 1  /* NAND doesn't work yet */
 
 #define CONFIG_NAND NAND_RK27XX
 #define HAVE_SW_TONE_CONTROLS
 
-#define HAVE_HOTSWAP
+//#define HAVE_HOTSWAP
 
-#define NUM_DRIVES 1
 #define SECTOR_SIZE 512
 
 /* for small(ish) SD cards */
@@ -184,7 +184,4 @@
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
 
-/* disabled for now */
-#undef HAVE_HOTSWAP
-
 #endif /* SIMULATOR */
diff --git a/firmware/export/config/ihifi960.h b/firmware/export/config/ihifi960.h
index 64c6c90874..c0af676f28 100644
--- a/firmware/export/config/ihifi960.h
+++ b/firmware/export/config/ihifi960.h
@@ -49,6 +49,7 @@
 #define HAVE_FLASH_STORAGE
 
 #define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
+#define NUM_DRIVES 1  /* NAND doesn't work yet */
 
 #define CONFIG_NAND NAND_RK27XX
 #define HAVE_SW_TONE_CONTROLS
@@ -58,7 +59,6 @@
 /* commented for now */
 /* #define HAVE_HOTSWAP */
 
-#define NUM_DRIVES 1
 #define SECTOR_SIZE 512
 
 /* for small(ish) SD cards */
diff --git a/firmware/export/config/mini2440.h b/firmware/export/config/mini2440.h
index 4fc483b324..4149835eec 100644
--- a/firmware/export/config/mini2440.h
+++ b/firmware/export/config/mini2440.h
@@ -38,8 +38,7 @@
 /* define the storage type */
 #define CONFIG_STORAGE STORAGE_SD
 
-#define HAVE_MULTIDRIVE
-#define NUM_DRIVES 1 // no access to NAND yet
+#define HAVE_MULTIVOLUME
 #define HAVE_HOTSWAP
 #define HAVE_HOTSWAP_STORAGE_AS_MAIN
 #define INCLUDE_TIMEOUT_API
diff --git a/firmware/export/config/ondavx747.h b/firmware/export/config/ondavx747.h
index 7f4f1ea843..a9d4f0fecf 100644
--- a/firmware/export/config/ondavx747.h
+++ b/firmware/export/config/ondavx747.h
@@ -161,11 +161,11 @@
 No access to the NAND yet..
 
 #define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD)
+#define HAVE_MULTIDRIVE
 #define NUM_DRIVES 2
 */
 #define CONFIG_STORAGE (STORAGE_SD)
-#define HAVE_MULTIDRIVE
-#define NUM_DRIVES 1
+#define HAVE_MULTIVOLUME
 #define HAVE_HOTSWAP_STORAGE_AS_MAIN
 #define INCLUDE_TIMEOUT_API
 
diff --git a/firmware/export/config/ondavx777.h b/firmware/export/config/ondavx777.h
index ceea151d8c..1387898eff 100644
--- a/firmware/export/config/ondavx777.h
+++ b/firmware/export/config/ondavx777.h
@@ -152,11 +152,11 @@
 No access to the NAND yet..
 
 #define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD)
+#define HAVE_MULTIDRIVE
 #define NUM_DRIVES 2
 */
 #define CONFIG_STORAGE (STORAGE_SD)
-#define HAVE_MULTIDRIVE
-#define NUM_DRIVES 1
+#define HAVE_MULTIVOLUME
 #define HAVE_HOTSWAP_STORAGE_AS_MAIN
 #define INCLUDE_TIMEOUT_API
 
diff --git a/firmware/export/config/rk27generic.h b/firmware/export/config/rk27generic.h
index 967fc6d8ff..23768c1d2e 100644
--- a/firmware/export/config/rk27generic.h
+++ b/firmware/export/config/rk27generic.h
@@ -56,6 +56,7 @@
 #define HAVE_FLASH_STORAGE
 
 #define CONFIG_STORAGE (STORAGE_SD | STORAGE_NAND)
+#define NUM_DRIVES 1  /* NAND doesn't work yet */
 
 #define CONFIG_NAND NAND_RK27XX
 #define HAVE_SW_TONE_CONTROLS
@@ -63,7 +64,6 @@
 /* commented for now */
 /* #define HAVE_HOTSWAP */
 
-#define NUM_DRIVES 1
 #define SECTOR_SIZE 512
 
 /* for small(ish) SD cards */
diff --git a/firmware/export/config/sansae200.h b/firmware/export/config/sansae200.h
index 1c10f74845..70782aa147 100644
--- a/firmware/export/config/sansae200.h
+++ b/firmware/export/config/sansae200.h
@@ -181,7 +181,6 @@
 #define CONFIG_LCD LCD_X5
 
 #define HAVE_MULTIDRIVE
-//#define HAVE_MULTIVOLUME
 #define NUM_DRIVES 2
 #define HAVE_HOTSWAP /* required to access sd from bootloader */
 
diff --git a/firmware/export/config/shanlingq1.h b/firmware/export/config/shanlingq1.h
index a708cfc2a9..4e74f9e33c 100644
--- a/firmware/export/config/shanlingq1.h
+++ b/firmware/export/config/shanlingq1.h
@@ -64,9 +64,7 @@
 #define CONFIG_STORAGE  STORAGE_SD
 #define HAVE_HOTSWAP
 #define HAVE_HOTSWAP_STORAGE_AS_MAIN
-#define HAVE_MULTIDRIVE
 #define HAVE_MULTIVOLUME
-#define NUM_DRIVES 1
 #define STORAGE_WANTS_ALIGN
 #define STORAGE_NEEDS_BOUNCE_BUFFER
 
diff --git a/firmware/export/config/xduoox3.h b/firmware/export/config/xduoox3.h
index 46e1a61712..0d413ad372 100644
--- a/firmware/export/config/xduoox3.h
+++ b/firmware/export/config/xduoox3.h
@@ -174,6 +174,7 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_XDUOOX3
 
+#ifndef BOOTLOADER
 /* USB On-the-go */
 #define CONFIG_USBOTG     USBOTG_JZ4760
 
@@ -189,6 +190,7 @@
 
 #define USB_NUM_ENDPOINTS  3
 #define USB_DEVBSS_ATTR    IBSS_ATTR
+#endif /* !BOOTLOADER */
 
 #define BOOTFILE_EXT "x3"
 #define BOOTFILE     "rockbox." BOOTFILE_EXT
@@ -198,7 +200,7 @@
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
-#endif /* SIMULATOR */
+#endif /* !SIMULATOR */
 
 /** Port-specific settings **/
 
diff --git a/firmware/export/disk.h b/firmware/export/disk.h
index e465552fdc..a19e011170 100644
--- a/firmware/export/disk.h
+++ b/firmware/export/disk.h
@@ -26,8 +26,8 @@
 
 struct partinfo
 {
-    unsigned long start; /* first sector (LBA) */
-    unsigned long size;  /* number of sectors */
+    sector_t start; /* first sector (LBA) */
+    sector_t size;  /* number of sectors */
     unsigned char type;
 };
 
diff --git a/firmware/export/fat.h b/firmware/export/fat.h
index 70152985b5..7382d85ce4 100644
--- a/firmware/export/fat.h
+++ b/firmware/export/fat.h
@@ -115,7 +115,7 @@ struct fat_filestr
 {
     struct fat_file *fatfilep;  /* common file information */
     long          lastcluster;  /* cluster of last access */
-    unsigned long lastsector;   /* sector of last access */
+    sector_t lastsector;   /* sector of last access */
     long          clusternum;   /* cluster number of last access */
     unsigned long sectornum;    /* sector number within current cluster */
     bool          eof;          /* end-of-file reached */
@@ -173,7 +173,7 @@ int fat_get_bytes_per_sector(IF_MV_NONVOID(int volume));
 #endif /* MAX_LOG_SECTOR_SIZE */
 unsigned int fat_get_cluster_size(IF_MV_NONVOID(int volume));
 void fat_recalc_free(IF_MV_NONVOID(int volume));
-bool fat_size(IF_MV(int volume,) unsigned long *size, unsigned long *free);
+bool fat_size(IF_MV(int volume,) sector_t *size, sector_t *free);
 
 /** Misc. **/
 void fat_empty_fat_direntry(struct fat_direntry *entry);
diff --git a/firmware/export/hostfs.h b/firmware/export/hostfs.h
index c0fe85236e..c59868110a 100644
--- a/firmware/export/hostfs.h
+++ b/firmware/export/hostfs.h
@@ -37,8 +37,8 @@ extern int  hostfs_init(void);
 extern int  hostfs_flush(void);
 
 #ifdef HAVE_HOTSWAP
-extern bool hostfs_removable(int drive);
-extern bool hostfs_present(int drive);
+extern bool hostfs_removable(IF_MD_NONVOID(int drive));
+extern bool hostfs_present(IF_MD_NONVOID(int drive));
 #endif
 
 /* This has to be repeated here for now for sim's sake since HAVE_HOSTFS
diff --git a/firmware/export/mmc.h b/firmware/export/mmc.h
index 0d27e20a64..06df979b81 100644
--- a/firmware/export/mmc.h
+++ b/firmware/export/mmc.h
@@ -36,8 +36,8 @@ bool mmc_disk_is_active(void);
 int mmc_soft_reset(void);
 int mmc_init(void) STORAGE_INIT_ATTR;
 void mmc_close(void);
-int mmc_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf);
-int mmc_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf);
+int mmc_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf);
+int mmc_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf);
 void mmc_spin(void);
 int mmc_spinup_time(void);
 
diff --git a/firmware/export/mv.h b/firmware/export/mv.h
index 966ff9a032..9d202a8087 100644
--- a/firmware/export/mv.h
+++ b/firmware/export/mv.h
@@ -23,6 +23,7 @@
 #define __MV_H__
 
 #include <stdbool.h>
+#include <stdint.h>
 #include "config.h"
 
 /* FixMe: These macros are a bit nasty and perhaps misplaced here.
@@ -40,6 +41,19 @@
 #define IF_MD_DRV(d)  0
 #endif /* HAVE_MULTIDRIVE */
 
+/* Storage size */
+#if (CONFIG_STORAGE & STORAGE_ATA) && defined(HAVE_LBA48)
+typedef uint64_t sector_t;
+#define STORAGE_64BIT_SECTOR
+#elif (CONFIG_STORAGE & STORAGE_SD) && defined(HAVE_SDUC)
+typedef uint64_t sector_t;
+#define STORAGE_64BIT_SECTOR
+#else
+typedef unsigned long sector_t;
+#undef STORAGE_64BIT_SECTOR
+#endif
+
+
 /* Volumes mean things that have filesystems on them, like partitions */
 #ifdef HAVE_MULTIVOLUME
 #define IF_MV(x...) x          /* valist contents or empty */
@@ -113,13 +127,16 @@ struct volumeinfo
 /* Volume-centric functions (in disk.c) */
 void volume_recalc_free(IF_MV_NONVOID(int volume));
 unsigned int volume_get_cluster_size(IF_MV_NONVOID(int volume));
-void volume_size(IF_MV(int volume,) unsigned long *size, unsigned long *free);
+void volume_size(IF_MV(int volume,) sector_t *size, sector_t *free);
 #ifdef HAVE_DIRCACHE
 bool volume_ismounted(IF_MV_NONVOID(int volume));
 #endif
 #ifdef HAVE_HOTSWAP
 bool volume_removable(int volume);
 bool volume_present(int volume);
+#else
+#define volume_present(x) 1
+#define volueme_removeable(x) 0
 #endif /* HAVE_HOTSWAP */
 
 #ifdef HAVE_MULTIDRIVE
diff --git a/firmware/export/nand.h b/firmware/export/nand.h
index fe25c9b407..d4fd6028ed 100644
--- a/firmware/export/nand.h
+++ b/firmware/export/nand.h
@@ -36,8 +36,8 @@ bool nand_disk_is_active(void);
 int  nand_soft_reset(void);
 int  nand_init(void) STORAGE_INIT_ATTR;
 void nand_close(void);
-int  nand_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf);
-int  nand_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf);
+int  nand_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf);
+int  nand_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf);
 #ifdef HAVE_STORAGE_FLUSH
 int  nand_flush(void);
 #endif
diff --git a/firmware/export/pathfuncs.h b/firmware/export/pathfuncs.h
index 1b18f22d06..fce8e5851c 100644
--- a/firmware/export/pathfuncs.h
+++ b/firmware/export/pathfuncs.h
@@ -82,6 +82,8 @@ int path_strip_volume(const char *name, const char **nameptr, bool greedy);
 int path_strip_last_volume(const char *name, const char **nameptr, bool greedy);
 int get_volume_name(int volume, char *name);
 int make_volume_root(int volume, char *dst);
+void init_volume_names(void);
+int path_get_volume_id(const char *name);
 #endif
 
 int path_strip_drive(const char *name, const char **nameptr, bool greedy);
diff --git a/firmware/export/ramdisk.h b/firmware/export/ramdisk.h
index d79ac50836..eb06ea9650 100644
--- a/firmware/export/ramdisk.h
+++ b/firmware/export/ramdisk.h
@@ -35,8 +35,8 @@ bool ramdisk_disk_is_active(void);
 int ramdisk_soft_reset(void);
 int ramdisk_init(void) STORAGE_INIT_ATTR;
 void ramdisk_close(void);
-int ramdisk_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf);
-int ramdisk_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf);
+int ramdisk_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf);
+int ramdisk_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf);
 void ramdisk_spin(void);
 void ramdisk_sleepnow(void);
 int ramdisk_spinup_time(void);
diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h
index 9dd0a24c6f..2376163180 100644
--- a/firmware/export/rbpaths.h
+++ b/firmware/export/rbpaths.h
@@ -54,6 +54,8 @@
 
 #define RB_ROOT_VOL_HIDDEN(v)   (IF_MV_VOL(v) == 0)
 #define RB_ROOT_CONTENTS_DIR    "/" IF_MV("<0>")
+#define REC_BASE_DIR        HOME_DIR "Recordings"
+#define PLAYLIST_CATALOG_DEFAULT_DIR HOME_DIR "Playlists"
 
 #else /* APPLICATION */
 
@@ -67,13 +69,11 @@
 #define CODECS_DIR          ROCKBOX_LIBRARY_PATH "/rockbox/codecs"
 #endif
 
-#endif /* !APPLICATION || SAMSUNG_YPR0 */
-
 #define REC_BASE_DIR        HOME_DIR "/Recordings"
 #define PLAYLIST_CATALOG_DEFAULT_DIR HOME_DIR "/Playlists"
+#endif /* !APPLICATION || SAMSUNG_YPR0 */
 
 #define LANG_DIR            ROCKBOX_DIR "/langs"
-
 #define PLUGIN_GAMES_DIR    PLUGIN_DIR "/games"
 #define PLUGIN_APPS_DIR     PLUGIN_DIR "/apps"
 #define PLUGIN_DEMOS_DIR    PLUGIN_DIR "/demos"
diff --git a/firmware/export/sd.h b/firmware/export/sd.h
index c657f8a545..d66e6f899c 100644
--- a/firmware/export/sd.h
+++ b/firmware/export/sd.h
@@ -42,8 +42,8 @@ bool sd_disk_is_active(void);
 int  sd_soft_reset(void);
 int  sd_init(void) STORAGE_INIT_ATTR;
 void sd_close(void);
-int  sd_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf);
-int  sd_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf);
+int  sd_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf);
+int  sd_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf);
 void sd_spin(void);
 int  sd_spinup_time(void); /* ticks */
 
@@ -93,6 +93,7 @@ int sd_num_drives(int first_drive);
 #define SD_READ_SINGLE_BLOCK      17
 #define SD_READ_MULTIPLE_BLOCK    18
 #define SD_SEND_NUM_WR_BLOCKS     22  /* acmd22 */
+#define SD_UC_ADDRESS_EXTENSION   22
 #define SD_SET_WR_BLK_ERASE_COUNT 23  /* acmd23 */
 #define SD_WRITE_BLOCK            24
 #define SD_WRITE_MULTIPLE_BLOCK   25
diff --git a/firmware/export/sdmmc.h b/firmware/export/sdmmc.h
index 35539169d9..f84a7b96fa 100644
--- a/firmware/export/sdmmc.h
+++ b/firmware/export/sdmmc.h
@@ -22,9 +22,11 @@
 #define __SDMMC_H__
 
 #include <stdbool.h>
+#include <stdint.h>
+#include <mv.h> /* for sector_t */
 
 typedef struct
-{  
+{
     bool initialized;
 
     unsigned long read_timeout;     /* n * 8 clock cycles */
@@ -37,7 +39,7 @@ typedef struct
     unsigned int nsac;              /* clock cycles */
     unsigned long taac;             /* n * 0.1 ns */
     unsigned int r2w_factor;
-    unsigned long numblocks;        /* size in flash blocks */
+    sector_t     numblocks;         /* size in flash blocks */
     unsigned int blocksize;         /* block size in bytes */
     unsigned long rca;              /* RCA register */
 
@@ -48,6 +50,8 @@ typedef struct
 #if (CONFIG_STORAGE & STORAGE_SD)
     unsigned int current_bank;
 #endif
+
+     unsigned int sd2plus;  /* SD 2.0 or better */
 } tCardInfo;
 
 #if (CONFIG_STORAGE & STORAGE_SD)
diff --git a/firmware/export/storage.h b/firmware/export/storage.h
index ee1423c93a..e2ae4056be 100644
--- a/firmware/export/storage.h
+++ b/firmware/export/storage.h
@@ -107,7 +107,7 @@ int ramdisk_event(long id, intptr_t data);
 struct storage_info
 {
     unsigned int sector_size;
-    unsigned int num_sectors;
+    sector_t num_sectors;
     char *vendor;
     char *product;
     char *revision;
@@ -227,7 +227,7 @@ static inline void storage_sleep(void) {};
         #define storage_last_disk_activity() mmc_last_disk_activity()
         #define storage_spinup_time() 0
         #define storage_get_identify() mmc_get_identify()
-       
+
         #ifdef STORAGE_GET_INFO
             #define storage_get_info(drive, info) mmc_get_info(IF_MD(drive,) info)
         #endif
@@ -251,7 +251,7 @@ static inline void storage_sleep(void) {};
         #define storage_last_disk_activity() nand_last_disk_activity()
         #define storage_spinup_time() 0
         #define storage_get_identify() nand_get_identify()
-       
+
         #ifdef STORAGE_GET_INFO
             #define storage_get_info(drive, info) nand_get_info(IF_MD(drive,) info)
         #endif
@@ -275,7 +275,7 @@ static inline void storage_sleep(void) {};
         #define storage_last_disk_activity() ramdisk_last_disk_activity()
         #define storage_spinup_time() 0
         #define storage_get_identify() ramdisk_get_identify()
-       
+
         #ifdef STORAGE_GET_INFO
             #define storage_get_info(drive, info) ramdisk_get_info(IF_MD(drive,) info)
         #endif
@@ -310,11 +310,14 @@ void storage_get_info(int drive, struct storage_info *info);
 #ifdef HAVE_HOTSWAP
 bool storage_removable(int drive);
 bool storage_present(int drive);
+#else
+#define storage_removable(x) 0
+#define storage_present(x) 1
 #endif
 int storage_driver_type(int drive);
 
 #endif /* NOT CONFIG_STORAGE_MULTI and NOT SIMULATOR*/
 
-int storage_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf);
-int storage_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf);
+int storage_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf);
+int storage_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf);
 #endif
diff --git a/firmware/include/dircache_redirect.h b/firmware/include/dircache_redirect.h
index ddd86c6d86..d7314cf3b1 100644
--- a/firmware/include/dircache_redirect.h
+++ b/firmware/include/dircache_redirect.h
@@ -24,6 +24,7 @@
 #include "pathfuncs.h"
 #include "dir.h"
 #include "dircache.h"
+#include "file.h"
 
 #if defined(HAVE_MULTIBOOT) && !defined(SIMULATOR) && !defined(BOOTLOADER)
 #include "rb-loader.h"
@@ -185,22 +186,33 @@ static inline void volume_onmount_internal(IF_MV_NONVOID(int volume))
 
         if (multiboot_is_boot_volume(IF_MV_VOL(volume)))
         {
-            int rtlen = get_redirect_dir(rtpath, sizeof(rtpath), volume, "", "");
-            while (rtlen > 0 && rtpath[--rtlen] == PATH_SEPCH)
-                rtpath[rtlen] = '\0'; /* remove extra separators */
+            /* get the full path to the BOOTFILE
+               ie. /<0>/redirectdir/.rockbox/rockbox.ext */
+            int rtlen = get_redirect_dir(rtpath, sizeof(rtpath),
+                                         volume, BOOTDIR, BOOTFILE);
+
+            if (rtlen <= 0 || rtlen >= (int) sizeof(rtpath))
+                rtlen = 0; /* path too long or sprintf error */
+            else if (file_exists(rtpath))
+            {
+                rtlen = get_redirect_dir(rtpath, sizeof(rtpath), volume, "", "");
+                while (rtlen > 0 && rtpath[--rtlen] == PATH_SEPCH)
+                    rtpath[rtlen] = '\0'; /* remove separators */
+            }
+            else
+                rtlen = 0; /* No BOOTFILE found */
 
 #if 0 /*removed, causes issues with playback for now?*/
             if (rtlen <= 0 || rtpath[rtlen] == VOL_END_TOK)
                 root_unmount_volume(volume); /* unmount so root can be hidden*/
 #endif
-            if (rtlen <= 0) /* Error occurred, card removed? Set root to default */
-            {
+            if (rtlen <= 0 || root_mount_path(rtpath, NSITEM_CONTENTS) != 0)
+            {   /* Error occurred, card removed? Set root to default */
+                boot_data_valid = false;
                 root_unmount_volume(volume); /* unmount so root can be hidden*/
                 goto standard_redirect;
             }
-            root_mount_path(rtpath, NSITEM_CONTENTS);
         }
-
     }
     else
     {
diff --git a/firmware/include/disk_cache.h b/firmware/include/disk_cache.h
index 79b2ccf2c6..9787c64aec 100644
--- a/firmware/include/disk_cache.h
+++ b/firmware/include/disk_cache.h
@@ -36,7 +36,7 @@ static inline void dc_unlock_cache(void)
     mutex_unlock(&disk_cache_mutex);
 }
 
-void * dc_cache_probe(IF_MV(int volume,) unsigned long secnum,
+void * dc_cache_probe(IF_MV(int volume,) sector_t secnum,
                       unsigned int *flags);
 void dc_dirty_buf(void *buf);
 void dc_discard_buf(void *buf);
@@ -46,7 +46,7 @@ void dc_discard_all(IF_MV_NONVOID(int volume));
 void dc_init(void) INIT_ATTR;
 
 /* in addition to filling, writeback is implemented by the client */
-extern void dc_writeback_callback(IF_MV(int volume, ) unsigned long sector,
+extern void dc_writeback_callback(IF_MV(int volume, ) sector_t sector,
                                   void *buf);
 
 
diff --git a/firmware/storage.c b/firmware/storage.c
index 267b0b8dfb..da3e06146d 100644
--- a/firmware/storage.c
+++ b/firmware/storage.c
@@ -23,6 +23,7 @@
 #include "ata_idle_notify.h"
 #include "usb.h"
 #include "disk.h"
+#include "pathfuncs.h"
 
 #ifdef CONFIG_STORAGE_MULTI
 
@@ -275,21 +276,21 @@ int storage_init(void)
 #ifdef CONFIG_STORAGE_MULTI
     int i;
     num_drives=0;
-    
+
 #if (CONFIG_STORAGE & STORAGE_ATA)
     if ((rc=ata_init())) return rc;
-    
+
     int ata_drives = ata_num_drives(num_drives);
     for (i=0; i<ata_drives; i++)
     {
-        storage_drivers[num_drives++] = 
+        storage_drivers[num_drives++] =
             (STORAGE_ATA<<DRIVER_OFFSET) | (i << DRIVE_OFFSET);
     }
 #endif
 
 #if (CONFIG_STORAGE & STORAGE_MMC)
     if ((rc=mmc_init())) return rc;
-    
+
     int mmc_drives = mmc_num_drives(num_drives);
     for (i=0; i<mmc_drives ;i++)
     {
@@ -300,7 +301,7 @@ int storage_init(void)
 
 #if (CONFIG_STORAGE & STORAGE_SD)
     if ((rc=sd_init())) return rc;
-    
+
     int sd_drives = sd_num_drives(num_drives);
     for (i=0; i<sd_drives; i++)
     {
@@ -311,7 +312,7 @@ int storage_init(void)
 
 #if (CONFIG_STORAGE & STORAGE_NAND)
     if ((rc=nand_init())) return rc;
-    
+
     int nand_drives = nand_num_drives(num_drives);
     for (i=0; i<nand_drives; i++)
     {
@@ -322,7 +323,7 @@ int storage_init(void)
 
 #if (CONFIG_STORAGE & STORAGE_RAMDISK)
     if ((rc=ramdisk_init())) return rc;
-    
+
     int ramdisk_drives = ramdisk_num_drives(num_drives);
     for (i=0; i<ramdisk_drives; i++)
     {
@@ -334,11 +335,15 @@ int storage_init(void)
     rc = STORAGE_FUNCTION(init)();
 #endif /* CONFIG_STORAGE_MULTI */
 
+#ifdef HAVE_MULTIVOLUME
+    init_volume_names();
+#endif
+
     storage_thread_init();
     return rc;
 }
 
-int storage_read_sectors(IF_MD(int drive,) unsigned long start, int count,
+int storage_read_sectors(IF_MD(int drive,) sector_t start, int count,
                          void* buf)
 {
 #ifdef CONFIG_STORAGE_MULTI
@@ -380,7 +385,7 @@ int storage_read_sectors(IF_MD(int drive,) unsigned long start, int count,
 
 }
 
-int storage_write_sectors(IF_MD(int drive,) unsigned long start, int count,
+int storage_write_sectors(IF_MD(int drive,) sector_t start, int count,
                           const void* buf)
 {
 #ifdef CONFIG_STORAGE_MULTI
@@ -520,7 +525,7 @@ bool storage_disk_is_active(void)
 int storage_soft_reset(void)
 {
     int rc=0;
-    
+
 #if (CONFIG_STORAGE & STORAGE_ATA)
     if ((rc=ata_soft_reset())) return rc;
 #endif
@@ -548,7 +553,7 @@ int storage_soft_reset(void)
 int storage_flush(void)
 {
     int rc=0;
-    
+
 #if (CONFIG_STORAGE & STORAGE_ATA)
     //if ((rc=ata_flush())) return rc;
 #endif
@@ -648,7 +653,7 @@ long storage_last_disk_activity(void)
 {
     long max=0;
     long t;
-    
+
 #if (CONFIG_STORAGE & STORAGE_ATA)
     t=ata_last_disk_activity();
     if (t>max) max=t;
@@ -681,7 +686,7 @@ int storage_spinup_time(void)
 {
     int max=0;
     int t;
-    
+
 #if (CONFIG_STORAGE & STORAGE_ATA)
     t=ata_spinup_time();
     if (t>max) max=t;
@@ -716,7 +721,7 @@ void storage_get_info(int drive, struct storage_info *info)
 {
     int driver=(storage_drivers[drive] & DRIVER_MASK)>>DRIVER_OFFSET;
     int ldrive=(storage_drivers[drive] & DRIVE_MASK)>>DRIVE_OFFSET;
-    
+
     switch(driver)
     {
 #if (CONFIG_STORAGE & STORAGE_ATA)
@@ -752,7 +757,7 @@ bool storage_removable(int drive)
 {
     int driver=(storage_drivers[drive] & DRIVER_MASK)>>DRIVER_OFFSET;
     int ldrive=(storage_drivers[drive] & DRIVE_MASK)>>DRIVE_OFFSET;
-    
+
     switch(driver)
     {
 #if (CONFIG_STORAGE & STORAGE_ATA)
@@ -789,7 +794,7 @@ bool storage_present(int drive)
 {
     int driver=(storage_drivers[drive] & DRIVER_MASK)>>DRIVER_OFFSET;
     int ldrive=(storage_drivers[drive] & DRIVE_MASK)>>DRIVE_OFFSET;
-    
+
     switch(driver)
     {
 #if (CONFIG_STORAGE & STORAGE_ATA)
diff --git a/firmware/target/arm/as3525/sd-as3525.c b/firmware/target/arm/as3525/sd-as3525.c
index 70e0778d2b..df39cba495 100644
--- a/firmware/target/arm/as3525/sd-as3525.c
+++ b/firmware/target/arm/as3525/sd-as3525.c
@@ -446,7 +446,7 @@ static int sd_init_card(const int drive)
     sd_parse_csd(&card_info[drive]);
 
 #if defined(HAVE_MULTIDRIVE)
-    hs_card = (card_info[drive].speed == 50000000);
+    hs_card = (card_info[drive].speed >= 50000000);
 #endif
 
     /* Boost MCICLK to operating speed */
@@ -455,7 +455,7 @@ static int sd_init_card(const int drive)
 #if defined(HAVE_MULTIDRIVE)
     else
         /* MCICLK = PCLK/2 = 31MHz(HS) or PCLK/4 = 15.5 Mhz (STD)*/
-        MCI_CLOCK(drive) = (hs_card ? MCI_HALFSPEED : MCI_QUARTERSPEED) | 
+        MCI_CLOCK(drive) = (hs_card ? MCI_HALFSPEED : MCI_QUARTERSPEED) |
                            MCI_CLOCK_POWERSAVE; /* SD supports powersave */
 #endif
 
@@ -680,7 +680,7 @@ static int sd_select_bank(signed char bank)
     return 0;
 }
 
-static int sd_transfer_sectors(IF_MD(int drive,) unsigned long start,
+static int sd_transfer_sectors(IF_MD(int drive,) sector_t start,
                                int count, void* buf, const bool write)
 {
 #ifndef HAVE_MULTIDRIVE
@@ -735,7 +735,8 @@ static int sd_transfer_sectors(IF_MD(int drive,) unsigned long start,
         unsigned int transfer = (count >= 128) ? 127 : count; /* sectors */
         void *dma_buf;
 
-        unsigned long bank_start = start;
+        sector_t bank_start = start;
+        // XXX 64-bit sectors?
 
         /* Only switch banks for internal storage */
         if(drive == INTERNAL_AS3525)
@@ -869,7 +870,7 @@ sd_transfer_error_nodma:
     return ret;
 }
 
-int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count,
+int sd_read_sectors(IF_MD(int drive,) sector_t start, int count,
                      void* buf)
 {
     int ret;
@@ -881,11 +882,11 @@ int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count,
     return ret;
 }
 
-int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count,
+int sd_write_sectors(IF_MD(int drive,) sector_t start, int count,
                      const void* buf)
 {
 #ifdef VERIFY_WRITE
-    unsigned long saved_start = start;
+    sector_t saved_start = start;
     int saved_count = count;
     void *saved_buf = (void*)buf;
 #endif
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c
index b512cc2ea4..f9ef7d9c97 100644
--- a/firmware/target/arm/as3525/sd-as3525v2.c
+++ b/firmware/target/arm/as3525/sd-as3525v2.c
@@ -677,7 +677,7 @@ int sd_init(void)
     return 0;
 }
 
-static int sd_transfer_sectors(IF_MD(int drive,) unsigned long start,
+static int sd_transfer_sectors(IF_MD(int drive,) sector_t start,
                                 int count, void* buf, bool write)
 {
     unsigned long response;
@@ -776,7 +776,7 @@ retry_with_reinit:
 
         MCI_BYTCNT = transfer * SD_BLOCK_SIZE;
 
-        int arg = start;
+        sector_t arg = start;  // XXX 64-bit
         if(!(card_info[drive].ocr & (1<<30))) /* not SDHC */
             arg *= SD_BLOCK_SIZE;
 
@@ -858,13 +858,13 @@ exit:
     return ret;
 }
 
-int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count,
+int sd_read_sectors(IF_MD(int drive,) sector_t start, int count,
                     void* buf)
 {
     return sd_transfer_sectors(IF_MD(drive,) start, count, buf, false);
 }
 
-int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count,
+int sd_write_sectors(IF_MD(int drive,) sector_t start, int count,
                      const void* buf)
 {
     return sd_transfer_sectors(IF_MD(drive,) start, count, (void*)buf, true);
diff --git a/firmware/target/arm/ata-nand-telechips.c b/firmware/target/arm/ata-nand-telechips.c
index d61c223219..453a51ed1b 100644
--- a/firmware/target/arm/ata-nand-telechips.c
+++ b/firmware/target/arm/ata-nand-telechips.c
@@ -179,7 +179,7 @@ static int phys_segment_to_page_addr(int phys_segment, int page_in_seg)
             break;
         }
     }
-    
+
     page_addr += (page_in_seg / nand_data->planes);
 
     return page_addr;
@@ -222,7 +222,7 @@ static void nand_chip_select(int bank)
 static void nand_read_id(int bank, unsigned char* id_buf)
 {
     int i;
-    
+
     /* Enable NFC bus clock */
     BCLKCTR |= DEV_NAND;
 
@@ -358,7 +358,7 @@ static void nand_setup_read(int bank, int row, int column)
 static void nand_end_read(void)
 {
     nand_chip_select(-1);
-        
+
     /* Disable NFC bus clock */
     BCLKCTR &= ~DEV_NAND;
 }
@@ -367,7 +367,7 @@ static void nand_end_read(void)
 static void nand_read_raw(int bank, int row, int column, int size, void* buf)
 {
     int i;
-    
+
     nand_setup_read(bank, row, column);
 
     /* Read data into page buffer */
@@ -388,7 +388,7 @@ static void nand_read_raw(int bank, int row, int column, int size, void* buf)
             ((unsigned int*)buf)[i] = NFC_WDATA;
         }
     }
-    
+
     nand_end_read();
 }
 
@@ -422,7 +422,7 @@ static void nand_get_chip_info(void)
     sectors_per_page = nand_data->page_size / SECTOR_SIZE;
 
     sectors_per_segment = bytes_per_segment / SECTOR_SIZE;
-    
+
     pages_per_segment = sectors_per_segment / sectors_per_page;
 
     /* Establish how many banks are present */
@@ -494,7 +494,7 @@ static bool nand_read_sector_of_phys_page(int bank, int page,
 
 #ifdef USE_ECC_CORRECTION
     unsigned long spare_buf[4];
-    
+
     /* Set up the ECC controller to monitor reads from NFC_WDATA */
     BCLKCTR |= DEV_ECC;
     ECC_BASE = (unsigned long)&NFC_WDATA;
@@ -514,27 +514,27 @@ static bool nand_read_sector_of_phys_page(int bank, int page,
            This way, reads are always done through NFC_WDATA - otherwise they
            would not be 'seen' by the ECC controller. */
         static char temp_buf[SECTOR_SIZE];
-        
+
         unsigned int* ptr = (unsigned int*) temp_buf;
-        
+
         for (i = 0; i < (SECTOR_SIZE/4); i++)
         {
             *ptr++ = NFC_WDATA;
         }
-        
+
         memcpy(buf, temp_buf, SECTOR_SIZE);
     }
     else
     {
         /* Use straight word copy as buffer and size are both word-aligned */
         unsigned int* ptr = (unsigned int*) buf;
-        
+
         for (i = 0; i < (SECTOR_SIZE/4); i++)
         {
             *ptr++ = NFC_WDATA;
         }
     }
-    
+
 #ifdef USE_ECC_CORRECTION
     /* Stop monitoring before we read the OOB data */
     ECC_CTRL &= ~ECC_M4EN;
@@ -549,29 +549,29 @@ static bool nand_read_sector_of_phys_page(int bank, int page,
     /* Calculate MLC4 ECC using bytes 0,1,8-15 */
     BCLKCTR |= DEV_ECC;
     ECC_CTRL |= ECC_M4EN;
-    
+
     MLC_ECC0W = *(unsigned short*)spare_buf;
     MLC_ECC1W = spare_buf[2];
     MLC_ECC2W = spare_buf[3];
-    
+
     while (!(ECC_CTRL & ECC_READY)) {};
 
     int errors = ECC_ERR_NUM & 7;
-    
+
     switch (errors)
     {
         case 4:     /* nothing to correct */
             break;
-            
+
         case 7:     /* fail, can't correct */
             ret = false;
             break;
-            
+
         default:    /* between 1 and 4 errors */
         {
             int i;
             unsigned char* char_buf = (unsigned char*)buf;
-            
+
             for (i = 0; i < errors + 1; i++)
             {
                 int offset = 0x207 - ECC_ERRADDR(i);
@@ -584,7 +584,7 @@ static bool nand_read_sector_of_phys_page(int bank, int page,
     ECC_CTRL &= ~ECC_M4EN;
     BCLKCTR &= ~DEV_ECC;
 #endif
-    
+
     nand_end_read();
 
     return ret;
@@ -619,7 +619,7 @@ static bool nand_read_sector_of_logical_segment(int log_segment, int sector,
 
     int cache_num = 0;
     bool found = false;
-    
+
     while (!found && cache_num < write_caches_in_use)
     {
         if (write_caches[cache_num].log_segment == log_segment)
@@ -628,10 +628,10 @@ static bool nand_read_sector_of_logical_segment(int log_segment, int sector,
             {
                 /* data is located in random pages cache */
                 found = true;
-                
+
                 bank = write_caches[cache_num].random_bank;
                 phys_segment = write_caches[cache_num].random_phys_segment;
-                
+
                 page_in_segment =
                     write_caches[cache_num].page_map[page_in_segment];
             }
@@ -640,7 +640,7 @@ static bool nand_read_sector_of_logical_segment(int log_segment, int sector,
             {
                 /* data is located in in-place pages cache */
                 found = true;
-                
+
                 bank = write_caches[cache_num].inplace_bank;
                 phys_segment = write_caches[cache_num].inplace_phys_segment;
             }
@@ -664,7 +664,7 @@ static inline unsigned char get_sector_type(char* spare_buf)
 static inline unsigned short get_log_segment_id(int phys_seg, char* spare_buf)
 {
     (void)phys_seg;
-    
+
     return ((spare_buf[OFF_LOG_SEG_HIBYTE] << 8) |
              spare_buf[OFF_LOG_SEG_LOBYTE])
 #if defined(FTL_V1)
@@ -702,7 +702,7 @@ static void read_random_writes_cache(int bank, int phys_segment)
                   16, spare_buf);
 
     log_segment = get_log_segment_id(phys_segment, spare_buf);
-    
+
     if (log_segment == -1)
         return;
 
@@ -734,13 +734,13 @@ static void read_random_writes_cache(int bank, int phys_segment)
          page++)
     {
         unsigned short cached_page;
-        
+
         nand_read_raw(bank, phys_segment_to_page_addr(phys_segment, page),
                       SECTOR_SIZE, /* offset to first sector's spare */
                       16, spare_buf);
 
         cached_page = get_cached_page_id(spare_buf);
-        
+
         if (cached_page != 0xFFFF)
             write_caches[cache_no].page_map[cached_page] = page;
     }
@@ -759,10 +759,10 @@ static void read_inplace_writes_cache(int bank, int phys_segment)
                   16, spare_buf);
 
     log_segment = get_log_segment_id(phys_segment, spare_buf);
-    
+
     if (log_segment == -1)
         return;
-    
+
     /* Find which cache this is related to */
     int cache_no = find_write_cache(log_segment);
 
@@ -780,7 +780,7 @@ static void read_inplace_writes_cache(int bank, int phys_segment)
     }
 
     write_caches[cache_no].log_segment = log_segment;
-    
+
     /* Find how many pages have been written to the new segment */
     while (log_segment != -1 &&
            page < (nand_data->pages_per_block * nand_data->planes) - 1)
@@ -791,7 +791,7 @@ static void read_inplace_writes_cache(int bank, int phys_segment)
 
         log_segment = get_log_segment_id(phys_segment, spare_buf);
     }
-    
+
     if (page != 0)
     {
         write_caches[cache_no].inplace_bank = bank;
@@ -801,7 +801,7 @@ static void read_inplace_writes_cache(int bank, int phys_segment)
 }
 
 
-int nand_read_sectors(IF_MD(int drive,) unsigned long start, int incount,
+int nand_read_sectors(IF_MD(int drive,) sector_t start, int incount,
                      void* inbuf)
 {
 #ifdef HAVE_MULTIDRIVE
@@ -809,15 +809,15 @@ int nand_read_sectors(IF_MD(int drive,) unsigned long start, int incount,
 #endif
 
     int ret = 0;
-    
+
     mutex_lock(&ata_mtx);
-    
+
     led(true);
 
     while (incount > 0)
     {
         int done = 0;
-        int segment = start / sectors_per_segment;
+        sector_t segment = start / sectors_per_segment;
         int secmod = start % sectors_per_segment;
 
         while (incount > 0 && secmod < sectors_per_segment)
@@ -839,7 +839,7 @@ int nand_read_sectors(IF_MD(int drive,) unsigned long start, int incount,
             secmod++;
             done++;
         }
-    
+
         if (done < 0)
         {
             ret = -1;
@@ -852,11 +852,11 @@ nand_read_error:
 
     mutex_unlock(&ata_mtx);
     led(false);
-    
+
     return ret;
 }
 
-int nand_write_sectors(IF_MD(int drive,) unsigned long start, int count,
+int nand_write_sectors(IF_MD(int drive,) sector_t start, int count,
                       const void* outbuf)
 {
 #ifdef HAVE_MULTIDRIVE
@@ -903,7 +903,7 @@ int nand_init(void)
     unsigned char spare_buf[16];
 
     if (initialized) return 0;
-    
+
     mutex_init(&ata_mtx);
 
     /* Set GPIO direction for chip select & write protect */
@@ -924,7 +924,7 @@ int nand_init(void)
 
     memset(lpt_lookup, 0xff, lptbuf_size);
     memset(write_caches, 0xff, sizeof(write_caches));
-    
+
     write_caches_in_use = 0;
 
     /* Scan banks to build up block translation table */
@@ -936,7 +936,7 @@ int nand_init(void)
             nand_read_raw(bank, phys_segment_to_page_addr(phys_segment, 0),
                           SECTOR_SIZE, /* offset */
                           16, spare_buf);
-            
+
             int type = get_sector_type(spare_buf);
 
 #ifdef FTL_V2
@@ -948,7 +948,7 @@ int nand_init(void)
                 nand_read_raw(bank, phys_segment_to_page_addr
                                 (phys_segment, pages_per_segment - 1),
                               SECTOR_SIZE, 16, spare_buf);
-                
+
                 if (get_sector_type(spare_buf) != 0xff)
                 {
                     type = SECTYPE_MAIN_DATA;
@@ -982,14 +982,14 @@ int nand_init(void)
                     }
                     break;
                 }
-                
+
                 case SECTYPE_MAIN_RANDOM_CACHE:
                 {
                     /* Newly-written random page data (Main data area) */
                     read_random_writes_cache(bank, phys_segment);
                     break;
                 }
-                
+
                 case SECTYPE_MAIN_INPLACE_CACHE:
                 {
                     /* Newly-written sequential page data (Main data area) */
@@ -999,7 +999,7 @@ int nand_init(void)
             }
         }
     }
-    
+
     initialized = true;
 
     return 0;
@@ -1029,7 +1029,7 @@ int nand_num_drives(int first_drive)
 {
     /* We don't care which logical drive number we have been assigned */
     (void)first_drive;
-    
+
     return 1;
 }
 
diff --git a/firmware/target/arm/imx233/nand-imx233.c b/firmware/target/arm/imx233/nand-imx233.c
index a7afba7d43..22da408e05 100644
--- a/firmware/target/arm/imx233/nand-imx233.c
+++ b/firmware/target/arm/imx233/nand-imx233.c
@@ -36,13 +36,13 @@ int nand_init(void)
 {
     return -1;
 }
-int nand_read_sectors(IF_MD(int drive,) unsigned long start, int count,
+int nand_read_sectors(IF_MD(int drive,) sector_t start, int count,
                      void* buf)
 {
     return -1;
 }
 
-int nand_write_sectors(IF_MD(int drive,) unsigned long start, int count,
+int nand_write_sectors(IF_MD(int drive,) sector_t start, int count,
                      const void* buf)
 {
     return -1;
diff --git a/firmware/target/arm/imx233/partitions-imx233.c b/firmware/target/arm/imx233/partitions-imx233.c
index 83a0bf8b42..69d0ba4199 100644
--- a/firmware/target/arm/imx233/partitions-imx233.c
+++ b/firmware/target/arm/imx233/partitions-imx233.c
@@ -71,7 +71,7 @@ static const char *creative_part_name(enum imx233_part_t part)
 }
 
 static int compute_window_creative(intptr_t user, part_read_fn_t read_fn,
-    enum imx233_part_t part, unsigned *start, unsigned *end)
+    enum imx233_part_t part, sector_t *start, sector_t *end)
 {
     uint8_t mblk[512];
     int ret = read_fn(user, MBLK_ADDR / 512, 1, mblk);
@@ -99,7 +99,7 @@ static int compute_window_creative(intptr_t user, part_read_fn_t read_fn,
             }
             else
                 *end = *start + ent[i].size * hdr->block_size / 512;
-            
+
             return 0;
         }
     }
@@ -109,7 +109,7 @@ static int compute_window_creative(intptr_t user, part_read_fn_t read_fn,
 
 #if (IMX233_PARTITIONS & IMX233_FREESCALE)
 static int compute_window_freescale(intptr_t user, part_read_fn_t read_fn,
-    enum imx233_part_t part, unsigned *start, unsigned *end)
+    enum imx233_part_t part, sector_t *start, sector_t *end)
 {
     uint8_t mbr[512];
     int ret = read_fn(user, 0, 1, mbr);
@@ -179,7 +179,7 @@ static int compute_window_freescale(intptr_t user, part_read_fn_t read_fn,
 #endif /* (IMX233_PARTITIONS & IMX233_FREESCALE) */
 
 int imx233_partitions_compute_window(intptr_t user, part_read_fn_t read_fn,
-    enum imx233_part_t part, unsigned *start, unsigned *end)
+    enum imx233_part_t part, sector_t *start, sector_t *end)
 {
     int ret = -1;
 #if (IMX233_PARTITIONS & IMX233_CREATIVE)
diff --git a/firmware/target/arm/imx233/partitions-imx233.h b/firmware/target/arm/imx233/partitions-imx233.h
index e5378dadbb..edc6c1b2f4 100644
--- a/firmware/target/arm/imx233/partitions-imx233.h
+++ b/firmware/target/arm/imx233/partitions-imx233.h
@@ -45,7 +45,7 @@ enum imx233_part_t
 /** The computation function can be called very early in the boot, at which point
  * usual storage read/write function may not be available. To workaround this
  * issue, one must provide a read function. */
-typedef int (*part_read_fn_t)(intptr_t user, unsigned long start, int count, void* buf);
+typedef int (*part_read_fn_t)(intptr_t user, sector_t start, int count, void* buf);
 /* Enable/Disable window computations for internal storage following the
  * Freescale/Creative convention */
 void imx233_partitions_enable_window(bool enable);
@@ -55,6 +55,6 @@ bool imx233_partitions_is_window_enabled(void);
  * for a whole disk, *end should be the size of the disk when the function is
  * called */
 int imx233_partitions_compute_window(intptr_t user, part_read_fn_t read_fn,
-    enum imx233_part_t part, unsigned *start, unsigned *end);
+    enum imx233_part_t part, sector_t *start, sector_t *end);
 
-#endif /* __PARTITIONS_IMX233__ */
\ No newline at end of file
+#endif /* __PARTITIONS_IMX233__ */
diff --git a/firmware/target/arm/imx233/sdmmc-imx233.c b/firmware/target/arm/imx233/sdmmc-imx233.c
index af090e8a07..02f59a50f4 100644
--- a/firmware/target/arm/imx233/sdmmc-imx233.c
+++ b/firmware/target/arm/imx233/sdmmc-imx233.c
@@ -203,8 +203,8 @@ struct sdmmc_status_t
  * the RCA is the 16-bit msb. Be careful that this is not the actuall RCA ! */
 
 /* common */
-static unsigned window_start[SDMMC_NUM_DRIVES];
-static unsigned window_end[SDMMC_NUM_DRIVES];
+static sector_t window_start[SDMMC_NUM_DRIVES];
+static sector_t window_end[SDMMC_NUM_DRIVES];
 static uint8_t aligned_buffer[SDMMC_NUM_DRIVES][512] CACHEALIGN_ATTR;
 static tCardInfo sdmmc_card_info[SDMMC_NUM_DRIVES];
 static struct mutex mutex[SDMMC_NUM_DRIVES];
@@ -648,7 +648,7 @@ int mmc_event(long id, intptr_t data)
 #endif /* CONFIG_STORAGE & STORAGE_MMC */
 
 /* low-level function, don't call directly! */
-static int __xfer_sectors(int drive, unsigned long start, int count, void *buf, bool read)
+static int __xfer_sectors(int drive, sector_t start, int count, void *buf, bool read)
 {
     uint32_t resp;
     int ret = 0;
@@ -660,7 +660,7 @@ static int __xfer_sectors(int drive, unsigned long start, int count, void *buf,
             need_stop = false;
         /* Set bank_start to the correct unit (blocks or bytes).
          * MMC drives use block addressing, SD cards bytes or blocks */
-        int bank_start = start;
+        sector_t bank_start = start;
         if(SDMMC_MODE(drive) == SD_MODE && !(SDMMC_INFO(drive).ocr & (1<<30)))   /* not SDHC */
             bank_start *= SD_BLOCK_SIZE;
         /* issue read/write
@@ -686,7 +686,7 @@ static int __xfer_sectors(int drive, unsigned long start, int count, void *buf,
     return ret;
 }
 
-static int transfer_sectors(int drive, unsigned long start, int count, void *buf, bool read)
+static int transfer_sectors(int drive, sector_t start, int count, void *buf, bool read)
 {
     int ret = 0;
     /* the function doesn't work when count is 0 */
@@ -806,7 +806,7 @@ static int transfer_sectors(int drive, unsigned long start, int count, void *buf
 }
 
 /* user specifies the sdmmc drive */
-static int part_read_fn(intptr_t user, unsigned long start, int count, void* buf)
+static int part_read_fn(intptr_t user, sector_t start, int count, void* buf)
 {
     return transfer_sectors(user, start, count, buf, true);
 }
@@ -917,7 +917,7 @@ void sd_enable(bool on)
     (void) on;
 }
 
-int sd_read_sectors(IF_MD(int sd_drive,) unsigned long start, int count, void *buf)
+int sd_read_sectors(IF_MD(int sd_drive,) sector_t start, int count, void *buf)
 {
 #ifndef HAVE_MULTIDRIVE
     int sd_drive = 0;
@@ -925,7 +925,7 @@ int sd_read_sectors(IF_MD(int sd_drive,) unsigned long start, int count, void *b
     return transfer_sectors(sd_map[sd_drive], start, count, buf, true);
 }
 
-int sd_write_sectors(IF_MD(int sd_drive,) unsigned long start, int count, const void* buf)
+int sd_write_sectors(IF_MD(int sd_drive,) sector_t start, int count, const void* buf)
 {
 #ifndef HAVE_MULTIDRIVE
     int sd_drive = 0;
@@ -1039,7 +1039,7 @@ int mmc_spinup_time(void)
     return 0;
 }
 
-int mmc_read_sectors(IF_MD(int mmc_drive,) unsigned long start, int count, void *buf)
+int mmc_read_sectors(IF_MD(int mmc_drive,) sector_t start, int count, void *buf)
 {
 #ifndef HAVE_MULTIDRIVE
     int mmc_drive = 0;
@@ -1047,7 +1047,7 @@ int mmc_read_sectors(IF_MD(int mmc_drive,) unsigned long start, int count, void
     return transfer_sectors(mmc_map[mmc_drive], start, count, buf, true);
 }
 
-int mmc_write_sectors(IF_MD(int mmc_drive,) unsigned long start, int count, const void* buf)
+int mmc_write_sectors(IF_MD(int mmc_drive,) sector_t start, int count, const void* buf)
 {
 #ifndef HAVE_MULTIDRIVE
     int mmc_drive = 0;
diff --git a/firmware/target/arm/pp/ata-pp5020.c b/firmware/target/arm/pp/ata-pp5020.c
index 176e74993c..7351215693 100644
--- a/firmware/target/arm/pp/ata-pp5020.c
+++ b/firmware/target/arm/pp/ata-pp5020.c
@@ -48,8 +48,8 @@ bool ata_is_coldstart()
    rest are the same. They go in IDE0_PRI_TIMING0.
 
    Rockbox used to use 0x10, and test_disk shows that leads to faster PIO.
-   However on some disks connected with mSATA adapters this causes corrupt data
-   so we now just use these timings from the OF.
+   However when used with mSATA and some SD adapters this causes corrupt data
+   so we now unconditionally use these timings from the OF.
 */
 static const unsigned long pio80mhz[] = {
     0xC293, 0x43A2, 0x11A1, 0x7232, 0x3131
@@ -83,10 +83,7 @@ void ata_device_init()
 /* Setup the timing for PIO mode */
 void ata_set_pio_timings(int mode)
 {
-    if (ata_disk_isssd())
-        IDE0_PRI_TIMING0 = pio80mhz[mode];
-    else
-        IDE0_PRI_TIMING0 = 0x10;
+    IDE0_PRI_TIMING0 = pio80mhz[mode];
 }
 
 #ifdef HAVE_ATA_DMA
@@ -109,6 +106,8 @@ static bool dma_boosted = false;
 static bool dma_needs_boost;
 #endif
 
+static int ata_is_ssd = 0;
+
 /* This function sets up registers for 80 Mhz.
    Ultra DMA mode 2 works at 30 Mhz.
  */
@@ -136,6 +135,8 @@ void ata_dma_set_mode(unsigned char mode) {
 #if !defined(IPOD_NANO)
     IDE0_CFG |= 0x20000000; /* >= 50 Mhz */
 #endif
+
+    ata_is_ssd = ata_disk_isssd();
 }
 
 #define IDE_CFG_INTRQ           8
@@ -175,11 +176,12 @@ bool ata_dma_setup(void *addr, unsigned long bytes, bool write) {
     /* Writes only need to be word-aligned, but by default DMA
      * is not used for writing on non-SSDs as it appears to be slower.
      */
-    if (!ata_disk_isssd())
-        return false;
-
-    if (write && ((unsigned long)addr & 3))
-        return false;
+    if (write) {
+        if ((unsigned long)addr & 3)
+            return false;
+        if (!ata_is_ssd)
+            return false;
+    }
 
 #if ATA_MAX_UDMA > 2
     if (dma_needs_boost && !dma_boosted) {
diff --git a/firmware/target/arm/pp/ata-sd-pp.c b/firmware/target/arm/pp/ata-sd-pp.c
index fb0a9e150e..b998afd21e 100644
--- a/firmware/target/arm/pp/ata-sd-pp.c
+++ b/firmware/target/arm/pp/ata-sd-pp.c
@@ -82,7 +82,7 @@
 #define STAT_TIME_OUT_RES     (1 << 1)
 #define STAT_TIME_OUT_READ    (1)
 #define STAT_ERROR_BITS       (0x3f)
- 
+
 /* MMC_CMDAT bits */
 /* Some of the bits used by the OF don't make much sense with these */
 /* definitions. So they're probably different between PXA and PP502x */
@@ -101,7 +101,7 @@
 #define CMDAT_RES_TYPE3    (3)
 #define CMDAT_RES_TYPE2    (2)
 #define CMDAT_RES_TYPE1    (1)
- 
+
 /* MMC_I_MASK bits */
 /* PP502x apparently only has bits 0-3 */
 #define I_MASK_SDIO_SUSPEND_ACK  (1 << 12)
@@ -499,18 +499,18 @@ static inline void copy_write_sectors(const unsigned char** buf)
     {
         asm volatile (
             "ldmia  %[buf]!, { r3, r5, r7, r9 } \r\n"
-            "mov    r4, r3, lsr #16             \r\n" 
-            "mov    r6, r5, lsr #16             \r\n" 
-            "mov    r8, r7, lsr #16             \r\n" 
-            "mov    r10, r9, lsr #16            \r\n" 
+            "mov    r4, r3, lsr #16             \r\n"
+            "mov    r6, r5, lsr #16             \r\n"
+            "mov    r8, r7, lsr #16             \r\n"
+            "mov    r10, r9, lsr #16            \r\n"
             "stmia  %[data], { r3-r10 }         \r\n"
             "ldmia  %[buf]!, { r3, r5, r7, r9 } \r\n"
-            "mov    r4, r3, lsr #16             \r\n" 
-            "mov    r6, r5, lsr #16             \r\n" 
-            "mov    r8, r7, lsr #16             \r\n" 
-            "mov    %[t], r9, lsr #16           \r\n" 
+            "mov    r4, r3, lsr #16             \r\n"
+            "mov    r6, r5, lsr #16             \r\n"
+            "mov    r8, r7, lsr #16             \r\n"
+            "mov    %[t], r9, lsr #16           \r\n"
             "stmia  %[data], { r3-r9 }          \r\n"
-            : [buf]"+&r"(*buf), [t]"=&r"(t) 
+            : [buf]"+&r"(*buf), [t]"=&r"(t)
             : [data]"r"(&MMC_DATA_FIFO)
             : "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10"
         );
@@ -760,7 +760,7 @@ static void sd_init_device(int card_no)
         currcard->csd[i] = temp_reg[3-i];
 
     sd_parse_csd(currcard);
-    
+
     MMC_CLKRT = 0;  /* switch to highest clock rate */
 
     ret = sd_command(SD_SELECT_CARD, currcard->rca, NULL,
@@ -849,7 +849,7 @@ static void sd_select_device(int card_no)
 
 /* API Functions */
 
-int sd_read_sectors(IF_MD(int drive,) unsigned long start, int incount,
+int sd_read_sectors(IF_MD(int drive,) sector_t start, int incount,
                      void* inbuf)
 {
 #ifndef HAVE_MULTIDRIVE
@@ -857,8 +857,8 @@ int sd_read_sectors(IF_MD(int drive,) unsigned long start, int incount,
 #endif
     int ret;
     unsigned char *buf, *buf_end;
-    unsigned int bank;
-    
+    sector_t bank;
+
     /* TODO: Add DMA support. */
 
     mutex_lock(&sd_mtx);
@@ -894,7 +894,7 @@ sd_read_retry:
             if (ret < 0)
                 goto sd_read_error;
         }
-    
+
         start -= bank * BLOCKS_PER_BANK;
     }
 
@@ -904,6 +904,8 @@ sd_read_retry:
 
     MMC_NUMBLK = incount;
 
+    // XXX 64-bit addresses..
+
 #ifdef HAVE_HOTSWAP
     if(currcard->ocr & (1<<30) )
     {
@@ -966,7 +968,7 @@ sd_read_error:
     }
 }
 
-int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count,
+int sd_write_sectors(IF_MD(int drive,) sector_t start, int count,
                       const void* outbuf)
 {
 /* Write support is not finished yet */
@@ -1010,7 +1012,7 @@ sd_write_retry:
             if (ret < 0)
                 goto sd_write_error;
         }
-    
+
         start -= bank * BLOCKS_PER_BANK;
     }
 
@@ -1250,7 +1252,7 @@ int sd_num_drives(int first_drive)
 #else
     (void)first_drive;
 #endif
-    
+
 #ifdef HAVE_MULTIDRIVE
     return 2;
 #else
diff --git a/firmware/target/arm/rk27xx/ata-nand-rk27xx.c b/firmware/target/arm/rk27xx/ata-nand-rk27xx.c
index e257416cd0..54a1223cfc 100644
--- a/firmware/target/arm/rk27xx/ata-nand-rk27xx.c
+++ b/firmware/target/arm/rk27xx/ata-nand-rk27xx.c
@@ -31,18 +31,18 @@
 
 /* This file provides only STUBS for now */
 
-/** static, private data **/ 
+/** static, private data **/
 static bool initialized = false;
 
 /* API Functions */
-int nand_read_sectors(IF_MD(int drive,) unsigned long start, int incount,
+int nand_read_sectors(IF_MD(int drive,) sector_t start, int incount,
                      void* inbuf)
 {
     (void)drive;
     return ftl_read(start, incount, inbuf);
 }
 
-int nand_write_sectors(IF_MD(int drive,) unsigned long start, int count,
+int nand_write_sectors(IF_MD(int drive,) sector_t start, int count,
                       const void* outbuf)
 {
     (void)drive;
@@ -112,7 +112,7 @@ int nand_num_drives(int first_drive)
 {
     /* We don't care which logical drive number(s) we have been assigned */
     (void)first_drive;
-    
+
     return 1;
 }
 #endif
diff --git a/firmware/target/arm/rk27xx/sd-rk27xx.c b/firmware/target/arm/rk27xx/sd-rk27xx.c
index 2ddf91a67e..e082a8bf2e 100644
--- a/firmware/target/arm/rk27xx/sd-rk27xx.c
+++ b/firmware/target/arm/rk27xx/sd-rk27xx.c
@@ -35,7 +35,7 @@
 #include "panic.h"
 #include "stdbool.h"
 #include "storage.h"
-
+#include "timeout.h"
 #include "lcd.h"
 #include <stdarg.h>
 #include "sysfont.h"
@@ -453,7 +453,7 @@ static inline void write_sd_data(unsigned char **src)
     *src += 512;
 }
 
-int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count,
+int sd_read_sectors(IF_MD(int drive,) sector_t start, int count,
                     void* buf)
 {
 #ifdef HAVE_MULTIDRIVE
@@ -498,6 +498,8 @@ int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count,
                        DATA_XFER_MULTI;
         }
 
+        // XXX 64-bit
+
         /* issue read command to the card */
         if (!send_cmd(SD_READ_MULTIPLE_BLOCK, start, RES_R1, &response))
         {
@@ -576,7 +578,7 @@ int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count,
 }
 
 /* Not tested */
-int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count,
+int sd_write_sectors(IF_MD(int drive,) sector_t start, int count,
                      const void* buf)
 {
 #ifdef HAVE_MULTIDRIVE
@@ -620,6 +622,7 @@ int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count,
 
         write_sd_data(&src); /* put data into transfer buffer */
 
+        // XXX 64-bit
         if (!send_cmd(SD_WRITE_MULTIPLE_BLOCK, start, RES_R1, &response))
         {
             ret = -3;
diff --git a/firmware/target/arm/s3c2440/sd-s3c2440.c b/firmware/target/arm/s3c2440/sd-s3c2440.c
index 2ff68aa4ee..82fd60c711 100644
--- a/firmware/target/arm/s3c2440/sd-s3c2440.c
+++ b/firmware/target/arm/s3c2440/sd-s3c2440.c
@@ -18,7 +18,7 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
- 
+
 //#define SD_DEBUG
 
 #include "system.h"
@@ -33,7 +33,7 @@
 #include "sdmmc.h"
 #endif
 #include "storage.h"
-#include "dma-target.h"     
+#include "dma-target.h"
 #include "system-target.h"
 #include "led-mini2440.h"
 
@@ -83,7 +83,7 @@ struct sd_card_status
     int retry_max;
 };
 
-/** static, private data **/ 
+/** static, private data **/
 
 /* for compatibility */
 static long last_disk_activity = -1;
@@ -117,13 +117,13 @@ static struct mutex             sd_mtx SHAREDBSS_ATTR;
 static struct semaphore         transfer_completion_signal;
 static volatile unsigned int    transfer_error[NUM_DRIVES];
 /* align on cache line size */
-static unsigned char    aligned_buffer[UNALIGNED_NUM_SECTORS * SD_BLOCK_SIZE] 
+static unsigned char    aligned_buffer[UNALIGNED_NUM_SECTORS * SD_BLOCK_SIZE]
                         __attribute__((aligned(32)));
 static unsigned char *  uncached_buffer;
 
-static inline void mci_delay(void) 
-{ 
-    int i = 0xffff; 
+static inline void mci_delay(void)
+{
+    int i = 0xffff;
     while (i--)
         asm volatile ("nop\n");
 }
@@ -146,7 +146,7 @@ static void get_regs (unsigned *regs)
 {
     unsigned j;
     volatile unsigned long *sdi_reg = &SDICON;
-    
+
     for (j=0; j < 16;j++)
     {
         *regs++ = *sdi_reg++;
@@ -158,7 +158,7 @@ static void dump_regs (unsigned *regs1, unsigned *regs2)
     unsigned j;
     volatile unsigned long*sdi_reg = &SDICON;
     unsigned long diff;
-    
+
     for (j=0; j < 16;j++)
     {
         diff = *regs1 ^ *regs2;
@@ -174,23 +174,23 @@ static void dump_regs (unsigned *regs1, unsigned *regs2)
 static void debug_r1(int cmd)
 {
 #if defined(SD_DEBUG)
-    dbgprintf("CMD%2.2d:SDICSTA=%04x [%c%c%c%c%c-%c%c%c%c%c%c%c]  SDIRSP0=%08x [%d %s] \n", 
-        cmd, 
-        SDICSTA, 
-        (SDICSTA & S3C2410_SDICMDSTAT_CRCFAIL)    ? 'C' : ' ', 
-        (SDICSTA & S3C2410_SDICMDSTAT_CMDSENT)    ? 'S' : ' ', 
-        (SDICSTA & S3C2410_SDICMDSTAT_CMDTIMEOUT) ? 'T' : ' ', 
-        (SDICSTA & S3C2410_SDICMDSTAT_RSPFIN)     ? 'R' : ' ', 
-        (SDICSTA & S3C2410_SDICMDSTAT_XFERING)    ? 'X' : ' ', 
-        
-        (SDICSTA & 0x40)    ? 'P' : ' ', 
-        (SDICSTA & 0x20)    ? 'A' : ' ', 
-        (SDICSTA & 0x10)    ? 'E' : ' ', 
-        (SDICSTA & 0x08)    ? 'C' : ' ', 
-        (SDICSTA & 0x04)    ? 'I' : ' ', 
-        (SDICSTA & 0x02)    ? 'R' : ' ', 
-        (SDICSTA & 0x01)    ? 'Z' : ' ', 
-        
+    dbgprintf("CMD%2.2d:SDICSTA=%04x [%c%c%c%c%c-%c%c%c%c%c%c%c]  SDIRSP0=%08x [%d %s] \n",
+        cmd,
+        SDICSTA,
+        (SDICSTA & S3C2410_SDICMDSTAT_CRCFAIL)    ? 'C' : ' ',
+        (SDICSTA & S3C2410_SDICMDSTAT_CMDSENT)    ? 'S' : ' ',
+        (SDICSTA & S3C2410_SDICMDSTAT_CMDTIMEOUT) ? 'T' : ' ',
+        (SDICSTA & S3C2410_SDICMDSTAT_RSPFIN)     ? 'R' : ' ',
+        (SDICSTA & S3C2410_SDICMDSTAT_XFERING)    ? 'X' : ' ',
+
+        (SDICSTA & 0x40)    ? 'P' : ' ',
+        (SDICSTA & 0x20)    ? 'A' : ' ',
+        (SDICSTA & 0x10)    ? 'E' : ' ',
+        (SDICSTA & 0x08)    ? 'C' : ' ',
+        (SDICSTA & 0x04)    ? 'I' : ' ',
+        (SDICSTA & 0x02)    ? 'R' : ' ',
+        (SDICSTA & 0x01)    ? 'Z' : ' ',
+
         SDIRSP0,
         SD_R1_CURRENT_STATE(SDIRSP0),
         (SDIRSP0 & SD_R1_READY_FOR_DATA) ? "RDY " : "    "
@@ -205,8 +205,8 @@ void SDI (void)
     int status = SDIDSTA;
 #ifndef HAVE_MULTIDRIVE
     const int curr_card = 0;
-#endif     
-    
+#endif
+
     transfer_error[curr_card] = status
 #if 0
         & ( S3C2410_SDIDSTA_CRCFAIL | S3C2410_SDIDSTA_RXCRCFAIL |
@@ -217,7 +217,7 @@ void SDI (void)
     SDIDSTA |= S3C2410_SDIDSTA_CLEAR_BITS;  /* needed to clear int  */
 
     dbgprintf ("SDI %x\n", transfer_error[curr_card]);
-    
+
     semaphore_release(&transfer_completion_signal);
 
     /* Ack the interrupt */
@@ -229,13 +229,13 @@ void SDI (void)
 void dma_callback (void)
 {
     const int status = SDIDSTA;
-    
+
     transfer_error[0] = status & (S3C2410_SDIDSTA_CRCFAIL |
         S3C2410_SDIDSTA_RXCRCFAIL   |
         S3C2410_SDIDSTA_DATATIMEOUT );
 
     SDIDSTA |= S3C2410_SDIDSTA_CLEAR_BITS;  /* needed to clear int  */
-    
+
     dbgprintf ("dma_cb\n");
     semaphore_release(&transfer_completion_signal);
 }
@@ -248,14 +248,14 @@ static void init_sdi_controller(const int card_no)
 /*****************************************************************************/
 #ifdef MINI2440
     /* Specific to Mini2440 */
-    
+
     /* Enable pullups on SDCMD and SDDAT pins */
     S3C2440_GPIO_PULLUP (GPEUP, 6, GPIO_PULLUP_ENABLE);
     S3C2440_GPIO_PULLUP (GPEUP, 7, GPIO_PULLUP_ENABLE);
     S3C2440_GPIO_PULLUP (GPEUP, 8, GPIO_PULLUP_ENABLE);
     S3C2440_GPIO_PULLUP (GPEUP, 9, GPIO_PULLUP_ENABLE);
     S3C2440_GPIO_PULLUP (GPEUP, 10, GPIO_PULLUP_ENABLE);
-    
+
     /* Enable special function for SDCMD, SDCLK and SDDAT pins */
     S3C2440_GPIO_CONFIG (GPECON, 5, GPIO_FUNCTION);
     S3C2440_GPIO_CONFIG (GPECON, 6, GPIO_FUNCTION);
@@ -263,15 +263,15 @@ static void init_sdi_controller(const int card_no)
     S3C2440_GPIO_CONFIG (GPECON, 8, GPIO_FUNCTION);
     S3C2440_GPIO_CONFIG (GPECON, 9, GPIO_FUNCTION);
     S3C2440_GPIO_CONFIG (GPECON, 10, GPIO_FUNCTION);
-    
+
     /* Card Detect input */
     S3C2440_GPIO_CONFIG (GPGCON, 8, GPIO_INPUT);
     /* enable external irq 8-23 on the internal interrupt controller */
     INTMSK &= ~1<<5;
     /* enable GPG8 IRQ on the external interrupt controller */
     EINTMASK &= ~(1<<16);
-    
-    
+
+
     /* Write Protect input */
     S3C2440_GPIO_CONFIG (GPHCON, 8, GPIO_INPUT);
 /*****************************************************************************/
@@ -279,11 +279,11 @@ static void init_sdi_controller(const int card_no)
 #error Unsupported target
 #endif
 /*****************************************************************************/
-    
+
     /* About 400KHz for initial comms with card */
     SDIPRE   = PCLK / INITIAL_CLK - 1;
     /* Byte order=Type A (Little Endian), clock enable */
-    SDICON   = S3C2410_SDICON_CLOCKTYPE;       
+    SDICON   = S3C2410_SDICON_CLOCKTYPE;
     SDIFSTA  |= S3C2440_SDIFSTA_FIFORESET;
     SDIBSIZE = SD_BLOCK_SIZE;
     SDIDTIMER= 0x7fffff;      /* Set timeout count - max value */
@@ -297,11 +297,11 @@ static void init_sdi_controller(const int card_no)
     /* Enable interrupt in controller */
     bitclr32(&INTMOD, SDI_MASK);
     bitclr32(&INTMSK, SDI_MASK);
-    
-    SDIIMSK |= S3C2410_SDIIMSK_DATAFINISH 
+
+    SDIIMSK |= S3C2410_SDIIMSK_DATAFINISH
                | S3C2410_SDIIMSK_DATATIMEOUT
-               | S3C2410_SDIIMSK_DATACRC     
-               | S3C2410_SDIIMSK_CRCSTATUS   
+               | S3C2410_SDIIMSK_DATACRC
+               | S3C2410_SDIIMSK_CRCSTATUS
                | S3C2410_SDIIMSK_FIFOFAIL
                ;
 #endif
@@ -325,18 +325,18 @@ static bool send_cmd(const int card_no, const int cmd, const int arg,
     get_regs (reg_copy2);
     dump_regs (reg_copy, reg_copy2);
 #endif
-    
+
 #if 0
     while (SDICSTA & S3C2410_SDICMDSTAT_XFERING)
         ; /* wait ?? */
-#endif    
+#endif
     /* set up new command */
-    
+
     if (flags & MCI_ARG)
         SDICARG = arg;
     else
         SDICARG = 0;
-    
+
     val = cmd | S3C2410_SDICMDCON_CMDSTART | S3C2410_SDICMDCON_SENDERHOST;
     if(flags & MCI_RESP)
     {
@@ -344,27 +344,27 @@ static bool send_cmd(const int card_no, const int cmd, const int arg,
         if(flags & MCI_LONG_RESP)
             val |= S3C2410_SDICMDCON_LONGRSP;
     }
-    
+
     /* Clear command/data status flags */
     SDICSTA |= 0x0f << 9;
     SDIDSTA |= S3C2410_SDIDSTA_CLEAR_BITS;
-        
+
     /* Initiate the command */
     SDICCON = val;
-             
+
     if (flags & MCI_RESP)
     {
         /* wait for response or timeout */
-        do 
+        do
         {
             status = SDICSTA;
-        } while ( (status & (S3C2410_SDICMDSTAT_RSPFIN | 
+        } while ( (status & (S3C2410_SDICMDSTAT_RSPFIN |
                              S3C2410_SDICMDSTAT_CMDTIMEOUT) ) == 0);
         debug_r1(cmd);
         if (status & S3C2410_SDICMDSTAT_CMDTIMEOUT)
             ret = false;
         else if (status & (S3C2410_SDICMDSTAT_RSPFIN))
-        {   
+        {
             /* resp received */
             if(flags & MCI_LONG_RESP)
             {
@@ -381,10 +381,10 @@ static bool send_cmd(const int card_no, const int cmd, const int arg,
         else
             ret = true;
     }
-    else 
+    else
     {
         /* wait for command completion or timeout */
-        do 
+        do
         {
             status = SDICSTA;
         } while ( (status & (S3C2410_SDICMDSTAT_CMDSENT |
@@ -395,12 +395,12 @@ static bool send_cmd(const int card_no, const int cmd, const int arg,
         else
             ret = true;
     }
-    
+
     /* Clear Command status flags */
     SDICSTA |= 0x0f << 9;
-    
+
     mci_delay();
-    
+
     return ret;
 }
 
@@ -558,7 +558,7 @@ bool sd_removable(IF_MD_NONVOID(int card_no))
     const int card_no = 0;
 #endif
     (void)card_no;
-    
+
     /* not applicable */
     dbgprintf ("sd_remov");
     return false;
@@ -596,7 +596,7 @@ static int sd_wait_for_state(const int card_no, unsigned int state)
     }
 }
 
-static int sd_transfer_sectors(int card_no, unsigned long start,
+static int sd_transfer_sectors(int card_no, sector_t start,
                                int count, void* buf, const bool write)
 {
     int ret = EC_OK;
@@ -636,7 +636,7 @@ static int sd_transfer_sectors(int card_no, unsigned long start,
         void *dma_buf;
         const int cmd =
             write ? SD_WRITE_MULTIPLE_BLOCK : SD_READ_MULTIPLE_BLOCK;
-        unsigned long start_addr = start;
+        sector_t start_addr = start;
 
         dma_buf = aligned_buffer;
         if(transfer > UNALIGNED_NUM_SECTORS)
@@ -650,10 +650,10 @@ static int sd_transfer_sectors(int card_no, unsigned long start,
 
         /* TODO? */
         SDIFSTA = SDIFSTA | S3C2440_SDIFSTA_FIFORESET;
-        SDIDCON = S3C2440_SDIDCON_DS_WORD   | 
+        SDIDCON = S3C2440_SDIDCON_DS_WORD   |
                   S3C2410_SDIDCON_BLOCKMODE | S3C2410_SDIDCON_WIDEBUS |
                   S3C2410_SDIDCON_DMAEN     |
-                  S3C2440_SDIDCON_DATSTART  |  
+                  S3C2440_SDIDCON_DATSTART  |
                   ( transfer << 0);
         if (write)
             SDIDCON |= S3C2410_SDIDCON_TXAFTERRESP | S3C2410_SDIDCON_XFER_TXSTART;
@@ -665,6 +665,7 @@ static int sd_transfer_sectors(int card_no, unsigned long start,
         INTPND = SDI_MASK;
 
         /* Initiate read/write command */
+        // XXX 64-bit
         if(!send_cmd(card_no, cmd, start_addr, MCI_ARG | MCI_RESP, NULL))
         {
             ret -= 3*20;
@@ -674,32 +675,32 @@ static int sd_transfer_sectors(int card_no, unsigned long start,
         if(write)
         {
             request.source_addr    = dma_buf;
-            request.source_control = DISRCC_LOC_AHB | DISRCC_INC_AUTO;            
+            request.source_control = DISRCC_LOC_AHB | DISRCC_INC_AUTO;
             request.dest_addr      = &SDIDAT_LLE;
-            request.dest_control   = DISRCC_LOC_APB | DISRCC_INC_FIXED;            
+            request.dest_control   = DISRCC_LOC_APB | DISRCC_INC_FIXED;
             request.count          = transfer * SD_BLOCK_SIZE / sizeof(long);
             request.source_map     = DMA_SRC_MAP_SDI;
-            request.control        = DCON_DMD_HS | DCON_SYNC_APB |  
+            request.control        = DCON_DMD_HS | DCON_SYNC_APB |
                                      DCON_HW_SEL |
                                      DCON_NO_RELOAD | DCON_DSZ_WORD;
-            request.callback       = NULL;        
-            
+            request.callback       = NULL;
+
             dma_enable_channel(0, &request);
         }
         else
         {
             request.source_addr    = &SDIDAT_LLE;
-            request.source_control = DISRCC_LOC_APB | DISRCC_INC_FIXED;            
+            request.source_control = DISRCC_LOC_APB | DISRCC_INC_FIXED;
             request.dest_addr      = dma_buf;
-            request.dest_control   = DISRCC_LOC_AHB | DISRCC_INC_AUTO;            
+            request.dest_control   = DISRCC_LOC_AHB | DISRCC_INC_AUTO;
             request.count          = transfer * SD_BLOCK_SIZE / sizeof(long);
             request.source_map     = DMA_SRC_MAP_SDI;
-            request.control        = DCON_DMD_HS | DCON_SYNC_APB |  
+            request.control        = DCON_DMD_HS | DCON_SYNC_APB |
                                      DCON_HW_SEL |
                                      DCON_NO_RELOAD | DCON_DSZ_WORD;
-            request.callback       = NULL;        
-            
-            dma_enable_channel(0, &request); 
+            request.callback       = NULL;
+
+            dma_enable_channel(0, &request);
         }
 
 #if 0
@@ -716,12 +717,12 @@ static int sd_transfer_sectors(int card_no, unsigned long start,
 #endif
 
         semaphore_wait(&transfer_completion_signal, 100 /*TIMEOUT_BLOCK*/);
-        
+
         /* wait for DMA to finish */
         while (DSTAT0 & DSTAT_STAT_BUSY)
             ;
-            
-#if 0        
+
+#if 0
         status = SDIDSTA;
         while ((status & (S3C2410_SDIDSTA_DATATIMEOUT|S3C2410_SDIDSTA_XFERFINISH)) == 0)
         {
@@ -738,10 +739,10 @@ static int sd_transfer_sectors(int card_no, unsigned long start,
             count -= transfer;
             loops = 0;  /* reset errors counter */
         }
-        else 
+        else
         {
             dbgprintf ("SD transfer error : 0x%x\n", transfer_error[card_no]);
-                
+
             if(loops++ > MAX_TRANSFER_ERRORS)
             {
                 led_flash(LED1|LED2, LED3|LED4);
@@ -783,11 +784,11 @@ sd_transfer_error:
     return ret;
 }
 
-int sd_read_sectors(IF_MD(int card_no,) unsigned long start, int incount,
+int sd_read_sectors(IF_MD(int card_no,) sector_t start, int incount,
                      void* inbuf)
 {
     int ret;
-  
+
 #ifdef HAVE_MULTIDRIVE
     dbgprintf ("sd_read %d %x %d\n", card_no, start, incount);
 #else
@@ -804,7 +805,7 @@ int sd_read_sectors(IF_MD(int card_no,) unsigned long start, int incount,
 }
 
 /*****************************************************************************/
-int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count,
+int sd_write_sectors(IF_MD(int drive,) sector_t start, int count,
                       const void* outbuf)
 {
 #ifdef BOOTLOADER /* we don't need write support in bootloader */
@@ -835,7 +836,7 @@ void sd_enable(bool on)
 {
     dbgprintf ("sd_enable %d\n", on);
     /* TODO: enable/disable SDI clock */
-    
+
     if (sd_enabled == on)
         return; /* nothing to do */
     if (on)
@@ -847,14 +848,14 @@ void sd_enable(bool on)
         sd_enabled = false;
     }
 }
-    
+
 int sd_init(void)
 {
     int ret = EC_OK;
     dbgprintf ("\n==============================\n");
     dbgprintf ("             sd_init\n");
     dbgprintf ("==============================\n");
-    
+
     init_sdi_controller (0);
 #ifndef BOOTLOADER
     sd_enabled = true;
@@ -893,7 +894,7 @@ long sd_last_disk_activity(void)
 }
 
 tCardInfo *card_get_info_target(int card_no)
-{    
+{
     return &card_info[card_no];
 }
 
diff --git a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c
index 7f68b82a0d..34a1c46043 100644
--- a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c
+++ b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c
@@ -29,17 +29,17 @@
 #include "ftl-target.h"
 #include "nand-target.h"
 
-/** static, private data **/ 
+/** static, private data **/
 static bool initialized = false;
 
 /* API Functions */
-int nand_read_sectors(IF_MD(int drive,) unsigned long start, int incount,
+int nand_read_sectors(IF_MD(int drive,) sector_t start, int incount,
                      void* inbuf)
 {
     return ftl_read(start, incount, inbuf);
 }
 
-int nand_write_sectors(IF_MD(int drive,) unsigned long start, int count,
+int nand_write_sectors(IF_MD(int drive,) sector_t start, int count,
                       const void* outbuf)
 {
     return ftl_write(start, count, outbuf);
@@ -106,7 +106,7 @@ int nand_num_drives(int first_drive)
 {
     /* We don't care which logical drive number(s) we have been assigned */
     (void)first_drive;
-    
+
     return 1;
 }
 #endif
diff --git a/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c b/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c
index 7a3be20577..9629b3e30f 100644
--- a/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c
@@ -58,10 +58,9 @@
 #define CEATA_DAT_NONBUSY_TIMEOUT 5000000
 #define CEATA_MMC_RCA 1
 
-
 /** static, private data **/
 static uint8_t ceata_taskfile[16] STORAGE_ALIGN_ATTR;
-static uint16_t ata_identify_data[0x100] STORAGE_ALIGN_ATTR;
+static uint16_t ata_identify_data[ATA_IDENTIFY_WORDS] STORAGE_ALIGN_ATTR;
 static bool ceata;
 static bool ata_lba48;
 static bool ata_dma;
@@ -510,7 +509,7 @@ static int ata_identify(uint16_t* buf)
         ata_write_cbr(&ATA_PIO_DVR, 0);
         ata_write_cbr(&ATA_PIO_CSD, CMD_IDENTIFY);
         PASS_RC(ata_wait_for_start_of_transfer(10000000), 1, 1);
-        for (i = 0; i < 0x100; i++) buf[i] = ata_read_cbr(&ATA_PIO_DTR);
+        for (i = 0; i < ATA_IDENTIFY_WORDS; i++) buf[i] = ata_read_cbr(&ATA_PIO_DTR);
     }
     return 0;
 }
@@ -701,7 +700,7 @@ static int ata_power_up(void)
                             | (((uint64_t)ata_identify_data[103]) << 48);
     else
         ata_total_sectors = ata_identify_data[60] | (((uint32_t)ata_identify_data[61]) << 16);
-    ata_total_sectors >>= 3;
+    ata_total_sectors >>= 3; /* ie SECTOR_SIZE/512. */
     ata_powered = true;
     ata_set_active();
     return 0;
@@ -966,7 +965,7 @@ static int ata_reset(void)
     return rc;
 }
 
-int ata_read_sectors(IF_MD(int drive,) unsigned long start, int incount,
+int ata_read_sectors(IF_MD(int drive,) sector_t start, int incount,
                      void* inbuf)
 {
     mutex_lock(&ata_mutex);
@@ -975,7 +974,7 @@ int ata_read_sectors(IF_MD(int drive,) unsigned long start, int incount,
     return rc;
 }
 
-int ata_write_sectors(IF_MD(int drive,) unsigned long start, int count,
+int ata_write_sectors(IF_MD(int drive,) sector_t start, int count,
                       const void* outbuf)
 {
     mutex_lock(&ata_mutex);
diff --git a/firmware/target/arm/tcc780x/sd-tcc780x.c b/firmware/target/arm/tcc780x/sd-tcc780x.c
index c80c3b746f..3ef8972ee9 100644
--- a/firmware/target/arm/tcc780x/sd-tcc780x.c
+++ b/firmware/target/arm/tcc780x/sd-tcc780x.c
@@ -104,19 +104,19 @@ static bool sd_poll_status(unsigned int trigger, long timeout)
     return true;
 }
 
-static int sd_command(unsigned int cmd, unsigned int arg, 
+static int sd_command(unsigned int cmd, unsigned int arg,
                       unsigned long* response, unsigned int resp_type)
 {
     int sdi_cmd = cmd;
-    
+
     sdi_cmd |= (127<<12) | (1<<11); /* max wait time | enable */
-    
+
     if (resp_type)
     {
         /* response type & response required flag */
         sdi_cmd |= (resp_type<<7) | (1<<6);
     }
-    
+
     if (cmd == SD_READ_SINGLE_BLOCK ||
         cmd == SD_READ_MULTIPLE_BLOCK ||
         cmd == SD_WRITE_BLOCK ||
@@ -124,18 +124,18 @@ static int sd_command(unsigned int cmd, unsigned int arg,
     {
         sdi_cmd |= (1<<10); /* request data transfer */
     }
-    
+
     if (!sd_poll_status(SDISTATUS_CMD_PATH_RDY, 100000))
         return -EC_COMMAND;
-    
+
     SDIARGU = arg;
     SDICMD = sdi_cmd;
-    
+
     udelay(10);
-    
+
     if (response == NULL)
         return 0;
-    
+
     if (!sd_poll_status(SDISTATUS_RESP_RCVD, 100000))
         return -EC_COMMAND;
 
@@ -150,7 +150,7 @@ static int sd_command(unsigned int cmd, unsigned int arg,
     {
         response[0] = SDIRSPARGU0;
     }
-    
+
     return 0;
 }
 
@@ -220,7 +220,7 @@ static int sd1_oneshot_callback(struct timeout *tmo)
 void EXT0(void)
 {
     static struct timeout sd1_oneshot;
-    
+
     timeout_register(&sd1_oneshot, sd1_oneshot_callback, (3*HZ/10), 0);
 }
 
@@ -248,7 +248,7 @@ bool sd_removable(IF_MD_NONVOID(int card_no))
     const int card_no = 0;
 #endif
     (void)card_no;
-    
+
     return false;
 }
 
@@ -259,7 +259,7 @@ static void sd_init_device(int card_no)
 {
     int ret;
     unsigned long response;
-    
+
     /* Initialise card data as blank */
     memset(currcard, 0, sizeof(*currcard));
 
@@ -282,7 +282,7 @@ static void sd_init_device(int card_no)
 #endif
 
     ret = sd_command(SD_GO_IDLE_STATE, 0, NULL, SDICMD_RES_TYPE1);
-    
+
     if (ret < 0)
         goto card_init_error;
 
@@ -290,30 +290,30 @@ static void sd_init_device(int card_no)
     SDICLK = (1<<12) | 59;
 
     sd_command(SD_SEND_IF_COND, 0x1aa, &response, SDICMD_RES_TYPE3);
-    
+
     if (!sd_poll_status(SDISTATUS_CMD_PATH_RDY, 100000))
         goto card_init_error;
-    
+
     currcard->ocr = 0;
-    
+
     long start_tick = current_tick;
-    
+
     while ((currcard->ocr & (1<<31)) == 0
             && TIME_BEFORE(current_tick, start_tick + HZ))
     {
         udelay(100);
         sd_command(SD_APP_CMD, 0, NULL, SDICMD_RES_TYPE1);
-        
+
         int arg = 0x100000 | ((response == 0x1aa) ? (1<<30):0);
         sd_command(SD_APP_OP_COND, arg, &currcard->ocr, SDICMD_RES_TYPE3);
     }
-    
+
     if ((currcard->ocr & (1<<31)) == 0)
     {
         ret = -EC_POWER_UP;
         goto card_init_error;
     }
-    
+
     ret = sd_command
         (SD_ALL_SEND_CID, 0, currcard->cid, SDICMD_RES_TYPE2);
 
@@ -322,39 +322,39 @@ static void sd_init_device(int card_no)
 
     ret = sd_command
         (SD_SEND_RELATIVE_ADDR, 0, &currcard->rca, SDICMD_RES_TYPE1);
-    
+
     if (ret < 0)
         goto card_init_error;
-    
+
     ret = sd_command
         (SD_SEND_CSD, currcard->rca, currcard->csd, SDICMD_RES_TYPE2);
-    
+
     if (ret < 0)
         goto card_init_error;
-    
+
     sd_parse_csd(currcard);
 
     ret = sd_command
         (SD_SELECT_CARD, currcard->rca, NULL, SDICMD_RES_TYPE1);
-    
+
     if (ret < 0)
         goto card_init_error;
 
     ret = sd_command
         (SD_APP_CMD, currcard->rca, NULL, SDICMD_RES_TYPE1);
-    
+
     if (ret < 0)
         goto card_init_error;
 
     ret = sd_command             /* 4 bit */
         (SD_SET_BUS_WIDTH, currcard->rca | 2, NULL, SDICMD_RES_TYPE1);
-    
+
     if (ret < 0)
         goto card_init_error;
 
     ret = sd_command
         (SD_SET_BLOCKLEN, currcard->blocksize, NULL, SDICMD_RES_TYPE1);
-    
+
     if (ret < 0)
         goto card_init_error;
 
@@ -386,7 +386,7 @@ static void sd_select_device(int card_no)
     }
 }
 
-int sd_read_sectors(IF_MD(int card_no,) unsigned long start, int incount,
+int sd_read_sectors(IF_MD(int card_no,) sector_t start, int incount,
                      void* inbuf)
 {
 #ifndef HAVE_MULTIDRIVE
@@ -416,23 +416,24 @@ sd_read_retry:
         ret = currcard->initialized;
         goto sd_read_error;
     }
-    
+
     last_disk_activity = current_tick;
 
     ret = sd_wait_for_state(SD_TRAN, EC_TRAN_READ_ENTRY);
-    
+
     if (ret < 0)
         goto sd_read_error;
-    
+
     /* Use full SD clock for data transfer (PCK_SDMMC) */
     SDICLK = (1<<13) | (1<<12); /* bypass divider | enable */
-            
+
     /*  Block count | FIFO count | Block size (2^9) | 4-bit bus */
     SDIDCTRL = (incount << 13) | (4<<8) | (9<<4) | (1<<2);
     SDIDCTRL |= (1<<12);    /* nReset */
-    
+
     SDIDCTRL2 = (1<<2); /* multi block, read */
 
+    // XXX 64-bit
     if (currcard->ocr & (1<<30))
         ret = sd_command(SD_READ_MULTIPLE_BLOCK, start, NULL, SDICMD_RES_TYPE1);
     else
@@ -500,7 +501,7 @@ sd_read_error:
     }
 }
 
-int sd_write_sectors(IF_MD(int card_no,) unsigned long start, int count,
+int sd_write_sectors(IF_MD(int card_no,) sector_t start, int count,
                       const void* outbuf)
 {
 /* Write support is not finished yet */
@@ -538,21 +539,22 @@ sd_write_retry:
         ret = currcard->initialized;
         goto sd_write_error;
     }
-    
+
     ret = sd_wait_for_state(SD_TRAN, EC_TRAN_WRITE_ENTRY);
-    
+
     if (ret < 0)
         goto sd_write_error;
 
     /* Use full SD clock for data transfer (PCK_SDMMC) */
     SDICLK = (1<<13) | (1<<12); /* bypass divider | enable */
-            
+
     /* Block count | FIFO count | Block size (2^9) | 4-bit bus */
     SDIDCTRL = (count<<13) | (4<<8) | (9<<4) | (1<<2);
     SDIDCTRL |= (1<<12);    /* nReset */
-    
+
     SDIDCTRL2 = (1<<2) | (1<<1); /* multi block, write */
 
+    // XXX 64-bit
     if (currcard->ocr & (1<<30))
         ret = sd_command(SD_WRITE_MULTIPLE_BLOCK, start, NULL, SDICMD_RES_TYPE1);
     else
@@ -578,7 +580,7 @@ sd_write_retry:
         else
         {
             int tmp_buf[4];
-            
+
             memcpy(tmp_buf, outbuf, 16);
 
             SDIWDATA = tmp_buf[0];
@@ -646,12 +648,12 @@ void sd_enable(bool on)
         PCLK_SDMMC &= ~PCK_EN;
     }
 }
-    
+
 int sd_init(void)
 {
     static bool initialized = false;
     int ret = 0;
-    
+
     if (!initialized)
         mutex_init(&sd_mtx);
 
@@ -678,7 +680,7 @@ int sd_init(void)
         GPIOC_DIR |= (1<<24);
 
         sleep(HZ/10);
-        
+
 #ifdef HAVE_HOTSWAP
         /* Configure interrupts for the card slot */
         TMODE &= ~EXT0_IRQ_MASK; /* edge-triggered */
@@ -696,7 +698,7 @@ long sd_last_disk_activity(void)
 }
 
 tCardInfo *card_get_info_target(int card_no)
-{    
+{
     return &card_info[card_no];
 }
 
@@ -706,7 +708,7 @@ int sd_num_drives(int first_drive)
 {
     /* Store which logical drive number(s) we have been assigned */
     sd_first_drive = first_drive;
-    
+
 #if defined(HAVE_INTERNAL_SD) && defined(HAVE_HOTSWAP)
     return 2;
 #else
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c
index a1985472a0..76929e603e 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c
@@ -126,8 +126,10 @@ void GIO2(void)
 
 #define VFAT_SECTOR_SIZE(x) ( (x)/0x8000 ) /* 1GB array requires 80kB of RAM */
 
-extern int ata_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf);
-extern int ata_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf);
+extern int ata_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf);
+extern int ata_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf);
+
+// XXX 64-bit:   Due to this it's not likely that this target will ever handle 64-bit storage.
 
 struct main_header
 {
@@ -253,9 +255,9 @@ static void cfs_init(void)
     /* Read root inode */
     _ata_read_sectors(CFS_CLUSTER2CLUSTER(cfs->first_inode), 64, &sector2);
     root_inode = (struct cfs_inode*)&sector2;
-    
+
     logf("Root inode = 0x%x", root_inode);
-    
+
     logf("0x%x 0x%x", CFS_CLUSTER2CLUSTER(root_inode->first_class_chain[0]), root_inode->first_class_chain[0]);
 
     /* Read root inode's first sector */
@@ -277,9 +279,9 @@ static void cfs_init(void)
                 vfat_inode_nr = root_direntry_items[i].inode_number;
         }
     }
-    
+
     logf("VFAT inode = 0x%x", vfat_inode_nr);
-    
+
     if(vfat_inode_nr != 0)
     {
         /* Read VFAT inode */
@@ -384,19 +386,19 @@ static void cfs_init(void)
     cfs_inited = true;
 }
 
-static inline unsigned long map_sector(unsigned long sector)
+static inline sector_t map_sector(sector_t 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);
+    sector_t *sectors = core_get_data(sectors_handle);
 #endif
     return cfs_start+sectors[sector/64]*64+sector%64;
 }
 
-int ata_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf)
+int ata_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf)
 {
     if(!cfs_inited)
         cfs_init();
@@ -423,7 +425,7 @@ int ata_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf
     }
 }
 
-int ata_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf)
+int ata_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf)
 {
     if(!cfs_inited)
         cfs_init();
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h b/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h
index d0aa12e040..41b8e73ad4 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h
+++ b/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h
@@ -36,8 +36,8 @@
 /* Nasty hack, but Creative is nasty... */
 #define ata_read_sectors _ata_read_sectors
 #define ata_write_sectors _ata_write_sectors
-extern int _ata_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf);
-extern int _ata_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf);
+extern int _ata_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf);
+extern int _ata_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf);
 
 /* General purpose memory region #1 */
 #define ATA_IOBASE      0x50FEE000
diff --git a/firmware/target/arm/tms320dm320/sdmmc-dm320.c b/firmware/target/arm/tms320dm320/sdmmc-dm320.c
index e66a4cb3c7..17cb239374 100644
--- a/firmware/target/arm/tms320dm320/sdmmc-dm320.c
+++ b/firmware/target/arm/tms320dm320/sdmmc-dm320.c
@@ -18,7 +18,7 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
- 
+
 #include "system.h"
 #include <string.h>
 #include "gcc_extensions.h"
@@ -97,7 +97,7 @@ struct sd_card_status
     int retry_max;
 };
 
-/** static, private data **/ 
+/** static, private data **/
 
 /* for compatibility */
 static long last_disk_activity = -1;
@@ -123,7 +123,7 @@ static struct mutex             sd_mtx SHAREDBSS_ATTR;
 static struct semaphore         data_done SHAREDBSS_ATTR;
 static volatile unsigned int    transfer_error[NUM_DRIVES];
 /* align on cache line size */
-static unsigned char    aligned_buffer[UNALIGNED_NUM_SECTORS * SD_BLOCK_SIZE] 
+static unsigned char    aligned_buffer[UNALIGNED_NUM_SECTORS * SD_BLOCK_SIZE]
                         __attribute__((aligned(32)));
 
 static void sd_card_mux(int card_no)
@@ -397,7 +397,7 @@ static int sd_init_card(const int card_no)
                      SDHC_RESP_FMT_1, &currcard->rca);
     if (ret < 0)
     {
-        dbgprintf("SD_SEND_RELATIVE_ADDR failed"); 
+        dbgprintf("SD_SEND_RELATIVE_ADDR failed");
         return -1;
     }
 
@@ -559,7 +559,7 @@ bool sd_removable(IF_MD_NONVOID(int card_no))
 #ifdef HAVE_MULTIDRIVE
     (void)card_no;
 #endif
-    
+
     /* not applicable */
     return false;
 }
@@ -597,17 +597,17 @@ static int sd_wait_for_state(unsigned int state)
     }
 }
 
-static int sd_transfer_sectors(int card_no, unsigned long start,
+static int sd_transfer_sectors(int card_no, sector_t start,
                                int count, void *buffer, bool write)
 {
     int ret;
-    unsigned long start_addr;
+    sector_t start_addr;
     int dma_channel = -1;
     bool use_direct_dma;
     int count_per_dma;
     unsigned long rel_addr;
 
-    dbgprintf("transfer %d %d %d", card_no, start, count);
+    dbgprintf("transfer %d %lu %d", card_no, start, count);
     mutex_lock(&sd_mtx);
     enable_controller(true);
 
@@ -673,6 +673,7 @@ sd_transfer_retry:
         if (!(card_info[card_no].ocr & SD_OCR_CARD_CAPACITY_STATUS))
             start_addr *= SD_BLOCK_SIZE; /* not SDHC */
 
+        // XXX 64-bit
         ret = sd_command(write ? SD_WRITE_MULTIPLE_BLOCK : SD_READ_MULTIPLE_BLOCK,
                          start_addr, MMC_CMD_DCLR | MMC_CMD_DATA |
                          SDHC_RESP_FMT_1 | (write ? MMC_CMD_WRITE : 0),
@@ -765,7 +766,7 @@ sd_transfer_error:
     }
 }
 
-int sd_read_sectors(IF_MD(int card_no,) unsigned long start, int incount,
+int sd_read_sectors(IF_MD(int card_no,) sector_t start, int incount,
                      void* inbuf)
 {
 #ifndef HAVE_MULTIDRIVE
@@ -774,7 +775,7 @@ int sd_read_sectors(IF_MD(int card_no,) unsigned long start, int incount,
     return sd_transfer_sectors(card_no, start, incount, inbuf, false);
 }
 
-int sd_write_sectors(IF_MD(int card_no,) unsigned long start, int count,
+int sd_write_sectors(IF_MD(int card_no,) sector_t start, int count,
                       const void* outbuf)
 {
 #ifndef HAVE_MULTIDRIVE
@@ -862,7 +863,7 @@ long sd_last_disk_activity(void)
 }
 
 tCardInfo *card_get_info_target(int card_no)
-{    
+{
     return &card_info[card_no];
 }
 
diff --git a/firmware/target/hosted/filesystem-hosted.h b/firmware/target/hosted/filesystem-hosted.h
index b9c7ce648a..348a921f82 100644
--- a/firmware/target/hosted/filesystem-hosted.h
+++ b/firmware/target/hosted/filesystem-hosted.h
@@ -21,9 +21,6 @@
 #ifndef _FILESYSTEM_HOSTED_H_
 #define _FILESYSTEM_HOSTED_H_
 
-#include "mv.h"
-
-int os_volume_path(IF_MV(int volume, ) char *buffer, size_t bufsize);
 void * os_lc_open(const char *ospath);
 
 #endif /* _FILESYSTEM_HOSTED_H_ */
diff --git a/firmware/target/hosted/filesystem-unix.c b/firmware/target/hosted/filesystem-unix.c
index f0d7de640d..4869d07263 100644
--- a/firmware/target/hosted/filesystem-unix.c
+++ b/firmware/target/hosted/filesystem-unix.c
@@ -33,6 +33,8 @@
 #include "pathfuncs.h"
 #include "string-extra.h"
 
+int os_volume_path(IF_MV(int volume, ) char *buffer, size_t bufsize);
+
 #define SAME_FILE_INFO(sb1p, sb2p) \
     ((sb1p)->st_dev == (sb2p)->st_dev && (sb1p)->st_ino == (sb2p)->st_ino)
 
@@ -207,9 +209,9 @@ int os_opendir_and_fd(const char *osdirname, DIR **osdirpp, int *osfdp)
 }
 
 /* do we really need this in the app? (in the sim, yes) */
-void volume_size(IF_MV(int volume,) unsigned long *sizep, unsigned long *freep)
+void volume_size(IF_MV(int volume,) sector_t *sizep, sector_t *freep)
 {
-    unsigned long size = 0, free = 0;
+    sector_t size = 0, free = 0;
     char volpath[MAX_PATH];
     struct statfs fs;
 
diff --git a/firmware/target/hosted/filesystem-win32.c b/firmware/target/hosted/filesystem-win32.c
index fac10d003b..ebb7f283ac 100644
--- a/firmware/target/hosted/filesystem-win32.c
+++ b/firmware/target/hosted/filesystem-win32.c
@@ -30,6 +30,7 @@
 #include "debug.h"
 #include "pathfuncs.h"
 #include "string-extra.h"
+#include "mv.h"
 
 #define SAME_FILE_INFO(lpInfo1, lpInfo2) \
     ((lpInfo1)->dwVolumeSerialNumber == (lpInfo2)->dwVolumeSerialNumber && \
@@ -469,7 +470,9 @@ int os_modtime(const char *path, time_t modtime)
     return 0;
 }
 
-void volume_size(IF_MV(int volume,) unsigned long *sizep, unsigned long *freep)
+int os_volume_path(IF_MV(int volume, ) char *buffer, size_t bufsize);
+
+void volume_size(IF_MV(int volume,) sector_t *sizep, sector_t *freep)
 {
     ULARGE_INTEGER free = { .QuadPart = 0 },
                    size = { .QuadPart = 0 };
diff --git a/firmware/target/hosted/lcd-linuxfb.c b/firmware/target/hosted/lcd-linuxfb.c
index 14c8c30f89..5dda5cf1cc 100644
--- a/firmware/target/hosted/lcd-linuxfb.c
+++ b/firmware/target/hosted/lcd-linuxfb.c
@@ -59,14 +59,21 @@ void lcd_init_device(void)
         panicf("Cannot read framebuffer fixed information");
     }
 
-#if 0
-    /* check resolution and framebuffer size */
-    if(vinfo.xres != LCD_WIDTH || vinfo.yres != LCD_HEIGHT || vinfo.bits_per_pixel != LCD_DEPTH)
+    if(ioctl(fd, FBIOGET_VSCREENINFO, &vinfo) < 0)
     {
-        panicf("Unexpected framebuffer resolution: %dx%dx%d\n", vinfo.xres,
-            vinfo.yres, vinfo.bits_per_pixel);
+        panicf("Cannot read framebuffer variable information");
+    }
+
+    /* Make sure we match our desired bitdepth */
+    if (vinfo.bits_per_pixel != LCD_DEPTH || vinfo.xres != LCD_WIDTH || vinfo.yres != LCD_HEIGHT) {
+        vinfo.bits_per_pixel = LCD_DEPTH;
+        vinfo.xres = LCD_WIDTH;
+        vinfo.yres = LCD_HEIGHT;
+        if (ioctl(fd, FBIOPUT_VSCREENINFO, &vinfo)) {
+            panicf("Cannot set framebuffer to %dx%dx%d",
+               vinfo.xres, vinfo.yres, vinfo.bits_per_pixel);
+        }
     }
-#endif
     /* Note: we use a framebuffer size of width*height*bbp. We cannot trust the
      * values returned by the driver for line_length */
 
@@ -77,11 +84,6 @@ void lcd_init_device(void)
         panicf("Cannot map framebuffer");
     }
 
-    if(ioctl(fd, FBIOGET_VSCREENINFO, &vinfo) < 0)
-    {
-        panicf("Cannot read framebuffer variable information");
-    }
-
     memset(framebuffer, 0, finfo.smem_len);
 
 #ifdef HAVE_LCD_ENABLE
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c
index 1055d7e0b9..b5f3720a3b 100644
--- a/firmware/target/hosted/sdl/button-sdl.c
+++ b/firmware/target/hosted/sdl/button-sdl.c
@@ -340,7 +340,7 @@ static void button_event(int key, bool pressed)
         }
         return;
 #endif
-#ifdef HAVE_MULTIDRIVE
+#ifdef HAVE_HOTSWAP
     case EXT_KEY:
         if (!pressed)
             sim_trigger_external(!storage_present(1));
diff --git a/firmware/target/mips/ingenic_jz47xx/app.lds b/firmware/target/mips/ingenic_jz47xx/app.lds
index 1d300fed82..29a973a0ca 100644
--- a/firmware/target/mips/ingenic_jz47xx/app.lds
+++ b/firmware/target/mips/ingenic_jz47xx/app.lds
@@ -37,15 +37,11 @@ SECTIONS
 {
     . = DRAMORIG;
 
-    .startup :
+    .text :
     {
         loadaddress = .;
         _loadaddress = .;
-        *(.startup.text);
-    } > DRAM
-
-    .text :
-    {
+        *(.init.text);
         *(.text*);
 #ifndef HAVE_INIT_ATTR
         *(.init*);
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c
index 5f320f8e9b..77fd5c013b 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c
@@ -84,7 +84,7 @@ struct nand_param
  *
  */
 
-static volatile unsigned long nand_address;
+static volatile sector_t nand_address;
 #define NAND_DATAPORT      (nand_address)
 #define NAND_ADDRPORT      (nand_address+0x10000)
 #define NAND_COMMPORT      (nand_address+0x08000)
@@ -111,7 +111,7 @@ static volatile unsigned long nand_address;
 static struct nand_info* chip_info = NULL;
 static struct nand_info* banks[4];
 static unsigned int nr_banks = 1;
-static unsigned long bank_size;
+static sector_t bank_size;
 static struct nand_param internal_param;
 static struct mutex nand_mtx;
 #ifdef USE_DMA
@@ -282,7 +282,7 @@ static void jz_rs_correct(unsigned char *dat, int idx, int mask)
 /*
  * Read oob
  */
-static int jz_nand_read_oob(unsigned long page_addr, unsigned char *buf, int size)
+static int jz_nand_read_oob(sector_t page_addr, unsigned char *buf, int size)
 {
     struct nand_param *nandp = &internal_param;
     int page_size, row_cycle, bus_width;
@@ -338,7 +338,7 @@ static int jz_nand_read_oob(unsigned long page_addr, unsigned char *buf, int siz
  *    page - page number within a block: 0, 1, 2, ...
  *    dst - pointer to target buffer
  */
-static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst)
+static int jz_nand_read_page(sector_t page_addr, unsigned char *dst)
 {
     struct nand_param *nandp = &internal_param;
     int page_size, oob_size;
@@ -611,7 +611,7 @@ int nand_init(void)
     return res;
 }
 
-static inline int read_sector(unsigned long start, unsigned int count,
+static inline int read_sector(sector_t start, unsigned int count,
                                void* buf, unsigned int chip_size)
 {
     register int ret;
@@ -627,14 +627,14 @@ static inline int read_sector(unsigned long start, unsigned int count,
     return ret;
 }
 
-int nand_read_sectors(IF_MV(int drive,) unsigned long start, int count, void* buf)
+int nand_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf)
 {
-#ifdef HAVE_MULTIVOLUME
+#ifdef HAVE_MULTIDRIVE
     (void)drive;
 #endif
     int ret = 0;
     unsigned int i, _count, chip_size = chip_info->page_size;
-    unsigned long _start;
+    sector_t _start;
 
     logf("start");
     mutex_lock(&nand_mtx);
@@ -670,12 +670,12 @@ int nand_read_sectors(IF_MV(int drive,) unsigned long start, int count, void* bu
 }
 
 /* TODO */
-int nand_write_sectors(IF_MV(int drive,) unsigned long start, int count, const void* buf)
+int nand_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf)
 {
     (void)start;
     (void)count;
     (void)buf;
-#ifdef HAVE_MULTIVOLUME
+#ifdef HAVE_MULTIDRIVE
     (void)drive;
 #endif
 
@@ -727,9 +727,9 @@ void nand_sleepnow(void)
 }
 
 #ifdef STORAGE_GET_INFO
-void nand_get_info(IF_MV(int drive,) struct storage_info *info)
+void nand_get_info(IF_MD(int drive,) struct storage_info *info)
 {
-#ifdef HAVE_MULTIVOLUME
+#ifdef HAVE_MULTIDRIVE
     (void)drive;
 #endif
 
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c
index efce5742d0..ff9b7e419e 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c
@@ -110,7 +110,7 @@ struct nand_param {
 
 static struct nand_info* chip_info = NULL;
 static struct nand_info* bank;
-static unsigned long nand_size;
+static sector_t nand_size;
 static struct nand_param internal_param;
 static struct mutex nand_mtx;
 #ifdef USE_DMA
@@ -281,7 +281,7 @@ static void jz_rs_correct(unsigned char *dat, int idx, int mask)
 /*
  * Read oob
  */
-static int jz_nand_read_oob(unsigned long page_addr, unsigned char *buf, int size)
+static int jz_nand_read_oob(sector_t page_addr, unsigned char *buf, int size)
 {
     struct nand_param *nandp = &internal_param;
     int page_size, row_cycle, bus_width;
@@ -337,7 +337,7 @@ static int jz_nand_read_oob(unsigned long page_addr, unsigned char *buf, int siz
  *    page - page number within a block: 0, 1, 2, ...
  *    dst - pointer to target buffer
  */
-static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst)
+static int jz_nand_read_page(sector_t page_addr, unsigned char *dst)
 {
     struct nand_param *nandp = &internal_param;
     int page_size, oob_size;
@@ -532,7 +532,7 @@ int nand_init(void)
     return res;
 }
 
-static inline int read_sector(unsigned long start, unsigned int count,
+static inline int read_sector(sector_t start, unsigned int count,
                                void* buf, unsigned int chip_size)
 {
     register int ret;
@@ -548,7 +548,7 @@ static inline int read_sector(unsigned long start, unsigned int count,
     return ret;
 }
 
-static inline int write_sector(unsigned long start, unsigned int count,
+static inline int write_sector(sector_t start, unsigned int count,
                                const void* buf, unsigned int chip_size)
 {
     int ret = 0;
@@ -563,14 +563,14 @@ static inline int write_sector(unsigned long start, unsigned int count,
     return ret;
 }
 
-int nand_read_sectors(IF_MV(int drive,) unsigned long start, int count, void* buf)
+int nand_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf)
 {
-#ifdef HAVE_MULTIVOLUME
+#ifdef HAVE_MULTIDRIVE
     (void)drive;
 #endif
     int ret = 0;
     unsigned int _count, chip_size = chip_info->page_size;
-    unsigned long _start;
+    sector_t _start;
 
     logf("start");
     mutex_lock(&nand_mtx);
@@ -590,14 +590,14 @@ int nand_read_sectors(IF_MV(int drive,) unsigned long start, int count, void* bu
     return ret;
 }
 
-int nand_write_sectors(IF_MV(int drive,) unsigned long start, int count, const void* buf)
+int nand_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf)
 {
-#ifdef HAVE_MULTIVOLUME
+#ifdef HAVE_MULTIDRIVE
     (void)drive;
 #endif
     int ret = 0;
     unsigned int _count, chip_size = chip_info->page_size;
-    unsigned long _start;
+    sector_t _start;
 
     logf("start");
     mutex_lock(&nand_mtx);
@@ -662,9 +662,9 @@ void nand_sleepnow(void)
 }
 
 #ifdef STORAGE_GET_INFO
-void nand_get_info(IF_MV(int drive,) struct storage_info *info)
+void nand_get_info(IF_MD(int drive,) struct storage_info *info)
 {
-#ifdef HAVE_MULTIVOLUME
+#ifdef HAVE_MULTIDRIVE
     (void)drive;
 #endif
 
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
index 56dd50814a..066be4e987 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
@@ -42,7 +42,6 @@ static struct mutex       sd_mtx;
 
 static int                use_4bit;
 static int                num_6;
-static int                sd2_0;
 
 //#define SD_DMA_ENABLE
 #define SD_DMA_INTERRUPT 0
@@ -598,7 +597,7 @@ static int jz_sd_transmit_data(struct sd_request *req)
 static inline unsigned int jz_sd_calc_clkrt(unsigned int rate)
 {
     unsigned int clkrt;
-    unsigned int clk_src = sd2_0 ? SD_CLOCK_HIGH : SD_CLOCK_FAST;
+    unsigned int clk_src = card.sd2plus ? SD_CLOCK_HIGH : SD_CLOCK_FAST;
 
     clkrt = 0;
     while (rate < clk_src)
@@ -716,7 +715,7 @@ static int jz_sd_exec_cmd(struct sd_request *request)
             events = SD_EVENT_RX_DATA_DONE;
             break;
 
-        case 6:
+        case SD_SWITCH_FUNC:
             if (num_6 < 2)
             {
 #if defined(SD_DMA_ENABLE)
@@ -1086,7 +1085,6 @@ static int sd_init_card_state(struct sd_request *request)
                                (request->response[3+i*4]<< 8) | request->response[4+i*4]);
 
             sd_parse_csd(&card);
-            sd2_0 = (card_extract_bits(card.csd, 127, 2) == 1);
 
             logf("CSD: %08lx%08lx%08lx%08lx", card.csd[0], card.csd[1], card.csd[2], card.csd[3]);
             DEBUG("SD card is ready");
@@ -1155,7 +1153,7 @@ static int sd_select_card(void)
     if (retval)
         return retval;
 
-    if (sd2_0)
+    if (card.sd2plus)
     {
         retval = sd_read_switch(&request);
         if (!retval)
@@ -1188,7 +1186,6 @@ static int __sd_init_device(void)
     /* Initialise card data as blank */
     memset(&card, 0, sizeof(tCardInfo));
 
-    sd2_0 = 0;
     num_6 = 0;
     use_4bit = 0;
 
@@ -1250,9 +1247,9 @@ static inline void sd_stop_transfer(void)
     mutex_unlock(&sd_mtx);
 }
 
-int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf)
+int sd_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf)
 {
-#ifdef HAVE_MULTIVOLUME
+#ifdef HAVE_MULTIDRIVE
     (void)drive;
 #endif
     sd_start_transfer();
@@ -1276,7 +1273,8 @@ int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf)
     if ((retval = sd_unpack_r1(&request, &r1)))
         goto err;
 
-    if (sd2_0)
+    // XXX 64-bit
+    if (card.sd2plus)
     {
         sd_send_cmd(&request, SD_READ_MULTIPLE_BLOCK, start,
                      count, SD_BLOCK_SIZE, RESPONSE_R1, buf);
@@ -1292,21 +1290,20 @@ int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf)
             goto err;
     }
 
-    last_disk_activity = current_tick;
-
     sd_simple_cmd(&request, SD_STOP_TRANSMISSION, 0, RESPONSE_R1B);
     if ((retval = sd_unpack_r1(&request, &r1)))
         goto err;
 
 err:
+    last_disk_activity = current_tick;
     sd_stop_transfer();
 
     return retval;
 }
 
-int sd_write_sectors(IF_MV(int drive,) unsigned long start, int count, const void* buf)
+int sd_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf)
 {
-#ifdef HAVE_MULTIVOLUME
+#ifdef HAVE_MULTIDRIVE
     (void)drive;
 #endif
     sd_start_transfer();
@@ -1330,7 +1327,8 @@ int sd_write_sectors(IF_MV(int drive,) unsigned long start, int count, const voi
     if ((retval = sd_unpack_r1(&request, &r1)))
         goto err;
 
-    if (sd2_0)
+    // XXX 64-bit
+    if (card.sd2plus)
     {
         sd_send_cmd(&request, SD_WRITE_MULTIPLE_BLOCK, start,
                  count, SD_BLOCK_SIZE, RESPONSE_R1,
@@ -1387,7 +1385,7 @@ int sd_soft_reset(void)
 #ifdef HAVE_HOTSWAP
 bool sd_removable(IF_MD_NONVOID(int drive))
 {
-#ifdef HAVE_MULTIVOLUME
+#ifdef HAVE_MULTIDRIVE
     (void)drive;
 #endif
     return true;
@@ -1415,7 +1413,7 @@ void MMC_CD_IRQ(void)
 }
 #endif
 
-bool sd_present(IF_MV_NONVOID(int drive))
+bool sd_present(IF_MD_NONVOID(int drive))
 {
 #ifdef HAVE_MULTIDRIVE
     (void)drive;
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c
index 1960fcbd35..3810852686 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4760.c
@@ -57,8 +57,6 @@ static struct semaphore   sd_wakeup[NUM_DRIVES];
 
 static int                use_4bit[NUM_DRIVES];
 static int                num_6[NUM_DRIVES];
-static int                sd2_0[NUM_DRIVES];
-
 
 //#define DEBUG(x...)         logf(x)
 #define DEBUG(x, ...)
@@ -698,7 +696,7 @@ static inline unsigned int jz_sd_calc_clkrt(const int drive, unsigned int rate)
     unsigned int clkrt = 0;
     unsigned int clk_src = cpu_frequency / __cpm_get_mscdiv(); /* MSC_CLK */
 
-    if (!sd2_0[drive] && rate > SD_CLOCK_FAST)
+    if (!card[drive].sd2plus && rate > SD_CLOCK_FAST)
         rate = SD_CLOCK_FAST;
 
     while (rate < clk_src)
@@ -1192,7 +1190,6 @@ static int sd_init_card_state(const int drive, struct sd_request *request)
                                (request->response[3+i*4]<< 8) | request->response[4+i*4]);
 
             sd_parse_csd(&card[drive]);
-            sd2_0[drive] = (card_extract_bits(card[drive].csd, 127, 2) == 1);
 
             logf("CSD: %08lx%08lx%08lx%08lx", card[drive].csd[0], card[drive].csd[1], card[drive].csd[2], card[drive].csd[3]);
             DEBUG("SD card is ready");
@@ -1261,7 +1258,7 @@ static int sd_select_card(const int drive)
     if (retval)
         return retval;
 
-    if (sd2_0[drive])
+    if (card[drive].sd2plus)
     {
         retval = sd_read_switch(drive, &request);
         if (!retval)
@@ -1292,7 +1289,6 @@ static int __sd_init_device(const int drive)
     /* Initialise card data as blank */
     memset(&card[drive], 0, sizeof(tCardInfo));
 
-    sd2_0[drive] = 0;
     num_6[drive] = 0;
     use_4bit[drive] = 0;
     active[drive] = 0;
@@ -1402,7 +1398,7 @@ static inline void sd_stop_transfer(const int drive)
     mutex_unlock(&sd_mtx[drive]);
 }
 
-int sd_transfer_sectors(IF_MD(const int drive,) unsigned long start, int count, void* buf, bool write)
+int sd_transfer_sectors(IF_MD(const int drive,) sector_t start, int count, void* buf, bool write)
 {
     struct sd_request request;
     struct sd_response_r1 r1;
@@ -1427,11 +1423,12 @@ int sd_transfer_sectors(IF_MD(const int drive,) unsigned long start, int count,
     if ((retval = sd_unpack_r1(&request, &r1)))
         goto err;
 
+    // XXX 64-bit
     sd_send_cmd(drive, &request,
                 (count > 1) ?
                 (write ? SD_WRITE_MULTIPLE_BLOCK : SD_READ_MULTIPLE_BLOCK) :
                 (write ? SD_WRITE_BLOCK : SD_READ_SINGLE_BLOCK),
-                sd2_0[drive] ? start : (start * SD_BLOCK_SIZE),
+                card[drive].sd2plus ? start : (start * SD_BLOCK_SIZE),
                 count, SD_BLOCK_SIZE, RESPONSE_R1, buf);
     if ((retval = sd_unpack_r1(&request, &r1)))
         goto err;
@@ -1451,12 +1448,12 @@ err:
     return retval;
 }
 
-int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf)
+int sd_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf)
 {
   return sd_transfer_sectors(IF_MD(drive,) start, count, buf, false);
 }
 
-int sd_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf)
+int sd_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf)
 {
   return sd_transfer_sectors(IF_MD(drive,) start, count, (void*)buf, true);
 }
diff --git a/firmware/target/mips/ingenic_jz47xx/crt0.S b/firmware/target/mips/ingenic_jz47xx/crt0.S
index b73a43d8f2..ee203b3b4d 100644
--- a/firmware/target/mips/ingenic_jz47xx/crt0.S
+++ b/firmware/target/mips/ingenic_jz47xx/crt0.S
@@ -44,7 +44,7 @@
     .extern main
     .global _start
 
-    .section .startup.text,"ax",%progbits
+    .section .init.text
     .set    push
     .set    mips32
     .set    noreorder
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/audiohw-erosqnative.c b/firmware/target/mips/ingenic_x1000/erosqnative/audiohw-erosqnative.c
index df97aba0c8..6968a19a1c 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/audiohw-erosqnative.c
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/audiohw-erosqnative.c
@@ -104,6 +104,30 @@ void audiohw_postinit(void)
         * for 24-bit data... */
         // es9018k2m_write_reg(ES9018K2M_REG1_INPUT_CONFIG, 0b01001100); // 24-bit data
 
+       /* Datasheet: Sets the number os FSR edges that must occur before    *
+        * the DPLL and ASRC can lock on to the the incoming Signal.         *
+        * When Samplerates >= 96khz could be used, STOP_DIV should be set   *
+        * to 0 (= 16384 FSR Edges).                                         *
+        *   Reg #10 [3:0] (0x05 default, 2730 FSR Edges)                    */
+        es9018k2m_write_reg(ES9018K2M_REG10_MASTER_MODE_CTRL, 0x00);
+
+       /* Datasheet: The ES90x8Q2M/K2M contains a Jitter Eliminator block,   *
+        * which employs the use of a digital phase locked loop (DPLL) to     *
+        * lock to the incoming audio clock rate. When in I2S or SPDIF mode,  *
+        * the DPLL will lock to the frame clock (1 x fs). However, when in   *
+        * DSD mode, the DPLL has no frame clock information, and must in-    *
+        * stead lock to the bit clock rate (BCK). For this reason, there are *
+        * two bandwidth settings for the DPLL.                               *
+           Reg #12 [7:4] (0x05 default) bandwidth for I2S / SPDIF mode.
+           Reg #12 [3:0] (0x0A default) bandwidth for DSD mode.
+        * The DPLL bandwidth sets how quickly the DPLL can adjust its intern *
+        * representation of the audio clock. The higher the jitter or        *
+        * frequency drift on the audio clock, the higher the bandwidth must  *
+        * be so that the DPLL can react.                                     *
+        * ! If the bandwidth is “too low”, the DPLL will loose lock and you  *
+        * ! will hear random dropouts. (Fixed my SurfansF20 v3.2 dropouts)   */
+        es9018k2m_write_reg(ES9018K2M_REG12_DPLL_SETTINGS, 0xda);
+
     } else { /* Default to SWVOL for PCM5102A DAC */
         logf("Default to SWVOL: ret=%d", ret);
     }
@@ -139,17 +163,19 @@ void audiohw_set_volume(int vol_l, int vol_r)
     r = vol_r;
 
 #if (defined(HAVE_HEADPHONE_DETECTION) && defined(HAVE_LINEOUT_DETECTION))
-    /* make sure headphones aren't present - don't want to
-     * blow out our eardrums cranking it to full */
-    if (lineout_inserted() && !headphones_inserted())
+    /* Due to the hardware's detection method, make the Line-Out
+     * the default. The LO can only be detected if it is active
+     * (assuming a high-impedance device is attached). HP takes priority
+     * if both are present. */
+    if (headphones_inserted())
     {
-        eros_qn_switch_output(1);
-
-        l = r = eros_qn_get_volume_limit();
+        eros_qn_switch_output(0);
     }
     else
     {
-        eros_qn_switch_output(0);
+        eros_qn_switch_output(1);
+
+        l = r = eros_qn_get_volume_limit();
     }
 #endif
 
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/button-erosqnative.c b/firmware/target/mips/ingenic_x1000/erosqnative/button-erosqnative.c
index 0d2207af2a..707dc372a8 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/button-erosqnative.c
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/button-erosqnative.c
@@ -75,12 +75,26 @@ volatile signed int enc_position = 0;
 /* Value of headphone detect register */
 static uint8_t hp_detect_reg = 0x00;
 static uint8_t hp_detect_reg_old = 0x00;
+static uint8_t hp_detect_debounce1 = 0x00;
+static uint8_t hp_detect_debounce2 = 0x00;
+static uint8_t debounce_count = 0;
 
 /* Interval to poll the register */
-#define HPD_POLL_TIME (HZ/2)
+#define HPD_POLL_TIME (HZ/4)
 
 static int hp_detect_tmo_cb(struct timeout* tmo)
 {
+    if (hp_detect_debounce1 == hp_detect_debounce2){
+        if (debounce_count >= 2){
+            debounce_count = 2;
+        } else {
+            debounce_count = debounce_count + 1;
+        }
+    } else {
+        debounce_count = 0;
+        hp_detect_debounce2 = hp_detect_debounce1;
+    }
+
     i2c_descriptor* d = (i2c_descriptor*)tmo->data;
     i2c_async_queue(AXP_PMU_BUS, TIMEOUT_NOBLOCK, I2C_Q_ADD, 0, d);
     return HPD_POLL_TIME;
@@ -96,7 +110,7 @@ static void hp_detect_init(void)
         .tran_mode = I2C_READ,
         .buffer[0] = (void*)&gpio_reg,
         .count[0] = 1,
-        .buffer[1] = &hp_detect_reg,
+        .buffer[1] = &hp_detect_debounce1,
         .count[1] = 1,
         .callback = NULL,
         .arg = 0,
@@ -113,6 +127,8 @@ static void hp_detect_init(void)
     if(r >= 0)
     {
         hp_detect_reg = r;
+        hp_detect_debounce1 = r;
+        hp_detect_debounce2 = r;
         hp_detect_reg_old = hp_detect_reg;
     }
 
@@ -122,6 +138,9 @@ static void hp_detect_init(void)
 
 bool headphones_inserted(void)
 {
+    if (debounce_count > 1){
+        hp_detect_reg = hp_detect_debounce2;
+    }
     /* if the status has changed, set the output volume accordingly */
     if ((hp_detect_reg & 0x30) != (hp_detect_reg_old & 0x30))
     {
@@ -135,6 +154,9 @@ bool headphones_inserted(void)
 
 bool lineout_inserted(void)
 {
+    if (debounce_count > 1){
+        hp_detect_reg = hp_detect_debounce2;
+    }
     /* if the status has changed, set the output volume accordingly */
     if ((hp_detect_reg & 0x30) != (hp_detect_reg_old & 0x30))
     {
diff --git a/firmware/target/mips/ingenic_x1000/msc-x1000.c b/firmware/target/mips/ingenic_x1000/msc-x1000.c
index 62172fa213..f0d417e4f7 100644
--- a/firmware/target/mips/ingenic_x1000/msc-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/msc-x1000.c
@@ -844,7 +844,7 @@ int msc_cmd_send_csd(msc_drv* d)
         d->cardinfo.csd[i] = req.response[i];
     sd_parse_csd(&d->cardinfo);
 
-    if((req.response[0] >> 30) == 1)
+    if(d->cardinfo.sd2plus)
         d->driver_flags |= MSC_DF_V2_CARD;
 
     return 0;
diff --git a/firmware/target/mips/ingenic_x1000/sd-x1000.c b/firmware/target/mips/ingenic_x1000/sd-x1000.c
index 679a25a222..c1aec59aa3 100644
--- a/firmware/target/mips/ingenic_x1000/sd-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/sd-x1000.c
@@ -51,7 +51,7 @@ static int sd_init_card(msc_drv* d)
 }
 
 static int sd_transfer(msc_drv* d, bool write,
-                       unsigned long start, int count, void* buf)
+                       sector_t start, int count, void* buf)
 {
     int status = -1;
 
@@ -114,6 +114,7 @@ static int sd_transfer(msc_drv* d, bool write,
                                           : SD_READ_MULTIPLE_BLOCK;
         }
 
+        // XXX 64-bit
         if(d->driver_flags & MSC_DF_V2_CARD)
             req.argument = start;
         else
@@ -142,14 +143,14 @@ static int sd_transfer(msc_drv* d, bool write,
     return status;
 }
 
-int sd_read_sectors(IF_MD(int drive,) unsigned long start,
+int sd_read_sectors(IF_MD(int drive,) sector_t start,
                     int count, void* buf)
 {
     return sd_transfer(sd_to_msc[IF_MD_DRV(drive)], false,
                        start, count, buf);
 }
 
-int sd_write_sectors(IF_MD(int drive,) unsigned long start,
+int sd_write_sectors(IF_MD(int drive,) sector_t start,
                      int count, const void* buf)
 {
     return sd_transfer(sd_to_msc[IF_MD_DRV(drive)], true,
@@ -187,6 +188,9 @@ long sd_last_disk_activity(void)
 
 bool sd_present(IF_MD_NONVOID(int drive))
 {
+#ifndef HAVE_MULTIDRIVE
+    int drive = 0;
+#endif
     /* Seems that volume_properties() in firmware/common/disk.c may pass
      * drive = -1 when the SD card is not inserted, so just return false.
      */
@@ -198,6 +202,10 @@ bool sd_present(IF_MD_NONVOID(int drive))
 
 bool sd_removable(IF_MD_NONVOID(int drive))
 {
+#ifndef HAVE_MULTIDRIVE
+    int drive = 0;
+#endif
+
     /* Same reason as sd_present() */
     if(drive < 0)
         return false;
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index 81d90d01db..e226c15f99 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -114,6 +114,9 @@
 #define SCSI_REPORT_LUNS          0xa0
 #define SCSI_WRITE_BUFFER         0x3b
 
+#define SCSI_READ_16              0x88
+#define SCSI_WRITE_16             0x8a
+
 #define UMS_STATUS_GOOD            0x00
 #define UMS_STATUS_FAIL            0x01
 
@@ -273,7 +276,7 @@ static union {
 static char *cbw_buffer;
 
 static struct {
-    unsigned int sector;
+    sector_t sector;
     unsigned int count;
     unsigned int orig_count;
     unsigned int cur_cmd;
@@ -503,7 +506,7 @@ void usb_storage_transfer_complete(int ep,int dir,int status,int length)
             if(dir==USB_DIR_IN) {
                 logf("IN received in RECEIVING");
             }
-            logf("scsi write %d %d", cur_cmd.sector, cur_cmd.count);
+            logf("scsi write %llu %d", cur_cmd.sector, cur_cmd.count);
             if(status==0) {
                 if((unsigned int)length!=(SECTOR_SIZE* cur_cmd.count)
                   && (unsigned int)length!=WRITE_BUFFER_SIZE) {
@@ -511,7 +514,7 @@ void usb_storage_transfer_complete(int ep,int dir,int status,int length)
                     break;
                 }
 
-                unsigned int next_sector = cur_cmd.sector +
+                sector_t next_sector = cur_cmd.sector +
                              (WRITE_BUFFER_SIZE/SECTOR_SIZE);
                 unsigned int next_count = cur_cmd.count -
                              MIN(cur_cmd.count,WRITE_BUFFER_SIZE/SECTOR_SIZE);
@@ -739,12 +742,10 @@ static void send_and_read_next(void)
 
 static void handle_scsi(struct command_block_wrapper* cbw)
 {
-    /* USB Mass Storage assumes LBA capability.
-       TODO: support 48-bit LBA */
-
     struct storage_info info;
     unsigned int length = cbw->data_transfer_length;
-    unsigned int block_size, block_count;
+    sector_t block_count;
+    unsigned int block_size;
     bool lun_present=true;
     unsigned char lun = cbw->lun;
     unsigned int block_size_mult = 1;
@@ -888,6 +889,12 @@ static void handle_scsi(struct command_block_wrapper* cbw)
                     memset(tb.ms_data_10->block_descriptor.reserved,0,4);
                     memset(tb.ms_data_10->block_descriptor.num_blocks,0,8);
 
+#ifdef STORAGE_64BIT_SECTOR
+                    tb.ms_data_10->block_descriptor.num_blocks[2] =
+                        ((block_count/block_size_mult) & 0xff00000000ULL)>>40;
+                    tb.ms_data_10->block_descriptor.num_blocks[3] =
+                        ((block_count/block_size_mult) & 0x00ff000000ULL)>>32;
+#endif
                     tb.ms_data_10->block_descriptor.num_blocks[4] =
                         ((block_count/block_size_mult) & 0xff000000)>>24;
                     tb.ms_data_10->block_descriptor.num_blocks[5] =
@@ -1070,7 +1077,7 @@ static void handle_scsi(struct command_block_wrapper* cbw)
                  cbw->command_block[8]);
             cur_cmd.orig_count = cur_cmd.count;
 
-            //logf("scsi read %d %d", cur_cmd.sector, cur_cmd.count);
+            logf("scsi read %llu %d", cur_cmd.sector, cur_cmd.count);
 
             if((cur_cmd.sector + cur_cmd.count) > block_count) {
                 send_csw(UMS_STATUS_FAIL);
@@ -1092,7 +1099,58 @@ static void handle_scsi(struct command_block_wrapper* cbw)
                 send_and_read_next();
             }
             break;
+#ifdef STORAGE_64BIT_SECTOR
+        case SCSI_READ_16:
+            logf("scsi read16 %d",lun);
+            if(!lun_present) {
+                send_command_failed_result();
+                cur_sense_data.sense_key=SENSE_NOT_READY;
+                cur_sense_data.asc=ASC_MEDIUM_NOT_PRESENT;
+                cur_sense_data.ascq=0;
+                break;
+            }
+            cur_cmd.data[0] = tb.transfer_buffer;
+            cur_cmd.data[1] = &tb.transfer_buffer[READ_BUFFER_SIZE];
+            cur_cmd.data_select=0;
+            cur_cmd.sector = block_size_mult *
+                 ((uint64_t)cbw->command_block[2] << 56 |
+                 (uint64_t)cbw->command_block[3] << 48 |
+                 (uint64_t)cbw->command_block[4] << 40 |
+                 (uint64_t)cbw->command_block[5] << 32 |
+                 cbw->command_block[6] << 24 |
+                 cbw->command_block[7] << 16 |
+                 cbw->command_block[8] << 8  |
+                 cbw->command_block[9]);
+            cur_cmd.count = block_size_mult *
+                (cbw->command_block[10] << 24 |
+                 cbw->command_block[11] << 16 |
+                 cbw->command_block[12] << 8 |
+                 cbw->command_block[13]);
+            cur_cmd.orig_count = cur_cmd.count;
 
+            logf("scsi read %llu %d", cur_cmd.sector, cur_cmd.count);
+
+            if((cur_cmd.sector + cur_cmd.count) > block_count) {
+                send_csw(UMS_STATUS_FAIL);
+                cur_sense_data.sense_key=SENSE_ILLEGAL_REQUEST;
+                cur_sense_data.asc=ASC_LBA_OUT_OF_RANGE;
+                cur_sense_data.ascq=0;
+            }
+            else {
+#ifdef USB_USE_RAMDISK
+                memcpy(cur_cmd.data[cur_cmd.data_select],
+                        ramdisk_buffer + cur_cmd.sector*SECTOR_SIZE,
+                        MIN(READ_BUFFER_SIZE/SECTOR_SIZE,cur_cmd.count)*SECTOR_SIZE);
+#else
+                cur_cmd.last_result = storage_read_sectors(IF_MD(cur_cmd.lun,)
+                        cur_cmd.sector,
+                        MIN(READ_BUFFER_SIZE/SECTOR_SIZE, cur_cmd.count),
+                        cur_cmd.data[cur_cmd.data_select]);
+#endif
+                send_and_read_next();
+            }
+            break;
+#endif
         case SCSI_WRITE_10:
             logf("scsi write10 %d",lun);
             if(!lun_present) {
@@ -1127,6 +1185,48 @@ static void handle_scsi(struct command_block_wrapper* cbw)
                         MIN(WRITE_BUFFER_SIZE, cur_cmd.count*SECTOR_SIZE));
             }
             break;
+#ifdef STORAGE_64BIT_SECTOR
+        case SCSI_WRITE_16:
+            logf("scsi write16 %d",lun);
+            if(!lun_present) {
+                send_csw(UMS_STATUS_FAIL);
+                cur_sense_data.sense_key=SENSE_NOT_READY;
+                cur_sense_data.asc=ASC_MEDIUM_NOT_PRESENT;
+                cur_sense_data.ascq=0;
+                break;
+            }
+            cur_cmd.data[0] = tb.transfer_buffer;
+            cur_cmd.data[1] = &tb.transfer_buffer[WRITE_BUFFER_SIZE];
+            cur_cmd.data_select=0;
+            cur_cmd.sector = block_size_mult *
+                ((uint64_t)cbw->command_block[2] << 56 |
+                 (uint64_t)cbw->command_block[3] << 48 |
+                 (uint64_t)cbw->command_block[4] << 40 |
+                 (uint64_t)cbw->command_block[5] << 32 |
+                 cbw->command_block[6] << 24 |
+                 cbw->command_block[7] << 16 |
+                 cbw->command_block[8] << 8  |
+                 cbw->command_block[9]);
+            cur_cmd.count = block_size_mult *
+                (cbw->command_block[10] << 24 |
+                 cbw->command_block[11] << 16 |
+                 cbw->command_block[12] << 8 |
+                 cbw->command_block[13]);
+            cur_cmd.orig_count = cur_cmd.count;
+
+            /* expect data */
+            if((cur_cmd.sector + cur_cmd.count) > block_count) {
+                send_csw(UMS_STATUS_FAIL);
+                cur_sense_data.sense_key=SENSE_ILLEGAL_REQUEST;
+                cur_sense_data.asc=ASC_LBA_OUT_OF_RANGE;
+                cur_sense_data.ascq=0;
+            }
+            else {
+                receive_block_data(cur_cmd.data[0],
+                        MIN(WRITE_BUFFER_SIZE, cur_cmd.count*SECTOR_SIZE));
+            }
+            break;
+#endif
 
 #if CONFIG_RTC
         case SCSI_WRITE_BUFFER: