Merge branch 'vfs-dev'

[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 23541ee9fe541aa9bacf85690df4babbd4e921d1..664488dbe3f0a1b5969516533b2c598ef36242b0 100644 (file)
--- a/lunaix-os/hal/ahci/utils.c
+++ b/lunaix-os/hal/ahci/utils.c
@@ -9,14 +9,20 @@
 #define IDDEV_OFFSERIALNUM 10
 #define IDDEV_OFFMODELNUM 27
 #define IDDEV_OFFADDSUPPORT 69
+#define IDDEV_OFFALIGN 209
+#define IDDEV_OFFLPP 106
+#define IDDEV_OFFCAPABILITIES 49
 
 void
 ahci_parse_dev_info(struct hba_device* dev_info, uint16_t* data)
 {
     dev_info->max_lba = *((uint32_t*)(data + IDDEV_OFFMAXLBA));
     dev_info->block_size = *((uint32_t*)(data + IDDEV_OFFLSECSIZE));
-    dev_info->cbd_size = (*data & 0x3) ? 12 : 16;
+    dev_info->cbd_size = (*data & 0x3) ? 16 : 12;
     dev_info->wwn = *(uint64_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 = *((uint32_t*)(data + IDDEV_OFFCAPABILITIES));
 
     if (!dev_info->block_size) {
         dev_info->block_size = 512;
@@ -27,8 +33,8 @@ ahci_parse_dev_info(struct hba_device* dev_info, uint16_t* data)
         dev_info->flags |= HBA_DEV_FEXTLBA;
     }
 
-    ahci_parsestr(&dev_info->serial_num, data + IDDEV_OFFSERIALNUM, 10);
-    ahci_parsestr(&dev_info->model, data + IDDEV_OFFMODELNUM, 20);
+    ahci_parsestr(dev_info->serial_num, data + IDDEV_OFFSERIALNUM, 10);
+    ahci_parsestr(dev_info->model, data + IDDEV_OFFMODELNUM, 20);
 }
 
 void