Second Extended Filesystem (ext2) and other improvements (#33)

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

diff --git a/lunaix-os/hal/ahci/utils.c b/lunaix-os/hal/ahci/utils.c
index 4a86cc3fe2e3bf98dc8a43670f27eb0ce0ec789f..8c39971ee15a9c33901b46fe6e66ffc3b142e11a 100644 (file)
--- a/lunaix-os/hal/ahci/utils.c
+++ b/lunaix-os/hal/ahci/utils.c
@@ -13,6 +13,7 @@
 #define IDDEV_OFFSERIALNUM 10
 #define IDDEV_OFFMODELNUM 27
 #define IDDEV_OFFADDSUPPORT 69
 #define IDDEV_OFFSERIALNUM 10
 #define IDDEV_OFFMODELNUM 27
 #define IDDEV_OFFADDSUPPORT 69

+#define IDDEV_OFFA48SUPPORT 83

 #define IDDEV_OFFALIGN 209
 #define IDDEV_OFFLPP 106
 #define IDDEV_OFFCAPABILITIES 49
 #define IDDEV_OFFALIGN 209
 #define IDDEV_OFFLPP 106
 #define IDDEV_OFFCAPABILITIES 49


@@ -20,12 +21,12 @@
 static u32_t cdb_size[] = { SCSI_CDB12, SCSI_CDB16, 0, 0 };
 
 void
 static u32_t cdb_size[] = { SCSI_CDB12, SCSI_CDB16, 0, 0 };
 
 void

-ahci_parse_dev_info(struct hba_device* dev_info, uint16_t* data)
+ahci_parse_dev_info(struct hba_device* dev_info, u16_t* data)

 {
     dev_info->max_lba = *((u32_t*)(data + IDDEV_OFFMAXLBA));
     dev_info->block_size = *((u32_t*)(data + IDDEV_OFFLSECSIZE));
     dev_info->cbd_size = cdb_size[(*data & 0x3)];
 {
     dev_info->max_lba = *((u32_t*)(data + IDDEV_OFFMAXLBA));
     dev_info->block_size = *((u32_t*)(data + IDDEV_OFFLSECSIZE));
     dev_info->cbd_size = cdb_size[(*data & 0x3)];

-    dev_info->wwn = *(uint64_t*)(data + IDDEV_OFFWWN);
+    dev_info->wwn = *(u64_t*)(data + IDDEV_OFFWWN);

     dev_info->block_per_sec = 1 << (*(data + IDDEV_OFFLPP) & 0xf);
     dev_info->alignment_offset = *(data + IDDEV_OFFALIGN) & 0x3fff;
     dev_info->capabilities = *((u32_t*)(data + IDDEV_OFFCAPABILITIES));
     dev_info->block_per_sec = 1 << (*(data + IDDEV_OFFLPP) & 0xf);
     dev_info->alignment_offset = *(data + IDDEV_OFFALIGN) & 0x3fff;
     dev_info->capabilities = *((u32_t*)(data + IDDEV_OFFCAPABILITIES));


@@ -34,8 +35,9 @@ ahci_parse_dev_info(struct hba_device* dev_info, uint16_t* data)
         dev_info->block_size = 512;
     }
 
         dev_info->block_size = 512;
     }
 

-    if ((*(data + IDDEV_OFFADDSUPPORT) & 0x8)) {
-        dev_info->max_lba = *((uint64_t*)(data + IDDEV_OFFMAXLBA_EXT));
+    if ((*(data + IDDEV_OFFADDSUPPORT) & 0x8) &&
+        (*(data + IDDEV_OFFA48SUPPORT) & 0x400)) {
+        dev_info->max_lba = *((lba_t*)(data + IDDEV_OFFMAXLBA_EXT));

         dev_info->flags |= HBA_DEV_FEXTLBA;
     }
 
         dev_info->flags |= HBA_DEV_FEXTLBA;
     }
 


@@ -44,11 +46,11 @@ ahci_parse_dev_info(struct hba_device* dev_info, uint16_t* data)
 }
 
 void
 }
 
 void

-ahci_parsestr(char* str, uint16_t* reg_start, int size_word)
+ahci_parsestr(char* str, u16_t* reg_start, int size_word)

 {
     int j = 0;
     for (int i = 0; i < size_word; i++, j += 2) {
 {
     int j = 0;
     for (int i = 0; i < size_word; i++, j += 2) {

-        uint16_t reg = *(reg_start + i);
+        u16_t reg = *(reg_start + i);

         str[j] = (char)(reg >> 8);
         str[j + 1] = (char)(reg & 0xff);
     }
         str[j] = (char)(reg >> 8);
         str[j + 1] = (char)(reg & 0xff);
     }