Menuconfig Implementation and auto-qemu refactoring (#44)

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

diff --git a/lunaix-os/hal/ahci/atapi.c b/lunaix-os/hal/ahci/atapi.c
index b6d41fa6005020d071ab48d02905544c4347df5f..841ee3113a2e51bfc2b364d0279cde9b672801b9 100644 (file)
--- a/lunaix-os/hal/ahci/atapi.c
+++ b/lunaix-os/hal/ahci/atapi.c
@@ -11,9 +11,9 @@
 
 void
 scsi_create_packet12(struct scsi_cdb12* cdb,
-                     uint8_t opcode,
-                     uint32_t lba,
-                     uint32_t alloc_size)
+                     u8_t opcode,
+                     u32_t lba,
+                     u32_t alloc_size)
 {
     memset(cdb, 0, sizeof(*cdb));
     cdb->opcode = opcode;
@@ -23,23 +23,23 @@ scsi_create_packet12(struct scsi_cdb12* cdb,
 
 void
 scsi_create_packet16(struct scsi_cdb16* cdb,
-                     uint8_t opcode,
-                     uint64_t lba,
-                     uint32_t alloc_size)
+                     u8_t opcode,
+                     lba_t lba,
+                     u32_t alloc_size)
 {
     memset(cdb, 0, sizeof(*cdb));
     cdb->opcode = opcode;
-    cdb->lba_be_hi = SCSI_FLIP((uint32_t)(lba >> 32));
-    cdb->lba_be_lo = SCSI_FLIP((uint32_t)lba);
+    cdb->lba_be_hi = SCSI_FLIP((u32_t)(lba >> 32));
+    cdb->lba_be_lo = SCSI_FLIP((u32_t)lba);
     cdb->length = SCSI_FLIP(alloc_size);
 }
 
 void
-scsi_parse_capacity(struct hba_device* device, uint32_t* parameter)
+scsi_parse_capacity(struct hba_device* device, u32_t* parameter)
 {
     if (device->cbd_size == SCSI_CDB16) {
-        device->max_lba =
-          SCSI_FLIP(*(parameter + 1)) | (SCSI_FLIP(*parameter) << 32);
+        device->max_lba = (lba_t)SCSI_FLIP(*(parameter + 1)) |
+                          ((lba_t)SCSI_FLIP(*parameter) << 32);
         device->block_size = SCSI_FLIP(*(parameter + 2));
     } else {
         // for READ_CAPACITY(10)
@@ -62,7 +62,7 @@ scsi_submit(struct hba_device* dev, struct blkio_req* io_req)
     header->options |= (HBA_CMDH_WRITE * (write == 1)) | HBA_CMDH_ATAPI;
 
     size_t size = vbuf_size(io_req->vbuf);
-    uint32_t count = ICEIL(size, port->device->block_size);
+    u32_t count = ICEIL(size, port->device->block_size);
 
     struct sata_reg_fis* fis = (struct sata_reg_fis*)table->command_fis;
     void* cdb = table->atapi_cmd;
@@ -77,12 +77,12 @@ scsi_submit(struct hba_device* dev, struct blkio_req* io_req)
     } else {
         scsi_create_packet12((struct scsi_cdb12*)cdb,
                              write ? SCSI_WRITE_BLOCKS_12 : SCSI_READ_BLOCKS_12,
-                             io_req->blk_addr,
+                             io_req->blk_addr & (u32_t)-1,
                              count);
     }
 
     // field: cdb->misc1
-    *((uint8_t*)cdb + 1) = 3 << 5; // RPROTECT=011b 禁用保护检查
+    *((u8_t*)cdb + 1) = 3 << 5; // RPROTECT=011b 禁用保护检查
 
     // The async way...
     struct hba_cmd_state* cmds = valloc(sizeof(struct hba_cmd_state));