X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/489fcbc119f6ae46efc8f4077cbb5aa43683e404..a7384053efe345d199440720b437a28e91058ff3:/lunaix-os/hal/ahci/ata.c

diff --git a/lunaix-os/hal/ahci/ata.c b/lunaix-os/hal/ahci/ata.c
index a2f10ba..845f420 100644
--- a/lunaix-os/hal/ahci/ata.c
+++ b/lunaix-os/hal/ahci/ata.c
@@ -1,3 +1,4 @@
+#include <hal/ahci/ahci.h>
 #include <hal/ahci/hba.h>
 #include <hal/ahci/sata.h>
 
@@ -5,6 +6,15 @@
 #include <lunaix/mm/vmm.h>
 #include <lunaix/spike.h>
 
+void
+sata_read_error(struct hba_port* port)
+{
+    uint32_t tfd = port->regs[HBA_RPxTFD];
+    port->device->last_result.sense_key = (tfd & 0xf000) >> 12;
+    port->device->last_result.error = (tfd & 0x0f00) >> 8;
+    port->device->last_result.status = tfd & 0x00ff;
+}
+
 int
 __sata_buffer_io(struct hba_device* dev,
                  uint64_t lba,
@@ -18,17 +28,11 @@ __sata_buffer_io(struct hba_device* dev,
     struct hba_cmdh* header;
     struct hba_cmdt* table;
     int slot = hba_prepare_cmd(port, &table, &header, buffer, size);
-    int bitmask = 1 << slot;
-
-    // 确保端口是空闲的
-    wait_until(!(port->regs[HBA_RPxTFD] & (HBA_PxTFD_BSY | HBA_PxTFD_DRQ)));
-
-    port->regs[HBA_RPxIS] = 0;
 
     header->options |= HBA_CMDH_WRITE * (write == 1);
 
     uint16_t count = ICEIL(size, port->device->block_size);
-    struct sata_reg_fis* fis = table->command_fis;
+    struct sata_reg_fis* fis = (struct sata_reg_fis*)table->command_fis;
 
     if ((port->device->flags & HBA_DEV_FEXTLBA)) {
         // 如果该设备支持48位LBA寻址
@@ -48,26 +52,10 @@ __sata_buffer_io(struct hba_device* dev,
     */
     fis->dev = (1 << 6);
 
-    int retries = 0;
-
-    while (retries < MAX_RETRY) {
-        port->regs[HBA_RPxCI] = bitmask;
+    int is_ok = ahci_try_send(port, slot);
 
-        wait_until(!(port->regs[HBA_RPxCI] & bitmask));
-
-        if ((port->regs[HBA_RPxTFD] & HBA_PxTFD_ERR)) {
-            // 有错误
-            sata_read_error(port);
-            retries++;
-        } else {
-            vfree_dma(table);
-            return 1;
-        }
-    }
-
-fail:
     vfree_dma(table);
-    return 0;
+    return is_ok;
 }
 
 int
@@ -87,11 +75,3 @@ sata_write_buffer(struct hba_device* dev,
 {
     return __sata_buffer_io(dev, lba, buffer, size, 1);
 }
-
-void
-sata_read_error(struct hba_port* port)
-{
-    uint32_t tfd = port->regs[HBA_RPxTFD];
-    port->device->last_error = (tfd >> 8) & 0xff;
-    port->device->last_status = tfd & 0xff;
-}
\ No newline at end of file