chore: fix almost *ALL* warnings.

[lunaix-os.git] / lunaix-os / hal / ahci / ata.c

diff --git a/lunaix-os/hal/ahci/ata.c b/lunaix-os/hal/ahci/ata.c
index 118bf1196a8697b6e4a001f66c2196d9e900a3d3..c698348b1b7280403348818300ba15ba15c9c708 100644 (file)
--- 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>
 
 #include <hal/ahci/hba.h>
 #include <hal/ahci/sata.h>
 


@@ -8,43 +9,37 @@
 void
 sata_read_error(struct hba_port* port)
 {
 void
 sata_read_error(struct hba_port* port)
 {

-    uint32_t tfd = port->regs[HBA_RPxTFD];
+    u32_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;
 }
 
     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,
-                 void* buffer,
-                 uint32_t size,
-                 int write)
+void
+sata_submit(struct hba_device* dev, struct blkio_req* io_req)

 {
 {

-    assert_msg(((uintptr_t)buffer & 0x3) == 0, "HBA: Bad buffer alignment");
-

     struct hba_port* port = dev->port;
     struct hba_cmdh* header;
     struct hba_cmdt* table;
     struct hba_port* port = dev->port;
     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;
+    int write = !!(io_req->flags & BLKIO_WRITE);
+    int slot = hba_prepare_cmd(port, &table, &header);
+    hba_bind_vbuf(header, table, io_req->vbuf);

 
 

-    header->options |= HBA_CMDH_WRITE * (write == 1);
+    header->options |= HBA_CMDH_WRITE * write;

 
 

-    uint16_t count = ICEIL(size, port->device->block_size);
+    u16_t count = ICEIL(vbuf_size(io_req->vbuf), port->device->block_size);

     struct sata_reg_fis* fis = (struct sata_reg_fis*)table->command_fis;
 
     if ((port->device->flags & HBA_DEV_FEXTLBA)) {
         // 如果该设备支持48位LBA寻址
     struct sata_reg_fis* fis = (struct sata_reg_fis*)table->command_fis;
 
     if ((port->device->flags & HBA_DEV_FEXTLBA)) {
         // 如果该设备支持48位LBA寻址

-        sata_create_fis(
-          fis, write ? ATA_WRITE_DMA_EXT : ATA_READ_DMA_EXT, lba, count);
+        sata_create_fis(fis,
+                        write ? ATA_WRITE_DMA_EXT : ATA_READ_DMA_EXT,
+                        io_req->blk_addr,
+                        count);

     } else {
     } else {

-        sata_create_fis(fis, write ? ATA_WRITE_DMA : ATA_READ_DMA, lba, count);
+        sata_create_fis(
+          fis, write ? ATA_WRITE_DMA : ATA_READ_DMA, io_req->blk_addr, count);

     }
     /*
           确保我们使用的是LBA寻址模式
     }
     /*
           确保我们使用的是LBA寻址模式


@@ -57,42 +52,8 @@ __sata_buffer_io(struct hba_device* dev,
     */
     fis->dev = (1 << 6);
 
     */
     fis->dev = (1 << 6);
 

-    int retries = 0;
-
-    while (retries < MAX_RETRY) {
-        port->regs[HBA_RPxCI] = bitmask;
-
-        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;
-}
-
-int
-sata_read_buffer(struct hba_device* dev,
-                 uint64_t lba,
-                 void* buffer,
-                 uint32_t size)
-{
-    return __sata_buffer_io(dev, lba, buffer, size, 0);
-}
-
-int
-sata_write_buffer(struct hba_device* dev,
-                  uint64_t lba,
-                  void* buffer,
-                  uint32_t size)
-{
-    return __sata_buffer_io(dev, lba, buffer, size, 1);
-}
+    // The async way...
+    struct hba_cmd_state* cmds = valloc(sizeof(struct hba_cmd_state));
+    *cmds = (struct hba_cmd_state){ .cmd_table = table, .state_ctx = io_req };
+    ahci_post(port, cmds, slot);
+}
\ No newline at end of file