Minor - sort ATA CMD definitions.

diff --git a/src/ata.h b/src/ata.h
index df53a01e6a32979d4bdd3347ced0a76fa83447be..d2172802a5ceba1e663fe2a251a959f950dac883 100644 (file)
--- a/src/ata.h
+++ b/src/ata.h
@@ -86,64 +86,64 @@ void describe_atapi(struct drive_s *drive_g);
 #define ATA_CB_DC_NIEN   0x02  // disable interrupts
 
 // Most mandtory and optional ATA commands (from ATA-3),
-#define ATA_CMD_CFA_ERASE_SECTORS            0xC0
+#define ATA_CMD_NOP                          0x00
 #define ATA_CMD_CFA_REQUEST_EXT_ERR_CODE     0x03
-#define ATA_CMD_CFA_TRANSLATE_SECTOR         0x87
-#define ATA_CMD_CFA_WRITE_MULTIPLE_WO_ERASE  0xCD
-#define ATA_CMD_CFA_WRITE_SECTORS_WO_ERASE   0x38
-#define ATA_CMD_CHECK_POWER_MODE1            0xE5
-#define ATA_CMD_CHECK_POWER_MODE2            0x98
 #define ATA_CMD_DEVICE_RESET                 0x08
-#define ATA_CMD_EXECUTE_DEVICE_DIAGNOSTIC    0x90
-#define ATA_CMD_FLUSH_CACHE                  0xE7
-#define ATA_CMD_FORMAT_TRACK                 0x50
-#define ATA_CMD_IDENTIFY_DEVICE              0xEC
-#define ATA_CMD_IDENTIFY_PACKET_DEVICE       0xA1
-#define ATA_CMD_IDLE1                        0xE3
-#define ATA_CMD_IDLE2                        0x97
-#define ATA_CMD_IDLE_IMMEDIATE1              0xE1
-#define ATA_CMD_IDLE_IMMEDIATE2              0x95
-#define ATA_CMD_INITIALIZE_DRIVE_PARAMETERS  0x91
-#define ATA_CMD_INITIALIZE_DEVICE_PARAMETERS 0x91
-#define ATA_CMD_NOP                          0x00
-#define ATA_CMD_PACKET                       0xA0
-#define ATA_CMD_READ_BUFFER                  0xE4
-#define ATA_CMD_READ_DMA                     0xC8
+#define ATA_CMD_RECALIBRATE                  0x10
+#define ATA_CMD_READ_SECTORS                 0x20
+#define ATA_CMD_READ_SECTORS_EXT             0x24
 #define ATA_CMD_READ_DMA_EXT                 0x25
-#define ATA_CMD_READ_DMA_QUEUED              0xC7
 #define ATA_CMD_READ_DMA_QUEUED_EXT          0x26
-#define ATA_CMD_READ_LOG_EXT                 0x2F
-#define ATA_CMD_READ_MULTIPLE                0xC4
-#define ATA_CMD_READ_MULTIPLE_EXT            0x29
-#define ATA_CMD_READ_NATIVE_MAX_ADDRESS      0xF8
 #define ATA_CMD_READ_NATIVE_MAX_ADDRESS_EXT  0x27
-#define ATA_CMD_READ_SECTORS                 0x20
-#define ATA_CMD_READ_SECTORS_EXT             0x24
+#define ATA_CMD_READ_MULTIPLE_EXT            0x29
+#define ATA_CMD_READ_LOG_EXT                 0x2F
+#define ATA_CMD_WRITE_SECTORS                0x30
+#define ATA_CMD_WRITE_SECTORS_EXT            0x34
+#define ATA_CMD_WRITE_DMA_EXT                0x35
+#define ATA_CMD_WRITE_DMA_QUEUED_EXT         0x36
+#define ATA_CMD_SET_MAX_ADDRESS_EXT          0x37
+#define ATA_CMD_CFA_WRITE_SECTORS_WO_ERASE   0x38
+#define ATA_CMD_WRITE_MULTIPLE_EXT           0x39
+#define ATA_CMD_WRITE_VERIFY                 0x3C
+#define ATA_CMD_WRITE_LOG_EXT                0x3F
 #define ATA_CMD_READ_VERIFY_SECTORS          0x40
 #define ATA_CMD_READ_VERIFY_SECTORS_EXT      0x42
-#define ATA_CMD_RECALIBRATE                  0x10
-#define ATA_CMD_REQUEST_SENSE                0x03
+#define ATA_CMD_FORMAT_TRACK                 0x50
 #define ATA_CMD_SEEK                         0x70
-#define ATA_CMD_SET_FEATURES                 0xEF
-#define ATA_CMD_SET_MAX                      0xF9
-#define ATA_CMD_SET_MAX_ADDRESS_EXT          0x37
-#define ATA_CMD_SET_MULTIPLE_MODE            0xC6
-#define ATA_CMD_SLEEP1                       0xE6
-#define ATA_CMD_SLEEP2                       0x99
-#define ATA_CMD_STANDBY1                     0xE2
-#define ATA_CMD_STANDBY2                     0x96
-#define ATA_CMD_STANDBY_IMMEDIATE1           0xE0
+#define ATA_CMD_CFA_TRANSLATE_SECTOR         0x87
+#define ATA_CMD_EXECUTE_DEVICE_DIAGNOSTIC    0x90
+#define ATA_CMD_INITIALIZE_DEVICE_PARAMETERS 0x91
 #define ATA_CMD_STANDBY_IMMEDIATE2           0x94
-#define ATA_CMD_WRITE_BUFFER                 0xE8
+#define ATA_CMD_IDLE_IMMEDIATE2              0x95
+#define ATA_CMD_STANDBY2                     0x96
+#define ATA_CMD_IDLE2                        0x97
+#define ATA_CMD_CHECK_POWER_MODE2            0x98
+#define ATA_CMD_SLEEP2                       0x99
+#define ATA_CMD_PACKET                       0xA0
+#define ATA_CMD_IDENTIFY_PACKET_DEVICE       0xA1
+#define ATA_CMD_CFA_ERASE_SECTORS            0xC0
+#define ATA_CMD_READ_MULTIPLE                0xC4
+#define ATA_CMD_WRITE_MULTIPLE               0xC5
+#define ATA_CMD_SET_MULTIPLE_MODE            0xC6
+#define ATA_CMD_READ_DMA_QUEUED              0xC7
+#define ATA_CMD_READ_DMA                     0xC8
 #define ATA_CMD_WRITE_DMA                    0xCA
-#define ATA_CMD_WRITE_DMA_EXT                0x35
 #define ATA_CMD_WRITE_DMA_QUEUED             0xCC
-#define ATA_CMD_WRITE_DMA_QUEUED_EXT         0x36
-#define ATA_CMD_WRITE_LOG_EXT                0x3F
-#define ATA_CMD_WRITE_MULTIPLE               0xC5
-#define ATA_CMD_WRITE_MULTIPLE_EXT           0x39
-#define ATA_CMD_WRITE_SECTORS                0x30
-#define ATA_CMD_WRITE_SECTORS_EXT            0x34
-#define ATA_CMD_WRITE_VERIFY                 0x3C
+#define ATA_CMD_CFA_WRITE_MULTIPLE_WO_ERASE  0xCD
+#define ATA_CMD_STANDBY_IMMEDIATE            0xE0
+#define ATA_CMD_IDLE_IMMEDIATE               0xE1
+#define ATA_CMD_STANDBY                      0xE2
+#define ATA_CMD_IDLE                         0xE3
+#define ATA_CMD_READ_BUFFER                  0xE4
+#define ATA_CMD_CHECK_POWER_MODE             0xE5
+#define ATA_CMD_SLEEP                        0xE6
+#define ATA_CMD_FLUSH_CACHE                  0xE7
+#define ATA_CMD_WRITE_BUFFER                 0xE8
+#define ATA_CMD_IDENTIFY_DEVICE              0xEC
+#define ATA_CMD_SET_FEATURES                 0xEF
+#define ATA_CMD_READ_NATIVE_MAX_ADDRESS      0xF8
+#define ATA_CMD_SET_MAX                      0xF9
+
+#define ATA_CMD_REQUEST_SENSE                0x03
 
 #endif // ata.h