Merge branch 'master' into sata-ahci-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 279cd50ee0e900d26dd7ef7b9c845e24b9608403..9af9cfee25ada3189cbffb1b4a5463dc75c1e7e4 100644 (file)
--- a/lunaix-os/hal/ahci/utils.c
+++ b/lunaix-os/hal/ahci/utils.c
@@ -1,3 +1,4 @@
+#include <hal/ahci/hba.h>

 #include <hal/ahci/utils.h>
 #include <klibc/string.h>
 
 #include <hal/ahci/utils.h>
 #include <klibc/string.h>
 


@@ -8,13 +9,14 @@
 #define IDDEV_MODELNUM_OFFSET 27
 
 void
 #define IDDEV_MODELNUM_OFFSET 27
 
 void

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

 {
     dev_info->max_lba = *((uint32_t*)(data + IDDEV_MAXLBA_OFFSET));
 {
     dev_info->max_lba = *((uint32_t*)(data + IDDEV_MAXLBA_OFFSET));

-    dev_info->sector_size = *((uint32_t*)(data + IDDEV_LSECSIZE_OFFSET));
+    dev_info->block_size = *((uint32_t*)(data + IDDEV_LSECSIZE_OFFSET));
+    dev_info->cbd_size = (*data & 0x3) ? 12 : 16;

     memcpy(&dev_info->wwn, (uint8_t*)(data + IDDEV_WWN_OFFSET), 8);
     memcpy(&dev_info->wwn, (uint8_t*)(data + IDDEV_WWN_OFFSET), 8);

-    if (!dev_info->sector_size) {
-        dev_info->sector_size = 512;
+    if (!dev_info->block_size) {
+        dev_info->block_size = 512;

     }
     ahci_parsestr(&dev_info->serial_num, data + IDDEV_SERIALNUM_OFFSET, 10);
     ahci_parsestr(&dev_info->model, data + IDDEV_MODELNUM_OFFSET, 20);
     }
     ahci_parsestr(&dev_info->serial_num, data + IDDEV_SERIALNUM_OFFSET, 10);
     ahci_parsestr(&dev_info->model, data + IDDEV_MODELNUM_OFFSET, 20);


@@ -23,9 +25,11 @@ ahci_parse_dev_info(struct ahci_device_info* dev_info, uint16_t* data)
 void
 ahci_parsestr(char* str, uint16_t* reg_start, int size_word)
 {
 void
 ahci_parsestr(char* str, uint16_t* reg_start, int size_word)
 {

-    for (int i = 0, j = 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);
         str[j] = (char)(reg >> 8);
         str[j + 1] = (char)(reg & 0xff);
     }
         uint16_t reg = *(reg_start + i);
         str[j] = (char)(reg >> 8);
         str[j + 1] = (char)(reg & 0xff);
     }

+    str[j - 1] = '\0';

 }
\ No newline at end of file
 }
\ No newline at end of file