58 files changed, 1252 insertions, 811 deletions
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/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c
index 0450c8b410..26a228cddf 100644
--- a/firmware/target/arm/as3525/system-as3525.c
+++ b/firmware/target/arm/as3525/system-as3525.c
@@ -92,7 +92,7 @@ void INT_GPIOA(void);
 default_interrupt(INT_GPIOB);
 default_interrupt(INT_GPIOC);
-static const char const irqname[][9] =
+static const char irqname[][9] =
 {
    "WATCHDOG", "TIMER1", "TIMER2", "USB", "DMAC", "NAND",
    "IDE", "MCI0", "MCI1", "AUDIO", "SSP", "I2C_MS",
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/clkctrl-imx233.c b/firmware/target/arm/imx233/clkctrl-imx233.c
index 59c23c1a76..1a8f523d5a 100644
--- a/firmware/target/arm/imx233/clkctrl-imx233.c
+++ b/firmware/target/arm/imx233/clkctrl-imx233.c
@@ -87,7 +87,9 @@ void imx233_clkctrl_set_div(enum imx233_clock_t clk, int div)
        case CLK_EMI: BF_WR(CLKCTRL_EMI, DIV(div)); break;
 #endif
        case CLK_SSP: BF_WR(CLKCTRL_SSP, DIV(div)); break;
-        case CLK_HBUS: BF_WR(CLKCTRL_HBUS, DIV(div)); break;
+        case CLK_HBUS:
+            /* make sure to switch to integer divide mode simulteanously */
+            BF_WR(CLKCTRL_HBUS, DIV_FRAC_EN(0), DIV(div)); break;
        case CLK_XBUS: BF_WR(CLKCTRL_XBUS, DIV(div)); break;
        default: return;
    }
@@ -107,7 +109,12 @@ int imx233_clkctrl_get_div(enum imx233_clock_t clk)
        case CLK_EMI: return BF_RD(CLKCTRL_EMI, DIV);
 #endif
        case CLK_SSP: return BF_RD(CLKCTRL_SSP, DIV);
-        case CLK_HBUS: return BF_RD(CLKCTRL_HBUS, DIV);
+        case CLK_HBUS:
+            /* since fractional and integer divider share the same field, clain it is disabled in frac mode */
+            if(BF_RD(CLKCTRL_HBUS, DIV_FRAC_EN))
+                return 0;
+            else
+                return BF_RD(CLKCTRL_HBUS, DIV);
        case CLK_XBUS: return BF_RD(CLKCTRL_XBUS, DIV);
        default: return 0;
    }
@@ -130,6 +137,14 @@ void imx233_clkctrl_set_frac_div(enum imx233_clock_t clk, int fracdiv)
        handle_frac(IO)
        handle_frac(CPU)
        handle_frac(EMI)
+        case CLK_HBUS:
+            if(fracdiv == 0)
+                panicf("Don't set hbus fracdiv to 0!");
+            /* value 0 is forbidden because we can't simply disabble the divider, it's always
+             * active but either in integer or fractional mode
+             * make sure we write both the value and frac_en bit at the same time */
+            BF_WR(CLKCTRL_HBUS, DIV_FRAC_EN(1), DIV(fracdiv));
+            break;
        default: break;
    }
 #undef handle_frac
@@ -151,6 +166,11 @@ int imx233_clkctrl_get_frac_div(enum imx233_clock_t clk)
        handle_frac(IO)
        handle_frac(CPU)
        handle_frac(EMI)
+        case CLK_HBUS:
+            if(BF_RD(CLKCTRL_HBUS, DIV_FRAC_EN))
+                return BF_RD(CLKCTRL_HBUS, DIV);
+            else
+                return 0;
        default: return 0;
    }
 #undef handle_frac
@@ -303,8 +323,12 @@ unsigned imx233_clkctrl_get_freq(enum imx233_clock_t clk)
            /* Derived from clk_p via integer/fractional div */
            unsigned ref = imx233_clkctrl_get_freq(CLK_CPU);
 #if IMX233_SUBTARGET >= 3700
+            /* if divider is in fractional mode, integer divider does not take effect (in fact it's
+             * the same divider but in a different mode ). Also the fractiona value is encoded as
+             * a fraction, not a divider */
            if(imx233_clkctrl_get_frac_div(CLK_HBUS) != 0)
                ref = (ref * imx233_clkctrl_get_frac_div(CLK_HBUS)) / 32;
+            else
 #endif
            if(imx233_clkctrl_get_div(CLK_HBUS) != 0)
                ref /= imx233_clkctrl_get_div(CLK_HBUS);
diff --git a/firmware/target/arm/imx233/clkctrl-imx233.h b/firmware/target/arm/imx233/clkctrl-imx233.h
index f12d181c50..d150912cfe 100644
--- a/firmware/target/arm/imx233/clkctrl-imx233.h
+++ b/firmware/target/arm/imx233/clkctrl-imx233.h
@@ -68,7 +68,7 @@ int imx233_clkctrl_get_div(enum imx233_clock_t clk);
 #if IMX233_SUBTARGET >= 3700
 /* call with fracdiv=0 to disable it */
 void imx233_clkctrl_set_frac_div(enum imx233_clock_t clk, int fracdiv);
-/* 0 means fractional dividor disable */
+/* 0 means fractional dividor disabled */
 int imx233_clkctrl_get_frac_div(enum imx233_clock_t clk);
 void imx233_clkctrl_set_bypass(enum imx233_clock_t clk, bool bypass);
 bool imx233_clkctrl_get_bypass(enum imx233_clock_t clk);
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 sector_t window_start[SDMMC_NUM_DRIVES];
-static unsigned window_end[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/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c
index 8f238936e7..9308b7664e 100644
--- a/firmware/target/arm/ipod/button-clickwheel.c
+++ b/firmware/target/arm/ipod/button-clickwheel.c
@@ -327,7 +327,13 @@ void ipod_4g_button_int(void)
 void button_init_device(void)
 {
    opto_i2c_init();
-    
+    /* fixes first button press being ignored */
+#if defined(IPOD_4G) || defined(IPOD_COLOR)
+    outl(inl(0x7000c100) & ~0x60000000, 0x7000c100);
+    outl(inl(0x7000c104) | 0x04000000, 0x7000c104);
+    outl(inl(0x7000c100) | 0x60000000, 0x7000c100);
+#endif
    /* hold button - enable as input */
    GPIOA_ENABLE |= 0x20;
    GPIOA_OUTPUT_EN &= ~0x20; 
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
+   However when used with mSATA and some SD adapters this causes corrupt data
-   so we now just use these timings from the OF.
+   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];
-        IDE0_PRI_TIMING0 = pio80mhz[mode];
-    else
-        IDE0_PRI_TIMING0 = 0x10;
 }
 #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())
+    if (write) {
-        return false;
+        if ((unsigned long)addr & 3)
+            return false;
-    if (write && ((unsigned long)addr & 3))
+        if (!ata_is_ssd)
-        return false;
+            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    r4, r3, lsr #16             \r\n"
-            "mov    r6, r5, lsr #16             \r\n" 
+            "mov    r6, r5, lsr #16             \r\n"
-            "mov    r8, r7, lsr #16             \r\n" 
+            "mov    r8, r7, lsr #16             \r\n"
-            "mov    r10, r9, 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    r4, r3, lsr #16             \r\n"
-            "mov    r6, r5, lsr #16             \r\n" 
+            "mov    r6, r5, lsr #16             \r\n"
-            "mov    r8, r7, lsr #16             \r\n" 
+            "mov    r8, r7, lsr #16             \r\n"
-            "mov    %[t], r9, 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) 
+static inline void mci_delay(void)
-{ 
+{
-    int i = 0xffff; 
+    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", 
+    dbgprintf("CMD%2.2d:SDICSTA=%04x [%c%c%c%c%c-%c%c%c%c%c%c%c]  SDIRSP0=%08x [%d %s] \n",
-        cmd, 
+        cmd,
-        SDICSTA, 
+        SDICSTA,
-        (SDICSTA & S3C2410_SDICMDSTAT_CRCFAIL)    ? 'C' : ' ', 
+        (SDICSTA & S3C2410_SDICMDSTAT_CRCFAIL)    ? 'C' : ' ',
-        (SDICSTA & S3C2410_SDICMDSTAT_CMDSENT)    ? 'S' : ' ', 
+        (SDICSTA & S3C2410_SDICMDSTAT_CMDSENT)    ? 'S' : ' ',
-        (SDICSTA & S3C2410_SDICMDSTAT_CMDTIMEOUT) ? 'T' : ' ', 
+        (SDICSTA & S3C2410_SDICMDSTAT_CMDTIMEOUT) ? 'T' : ' ',
-        (SDICSTA & S3C2410_SDICMDSTAT_RSPFIN)     ? 'R' : ' ', 
+        (SDICSTA & S3C2410_SDICMDSTAT_RSPFIN)     ? 'R' : ' ',
-        (SDICSTA & S3C2410_SDICMDSTAT_XFERING)    ? 'X' : ' ', 
+        (SDICSTA & S3C2410_SDICMDSTAT_XFERING)    ? 'X' : ' ',
-        
-        (SDICSTA & 0x40)    ? 'P' : ' ', 
+        (SDICSTA & 0x40)    ? 'P' : ' ',
-        (SDICSTA & 0x20)    ? 'A' : ' ', 
+        (SDICSTA & 0x20)    ? 'A' : ' ',
-        (SDICSTA & 0x10)    ? 'E' : ' ', 
+        (SDICSTA & 0x10)    ? 'E' : ' ',
-        (SDICSTA & 0x08)    ? 'C' : ' ', 
+        (SDICSTA & 0x08)    ? 'C' : ' ',
-        (SDICSTA & 0x04)    ? 'I' : ' ', 
+        (SDICSTA & 0x04)    ? 'I' : ' ',
-        (SDICSTA & 0x02)    ? 'R' : ' ', 
+        (SDICSTA & 0x02)    ? 'R' : ' ',
-        (SDICSTA & 0x01)    ? 'Z' : ' ', 
+        (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_DATACRC
-               | S3C2410_SDIIMSK_CRCSTATUS   
+               | 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;        
+            request.callback       = NULL;
-            
-            dma_enable_channel(0, &request); 
+            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/s5l8700/ipodnano2g/ftl-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c
index 0d831a7167..7071d411b5 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c
@@ -186,7 +186,6 @@ struct ftl_cxt_type
   There is one of these per bank. */
 struct ftl_vfl_cxt_type
 {
    /* Cross-bank update sequence number, incremented on every VFL
       context commit on any bank. */
    uint32_t usn;
@@ -525,18 +524,24 @@ static uint32_t ftl_vfl_verify_checksum(uint32_t bank)
    return 1;
 }
 #ifndef FTL_READONLY
+#if __GNUC__ >= 9
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+#endif
 /* Updates the checksums of the VFL context of the specified bank */
 static void ftl_vfl_update_checksum(uint32_t bank)
 {
    ftl_vfl_calculate_checksum(bank, &ftl_vfl_cxt[bank].checksum1,
                               &ftl_vfl_cxt[bank].checksum2);
 }
-#endif
+#if __GNUC__ >= 9
+#pragma GCC diagnostic pop
+#endif
-#ifndef FTL_READONLY
 /* Writes 8 copies of the VFL context of the specified bank to flash,
   and succeeds if at least 4 can be read back properly. */
 static uint32_t ftl_vfl_store_cxt(uint32_t bank)
@@ -2107,7 +2112,7 @@ uint32_t ftl_sync(void)
    if (ftl_cxt.clean_flag == 1) return 0;
    mutex_lock(&ftl_mtx);
-    
 #ifdef FTL_TRACE
    DEBUGF("FTL: Syncing\n");
 #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..8cc5b44aca 100644
--- a/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c
@@ -29,6 +29,9 @@
 #include "mmcdefs-target.h"
 #include "s5l8702.h"
 #include "led.h"
+#include "debug.h"
+#include "panic.h"
+#include "fs_defines.h"
 #ifndef ATA_RETRIES
 #define ATA_RETRIES 3
@@ -58,10 +61,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 identify_info[ATA_IDENTIFY_WORDS] STORAGE_ALIGN_ATTR;
 static bool ceata;
 static bool ata_lba48;
 static bool ata_dma;
@@ -70,18 +72,18 @@ static struct mutex ata_mutex;
 static struct semaphore ata_wakeup;
 static uint32_t ata_dma_flags;
 static long ata_last_activity_value = -1;
-static long ata_sleep_timeout = 20 * HZ;
+static long ata_sleep_timeout = 7 * HZ;
 static bool ata_powered;
-static const int ata_retries = ATA_RETRIES;
+static bool canflush = true;
-static const bool ata_error_srst = true;
 static struct semaphore mmc_wakeup;
 static struct semaphore mmc_comp_wakeup;
 static int spinup_time = 0;
 static int dma_mode = 0;
-static char aligned_buffer[SECTOR_SIZE] STORAGE_ALIGN_ATTR;
-static int ata_reset(void);
+static const int ata_retries = ATA_RETRIES;
+static const bool ata_error_srst = true;
+static int ata_reset(void);
 static uint16_t ata_read_cbr(uint32_t volatile* reg)
 {
@@ -103,8 +105,10 @@ static int ata_wait_for_not_bsy(long timeout)
    while (true)
    {
        uint8_t csd = ata_read_cbr(&ATA_PIO_CSD);
-        if (!(csd & BIT(7))) return 0;
+        if (!(csd & BIT(7)))
-        if (TIMEOUT_EXPIRED(startusec, timeout)) RET_ERR(0);
+            return 0;
+        if (TIMEOUT_EXPIRED(startusec, timeout))
+            RET_ERR(0);
        yield();
    }
 }
@@ -116,8 +120,10 @@ static int ata_wait_for_rdy(long timeout)
    while (true)
    {
        uint8_t dad = ata_read_cbr(&ATA_PIO_DAD);
-        if (dad & BIT(6)) return 0;
+        if (dad & BIT(6))
-        if (TIMEOUT_EXPIRED(startusec, timeout)) RET_ERR(1);
+            return 0;
+        if (TIMEOUT_EXPIRED(startusec, timeout))
+            RET_ERR(1);
        yield();
    }
 }
@@ -129,9 +135,12 @@ static int ata_wait_for_start_of_transfer(long timeout)
    while (true)
    {
        uint8_t dad = ata_read_cbr(&ATA_PIO_DAD);
-        if (dad & BIT(0)) RET_ERR(1);
+        if (dad & BIT(0))
-        if ((dad & (BIT(7) | BIT(3))) == BIT(3)) return 0;
+            RET_ERR(1);
-        if (TIMEOUT_EXPIRED(startusec, timeout)) RET_ERR(2);
+        if ((dad & (BIT(7) | BIT(3))) == BIT(3))
+            return 0;
+        if (TIMEOUT_EXPIRED(startusec, timeout))
+            RET_ERR(2);
        yield();
    }
 }
@@ -140,8 +149,10 @@ static int ata_wait_for_end_of_transfer(long timeout)
 {
    PASS_RC(ata_wait_for_not_bsy(timeout), 2, 0);
    uint8_t dad = ata_read_cbr(&ATA_PIO_DAD);
-    if (dad & BIT(0)) RET_ERR(1);
+    if (dad & BIT(0))
-    if ((dad & (BIT(3) | BITRANGE(5, 7))) == BIT(6)) return 0;
+        RET_ERR(1);
+    if ((dad & (BIT(3) | BITRANGE(5, 7))) == BIT(6))
+        return 0;
    RET_ERR(2);
 }
@@ -149,13 +160,17 @@ static int mmc_dsta_check_command_success(bool disable_crc)
 {
    int rc = 0;
    uint32_t dsta = SDCI_DSTA;
-    if (dsta & SDCI_DSTA_RESTOUTE) rc |= 1;
+    if (dsta & SDCI_DSTA_RESTOUTE)
-    if (dsta & SDCI_DSTA_RESENDE) rc |= 2;
+        rc |= 1;
-    if (dsta & SDCI_DSTA_RESINDE) rc |= 4;
+    if (dsta & SDCI_DSTA_RESENDE)
+        rc |= 2;
+    if (dsta & SDCI_DSTA_RESINDE)
+        rc |= 4;
    if (!disable_crc)
        if (dsta & SDCI_DSTA_RESCRCE)
            rc |= 8;
-    if (rc) RET_ERR(rc);
+    if (rc)
+        RET_ERR(rc);
    return 0;
 }
@@ -164,7 +179,8 @@ static bool mmc_send_command(uint32_t cmd, uint32_t arg, uint32_t* result, int t
    long starttime = USEC_TIMER;
    while ((SDCI_STATE & SDCI_STATE_CMD_STATE_MASK) != SDCI_STATE_CMD_STATE_CMD_IDLE)
    {
-        if (TIMEOUT_EXPIRED(starttime, timeout)) RET_ERR(0);
+        if (TIMEOUT_EXPIRED(starttime, timeout))
+            RET_ERR(0);
        yield();
    }
    SDCI_STAC = SDCI_STAC_CLR_CMDEND | SDCI_STAC_CLR_BIT_3
@@ -179,32 +195,38 @@ static bool mmc_send_command(uint32_t cmd, uint32_t arg, uint32_t* result, int t
              | SDCI_STAC_CLR_RD_DATENDE6 | SDCI_STAC_CLR_RD_DATENDE7;
    SDCI_ARGU = arg;
    SDCI_CMD = cmd;
-    if (!(SDCI_DSTA & SDCI_DSTA_CMDRDY)) RET_ERR(1);
+    if (!(SDCI_DSTA & SDCI_DSTA_CMDRDY))
+        RET_ERR(1);
    SDCI_CMD = cmd | SDCI_CMD_CMDSTR;
    long sleepbase = USEC_TIMER;
-    while (TIMEOUT_EXPIRED(sleepbase, 1000)) yield();
+    while (TIMEOUT_EXPIRED(sleepbase, 1000))
+        yield();
    while (!(SDCI_DSTA & SDCI_DSTA_CMDEND))
    {
-        if (TIMEOUT_EXPIRED(starttime, timeout)) RET_ERR(2);
+        if (TIMEOUT_EXPIRED(starttime, timeout))
+            RET_ERR(2);
        yield();
    }
    if ((cmd & SDCI_CMD_RES_TYPE_MASK) != SDCI_CMD_RES_TYPE_NONE)
    {
        while (!(SDCI_DSTA & SDCI_DSTA_RESEND))
        {
-            if (TIMEOUT_EXPIRED(starttime, timeout)) RET_ERR(3);
+            if (TIMEOUT_EXPIRED(starttime, timeout))
+                RET_ERR(3);
            yield();
        }
        if (cmd & SDCI_CMD_RES_BUSY)
            while (SDCI_DSTA & SDCI_DSTA_DAT_BUSY)
            {
-                if (TIMEOUT_EXPIRED(starttime, CEATA_DAT_NONBUSY_TIMEOUT)) RET_ERR(4);
+                if (TIMEOUT_EXPIRED(starttime, CEATA_DAT_NONBUSY_TIMEOUT))
+                    RET_ERR(4);
                yield();
            }
    }
    bool nocrc = (cmd & SDCI_CMD_RES_SIZE_MASK) == SDCI_CMD_RES_SIZE_136;
    PASS_RC(mmc_dsta_check_command_success(nocrc), 3, 5);
-    if (result) *result = SDCI_RESP0;
+    if (result)
+        *result = SDCI_RESP0;
    return 0;
 }
@@ -227,7 +249,8 @@ static int mmc_init(void)
    uint32_t result;
    do
    {
-        if (TIMEOUT_EXPIRED(startusec, CEATA_POWERUP_TIMEOUT)) RET_ERR(1);
+        if (TIMEOUT_EXPIRED(startusec, CEATA_POWERUP_TIMEOUT))
+            RET_ERR(1);
        sleep(HZ / 100);
        PASS_RC(mmc_send_command(SDCI_CMD_CMD_NUM(MMC_CMD_SEND_OP_COND)
                               | SDCI_CMD_CMD_TYPE_BCR | SDCI_CMD_RES_TYPE_R3
@@ -252,7 +275,8 @@ static int mmc_init(void)
                             MMC_CMD_SELECT_CARD_RCA(CEATA_MMC_RCA),
                             NULL, CEATA_COMMAND_TIMEOUT), 3, 5);
    PASS_RC(mmc_get_card_status(&result), 3, 6);
-    if ((result & MMC_STATUS_CURRENT_STATE_MASK) != MMC_STATUS_CURRENT_STATE_TRAN) RET_ERR(7);
+    if ((result & MMC_STATUS_CURRENT_STATE_MASK) != MMC_STATUS_CURRENT_STATE_TRAN)
+        RET_ERR(7);
    return 0;
 }
@@ -286,7 +310,8 @@ static int ceata_soft_reset(void)
    do
    {
        PASS_RC(mmc_fastio_read(0xf, &status), 2, 2);
-        if (TIMEOUT_EXPIRED(startusec, CEATA_POWERUP_TIMEOUT)) RET_ERR(3);
+        if (TIMEOUT_EXPIRED(startusec, CEATA_POWERUP_TIMEOUT))
+            RET_ERR(3);
        sleep(HZ / 100);
    }
    while (status & 0x80);
@@ -299,16 +324,21 @@ static int mmc_dsta_check_data_success(void)
    uint32_t dsta = SDCI_DSTA;
    if (dsta & (SDCI_DSTA_WR_DATCRCE | SDCI_DSTA_RD_DATCRCE))
    {
-        if (dsta & SDCI_DSTA_WR_DATCRCE) rc |= 1;
+        if (dsta & SDCI_DSTA_WR_DATCRCE)
-        if (dsta & SDCI_DSTA_RD_DATCRCE) rc |= 2;
+            rc |= 1;
-        if ((dsta & SDCI_DSTA_WR_CRC_STATUS_MASK) == SDCI_DSTA_WR_CRC_STATUS_TXERR) rc |= 4;
+        if (dsta & SDCI_DSTA_RD_DATCRCE)
-        else if ((dsta & SDCI_DSTA_WR_CRC_STATUS_MASK) == SDCI_DSTA_WR_CRC_STATUS_CARDERR) rc |= 8;
+            rc |= 2;
+        if ((dsta & SDCI_DSTA_WR_CRC_STATUS_MASK) == SDCI_DSTA_WR_CRC_STATUS_TXERR)
+            rc |= 4;
+        else if ((dsta & SDCI_DSTA_WR_CRC_STATUS_MASK) == SDCI_DSTA_WR_CRC_STATUS_CARDERR)
+            rc |= 8;
    }
    if (dsta & (SDCI_DSTA_RD_DATENDE0 | SDCI_DSTA_RD_DATENDE1 | SDCI_DSTA_RD_DATENDE2
              | SDCI_DSTA_RD_DATENDE3 | SDCI_DSTA_RD_DATENDE4 | SDCI_DSTA_RD_DATENDE5
              | SDCI_DSTA_RD_DATENDE6 | SDCI_DSTA_RD_DATENDE7))
        rc |= 16;
-    if (rc) RET_ERR(rc);
+    if (rc)
+        RET_ERR(rc);
    return 0;
 }
@@ -321,7 +351,8 @@ static void mmc_discard_irq(void)
 static int ceata_read_multiple_register(uint32_t addr, void* dest, uint32_t size)
 {
-    if (size > 0x10) RET_ERR(0);
+    if (size > 0x10)
+        RET_ERR(0);
    mmc_discard_irq();
    SDCI_DMASIZE = size;
    SDCI_DMACOUNT = 1;
@@ -335,8 +366,8 @@ static int ceata_read_multiple_register(uint32_t addr, void* dest, uint32_t size
                           | MMC_CMD_CEATA_RW_MULTIPLE_REG_ADDRESS(addr & 0xfc)
                           | MMC_CMD_CEATA_RW_MULTIPLE_REG_COUNT(size & 0xfc),
                             NULL, CEATA_COMMAND_TIMEOUT), 2, 1);
-    if (semaphore_wait(&mmc_wakeup, CEATA_COMMAND_TIMEOUT * HZ / 1000000)
+    if (semaphore_wait(&mmc_wakeup, CEATA_COMMAND_TIMEOUT * HZ / 1000000) == OBJ_WAIT_TIMEDOUT)
-        == OBJ_WAIT_TIMEDOUT) RET_ERR(2);
+        RET_ERR(2);
    PASS_RC(mmc_dsta_check_data_success(), 2, 3);
    return 0;
 }
@@ -344,7 +375,8 @@ static int ceata_read_multiple_register(uint32_t addr, void* dest, uint32_t size
 static int ceata_write_multiple_register(uint32_t addr, void* dest, uint32_t size)
 {
    uint32_t i;
-    if (size > 0x10) RET_ERR(0);
+    if (size > 0x10)
+        RET_ERR(0);
    mmc_discard_irq();
    SDCI_DMASIZE = size;
    SDCI_DMACOUNT = 0;
@@ -358,13 +390,15 @@ static int ceata_write_multiple_register(uint32_t addr, void* dest, uint32_t siz
                           | MMC_CMD_CEATA_RW_MULTIPLE_REG_COUNT(size & 0xfc),
                             NULL, CEATA_COMMAND_TIMEOUT), 3, 1);
    SDCI_DCTRL = SDCI_DCTRL_TRCONT_TX;
-    for (i = 0; i < size / 4; i++) SDCI_DATA = ((uint32_t*)dest)[i];
+    for (i = 0; i < size / 4; i++)
+        SDCI_DATA = ((uint32_t*)dest)[i];
    long startusec = USEC_TIMER;
-    if (semaphore_wait(&mmc_wakeup, CEATA_COMMAND_TIMEOUT * HZ / 1000000)
+    if (semaphore_wait(&mmc_wakeup, CEATA_COMMAND_TIMEOUT * HZ / 1000000) == OBJ_WAIT_TIMEDOUT)
-        == OBJ_WAIT_TIMEDOUT) RET_ERR(2);
+        RET_ERR(2);
    while ((SDCI_STATE & SDCI_STATE_DAT_STATE_MASK) != SDCI_STATE_DAT_STATE_IDLE)
    {
-        if (TIMEOUT_EXPIRED(startusec, CEATA_COMMAND_TIMEOUT)) RET_ERR(3);
+        if (TIMEOUT_EXPIRED(startusec, CEATA_COMMAND_TIMEOUT))
+            RET_ERR(3);
        yield();
    }
    PASS_RC(mmc_dsta_check_data_success(), 3, 4);
@@ -381,13 +415,17 @@ static int ceata_init(int buswidth)
                           | MMC_CMD_SWITCH_INDEX(MMC_CMD_SWITCH_FIELD_HS_TIMING)
                           | MMC_CMD_SWITCH_VALUE(MMC_CMD_SWITCH_FIELD_HS_TIMING_HIGH_SPEED),
                             &result, CEATA_COMMAND_TIMEOUT), 3, 0);
-    if (result & MMC_STATUS_SWITCH_ERROR) RET_ERR(1);
+    if (result & MMC_STATUS_SWITCH_ERROR)
+        RET_ERR(1);
    if (buswidth > 1)
    {
        int setting;
-        if (buswidth == 4) setting = MMC_CMD_SWITCH_FIELD_BUS_WIDTH_4BIT;
+        if (buswidth == 4)
-        else if (buswidth == 8) setting = MMC_CMD_SWITCH_FIELD_BUS_WIDTH_8BIT;
+            setting = MMC_CMD_SWITCH_FIELD_BUS_WIDTH_4BIT;
-        else setting = MMC_CMD_SWITCH_FIELD_BUS_WIDTH_1BIT;
+        else if (buswidth == 8)
+            setting = MMC_CMD_SWITCH_FIELD_BUS_WIDTH_8BIT;
+        else
+            setting = MMC_CMD_SWITCH_FIELD_BUS_WIDTH_1BIT;
        PASS_RC(mmc_send_command(SDCI_CMD_CMD_NUM(MMC_CMD_SWITCH) | SDCI_CMD_RES_BUSY
                               | SDCI_CMD_CMD_TYPE_AC | SDCI_CMD_RES_TYPE_R1
                               | SDCI_CMD_RES_SIZE_48 | SDCI_CMD_NCR_NID_NCR,
@@ -395,7 +433,8 @@ static int ceata_init(int buswidth)
                               | MMC_CMD_SWITCH_INDEX(MMC_CMD_SWITCH_FIELD_BUS_WIDTH)
                               | MMC_CMD_SWITCH_VALUE(setting),
                                 &result, CEATA_COMMAND_TIMEOUT), 3, 2);
-        if (result & MMC_STATUS_SWITCH_ERROR) RET_ERR(3);
+        if (result & MMC_STATUS_SWITCH_ERROR)
+            RET_ERR(3);
        if (buswidth == 4)
            SDCI_CTRL = (SDCI_CTRL & ~SDCI_CTRL_BUS_WIDTH_MASK) | SDCI_CTRL_BUS_WIDTH_4BIT;
        else if (buswidth == 8)
@@ -403,7 +442,8 @@ static int ceata_init(int buswidth)
    }
    PASS_RC(ceata_soft_reset(), 3, 4);
    PASS_RC(ceata_read_multiple_register(0, ceata_taskfile, 0x10), 3, 5);
-    if (ceata_taskfile[0xc] != 0xce || ceata_taskfile[0xd] != 0xaa) RET_ERR(6);
+    if (ceata_taskfile[0xc] != 0xce || ceata_taskfile[0xd] != 0xaa)
+        RET_ERR(6);
    PASS_RC(mmc_fastio_write(6, 0), 3, 7);
    return 0;
 }
@@ -427,8 +467,10 @@ static int ceata_wait_idle(void)
    {
        uint32_t status;
        PASS_RC(mmc_fastio_read(0xf, &status), 1, 0);
-        if (!(status & 0x88)) return 0;
+        if (!(status & 0x88))
-        if (TIMEOUT_EXPIRED(startusec, CEATA_DAT_NONBUSY_TIMEOUT)) RET_ERR(1);
+            return 0;
+        if (TIMEOUT_EXPIRED(startusec, CEATA_DAT_NONBUSY_TIMEOUT))
+            RET_ERR(1);
        sleep(HZ / 20);
    }
 }
@@ -477,7 +519,8 @@ static int ceata_rw_multiple_block(bool write, void* buf, uint32_t count, long t
                           | SDCI_CMD_RES_SIZE_48 | SDCI_CMD_NCR_NID_NCR,
                             direction | MMC_CMD_CEATA_RW_MULTIPLE_BLOCK_COUNT(count),
                             NULL, CEATA_COMMAND_TIMEOUT), 3, 0);
-    if (write) SDCI_DCTRL = SDCI_DCTRL_TRCONT_TX;
+    if (write)
+        SDCI_DCTRL = SDCI_DCTRL_TRCONT_TX;
    if (semaphore_wait(&mmc_wakeup, timeout) == OBJ_WAIT_TIMEDOUT)
    {
        PASS_RC(ceata_cancel_command(), 3, 1);
@@ -510,7 +553,8 @@ 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;
 }
@@ -549,6 +593,41 @@ static int ata_set_feature(uint32_t feature, uint32_t param)
    return 0;
 }
+#ifdef HAVE_ATA_DMA
+static int udmatimes[ATA_MAX_UDMA + 1] = {
+        0x4071152,
+        0x2050d52,
+#if ATA_MAX_UDMA >= 2
+        0x2030a52,
+#endif
+#if ATA_MAX_UDMA >= 3
+        0x1020a52,
+#endif
+#if ATA_MAX_UDMA >= 4
+        0x1010a52,
+#endif
+};
+static int mwdmatimes[ATA_MAX_MWDMA + 1] = {
+        0x1c175,
+        0x7083,
+        0x5072,
+};
+static int ata_get_best_mode(unsigned short identword, int max, int modetype)
+{
+    unsigned short testbit = BIT_N(max);
+    while (1) {
+        if (identword & testbit)
+            return max | modetype;
+        testbit >>= 1;
+        if (!testbit)
+            return 0;
+        max--;
+    }
+}
+#endif
 /*
 * ATA_UDMA_TIME register is documented on s3c6400 datasheet, information
 * included in s5l8700 datasheet is wrong or not valid for s5l8702.
@@ -573,10 +652,10 @@ static int ata_power_up(void)
    ata_set_active();
    ide_power_enable(true);
    long spinup_start = current_tick;
-    if (ceata)
+    if (ceata) {
-    {
        ata_lba48 = true;
        ata_dma = true;
+        dma_mode = 0xff; /* Canary */
        PCON(8) = 0x33333333;
        PCON(9) = 0x00000033;
        PCON(11) |= 0xf;
@@ -596,11 +675,8 @@ static int ata_power_up(void)
        SDCI_CDIV = SDCI_CDIV_CLKDIV(4);
        sleep(HZ / 100);
        PASS_RC(ceata_init(8), 3, 1);
-        PASS_RC(ata_identify(ata_identify_data), 3, 2);
+        PASS_RC(ata_identify(identify_info), 3, 2);
-        dma_mode = 0x44;
+    } else {
-    }
-    else
-    {
        PCON(7) = 0x44444444;
        PCON(8) = 0x44444444;
        PCON(9) = 0x44444444;
@@ -620,88 +696,71 @@ static int ata_power_up(void)
        ATA_PIO_LHR = 0;
        ATA_CFG = BIT(6);
        while (!(ATA_PIO_READY & BIT(1))) yield();
-        PASS_RC(ata_identify(ata_identify_data), 3, 3);
-        uint32_t piotime = 0x11f3;
+        PASS_RC(ata_identify(identify_info), 3, 3);
-        uint32_t mdmatime = 0x1c175;
-        uint32_t udmatime = 0x4071152;
+        uint32_t piotime = 0x11f3; /* PIO0-2? */
-        uint32_t param = 0;
+        if (identify_info[53] & BIT(1)) /* Word 64..70 valid */
-        ata_dma_flags = 0;
-        ata_lba48 = ata_identify_data[83] & BIT(10) ? true : false;
-        if (ata_identify_data[53] & BIT(1))
-        {
-            if (ata_identify_data[64] & BIT(1)) piotime = 0x2072;
-            else if (ata_identify_data[64] & BIT(0)) piotime = 0x7083;
-        }
-        if (ata_identify_data[63] & BIT(2))
        {
-            mdmatime = 0x5072;
+            if (identify_info[64] & BIT(1))
-            param = 0x22;
+                piotime = 0x2072; /* PIO mode 4 */
+            else if (identify_info[64] & BIT(0))
+                piotime = 0x7083; /* PIO mode 3 */
        }
-        else if (ata_identify_data[63] & BIT(1))
+        ATA_PIO_TIME = piotime;
+        uint32_t param = 0;
+        ata_dma_flags = 0;
+#ifdef HAVE_ATA_DMA
+        if ((identify_info[53] & BIT(2)) && (identify_info[88] & BITRANGE(0, 4))) /* Any UDMA */
        {
-            mdmatime = 0x7083;
+            int max_udma = ATA_MAX_UDMA;
-            param = 0x21;
+#if ATA_MAX_UDMA > 2
+            if (!(identify_info[93] & BIT(13)))
+                max_udma = 2;
+#endif
+            param = ata_get_best_mode(identify_info[88], max_udma, 0x40);
+            ATA_UDMA_TIME = udmatimes[param & 0xf];
+            ata_dma_flags = BIT(2) | BIT(3) | BIT(9) | BIT(10);
        }
-        if (ata_identify_data[63] & BITRANGE(0, 2))
+        if (!param && identify_info[63] & BITRANGE(0, 2)) /* Fall back to any MWDMA */
        {
+            param = ata_get_best_mode(identify_info[63], ATA_MAX_MWDMA, 0x20);
+            ATA_MDMA_TIME = mwdmatimes[param & 0xf];
            ata_dma_flags = BIT(3) | BIT(10);
-            param |= 0x20;
-        }
-        if (ata_identify_data[53] & BIT(2))
-        {
-            if (ata_identify_data[88] & BIT(4))
-            {
-                udmatime = 0x1010a52;
-                param = 0x44;
-            }
-            else if (ata_identify_data[88] & BIT(3))
-            {
-                udmatime = 0x1020a52;
-                param = 0x43;
-            }
-            else if (ata_identify_data[88] & BIT(2))
-            {
-                udmatime = 0x2030a52;
-                param = 0x42;
-            }
-            else if (ata_identify_data[88] & BIT(1))
-            {
-                udmatime = 0x2050d52;
-                param = 0x41;
-            }
-            else if (ata_identify_data[88] & BIT(0))
-            {
-                param = 0x40;
-            }
-            if (ata_identify_data[88] & BITRANGE(0, 4))
-            {
-                ata_dma_flags = BIT(2) | BIT(3) | BIT(9) | BIT(10);
-            }
        }
+#endif /* HAVE_ATA_DMA */
        ata_dma = param ? true : false;
        dma_mode = param;
        PASS_RC(ata_set_feature(0x03, param), 3, 4); /* Transfer mode */
-        if (ata_identify_data[82] & BIT(5))
+        /* SET_FEATURE only supported on PATA, not CE-ATA */
+        if (identify_info[82] & BIT(5))
            PASS_RC(ata_set_feature(0x02, 0), 3, 5); /* Enable volatile write cache */
-        if (ata_identify_data[82] & BIT(6))
+        if (identify_info[82] & BIT(6))
            PASS_RC(ata_set_feature(0xaa, 0), 3, 6); /* Enable read lookahead */
-        if (ata_identify_data[83] & BIT(3))
+        if (identify_info[83] & BIT(3))
            PASS_RC(ata_set_feature(0x05, 0x80), 3, 7); /* Enable lowest power mode w/o standby */
-        if (ata_identify_data[83] & BIT(9))
+        if (identify_info[83] & BIT(9))
            PASS_RC(ata_set_feature(0x42, 0x80), 3, 8); /* Enable lowest noise mode */
-        ATA_PIO_TIME = piotime;
-        ATA_MDMA_TIME = mdmatime;
+        PASS_RC(ata_identify(identify_info), 3, 9); /* Finally, re-read identify info */
-        ATA_UDMA_TIME = udmatime;
    }
    spinup_time = current_tick - spinup_start;
-    if (ata_lba48)
-        ata_total_sectors = ata_identify_data[100]
+    ata_total_sectors = (identify_info[61] << 16) | identify_info[60];
-                            | (((uint64_t)ata_identify_data[101]) << 16)
+    if ( identify_info[83] & BIT(10) && ata_total_sectors == 0x0FFFFFFF)
-                            | (((uint64_t)ata_identify_data[102]) << 32)
+    {
-                            | (((uint64_t)ata_identify_data[103]) << 48);
+        ata_total_sectors = ((uint64_t)identify_info[103] << 48) |
-    else
+                ((uint64_t)identify_info[102] << 32) |
-        ata_total_sectors = ata_identify_data[60] | (((uint32_t)ata_identify_data[61]) << 16);
+                ((uint64_t)identify_info[101] << 16) |
-    ata_total_sectors >>= 3;
+                identify_info[100];
+        ata_lba48 = true;
+    } else {
+        ata_lba48 = false;
+    }
    ata_powered = true;
    ata_set_active();
    return 0;
@@ -709,28 +768,8 @@ static int ata_power_up(void)
 static void ata_power_down(void)
 {
-    if (!ata_powered) return;
+    if (!ata_powered)
-    if (ceata)
+        return;
-    {
-        memset(ceata_taskfile, 0, 16);
-        ceata_taskfile[0xf] = CMD_STANDBY_IMMEDIATE;
-        ceata_wait_idle();
-        ceata_write_multiple_register(0, ceata_taskfile, 16);
-        ceata_wait_idle();
-        sleep(HZ);
-        PWRCON(0) |= (1 << 9);
-    }
-    else
-    {
-        ata_wait_for_rdy(1000000);
-        ata_write_cbr(&ATA_PIO_DVR, 0);
-        ata_write_cbr(&ATA_PIO_CSD, CMD_STANDBY_IMMEDIATE);
-        ata_wait_for_rdy(1000000);
-        sleep(HZ / 30);
-        ATA_CONTROL = 0;
-        while (!(ATA_CONTROL & BIT(1))) yield();
-        PWRCON(0) |= (1 << 5);
-    }
    PCON(7) = 0;
    PCON(8) = 0;
    PCON(9) = 0;
@@ -745,18 +784,18 @@ static int ata_rw_chunk_internal(uint64_t sector, uint32_t cnt, void* buffer, bo
    if (ceata)
    {
        memset(ceata_taskfile, 0, 16);
-        ceata_taskfile[0x2] = cnt >> 5;
+        ceata_taskfile[0x2] = cnt >> 8;
-        ceata_taskfile[0x3] = sector >> 21;
+        ceata_taskfile[0x3] = sector >> 24;
-        ceata_taskfile[0x4] = sector >> 29;
+        ceata_taskfile[0x4] = sector >> 32;
-        ceata_taskfile[0x5] = sector >> 37;
+        ceata_taskfile[0x5] = sector >> 40;
-        ceata_taskfile[0xa] = cnt << 3;
+        ceata_taskfile[0xa] = cnt;
-        ceata_taskfile[0xb] = sector << 3;
+        ceata_taskfile[0xb] = sector;
-        ceata_taskfile[0xc] = sector >> 5;
+        ceata_taskfile[0xc] = sector >> 8;
-        ceata_taskfile[0xd] = sector >> 13;
+        ceata_taskfile[0xd] = sector >> 16;
        ceata_taskfile[0xf] = write ? CMD_WRITE_DMA_EXT : CMD_READ_DMA_EXT;
        PASS_RC(ceata_wait_idle(), 2, 0);
        PASS_RC(ceata_write_multiple_register(0, ceata_taskfile, 16), 2, 1);
-        PASS_RC(ceata_rw_multiple_block(write, buffer, cnt << 3, CEATA_COMMAND_TIMEOUT * HZ / 1000000), 2, 2);
+        PASS_RC(ceata_rw_multiple_block(write, buffer, cnt, CEATA_COMMAND_TIMEOUT * HZ / 1000000), 2, 2);
    }
    else
    {
@@ -764,14 +803,14 @@ static int ata_rw_chunk_internal(uint64_t sector, uint32_t cnt, void* buffer, bo
        ata_write_cbr(&ATA_PIO_DVR, 0);
        if (ata_lba48)
        {
-            ata_write_cbr(&ATA_PIO_SCR, cnt >> 5);
+            ata_write_cbr(&ATA_PIO_SCR, (cnt >> 8) & 0xff);
-            ata_write_cbr(&ATA_PIO_SCR, (cnt << 3) & 0xff);
+            ata_write_cbr(&ATA_PIO_SCR, (cnt) & 0xff);
-            ata_write_cbr(&ATA_PIO_LHR, (sector >> 37) & 0xff);
+            ata_write_cbr(&ATA_PIO_LHR, (sector >> 40) & 0xff);
-            ata_write_cbr(&ATA_PIO_LMR, (sector >> 29) & 0xff);
+            ata_write_cbr(&ATA_PIO_LMR, (sector >> 32) & 0xff);
-            ata_write_cbr(&ATA_PIO_LLR, (sector >> 21) & 0xff);
+            ata_write_cbr(&ATA_PIO_LLR, (sector >> 24) & 0xff);
-            ata_write_cbr(&ATA_PIO_LHR, (sector >> 13) & 0xff);
+            ata_write_cbr(&ATA_PIO_LHR, (sector >> 16) & 0xff);
-            ata_write_cbr(&ATA_PIO_LMR, (sector >> 5) & 0xff);
+            ata_write_cbr(&ATA_PIO_LMR, (sector >> 8) & 0xff);
-            ata_write_cbr(&ATA_PIO_LLR, (sector << 3) & 0xff);
+            ata_write_cbr(&ATA_PIO_LLR, (sector) & 0xff);
            ata_write_cbr(&ATA_PIO_DVR, BIT(6));
            if (write)
                ata_write_cbr(&ATA_PIO_CSD, ata_dma ? CMD_WRITE_DMA_EXT : CMD_WRITE_MULTIPLE_EXT);
@@ -780,16 +819,17 @@ static int ata_rw_chunk_internal(uint64_t sector, uint32_t cnt, void* buffer, bo
        }
        else
        {
-            ata_write_cbr(&ATA_PIO_SCR, (cnt << 3) & 0xff);
+            ata_write_cbr(&ATA_PIO_SCR, (cnt) & 0xff);
-            ata_write_cbr(&ATA_PIO_LHR, (sector >> 13) & 0xff);
+            ata_write_cbr(&ATA_PIO_LHR, (sector >> 16) & 0xff);
-            ata_write_cbr(&ATA_PIO_LMR, (sector >> 5) & 0xff);
+            ata_write_cbr(&ATA_PIO_LMR, (sector >> 8) & 0xff);
-            ata_write_cbr(&ATA_PIO_LLR, (sector << 3) & 0xff);
+            ata_write_cbr(&ATA_PIO_LLR, (sector) & 0xff);
-            ata_write_cbr(&ATA_PIO_DVR, BIT(6) | ((sector >> 21) & 0xf));
+            ata_write_cbr(&ATA_PIO_DVR, BIT(6) | ((sector >> 24) & 0xf)); /* LBA28, mask off upper 4 bits of 32-bit sector address */
            if (write)
                ata_write_cbr(&ATA_PIO_CSD, ata_dma ? CMD_WRITE_DMA : CMD_WRITE_SECTORS);
            else
                ata_write_cbr(&ATA_PIO_CSD, ata_dma ? CMD_READ_DMA : CMD_READ_MULTIPLE);
        }
+#ifdef HAVE_ATA_DMA
        if (ata_dma)
        {
            PASS_RC(ata_wait_for_start_of_transfer(500000), 2, 1);
@@ -812,8 +852,7 @@ static int ata_rw_chunk_internal(uint64_t sector, uint32_t cnt, void* buffer, bo
            ATA_IRQ = BITRANGE(0, 4);
            ATA_IRQ_MASK = BIT(0);
            ATA_COMMAND = BIT(0);
-            if (semaphore_wait(&ata_wakeup, 500000 * HZ / 1000000)
+            if (semaphore_wait(&ata_wakeup, 500000 * HZ / 1000000) == OBJ_WAIT_TIMEDOUT)
-                == OBJ_WAIT_TIMEDOUT)
            {
                ATA_COMMAND = BIT(1);
                ATA_CFG &= ~(BITRANGE(2, 3) | BIT(12));
@@ -823,19 +862,19 @@ static int ata_rw_chunk_internal(uint64_t sector, uint32_t cnt, void* buffer, bo
            ATA_CFG &= ~(BITRANGE(2, 3) | BIT(12));
        }
        else
+#endif // HAVE_ATA_DMA
        {
-            cnt *= SECTOR_SIZE / 512;
            while (cnt--)
            {
                int i;
                PASS_RC(ata_wait_for_start_of_transfer(500000), 2, 1);
                if (write)
-                    for (i = 0; i < 256; i++)
+                    for (i = 0; i < SECTOR_SIZE/2; i++)
                        ata_write_cbr(&ATA_PIO_DTR, ((uint16_t*)buffer)[i]);
                else
-                    for (i = 0; i < 256; i++)
+                    for (i = 0; i < SECTOR_SIZE/2; i++)
                        ((uint16_t*)buffer)[i] = ata_read_cbr(&ATA_PIO_DTR);
-                buffer += 512;
+                buffer += SECTOR_SIZE;
            }
        }
        PASS_RC(ata_wait_for_end_of_transfer(100000), 2, 3);
@@ -851,40 +890,27 @@ static int ata_rw_chunk(uint64_t sector, uint32_t cnt, void* buffer, bool write)
    return rc;
 }
-static int ata_rw_sectors(uint64_t sector, uint32_t count, void* buffer, bool write)
+static int ata_transfer_sectors(uint64_t sector, uint32_t count, void* buffer, bool write)
 {
-    if (STORAGE_OVERLAP((uint32_t)buffer))
+    if (!ata_powered)
-    {
+        ata_power_up();
-        while (count)
+    if (sector + count > ata_total_sectors)
-        {
+        RET_ERR(0);
-            if (write)
-                memcpy(aligned_buffer, buffer, SECTOR_SIZE);
-            PASS_RC(ata_rw_sectors(sector, 1, aligned_buffer, write), 0, 0);
-            if (!write)
-                memcpy(buffer, aligned_buffer, SECTOR_SIZE);
-            buffer += SECTOR_SIZE;
-            sector++;
-            count--;
-        }
-        return 0;
-    }
-    if (!ata_powered) ata_power_up();
-    if (sector + count > ata_total_sectors) RET_ERR(0);
    ata_set_active();
-    if (ata_dma && write) commit_dcache();
+    if (ata_dma && write)
-    else if (ata_dma) commit_discard_dcache();
+        commit_dcache();
-    if (!ceata) ATA_COMMAND = BIT(1);
+    else if (ata_dma)
+        commit_discard_dcache();
+    if (!ceata)
+        ATA_COMMAND = BIT(1);
    while (count)
    {
-        uint32_t cnt = MIN(ata_lba48 ? 8192 : 32, count);
+        uint32_t cnt = MIN(ata_lba48 ? 65536 : 256, count);
        int rc = -1;
        rc = ata_rw_chunk(sector, cnt, buffer, write);
-        if (rc && ata_error_srst) ata_reset();
+        if (rc && ata_error_srst)
+            ata_reset();
        if (rc && ata_retries)
        {
            void* buf = buffer;
@@ -896,9 +922,11 @@ static int ata_rw_sectors(uint64_t sector, uint32_t count, void* buffer, bool wr
                while (tries-- && rc)
                {
                    rc = ata_rw_chunk(sect, 1, buf, write);
-                    if (rc && ata_error_srst) ata_reset();
+                    if (rc && ata_error_srst)
+                        ata_reset();
                }
-                if (rc) break;
+                if (rc)
+                    break;
                buf += SECTOR_SIZE;
            }
        }
@@ -916,9 +944,13 @@ int ata_soft_reset(void)
 {
    int rc;
    mutex_lock(&ata_mutex);
-    if (!ata_powered) PASS_RC(ata_power_up(), 1, 0);
+    if (!ata_powered)
+        PASS_RC(ata_power_up(), 1, 0);
    ata_set_active();
-    if (ceata) rc = ceata_soft_reset();
+    if (ceata)
+    {
+        rc = ceata_soft_reset();
+    }
    else
    {
        ata_write_cbr(&ATA_PIO_DAD, BIT(1) | BIT(2));
@@ -945,7 +977,8 @@ static int ata_reset(void)
 {
    int rc;
    mutex_lock(&ata_mutex);
-    if (!ata_powered) PASS_RC(ata_power_up(), 2, 0);
+    if (!ata_powered)
+        PASS_RC(ata_power_up(), 2, 0);
    ata_set_active();
    rc = ata_soft_reset();
    if (IS_ERR(rc))
@@ -957,7 +990,8 @@ static int ata_reset(void)
            ata_power_down();
            sleep(HZ * 3);
            int rc2 = ata_power_up();
-            if (IS_ERR(rc2)) rc = ERR_RC((rc << 2) | 2);
+            if (IS_ERR(rc2))
+                rc = ERR_RC((rc << 2) | 2);
        }
        else rc = 1;
    }
@@ -966,23 +1000,35 @@ static int ata_reset(void)
    return rc;
 }
-int ata_read_sectors(IF_MD(int drive,) unsigned long start, int incount,
+#include "ata-common.c"
+#ifndef MAX_PHYS_SECTOR_SIZE
+int ata_read_sectors(IF_MD(int drive,) sector_t start, int incount,
                     void* inbuf)
 {
+#ifdef HAVE_MULTIDRIVE
+    (void)drive; /* unused for now */
+#endif
    mutex_lock(&ata_mutex);
-    int rc = ata_rw_sectors(start, incount, inbuf, false);
+    int rc = ata_transfer_sectors(start, incount, inbuf, false);
    mutex_unlock(&ata_mutex);
    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)
 {
+#ifdef HAVE_MULTIDRIVE
+    (void)drive; /* unused for now */
+#endif
    mutex_lock(&ata_mutex);
-    int rc = ata_rw_sectors(start, count, (void*)((uint32_t)outbuf), true);
+    int rc = ata_transfer_sectors(start, count, (void*)((uint32_t)outbuf), true);
    mutex_unlock(&ata_mutex);
    return rc;
 }
+#endif /* ndef MAX_PHYS_SECTOR_SIZE */
 void ata_spindown(int seconds)
 {
@@ -993,26 +1039,27 @@ static void ata_flush_cache(void)
 {
    uint8_t cmd;
-    if (ata_identify_data[83] & BIT(13)) {
+    if (ceata) {
-        cmd = CMD_FLUSH_CACHE_EXT;
-    } else if (ata_identify_data[83] & BIT(12)) {
-        cmd = CMD_FLUSH_CACHE;
-    } else {
-        /* If neither (mandatory!) command is supported
-           then don't issue it. */
-       return;
-    }
-    if (ceata)
-    {
        memset(ceata_taskfile, 0, 16);
-        ceata_taskfile[0xf] = cmd;
+        ceata_taskfile[0xf] = CMD_FLUSH_CACHE_EXT;  /* CE-ATA only supports EXT */
        ceata_wait_idle();
        ceata_write_multiple_register(0, ceata_taskfile, 16);
        ceata_wait_idle();
-    }
+    } else {
-    else
+        if (!canflush) {
-    {
+            return;
+        } else if (ata_lba48 && identify_info[83] & BIT(13)) {
+            cmd = CMD_FLUSH_CACHE_EXT; /* Flag, optional, ATA-6 and up, for use with LBA48 devices. Mandatory for CE-ATA */
+        } else if (identify_info[83] & BIT(12)) {
+            cmd = CMD_FLUSH_CACHE; /* Flag, mandatory, ATA-6 and up */
+        } else if (identify_info[80] >= BIT(5)) {  /* Use >= instead of '&' because bits lower than the latest standard we support don't have to be set */
+            cmd = CMD_FLUSH_CACHE; /* No flag, mandatory, ATA-5  (Optional for ATA-4) */
+        } else {
+            /* If neither command is supported then don't issue it. */
+            canflush = 0;
+            return;
+        }
        ata_wait_for_rdy(1000000);
        ata_write_cbr(&ATA_PIO_DVR, 0);
        ata_write_cbr(&ATA_PIO_CSD, cmd);
@@ -1020,14 +1067,46 @@ static void ata_flush_cache(void)
    }
 }
+int ata_flush(void)
+{
+    if (ata_powered) {
+        mutex_lock(&ata_mutex);
+        ata_flush_cache();
+        mutex_unlock(&ata_mutex);
+    }
+    return 0;
+}
 void ata_sleepnow(void)
 {
    mutex_lock(&ata_mutex);
-    if (ata_disk_can_poweroff())
+    ata_flush_cache();
-        ata_power_down();
-    else
+    if (ata_disk_can_sleep()) {
-        ata_flush_cache();
+        if (ceata) {
+            memset(ceata_taskfile, 0, 16);
+            ceata_taskfile[0xf] = CMD_STANDBY_IMMEDIATE;
+            ceata_wait_idle();
+            ceata_write_multiple_register(0, ceata_taskfile, 16);
+            ceata_wait_idle();
+            sleep(HZ);
+            PWRCON(0) |= (1 << 9);
+        } else {
+            ata_wait_for_rdy(1000000);
+            ata_write_cbr(&ATA_PIO_DVR, 0);
+            ata_write_cbr(&ATA_PIO_CSD, CMD_STANDBY_IMMEDIATE);
+            ata_wait_for_rdy(1000000);
+            sleep(HZ / 30);
+            ATA_CONTROL = 0;
+            while (!(ATA_CONTROL & BIT(1)))
+                yield();
+            PWRCON(0) |= (1 << 5);
+        }
+    }
+    if (ata_disk_can_sleep() || canflush)
+        ata_power_down(); // XXX add a powerdown delay similar to main ATA driver?
    mutex_unlock(&ata_mutex);
 }
@@ -1037,14 +1116,21 @@ void ata_spin(void)
    ata_set_active();
 }
+#ifdef STORAGE_GET_INFO
 void ata_get_info(IF_MD(int drive,) struct storage_info *info)
 {
-    (*info).sector_size = SECTOR_SIZE;
+    /* Logical sector size */
+    if ((identify_info[106] & 0xd000) == 0x5000) /* B14, B12 */
+        info->sector_size = (identify_info[117] | (identify_info[118] << 16)) * 2;
+    else
+        info->sector_size = SECTOR_SIZE;
    (*info).num_sectors = ata_total_sectors;
    (*info).vendor = "Apple";
    (*info).product = "iPod Classic";
    (*info).revision = "1.0";
 }
+#endif
 long ata_last_disk_activity(void)
 {
@@ -1061,11 +1147,18 @@ int ata_init(void)
    ata_powered = false;
    ata_total_sectors = 0;
-    /* get ata_identify_data */
+    /* get identify_info */
    mutex_lock(&ata_mutex);
    int rc = ata_power_up();
    mutex_unlock(&ata_mutex);
-    if (IS_ERR(rc)) return rc;
+    if (IS_ERR(rc))
+        return rc;
+#ifdef MAX_PHYS_SECTOR_SIZE
+    rc = ata_get_phys_sector_mult();
+    if (IS_ERR(rc))
+        return rc;
+#endif
    return 0;
 }
@@ -1082,7 +1175,7 @@ static int ata_smart(uint16_t* buf)
        ceata_taskfile[0xe] = BIT(6);
        ceata_taskfile[0xf] = CMD_SMART;
        PASS_RC(ceata_wait_idle(), 3, 1);
-        if (((uint8_t*)ata_identify_data)[54] != 'A')  /* Model != aAmsung */
+        if (((uint8_t*)identify_info)[54] != 'A')  /* Model != aAmsung */
        {
            ceata_taskfile[0x9] = 0xd8; /* SMART enable operations */
            PASS_RC(ceata_write_multiple_register(0, ceata_taskfile, 16), 3, 2);
@@ -1102,7 +1195,8 @@ static int ata_smart(uint16_t* buf)
        ata_write_cbr(&ATA_PIO_DVR, BIT(6));
        ata_write_cbr(&ATA_PIO_CSD, CMD_SMART);
        PASS_RC(ata_wait_for_start_of_transfer(10000000), 3, 7);
-        for (i = 0; i < 0x100; i++) buf[i] = ata_read_cbr(&ATA_PIO_DTR);
+        for (i = 0; i < 0x100; i++)
+            buf[i] = ata_read_cbr(&ATA_PIO_DTR);
    }
    ata_set_active();
    return 0;
@@ -1129,7 +1223,7 @@ static int ata_num_drives(int first_drive)
 unsigned short* ata_get_identify(void)
 {
-    return ata_identify_data;
+    return identify_info;
 }
 int ata_spinup_time(void)
@@ -1137,24 +1231,29 @@ int ata_spinup_time(void)
    return spinup_time;
 }
+#ifdef HAVE_ATA_DMA
 int ata_get_dma_mode(void)
 {
    return dma_mode;
 }
+#endif
 void INT_ATA(void)
 {
    uint32_t ata_irq = ATA_IRQ;
    ATA_IRQ = ata_irq;
-    if (ata_irq & ATA_IRQ_MASK) semaphore_release(&ata_wakeup);
+    if (ata_irq & ATA_IRQ_MASK)
+        semaphore_release(&ata_wakeup);
    ATA_IRQ_MASK = 0;
 }
 void INT_MMC(void)
 {
    uint32_t irq = SDCI_IRQ;
-    if (irq & SDCI_IRQ_DAT_DONE_INT) semaphore_release(&mmc_wakeup);
+    if (irq & SDCI_IRQ_DAT_DONE_INT)
-    if (irq & SDCI_IRQ_IOCARD_IRQ_INT) semaphore_release(&mmc_comp_wakeup);
+        semaphore_release(&mmc_wakeup);
+    if (irq & SDCI_IRQ_IOCARD_IRQ_INT)
+        semaphore_release(&mmc_comp_wakeup);
    SDCI_IRQ = irq;
 }
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_read_sectors(IF_MD(int drive,) sector_t 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_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_read_sectors(IF_MD(int drive,) sector_t 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_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/arm/tms320dm320/system-dm320.c b/firmware/target/arm/tms320dm320/system-dm320.c
index 6cf616184d..62eaf1f8ce 100644
--- a/firmware/target/arm/tms320dm320/system-dm320.c
+++ b/firmware/target/arm/tms320dm320/system-dm320.c
@@ -100,7 +100,7 @@ default_interrupt(RESERVED);
 * change the offset for the interrupt in the entry table.
 */
-static const unsigned short const irqpriority[] =
+static const unsigned short irqpriority[] =
 {
    IRQ_TIMER0,IRQ_TIMER1,IRQ_TIMER2,IRQ_TIMER3,IRQ_CCD_VD0,IRQ_CCD_VD1,
    IRQ_CCD_WEN,IRQ_VENC,IRQ_SERIAL0,IRQ_SERIAL1,IRQ_EXT_HOST,IRQ_DSPHINT,
diff --git a/firmware/target/coldfire/system-coldfire.c b/firmware/target/coldfire/system-coldfire.c
index ed130fca1f..2f2f2cb45b 100644
--- a/firmware/target/coldfire/system-coldfire.c
+++ b/firmware/target/coldfire/system-coldfire.c
@@ -26,6 +26,11 @@
 #include "lcd.h"
 #include "font.h"
+#if __GNUC__ >= 9
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmissing-attributes"
+#endif
 #define default_interrupt(name) \
  extern __attribute__((weak,alias("UIE"))) void name (void)
diff --git a/firmware/target/hosted/agptek/debug-agptek.c b/firmware/target/hosted/agptek/debug-agptek.c
index a9b829f7ec..de4bc946bc 100644
--- a/firmware/target/hosted/agptek/debug-agptek.c
+++ b/firmware/target/hosted/agptek/debug-agptek.c
@@ -37,6 +37,8 @@
 static int line = 0;
+extern int hwver;
 bool dbg_hw_info(void)
 {
    int btn = 0;
@@ -61,6 +63,10 @@ bool dbg_hw_info(void)
            lcd_putsf(0, line++, "Boot ver: %s", verstr);
        }
+#ifdef EROS_Q
+        lcd_putsf(0, line++, "hwver: %d", hwver);
+#endif
        lcd_putsf(0, line++, "pcm srate: %d", pcm_alsa_get_rate());
        lcd_putsf(0, line++, "pcm xruns: %d", pcm_alsa_get_xruns());
 #ifdef HAVE_HEADPHONE_DETECTION
diff --git a/firmware/target/hosted/aigo/power-erosq.c b/firmware/target/hosted/aigo/power-erosq.c
index 73fa5fe972..7c4515f616 100644
--- a/firmware/target/hosted/aigo/power-erosq.c
+++ b/firmware/target/hosted/aigo/power-erosq.c
@@ -28,17 +28,34 @@
 #include "power.h"
 #include "panic.h"
 #include "sysfs.h"
+#include "tick.h"
-const char * const sysfs_bat_voltage =
+const char * const sysfs_bat_voltage[2] = {
-    "/sys/class/power_supply/battery/voltage_now";
+    "/sys/class/power_supply/battery/voltage_now",
+    "/sys/class/power_supply/axp_battery/voltage_now",
+};
-const char * const sysfs_bat_capacity =
+const char * const sysfs_bat_capacity[2] = {
-    "/sys/class/power_supply/battery/capacity";
+    "/sys/class/power_supply/battery/capacity",
+    "/sys/class/power_supply/axp_battery/capacity",
+};
+const char * const sysfs_bat_status[2] = {
+    "/sys/class/power_supply/battery/status",
+    "/sys/class/power_supply/axp_battery/status",
+};
+int hwver = 1;  /* Exported */
 unsigned int erosq_power_get_battery_voltage(void)
 {
    int battery_voltage;
-    sysfs_get_int(sysfs_bat_voltage, &battery_voltage);
+    int x = sysfs_get_int(sysfs_bat_voltage[hwver == 4], &battery_voltage);
+    if (!x && hwver != 4) {
+        hwver = 4;
+        sysfs_get_int(sysfs_bat_voltage[hwver == 4], &battery_voltage);
+    }
    return battery_voltage/1000;
 }
@@ -46,7 +63,33 @@ unsigned int erosq_power_get_battery_voltage(void)
 unsigned int erosq_power_get_battery_capacity(void)
 {
    int battery_capacity;
-    sysfs_get_int(sysfs_bat_capacity, &battery_capacity);
+    int x = sysfs_get_int(sysfs_bat_capacity[hwver == 4], &battery_capacity);
+    if (!x && hwver != 4) {
+        hwver = 4;
+        sysfs_get_int(sysfs_bat_capacity[hwver == 4], &battery_capacity);
+    }
    return battery_capacity;
 }
+/* We get called multiple times per tick, let's cut that back! */
+static long last_tick = 0;
+static bool last_power = false;
+bool charging_state(void)
+{
+    if ((current_tick - last_tick) > HZ/2 ) {
+        char buf[12] = {0};
+        int x = sysfs_get_string(sysfs_bat_status[hwver == 4], buf, sizeof(buf));
+        if (!x && hwver != 4) {
+            hwver = 4;
+            sysfs_get_string(sysfs_bat_status[hwver == 4], buf, sizeof(buf));
+        }
+        last_tick = current_tick;
+        last_power = (strncmp(buf, "Charging", 8) == 0);
+    }
+    return last_power;
+}
diff --git a/firmware/target/hosted/alsa-controls.h b/firmware/target/hosted/alsa-controls.h
index af3e584cd9..b868ef52fb 100644
--- a/firmware/target/hosted/alsa-controls.h
+++ b/firmware/target/hosted/alsa-controls.h
@@ -36,6 +36,8 @@ void alsa_controls_close(void);
 /* check wether a control exists */
 bool alsa_has_control(const char *name);
+/* find a control element ID by name, return -1 of not found or index into array */
+int alsa_controls_find(const char *name);
 /* find a control element enum index by name, return -1 if not found */
 int alsa_controls_find_enum(const char *name, const char *enum_name);
 /* set a control, potentially supports several values */
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
+    if(ioctl(fd, FBIOGET_VSCREENINFO, &vinfo) < 0)
-    /* check resolution and framebuffer size */
-    if(vinfo.xres != LCD_WIDTH || vinfo.yres != LCD_HEIGHT || vinfo.bits_per_pixel != LCD_DEPTH)
    {
-        panicf("Unexpected framebuffer resolution: %dx%dx%d\n", vinfo.xres,
+        panicf("Cannot read framebuffer variable information");
-            vinfo.yres, vinfo.bits_per_pixel);
+    }
+    /* 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/power-linux.c b/firmware/target/hosted/power-linux.c
index ddd7ad63e3..8d263eebec 100644
--- a/firmware/target/hosted/power-linux.c
+++ b/firmware/target/hosted/power-linux.c
@@ -33,9 +33,13 @@
 #include "usb.h"
 #endif
+#ifdef BATTERY_DEV_NAME
 #define BATTERY_STATUS_PATH "/sys/class/power_supply/" BATTERY_DEV_NAME "/status"
+#endif
 #define POWER_STATUS_PATH "/sys/class/power_supply/" POWER_DEV_NAME "/online"
+#ifdef BATTERY_DEV_NAME
 /* We get called multiple times per tick, let's cut that back! */
 static long last_tick = 0;
 static bool last_power = false;
@@ -51,6 +55,7 @@ bool charging_state(void)
    }
    return last_power;
 }
+#endif
 unsigned int power_input_status(void)
 {
diff --git a/firmware/target/hosted/sdl/app/button-application.c b/firmware/target/hosted/sdl/app/button-application.c
index 9c313b76b1..8071df201a 100644
--- a/firmware/target/hosted/sdl/app/button-application.c
+++ b/firmware/target/hosted/sdl/app/button-application.c
@@ -40,23 +40,23 @@ int key_to_button(int keyboard_key)
 #if (CONFIG_PLATFORM & PLATFORM_MAEMO4)
        case SDLK_ESCAPE:
 #endif
-        case SDLK_KP7:
+        case SDLK_KP_7:
            new_btn = BUTTON_TOPLEFT;
            break;
-        case SDLK_KP8:
+        case SDLK_KP_8:
        case SDLK_UP:
            new_btn = BUTTON_TOPMIDDLE;
            break;
 #if (CONFIG_PLATFORM & PLATFORM_MAEMO4)
        case SDLK_F7:
 #endif
-        case SDLK_KP9:
+        case SDLK_KP_9:
            new_btn = BUTTON_TOPRIGHT;
            break;
 #if (CONFIG_PLATFORM & PLATFORM_PANDORA)
        case SDLK_RSHIFT:
 #endif
-        case SDLK_KP4:
+        case SDLK_KP_4:
        case SDLK_LEFT:
            new_btn = BUTTON_MIDLEFT;
            break;
@@ -64,40 +64,32 @@ int key_to_button(int keyboard_key)
        case SDLK_RETURN:
        case SDLK_KP_ENTER:
 #endif
-        case SDLK_KP5:
+        case SDLK_KP_5:
            new_btn = BUTTON_CENTER;
            break;
 #if (CONFIG_PLATFORM & PLATFORM_PANDORA)
        case SDLK_RCTRL:
 #endif
-        case SDLK_KP6:
+        case SDLK_KP_6:
        case SDLK_RIGHT:
            new_btn = BUTTON_MIDRIGHT;
            break;
 #if (CONFIG_PLATFORM & PLATFORM_MAEMO4)
        case SDLK_F6:
 #endif
-        case SDLK_KP1:
+        case SDLK_KP_1:
            new_btn = BUTTON_BOTTOMLEFT;
            break;
-        case SDLK_KP2:
+        case SDLK_KP_2:
        case SDLK_DOWN:
            new_btn = BUTTON_BOTTOMMIDDLE;
            break;
 #if (CONFIG_PLATFORM & PLATFORM_MAEMO4)
        case SDLK_F8:
 #endif
-        case SDLK_KP3:
+        case SDLK_KP_3:
            new_btn = BUTTON_BOTTOMRIGHT;
            break;
-#ifdef HAVE_SCROLLWHEEL
-        case SDL_BUTTON_WHEELUP:
-            new_btn = BUTTON_SCROLL_BACK;
-            break;
-        case SDL_BUTTON_WHEELDOWN:
-            new_btn = BUTTON_SCROLL_FWD;
-            break;
-#endif
        case SDL_BUTTON_RIGHT:
            new_btn = BUTTON_MIDLEFT;
            break;
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c
index 1055d7e0b9..8af6f3ffaf 100644
--- a/firmware/target/hosted/sdl/button-sdl.c
+++ b/firmware/target/hosted/sdl/button-sdl.c
@@ -107,6 +107,30 @@ static void touchscreen_event(int x, int y)
 }
 #endif
+#if defined(HAVE_SCROLLWHEEL) || ((defined(BUTTON_SCROLL_FWD) && defined(BUTTON_SCROLL_BACK)))
+static void scrollwheel_event(int x, int y)
+{
+    int new_btn = 0;
+    if (y > 0)
+        new_btn = BUTTON_SCROLL_BACK;
+    else if (y < 0)
+        new_btn = BUTTON_SCROLL_FWD;
+    else
+        return;
+#ifdef HAVE_BACKLIGHT
+    backlight_on();
+#endif
+#ifdef HAVE_BUTTON_LIGHT
+    buttonlight_on();
+#endif
+    reset_poweroff_timer();
+    if (new_btn && !queue_full(&button_queue))
+        queue_post(&button_queue, new_btn, 1<<24);
+    (void)x;
+}
+#endif
 static void mouse_event(SDL_MouseButtonEvent *event, bool button_up)
 {
 #define SQUARE(x) ((x)*(x))
@@ -118,10 +142,6 @@ static void mouse_event(SDL_MouseButtonEvent *event, bool button_up)
    if(button_up) {
        switch ( event->button )
        {
-#ifdef HAVE_SCROLLWHEEL
-        case SDL_BUTTON_WHEELUP:
-        case SDL_BUTTON_WHEELDOWN:
-#endif
        case SDL_BUTTON_MIDDLE:
        case SDL_BUTTON_RIGHT:
            button_event( event->button, false );
@@ -145,13 +165,9 @@ static void mouse_event(SDL_MouseButtonEvent *event, bool button_up)
 #endif
            break;
        }
-    } else {    /* button down */
+    } else {   /* button down */
        switch ( event->button )
        {
-#ifdef HAVE_SCROLLWHEEL
-        case SDL_BUTTON_WHEELUP:
-        case SDL_BUTTON_WHEELDOWN:
-#endif
        case SDL_BUTTON_MIDDLE:
        case SDL_BUTTON_RIGHT:
            button_event( event->button, true );
@@ -215,18 +231,15 @@ static void mouse_event(SDL_MouseButtonEvent *event, bool button_up)
 static bool event_handler(SDL_Event *event)
 {
-    SDLKey ev_key;
+    SDL_Keycode ev_key;
    switch(event->type)
    {
-    case SDL_ACTIVEEVENT:
+    case SDL_WINDOWEVENT:
-        if (event->active.state & SDL_APPINPUTFOCUS)
+        if (event->window.event == SDL_WINDOWEVENT_FOCUS_GAINED)
-        {
+            sdl_app_has_input_focus = 1;
-            if (event->active.gain == 1)
+        else if (event->window.event == SDL_WINDOWEVENT_FOCUS_LOST)
-                sdl_app_has_input_focus = 1;
+            sdl_app_has_input_focus = 0;
-            else
-                sdl_app_has_input_focus = 0;
-        }
        break;
    case SDL_KEYDOWN:
    case SDL_KEYUP:
@@ -275,6 +288,13 @@ static bool event_handler(SDL_Event *event)
        mouse_event(mev, event->type == SDL_MOUSEBUTTONUP);
        break;
    }
+#ifdef HAVE_SCROLLWHEEL
+    case SDL_MOUSEWHEEL:
+    {
+        scrollwheel_event(event->wheel.x, event->wheel.y);
+        break;
+    }
+#endif
    case SDL_QUIT:
        /* Will post SDL_USEREVENT in shutdown_hw() if successful. */
        sdl_sys_quit();
@@ -340,7 +360,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));
@@ -362,7 +382,7 @@ static void button_event(int key, bool pressed)
        }
        return;
 #endif
-        
 #ifdef HAS_REMOTE_BUTTON_HOLD
    case SDLK_j:
        if(pressed)
@@ -379,7 +399,7 @@ static void button_event(int key, bool pressed)
        if(pressed)
            switch(_remote_type)
            {
-                case REMOTETYPE_UNPLUGGED: 
+                case REMOTETYPE_UNPLUGGED:
                    _remote_type=REMOTETYPE_H100_LCD;
                    DEBUGF("Changed remote type to H100\n");
                    break;
@@ -399,7 +419,7 @@ static void button_event(int key, bool pressed)
        break;
 #endif
 #ifndef APPLICATION
-    case SDLK_KP0:
+    case SDLK_KP_0:
    case SDLK_F5:
        if(pressed)
        {
@@ -430,32 +450,17 @@ static void button_event(int key, bool pressed)
 #endif
        break;
    }
-    /* Call to make up for scrollwheel target implementation.  This is
-     * not handled in the main button.c driver, but on the target
-     * implementation (look at button-e200.c for example if you are trying to 
-     * figure out why using button_get_data needed a hack before).
-     */
 #if defined(BUTTON_SCROLL_FWD) && defined(BUTTON_SCROLL_BACK)
-    if((new_btn == BUTTON_SCROLL_FWD || new_btn == BUTTON_SCROLL_BACK) && 
+    if((new_btn == BUTTON_SCROLL_FWD || new_btn == BUTTON_SCROLL_BACK) &&
        pressed)
    {
-        /* Clear these buttons from the data - adding them to the queue is
+        scrollwheel_event(0, new_btn == BUTTON_SCROLL_FWD ? -1 : 1);
-         *  handled in the scrollwheel drivers for the targets.  They do not
-         *  store the scroll forward/back buttons in their button data for
-         *  the button_read call.
-         */
-#ifdef HAVE_BACKLIGHT
-        backlight_on();
-#endif
-#ifdef HAVE_BUTTON_LIGHT
-        buttonlight_on();
-#endif
-        reset_poweroff_timer();
-        queue_post(&button_queue, new_btn, 1<<24);
        new_btn &= ~(BUTTON_SCROLL_FWD | BUTTON_SCROLL_BACK);
    }
 #endif
+    /* Update global button press state */
    if (pressed)
        btn |= new_btn;
    else
@@ -496,5 +501,4 @@ int button_read_device(void)
 void button_init_device(void)
 {
-    SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 }
diff --git a/firmware/target/hosted/sdl/kernel-sdl.c b/firmware/target/hosted/sdl/kernel-sdl.c
index 5c16f86749..bcad39b4d8 100644
--- a/firmware/target/hosted/sdl/kernel-sdl.c
+++ b/firmware/target/hosted/sdl/kernel-sdl.c
@@ -153,7 +153,7 @@ void sim_kernel_shutdown(void)
        SDL_Delay(10);
    SDL_DestroyMutex(sim_irq_mtx);
-    SDL_DestroyCond(sim_thread_cond); 
+    SDL_DestroyCond(sim_thread_cond);
 }
 Uint32 tick_timer(Uint32 interval, void *param)
@@ -162,9 +162,9 @@ Uint32 tick_timer(Uint32 interval, void *param)
    (void) interval;
    (void) param;
-    
    new_tick = (SDL_GetTicks() - start_tick) / (1000/HZ);
-        
    while(new_tick != current_tick)
    {
        sim_enter_irq_handler();
@@ -175,7 +175,7 @@ Uint32 tick_timer(Uint32 interval, void *param)
        sim_exit_irq_handler();
    }
-    
    return interval;
 }
@@ -187,10 +187,10 @@ void tick_start(unsigned int interval_in_ms)
        exit(-1);
    }
-    if (tick_timer_id != NULL)
+    if (tick_timer_id != 0)
    {
        SDL_RemoveTimer(tick_timer_id);
-        tick_timer_id = NULL;
+        tick_timer_id = 0;
    }
    else
    {
diff --git a/firmware/target/hosted/sdl/key_to_touch-sdl.c b/firmware/target/hosted/sdl/key_to_touch-sdl.c
index d56d06ba74..b7052e043f 100644
--- a/firmware/target/hosted/sdl/key_to_touch-sdl.c
+++ b/firmware/target/hosted/sdl/key_to_touch-sdl.c
@@ -52,12 +52,12 @@ int key_to_touch(int keyboard_button, unsigned int mouse_coords)
            }
            break;
 #ifndef APPLICATION
-        case SDLK_KP7:
+        case SDLK_KP_7:
        case SDLK_7:
        case SDLK_HOME:
            new_btn = BUTTON_TOPLEFT;
            break;
-        case SDLK_KP8:
+        case SDLK_KP_8:
        case SDLK_8:
        case SDLK_UP:
 #ifdef HAVE_SCROLLWHEEL
@@ -65,32 +65,32 @@ int key_to_touch(int keyboard_button, unsigned int mouse_coords)
 #endif
            new_btn = BUTTON_TOPMIDDLE;
            break;
-        case SDLK_KP9:
+        case SDLK_KP_9:
        case SDLK_9:
        case SDLK_PAGEUP:
            new_btn = BUTTON_TOPRIGHT;
            break;
-        case SDLK_KP4:
+        case SDLK_KP_4:
        case SDLK_u:
        case SDLK_LEFT:
            new_btn = BUTTON_MIDLEFT;
            break;
-        case SDLK_KP5:
+        case SDLK_KP_5:
        case SDLK_i:
        case SDL_BUTTON_MIDDLE:
            new_btn = BUTTON_CENTER;
            break;
-        case SDLK_KP6:
+        case SDLK_KP_6:
        case SDLK_o:
        case SDLK_RIGHT:
            new_btn = BUTTON_MIDRIGHT;
            break;
-        case SDLK_KP1:
+        case SDLK_KP_1:
        case SDLK_j:
        case SDLK_END:
            new_btn = BUTTON_BOTTOMLEFT;
            break;
-        case SDLK_KP2:
+        case SDLK_KP_2:
        case SDLK_k:
 #ifdef HAVE_SCROLLWHEEL
        case SDL_BUTTON_WHEELDOWN:
@@ -98,7 +98,7 @@ int key_to_touch(int keyboard_button, unsigned int mouse_coords)
        case SDLK_DOWN:
            new_btn = BUTTON_BOTTOMMIDDLE;
            break;
-        case SDLK_KP3:
+        case SDLK_KP_3:
        case SDLK_l:
        case SDLK_PAGEDOWN:
            new_btn = BUTTON_BOTTOMRIGHT;
@@ -106,4 +106,5 @@ int key_to_touch(int keyboard_button, unsigned int mouse_coords)
 #endif
    }
    return new_btn;
 }
diff --git a/firmware/target/hosted/sdl/lcd-bitmap.c b/firmware/target/hosted/sdl/lcd-bitmap.c
index ea30afea3b..ef284eeb48 100644
--- a/firmware/target/hosted/sdl/lcd-bitmap.c
+++ b/firmware/target/hosted/sdl/lcd-bitmap.c
@@ -164,12 +164,12 @@ void sim_backlight(int value)
 #else /* LCD_DEPTH > 8 */
 #if defined(HAVE_TRANSFLECTIVE_LCD) && defined(HAVE_LCD_SLEEP)
    if (!lcd_active())
-        SDL_SetAlpha(lcd_surface, SDL_SRCALPHA, 0);
+        SDL_SetSurfaceAlphaMod(lcd_surface, 0);
    else
-        SDL_SetAlpha(lcd_surface, SDL_SRCALPHA,
+        SDL_SetSurfaceAlphaMod(lcd_surface,
                        MAX(BACKLIGHT_OFF_ALPHA, (value * 255) / 100));
 #else
-    SDL_SetAlpha(lcd_surface, SDL_SRCALPHA, (value * 255) / 100);
+    SDL_SetSurfaceAlphaMod(lcd_surface, (value * 255) / 100);
 #endif
 #endif /* LCD_DEPTH */
@@ -187,6 +187,7 @@ void lcd_init_device(void)
                                       SIM_LCD_WIDTH * display_zoom,
                                       SIM_LCD_HEIGHT * display_zoom,
                                       LCD_DEPTH, 0, 0, 0, 0);
+    SDL_SetSurfaceBlendMode(lcd_surface, SDL_BLENDMODE_BLEND);
 #elif LCD_DEPTH <= 8
    lcd_surface = SDL_CreateRGBSurface(SDL_SWSURFACE,
                                       SIM_LCD_WIDTH * display_zoom,
@@ -222,7 +223,7 @@ void sim_lcd_ex_update_rect(int x_start, int y_start, int width, int height)
    if (lcd_ex_getpixel) {
        sdl_update_rect(lcd_surface, x_start, y_start, width, height,
                        LCD_WIDTH, LCD_HEIGHT, lcd_ex_getpixel);
-        sdl_gui_update(lcd_surface, x_start, y_start, width, 
+        sdl_gui_update(lcd_surface, x_start, y_start, width,
                       height + LCD_SPLIT_LINES, SIM_LCD_WIDTH, SIM_LCD_HEIGHT,
                       background ? UI_LCD_POSX : 0,
                       background ? UI_LCD_POSY : 0);
diff --git a/firmware/target/hosted/sdl/lcd-sdl.c b/firmware/target/hosted/sdl/lcd-sdl.c
index 8cbb6c5651..1e9daeffd3 100644
--- a/firmware/target/hosted/sdl/lcd-sdl.c
+++ b/firmware/target/hosted/sdl/lcd-sdl.c
@@ -115,12 +115,17 @@ void sdl_gui_update(SDL_Surface *surface, int x_start, int y_start, int width,
                    (ui_y + y_start) * display_zoom,
                    width * display_zoom, height * display_zoom};
-    if (surface->flags & SDL_SRCALPHA) /* alpha needs a black background */
+    uint8_t alpha;
+    if (SDL_GetSurfaceAlphaMod(surface,&alpha) == 0 && alpha < 255)
        SDL_FillRect(gui_surface, &dest, 0);
-    SDL_BlitSurface(surface, &src, gui_surface, &dest);
+    SDL_BlitSurface(surface, &src, gui_surface, &dest); /* alpha needs a black background */
-    SDL_Flip(gui_surface);
+    SDL_Texture *sdlTexture = SDL_CreateTextureFromSurface(sdlRenderer, gui_surface);
+    SDL_RenderClear(sdlRenderer);
+    SDL_RenderCopy(sdlRenderer, sdlTexture, NULL, NULL);
+    SDL_RenderPresent(sdlRenderer);
+    SDL_DestroyTexture(sdlTexture);
 }
 /* set a range of bitmap indices to a gradient from startcolour to endcolour */
@@ -136,7 +141,7 @@ void sdl_set_gradient(SDL_Surface *surface, SDL_Color *start, SDL_Color *end,
        palette[i].b = start->b + (end->b - start->b) * i / (steps - 1);
    }
-    SDL_SetPalette(surface, SDL_LOGPAL|SDL_PHYSPAL, palette, first, steps);
+    SDL_SetPaletteColors(surface->format->palette, palette, first , steps);
 }
 int lcd_get_dpi(void)
diff --git a/firmware/target/hosted/sdl/lcd-sdl.h b/firmware/target/hosted/sdl/lcd-sdl.h
index a964c9bc40..3f1334e4a2 100644
--- a/firmware/target/hosted/sdl/lcd-sdl.h
+++ b/firmware/target/hosted/sdl/lcd-sdl.h
@@ -3,7 +3,7 @@
 *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
 *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \ 
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
 * $Id$
 *
@@ -27,6 +27,7 @@
 /* Default display zoom level */
 extern SDL_Surface *gui_surface;
+extern SDL_Renderer *sdlRenderer;
 void sdl_update_rect(SDL_Surface *surface, int x_start, int y_start, int width,
                     int height, int max_x, int max_y,
@@ -39,4 +40,3 @@ void sdl_set_gradient(SDL_Surface *surface, SDL_Color *start, SDL_Color *end,
                      int first, int steps);
 #endif /* #ifndef __LCDSDL_H__ */
diff --git a/firmware/target/hosted/sdl/pcm-sdl.c b/firmware/target/hosted/sdl/pcm-sdl.c
index 940403002f..dec12af2f1 100644
--- a/firmware/target/hosted/sdl/pcm-sdl.c
+++ b/firmware/target/hosted/sdl/pcm-sdl.c
@@ -1,10 +1,10 @@
 /***************************************************************************
- *             __________               __   ___.                  
+ *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___  
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /  
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/ 
+ *                     \/            \/     \/    \/            \/
 * $Id$
 *
 * Copyright (C) 2005 by Nick Lanham
@@ -85,8 +85,43 @@ void pcm_play_unlock(void)
        SDL_UnlockMutex(audio_lock);
 }
+static void sdl_audio_callback(struct pcm_udata *udata, Uint8 *stream, int len);
 static void pcm_dma_apply_settings_nolock(void)
 {
+    SDL_AudioSpec wanted_spec;
+    wanted_spec.freq = pcm_sampr;
+    wanted_spec.format = AUDIO_S16SYS;
+    wanted_spec.channels = 2;
+    wanted_spec.samples = 2048;
+    wanted_spec.callback =
+        (void (SDLCALL *)(void *userdata,
+            Uint8 *stream, int len))sdl_audio_callback;
+    wanted_spec.userdata = &udata;
+    SDL_CloseAudio();
+    /* Open the audio device and start playing sound! */
+    if(SDL_OpenAudio(&wanted_spec, &obtained) < 0) {
+        DEBUGF("Unable to open audio: %s\n", SDL_GetError());
+        return;
+    }
+    switch (obtained.format)
+    {
+    case AUDIO_U8:
+    case AUDIO_S8:
+        pcm_channel_bytes = 1;
+        break;
+    case AUDIO_U16LSB:
+    case AUDIO_S16LSB:
+    case AUDIO_U16MSB:
+    case AUDIO_S16MSB:
+        pcm_channel_bytes = 2;
+        break;
+    default:
+        DEBUGF("Unknown sample format obtained: %u\n",
+                (unsigned)obtained.format);
+        return;
+    }
+    pcm_sample_bytes = obtained.channels * pcm_channel_bytes;
    cvt_status = SDL_BuildAudioCVT(&cvt, AUDIO_S16SYS, 2, pcm_sampr,
                    obtained.format, obtained.channels, obtained.freq);
@@ -104,7 +139,6 @@ void pcm_dma_apply_settings(void)
 void pcm_play_dma_start(const void *addr, size_t size)
 {
-    pcm_dma_apply_settings_nolock();
    pcm_data = addr;
    pcm_data_size = size;
@@ -257,9 +291,7 @@ static void sdl_audio_callback(struct pcm_udata *udata, Uint8 *stream, int len)
                if (delay > 0)
                {
-                    SDL_UnlockMutex(audio_lock);
                    SDL_Delay(delay);
-                    SDL_LockMutex(audio_lock);
                    if (!pcm_is_playing())
                        break;
@@ -340,7 +372,6 @@ void pcm_play_dma_init(void)
        return;
    }
-    SDL_AudioSpec wanted_spec;
 #ifdef DEBUG
    udata.debug = NULL;
    if (debug_audio) {
@@ -348,43 +379,6 @@ void pcm_play_dma_init(void)
        DEBUGF("Audio debug file open\n");
    }
 #endif
-    /* Set 16-bit stereo audio at 44Khz */
-    wanted_spec.freq = 44100;
-    wanted_spec.format = AUDIO_S16SYS;
-    wanted_spec.channels = 2;
-    wanted_spec.samples = 2048;
-    wanted_spec.callback =
-        (void (SDLCALL *)(void *userdata,
-            Uint8 *stream, int len))sdl_audio_callback;
-    wanted_spec.userdata = &udata;
-    /* Open the audio device and start playing sound! */
-    if(SDL_OpenAudio(&wanted_spec, &obtained) < 0) {
-        DEBUGF("Unable to open audio: %s\n", SDL_GetError());
-        return;
-    }
-    switch (obtained.format)
-    {
-    case AUDIO_U8:
-    case AUDIO_S8:
-        pcm_channel_bytes = 1;
-        break;
-    case AUDIO_U16LSB:
-    case AUDIO_S16LSB:
-    case AUDIO_U16MSB:
-    case AUDIO_S16MSB:
-        pcm_channel_bytes = 2;
-        break;
-    default:
-        DEBUGF("Unknown sample format obtained: %u\n",
-                (unsigned)obtained.format);
-        return;
-    }
-    pcm_sample_bytes = obtained.channels * pcm_channel_bytes;
-    pcm_dma_apply_settings_nolock();
 }
 void pcm_play_dma_postinit(void)
diff --git a/firmware/target/hosted/sdl/system-sdl.c b/firmware/target/hosted/sdl/system-sdl.c
index e53643f449..56cff3f1be 100644
--- a/firmware/target/hosted/sdl/system-sdl.c
+++ b/firmware/target/hosted/sdl/system-sdl.c
@@ -1,10 +1,10 @@
 /***************************************************************************
- *             __________               __   ___.                  
+ *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___  
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /  
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/ 
+ *                     \/            \/     \/    \/            \/
 * $Id$
 *
 * Copyright (C) 2006 by Daniel Everton <dan@iocaine.org>
@@ -50,6 +50,8 @@
 #define SIMULATOR_DEFAULT_ROOT "simdisk"
 SDL_Surface    *gui_surface;
+SDL_Window     *window;
+SDL_Renderer   *sdlRenderer;
 bool            background = true;          /* use backgrounds by default */
 #ifdef HAVE_REMOTE_LCD
@@ -72,26 +74,12 @@ bool debug_audio = false;
 bool debug_wps = false;
 int wps_verbose_level = 3;
-/*
+static void sdl_window_setup(void)
- * This thread will read the buttons in an interrupt like fashion, and
- * also initializes SDL_INIT_VIDEO and the surfaces
- *
- * it must be done in the same thread (at least on windows) because events only
- * work in the thread which called SDL_Init(SubSystem) with SDL_INIT_VIDEO
- *
- * This is an SDL thread and relies on preemptive behavoir of the host
- **/
-static int sdl_event_thread(void * param)
 {
-    SDL_InitSubSystem(SDL_INIT_VIDEO);
-#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
-    SDL_sem *wait_for_maemo_startup;
-#endif
    SDL_Surface *picture_surface = NULL;
    int width, height;
    int depth;
-    Uint32 flags;
+    Uint32 flags = 0;
    /* Try and load the background image. If it fails go without */
    if (background) {
@@ -101,14 +89,14 @@ static int sdl_event_thread(void * param)
            DEBUGF("warn: %s\n", SDL_GetError());
        }
    }
-    
    /* Set things up */
    if (background)
    {
        width = UI_WIDTH;
        height = UI_HEIGHT;
-    } 
+    }
-    else 
+    else
    {
 #ifdef HAVE_REMOTE_LCD
        if (showremote)
@@ -128,17 +116,47 @@ static int sdl_event_thread(void * param)
    if (depth < 8)
        depth = 16;
-    flags = SDL_HWSURFACE|SDL_DOUBLEBUF;
 #if (CONFIG_PLATFORM & (PLATFORM_MAEMO|PLATFORM_PANDORA))
    /* Fullscreen mode for maemo app */
-    flags |= SDL_FULLSCREEN;
+    flags |= SDL_WINDOW_FULLSCREEN;
 #endif
-    SDL_WM_SetCaption(UI_TITLE, NULL);
+    if ((window = SDL_CreateWindow(UI_TITLE, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+                      width * display_zoom, height * display_zoom , flags)) == NULL)
-    if ((gui_surface = SDL_SetVideoMode(width * display_zoom, height * display_zoom, depth, flags)) == NULL) {
+        panicf("%s", SDL_GetError());
+    if ((sdlRenderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_PRESENTVSYNC)) == NULL)
        panicf("%s", SDL_GetError());
+    if ((gui_surface = SDL_CreateRGBSurface(0, width * display_zoom, height * display_zoom, depth,
+                                       0, 0, 0, 0)) == NULL)
+        panicf("%s", SDL_GetError());
+    /* If we have a background, blit it over to the display surface */
+    if (background && picture_surface)
+    {
+        SDL_BlitSurface(picture_surface, NULL, gui_surface, NULL);
+        SDL_FreeSurface(picture_surface);
    }
+}
+/*
+ * This thread will read the buttons in an interrupt like fashion, and
+ * also initializes SDL_INIT_VIDEO and the surfaces
+ *
+ * it must be done in the same thread (at least on windows) because events only
+ * work in the thread that called SDL_InitSubSystem(SDL_INIT_VIDEO)
+ *
+ * This is an SDL thread and relies on preemptive behavoir of the host
+ **/
+static int sdl_event_thread(void * param)
+{
+#ifdef __WIN32 /* Fails on Linux and MacOS */
+    SDL_InitSubSystem(SDL_INIT_VIDEO);
+    sdl_window_setup();
+#endif
+#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
+    SDL_sem *wait_for_maemo_startup;
+#endif
 #if (CONFIG_PLATFORM & (PLATFORM_MAEMO|PLATFORM_PANDORA))
    /* SDL touch screen fix: Work around a SDL assumption that returns
@@ -152,14 +170,10 @@ static int sdl_event_thread(void * param)
    SDL_SetCursor(hiddenCursor);
 #endif
-    if (background && picture_surface != NULL)
-        SDL_BlitSurface(picture_surface, NULL, gui_surface, NULL);
 #if (CONFIG_PLATFORM & PLATFORM_MAEMO)
    /* start maemo thread: Listen to display on/off events and battery monitoring */
    wait_for_maemo_startup = SDL_CreateSemaphore(0); /* 0-count so it blocks */
-    SDL_Thread *maemo_thread = SDL_CreateThread(maemo_thread_func, wait_for_maemo_startup);
+    SDL_Thread *maemo_thread = SDL_CreateThread(maemo_thread_func, NULL, wait_for_maemo_startup);
    SDL_SemWait(wait_for_maemo_startup);
    SDL_DestroySemaphore(wait_for_maemo_startup);
 #endif
@@ -184,9 +198,6 @@ static int sdl_event_thread(void * param)
    SDL_FreeCursor(hiddenCursor);
 #endif
-    if(picture_surface)
-        SDL_FreeSurface(picture_surface);
    /* Order here is relevent to prevent deadlocks and use of destroyed
       sync primitives by kernel threads */
 #ifdef HAVE_SDL_THREADS
@@ -251,15 +262,16 @@ void system_init(void)
    g_type_init();
 #endif
-    if (SDL_Init(SDL_INIT_TIMER))
+    if (SDL_InitSubSystem(SDL_INIT_TIMER))
        panicf("%s", SDL_GetError());
-    s = SDL_CreateSemaphore(0); /* 0-count so it blocks */
+#ifndef __WIN32  /* Fails on Windows */
+    SDL_InitSubSystem(SDL_INIT_VIDEO);
-    evt_thread = SDL_CreateThread(sdl_event_thread, s);
+    sdl_window_setup();
+#endif
-    /* wait for sdl_event_thread to run so that it can initialize the surfaces
+    s = SDL_CreateSemaphore(0); /* 0-count so it blocks */
-     * and video subsystem needed for SDL events */
+    evt_thread = SDL_CreateThread(sdl_event_thread, NULL, s);
    SDL_SemWait(s);
    /* cleanup */
    SDL_DestroySemaphore(s);
@@ -303,29 +315,29 @@ int hostfs_flush(void)
 void sys_handle_argv(int argc, char *argv[])
 {
-    if (argc >= 1) 
+    if (argc >= 1)
    {
        int x;
-        for (x = 1; x < argc; x++) 
+        for (x = 1; x < argc; x++)
        {
 #ifdef DEBUG
-            if (!strcmp("--debugaudio", argv[x])) 
+            if (!strcmp("--debugaudio", argv[x]))
            {
                debug_audio = true;
                printf("Writing debug audio file.\n");
            }
-            else 
+            else
 #endif
                if (!strcmp("--debugwps", argv[x]))
            {
                debug_wps = true;
                printf("WPS debug mode enabled.\n");
-            } 
+            }
            else if (!strcmp("--nobackground", argv[x]))
            {
                background = false;
                printf("Disabling background image.\n");
-            } 
+            }
 #ifdef HAVE_REMOTE_LCD
            else if (!strcmp("--noremote", argv[x]))
            {
@@ -346,7 +358,7 @@ void sys_handle_argv(int argc, char *argv[])
                    display_zoom=atof(argv[x]);
                else
                    display_zoom = 2;
-                printf("Window zoom is %d\n", display_zoom);
+                printf("Window zoom is %f\n", display_zoom);
            }
            else if (!strcmp("--alarm", argv[x]))
            {
@@ -372,7 +384,7 @@ void sys_handle_argv(int argc, char *argv[])
                    debug_buttons = true;
                    printf("Printing background button clicks.\n");
            }
-            else 
+            else
            {
                printf("rockboxui\n");
                printf("Arguments:\n");
diff --git a/firmware/target/hosted/sdl/thread-sdl.c b/firmware/target/hosted/sdl/thread-sdl.c
index 17a0f847b5..abd6339cee 100644
--- a/firmware/target/hosted/sdl/thread-sdl.c
+++ b/firmware/target/hosted/sdl/thread-sdl.c
@@ -340,7 +340,7 @@ unsigned int create_thread(void (*function)(void),
        return 0;
    }
-    SDL_Thread *t = SDL_CreateThread(runthread, thread);
+    SDL_Thread *t = SDL_CreateThread(runthread, NULL, thread);
    if (t == NULL)
    {
        DEBUGF("Failed to create SDL thread\n");
@@ -447,7 +447,7 @@ void init_threads(void)
    thread->context.s = SDL_CreateSemaphore(0);
    thread->context.t = NULL; /* NULL for the implicit main thread */
    __running_self_entry() = thread;
- 
    if (thread->context.s == NULL)
    {
        fprintf(stderr, "Failed to create main semaphore\n");
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);
+        *(.init.text);
-    } > DRAM
-    .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_jz47xx/xduoo_x3/power-xduoo_x3.c b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/power-xduoo_x3.c
index 9ae602ba56..c9bcb47fcd 100644
--- a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/power-xduoo_x3.c
+++ b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/power-xduoo_x3.c
@@ -23,15 +23,19 @@
 #include "power.h"
 #include "cpu.h"
-#define CHARGE_STAT_GPIO (32*1+6) /* STAT port */
+#define CHARGE_STAT_GPIO (32*1+6)  /* STAT port */
+#define PIN_USB_DET      (32*4+19) /* USB connected */
 /* Detect which power sources are present. */
 unsigned int power_input_status(void)
 {
+    int rval = POWER_INPUT_NONE;
+    if(!__gpio_get_pin(PIN_USB_DET))
+        rval |= POWER_INPUT_USB;
    if(!__gpio_get_pin(CHARGE_STAT_GPIO))
-        return POWER_INPUT_USB_CHARGER;
+        rval |= POWER_INPUT_USB_CHARGER;
-    return POWER_INPUT_NONE;
+    return rval;
 }
 void power_init(void)
@@ -42,5 +46,5 @@ void power_init(void)
 bool charging_state(void)
 {
-    return (power_input_status() == POWER_INPUT_USB_CHARGER);
+    return (power_input_status() & POWER_INPUT_USB_CHARGER);
 }
diff --git a/firmware/target/mips/ingenic_x1000/crt0.S b/firmware/target/mips/ingenic_x1000/crt0.S
index 6c0942b0db..23daaefb5e 100644
--- a/firmware/target/mips/ingenic_x1000/crt0.S
+++ b/firmware/target/mips/ingenic_x1000/crt0.S
@@ -23,6 +23,10 @@
 #include "mips.h"
 #include "bootdata.h"
+#if defined(HAVE_DEVICEDATA) && !defined(BOOTLOADER)
+#include "devicedata.h"
+#endif
    .text
    .extern main
    .extern system_early_init
@@ -52,6 +56,9 @@ _header:
 #ifndef BOOTLOADER
    /* Multiboot support header; this is not part of the above header. */
    put_boot_data_here
+#ifdef HAVE_DEVICEDATA
+    put_device_data_here
+#endif
 #endif
 _realstart:
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
+    /* Due to the hardware's detection method, make the Line-Out
-     * blow out our eardrums cranking it to full */
+     * the default. The LO can only be detected if it is active
-    if (lineout_inserted() && !headphones_inserted())
+     * (assuming a high-impedance device is attached). HP takes priority
+     * if both are present. */
+    if (headphones_inserted())
    {
-        eros_qn_switch_output(1);
+        eros_qn_switch_output(0);
-        l = r = eros_qn_get_volume_limit();
    }
    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/erosqnative/lcd-erosqnative.c b/firmware/target/mips/ingenic_x1000/erosqnative/lcd-erosqnative.c
index 0d43a3f010..bcc30a71bd 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/lcd-erosqnative.c
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/lcd-erosqnative.c
@@ -25,11 +25,138 @@
 #include "lcd-x1000.h"
 #include "gpio-x1000.h"
 #include "system.h"
+#include "devicedata.h"
 /* for reference on these command/data hex values, see the mipi dcs lcd spec.  *
 * Not everything here is there, but all the standard stuff is.                */
-static const uint32_t erosqnative_lcd_cmd_enable[] = {
+/* New Display Eroq 2.1 / Hifiwalker 1.7+ / Surfans v3.2, unknown Controller  *
+ * (partially GC9A01 register compatible)                                     *
+ *   https://espruino.microcosm.app/api/v1/files/ \                           *
+ *   9dc1b976d621a2ab3854312cce862c4a9a50dc1b.html#GC9A01 ,                   *
+ *   https://www.buydisplay.com/download/ic/GC9A01A.pdf ,                     *
+ *   https://lcddisplay.co/wp-content/uploads/2023/02/GC9A01.pdf              *
+ * Init sequence From 'EROS Q （c口）_V2.1_20231209固件.zip'                  *
+ * update.upt/.iso -> In 'uboot.bin' at 0x52da0-0x5305f                       *
+ *  http://www.eroshifi.com/download/firmware/122.html                        */
+static const uint32_t erosqnative_lcd_cmd_enable_v3[] = {
+    /* Unlock EXTC? */
+    LCD_INSTR_CMD,      0xfe, // Inter Register Enable1
+    LCD_INSTR_CMD,      0xef, // Inter Register Enable2
+    LCD_INSTR_CMD,      0x36, // Memory Access Control
+/* Bit7 1:vertical flip   0:no vertical flip
+   Bit6 1:horizontal flip 0:no horizontal flip
+   Bit3 1:BGR 0:RGB */
+    LCD_INSTR_DAT,      0x90,
+    /* Pixel Format Set */
+    LCD_INSTR_CMD,      0x3a,
+    LCD_INSTR_DAT,      0x55, /* Rockbox uses 16pp, OF specified 18 bpp */
+    LCD_INSTR_CMD,      0x84, // ?? (undocumented)
+    LCD_INSTR_DAT,      0x04,
+    LCD_INSTR_CMD,      0x86, // ??
+    LCD_INSTR_DAT,      0xfb,
+    LCD_INSTR_CMD,      0x87, // ??
+    LCD_INSTR_DAT,      0x79,
+    LCD_INSTR_CMD,      0x89, // ??
+    LCD_INSTR_DAT,      0x0b,
+    LCD_INSTR_CMD,      0x8a, // ??
+    LCD_INSTR_DAT,      0x20,
+    LCD_INSTR_CMD,      0x8b, // ??
+    LCD_INSTR_DAT,      0x80,
+    LCD_INSTR_CMD,      0x8d, // ??
+    LCD_INSTR_DAT,      0x3b,
+    LCD_INSTR_CMD,      0x8e, // ??
+    LCD_INSTR_DAT,      0xcf,
+    LCD_INSTR_CMD,      0xec, // Charge Pump Frequent Control
+    LCD_INSTR_DAT,      0x33,
+    LCD_INSTR_DAT,      0x02,
+    LCD_INSTR_DAT,      0x4c,
+    LCD_INSTR_CMD,      0x98, // ?? (undocumented)
+    LCD_INSTR_DAT,      0x3e,
+    LCD_INSTR_CMD,      0x9c, // ??
+    LCD_INSTR_DAT,      0x4b,
+    LCD_INSTR_CMD,      0x99, // ??
+    LCD_INSTR_DAT,      0x3e,
+    LCD_INSTR_CMD,      0x9d, // ??
+    LCD_INSTR_DAT,      0x4b,
+    LCD_INSTR_CMD,      0x9b, // ??
+    LCD_INSTR_DAT,      0x55,
+    LCD_INSTR_CMD,      0xe8, // Frame Rate
+    LCD_INSTR_DAT,      0x11,
+    LCD_INSTR_DAT,      0x00,
+    LCD_INSTR_CMD,      0xff, // ?? (Adafruit & Co lib.  C:0xFF, D:0x60, D:0x01, D:0x04)
+    LCD_INSTR_DAT,      0x62, // LCD_INSTR_DAT, 0x01, LCD_INSTR_DAT, 0x04,
+    LCD_INSTR_CMD,      0xc3, // Vreg1a voltage Control
+    LCD_INSTR_DAT,      0x20,
+    LCD_INSTR_CMD,      0xc4, // Vreg1b voltage Control
+    LCD_INSTR_DAT,      0x03,
+    LCD_INSTR_CMD,      0xc9, // Vreg2a voltage Control
+    LCD_INSTR_DAT,      0x2a,
+    LCD_INSTR_CMD,      0xf0, // SET_GAMMA1
+    LCD_INSTR_DAT,      0x4a,
+    LCD_INSTR_DAT,      0x10,
+    LCD_INSTR_DAT,      0x0a,
+    LCD_INSTR_DAT,      0x0a,
+    LCD_INSTR_DAT,      0x26,
+    LCD_INSTR_DAT,      0x39,
+    LCD_INSTR_CMD,      0xf2, // SET_GAMMA3
+    LCD_INSTR_DAT,      0x4a,
+    LCD_INSTR_DAT,      0x10,
+    LCD_INSTR_DAT,      0x0a,
+    LCD_INSTR_DAT,      0x0a,
+    LCD_INSTR_DAT,      0x26,
+    LCD_INSTR_DAT,      0x39,
+    LCD_INSTR_CMD,      0xf1, // SET_GAMMA2
+    LCD_INSTR_DAT,      0x50,
+    LCD_INSTR_DAT,      0x8f,
+    LCD_INSTR_DAT,      0xaf,
+    LCD_INSTR_DAT,      0x3b,
+    LCD_INSTR_DAT,      0x3f,
+    LCD_INSTR_DAT,      0x7f,
+    LCD_INSTR_CMD,      0xf3, // SET_GAMMA4
+    LCD_INSTR_DAT,      0x50,
+    LCD_INSTR_DAT,      0x8f,
+    LCD_INSTR_DAT,      0xaf,
+    LCD_INSTR_DAT,      0x3b,
+    LCD_INSTR_DAT,      0x3f,
+    LCD_INSTR_DAT,      0x7f,
+    LCD_INSTR_CMD,      0xba, // TE Control
+    LCD_INSTR_DAT,      0x0a,
+#ifdef BOOTLOADER
+    LCD_INSTR_CMD,      0x35, // Tearing Effect Line ON
+    LCD_INSTR_DAT,      0x00,
+#endif
+    LCD_INSTR_CMD,      0x21, /* Invert */
+    /* Lock EXTC? */
+    LCD_INSTR_CMD,      0xfe, // Inter Register Enable1
+    LCD_INSTR_CMD,      0xee,
+    /* Exit Sleep */
+    LCD_INSTR_CMD,      0x11,
+    LCD_INSTR_UDELAY,   120000,
+    /* Display On */
+    LCD_INSTR_CMD,      0x29,
+    LCD_INSTR_UDELAY,   20000,
+    LCD_INSTR_END,
+};
+/* Original Display / Hifiwalker -1.5 / Surfans -2.7 */
+static const uint32_t erosqnative_lcd_cmd_enable_v1[] = {
    /* Set EXTC? */
    LCD_INSTR_CMD,      0xc8,
    LCD_INSTR_DAT,      0xff,
@@ -179,7 +306,22 @@ void lcd_tgt_enable(bool enable)
        mdelay(5);
        gpio_set_level(GPIO_LCD_CE, 0);
-        lcd_exec_commands(&erosqnative_lcd_cmd_enable[0]);
+#ifdef BOOTLOADER
+# if EROSQN_VER == 3
+        lcd_exec_commands(&erosqnative_lcd_cmd_enable_v3[0]);
+# else
+        lcd_exec_commands(&erosqnative_lcd_cmd_enable_v1[0]);
+# endif
+#else
+        if (device_data.lcd_version == 3)
+        {
+            lcd_exec_commands(&erosqnative_lcd_cmd_enable_v3[0]);
+        }
+        else
+        {
+            lcd_exec_commands(&erosqnative_lcd_cmd_enable_v1[0]);
+        }
+#endif
    } else {
        /* doesn't flash white if we don't do anything... */
 #if 0
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/target/mips/ingenic_x1000/system-x1000.c b/firmware/target/mips/ingenic_x1000/system-x1000.c
index 64890a6c3a..1c850736b6 100644
--- a/firmware/target/mips/ingenic_x1000/system-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/system-x1000.c
@@ -20,6 +20,7 @@
 ****************************************************************************/
 #include "system.h"
+#include <string.h>
 #include "mips.h"
 #include "panic.h"
 #include "button.h"
@@ -36,6 +37,10 @@
 #include "x1000/msc.h"
 #include "x1000/aic.h"
+#if defined(HAVE_DEVICEDATA)
+#include "devicedata.h"
+#endif
 #ifdef X1000_CPUIDLE_STATS
 int __cpu_idle_avg = 0;
 int __cpu_idle_cur = 0;
@@ -81,6 +86,20 @@ void system_early_init(void)
    clk_init();
 }
+#if defined (HAVE_DEVICEDATA) && defined(EROS_QN)
+void fill_devicedata(struct device_data_t *data)
+{
+#ifdef BOOTLOADER
+    memset(data->payload, 0xff, data->length);
+    data->lcd_version = EROSQN_VER;
+#else
+    uint8_t lcd_version = device_data.lcd_version;
+    memset(data->payload, 0xff, data->length);
+    data->lcd_version = lcd_version;
+#endif
+}
+#endif
 /* First thing called from Rockbox main() */
 void system_init(void)
 {
diff --git a/firmware/target/mips/ingenic_x1000/x1000boot.make b/firmware/target/mips/ingenic_x1000/x1000boot.make
index 0bdf5cf7b4..7a861b0a3d 100644
--- a/firmware/target/mips/ingenic_x1000/x1000boot.make
+++ b/firmware/target/mips/ingenic_x1000/x1000boot.make
@@ -12,7 +12,7 @@ include $(ROOTDIR)/lib/microtar/microtar.make
 INCLUDES += -I$(APPSDIR)
 SRC += $(call preprocess, $(APPSDIR)/SOURCES)
-LDSDEP := $(FIRMDIR)/export/cpu.h $(FIRMDIR)/export/config/$(MODELNAME).h
+LDSDEP := $(FIRMDIR)/export/cpu.h $(FIRMDIR)/export/config.h
 BOOTLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/boot.lds
 BOOTLINK := $(BUILDDIR)/boot.link