1 files changed, 20 insertions, 18 deletions

diff --git a/firmware/export/ata.h b/firmware/export/ata.h
index 62c9467643..dfa73eebf5 100644
--- a/firmware/export/ata.h
+++ b/firmware/export/ata.h
@@ -101,7 +101,7 @@ struct ata_smart_values
     unsigned char reserved_375_385[11];
     unsigned char vendor_specific_386_510[125];
     unsigned char chksum;
-} __attribute__((packed));
+} __attribute__((packed)) __attribute__((aligned(2)));
 
 /* Raw attribute value print formats */
 enum ata_attr_raw_format
@@ -140,8 +140,8 @@ bool ata_disk_is_active(void);
 int ata_soft_reset(void);
 int ata_init(void) STORAGE_INIT_ATTR;
 void ata_close(void);
-int ata_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf);
-int ata_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf);
+int ata_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf);
+int ata_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf);
 void ata_spin(void);
 #if (CONFIG_LED == LED_REAL)
 void ata_set_led_enabled(bool enabled);
@@ -176,7 +176,6 @@ static inline int ata_disk_isssd(void)
         0x0401 -> 0xffe == RPM
         All others reserved
 
-        Some CF cards return 0x0100 (ie byteswapped 0x0001) so accept either.
         However, this is a relatively recent change, and we can't rely on it,
         especially for the FC1307A CF->SD adapters!
 
@@ -191,27 +190,26 @@ static inline int ata_disk_isssd(void)
         However microdrives pose a problem as they support CFA but are not
         SSD.
 
+       Offset 163 shows CF Advanced timing modes; microdrives all seems to
+        report 0, but all others (including iFlash) report higher!  This
+        is often present even when the "CFA supported" bit is 0.
+
        Offset 160 b15 indicates support for CF+ power level 1, if not set
         then device is standard flash CF.  However this is not foolproof
-        as newer CF cards may support it for extra performance.
-
-       Offset 163 shows CF Advanced timing modes; microdrive seems to
-        report 0, but all others (including iFlash) report higher!
-
-       So if device support CFA _AND_ reports higher speeds modes, it is SSD.
+        as newer CF cards (and those CF->SD adapters) may report this.
 
      */
-    return ( (identify_info[217] == 0x0001 || identify_info[217] == 0x0100) /* "Solid state" rotational rate */
-             || ((identify_info[168] & 0x0f) >= 0x06)                       /* Explicit SSD form factors */
-             || (identify_info[169] & (1<<0))                               /* TRIM supported */
-             || ((identify_info[83] & (1<<2)) &&                            /* CFA compliant */
-                 (((identify_info[160] & (1<<15)) == 0) ||                     /* CF level 0 */
-                  (identify_info[163] > 0)))                                   /* Advanced timing modes */
+    return ( (identify_info[217] == 0x0001)               /* "Solid state" rotational rate */
+             || ((identify_info[168] & 0x0f) >= 0x06)     /* Explicit SSD form factors */
+             || (identify_info[169] & (1<<0))             /* TRIM supported */
+             || (identify_info[163] > 0)                  /* CF Advanced timing modes */
+             || ((identify_info[83] & (1<<2)) &&          /* CFA compliant */
+                 ((identify_info[160] & (1<<15)) == 0))   /* CF power level 0 */
            );
 }
 
-/* Returns 1 if the drive can be powered off safely */
-static inline int ata_disk_can_poweroff(void)
+/* Returns 1 if the drive supports power management commands */
+static inline int ata_disk_can_sleep(void)
 {
     unsigned short *identify_info = ata_get_identify();
     /* Only devices that claim to support PM can be safely powered off.
@@ -219,6 +217,8 @@ static inline int ata_disk_can_poweroff(void)
     return (identify_info[82] & (1<<3) && identify_info[85] & (1<<3));
 }
 
+int ata_flush(void);
+
 #ifdef HAVE_ATA_DMA
 /* Returns current DMA mode */
 int ata_get_dma_mode(void);
@@ -233,4 +233,6 @@ int ata_read_smart(struct ata_smart_values*);
 #define STORAGE_CLOSE
 #endif
 
+#define ATA_IDENTIFY_WORDS 256
+
 #endif /* __ATA_H__ */