1 files changed, 14 insertions, 23 deletions

diff --git a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c
index 53ec45ec6d..da45906b36 100644
--- a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c
+++ b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c
@@ -50,9 +50,6 @@
 /** static, private data **/ 
 static uint8_t ceata_taskfile[16] STORAGE_ALIGN_ATTR;
 static uint16_t ata_identify_data[0x100] STORAGE_ALIGN_ATTR;
-#ifdef HAVE_ATA_SMART
-static uint16_t ata_smart_data[0x100] STORAGE_ALIGN_ATTR;
-#endif
 static bool ceata;
 static bool ata_swap;
 static bool ata_lba48;
@@ -1217,56 +1214,50 @@ int ata_init(void)
 #ifdef HAVE_ATA_SMART
 static int ata_smart(uint16_t* buf)
 {
-    mutex_lock(&ata_mutex);
-    ata_power_up();
-
+    if (!ata_powered) PASS_RC(ata_power_up(), 3, 0);
     if (ceata)
     {
         memset(ceata_taskfile, 0, 16);
         ceata_taskfile[0xc] = 0x4f;
         ceata_taskfile[0xd] = 0xc2;
-        ceata_taskfile[0xe] = 0x40; /* Device/Head Register, bit6: 0->CHS, 1->LBA */
+        ceata_taskfile[0xe] = BIT(6);
         ceata_taskfile[0xf] = 0xb0;
-        PASS_RC(ceata_wait_idle(), 3, 0);
+        PASS_RC(ceata_wait_idle(), 3, 1);
         if (((uint8_t*)ata_identify_data)[54] != 'A')  /* Model != aAmsung */
         {
             ceata_taskfile[0x9] = 0xd8; /* SMART enable operations */
-            PASS_RC(ceata_write_multiple_register(0, ceata_taskfile, 16), 3, 1);
-            PASS_RC(ceata_check_error(), 3, 2);
+            PASS_RC(ceata_write_multiple_register(0, ceata_taskfile, 16), 3, 2);
+            PASS_RC(ceata_check_error(), 3, 3);
         }
         ceata_taskfile[0x9] = 0xd0; /* SMART read data */
-        PASS_RC(ceata_write_multiple_register(0, ceata_taskfile, 16), 3, 3);
-        PASS_RC(ceata_rw_multiple_block(false, buf, 1, CEATA_COMMAND_TIMEOUT * HZ / 1000000), 3, 4);
+        PASS_RC(ceata_write_multiple_register(0, ceata_taskfile, 16), 3, 4);
+        PASS_RC(ceata_rw_multiple_block(false, buf, 1, CEATA_COMMAND_TIMEOUT * HZ / 1000000), 3, 5);
     }
     else
     {
         int i;
         uint32_t old = ATA_CFG;
         ATA_CFG |= BIT(6);  /* 16bit big-endian */
-        PASS_RC(ata_wait_for_not_bsy(10000000), 3, 5);
-        ata_write_cbr(&ATA_PIO_DAD, 0);
+        PASS_RC(ata_wait_for_not_bsy(10000000), 3, 6);
         ata_write_cbr(&ATA_PIO_FED, 0xd0);
-        ata_write_cbr(&ATA_PIO_SCR, 0);
-        ata_write_cbr(&ATA_PIO_LLR, 0);
         ata_write_cbr(&ATA_PIO_LMR, 0x4f);
         ata_write_cbr(&ATA_PIO_LHR, 0xc2);
         ata_write_cbr(&ATA_PIO_DVR, BIT(6));
         ata_write_cbr(&ATA_PIO_CSD, 0xb0);
-        PASS_RC(ata_wait_for_start_of_transfer(10000000), 3, 6);
+        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);
         ATA_CFG = old;
     }
-
     ata_set_active();
-    mutex_unlock(&ata_mutex);
-
     return 0;
 }
 
-void* ata_read_smart(void)
+int ata_read_smart(struct ata_smart_values* smart_data)
 {
-    ata_smart(ata_smart_data);
-    return ata_smart_data;
+    mutex_lock(&ata_mutex);
+    int rc = ata_smart((uint16_t*)smart_data);
+    mutex_unlock(&ata_mutex);
+    return rc;
 }
 #endif /* HAVE_ATA_SMART */