Changes in uspace/drv/block/ahci/ahci.c [b7fd2a0:01c3bb4] in mainline

File:

• uspace/drv/block/ahci/ahci.c (modified) (19 diffs)

uspace/drv/block/ahci/ahci.c

@@ -109 +109 @@
         }
 
-static errno_t get_sata_device_name(ddf_fun_t *, size_t, char *);
-static errno_t get_num_blocks(ddf_fun_t *, uint64_t *);
-static errno_t get_block_size(ddf_fun_t *, size_t *);
-static errno_t read_blocks(ddf_fun_t *, uint64_t, size_t, void *);
-static errno_t write_blocks(ddf_fun_t *, uint64_t, size_t, void *);
-
-static errno_t ahci_identify_device(sata_dev_t *);
-static errno_t ahci_set_highest_ultra_dma_mode(sata_dev_t *);
-static errno_t ahci_rb_fpdma(sata_dev_t *, uintptr_t, uint64_t);
-static errno_t ahci_wb_fpdma(sata_dev_t *, uintptr_t, uint64_t);
+static int get_sata_device_name(ddf_fun_t *, size_t, char *);
+static int get_num_blocks(ddf_fun_t *, uint64_t *);
+static int get_block_size(ddf_fun_t *, size_t *);
+static int read_blocks(ddf_fun_t *, uint64_t, size_t, void *);
+static int write_blocks(ddf_fun_t *, uint64_t, size_t, void *);
+
+static int ahci_identify_device(sata_dev_t *);
+static int ahci_set_highest_ultra_dma_mode(sata_dev_t *);
+static int ahci_rb_fpdma(sata_dev_t *, uintptr_t, uint64_t);
+static int ahci_wb_fpdma(sata_dev_t *, uintptr_t, uint64_t);
 
 static void ahci_sata_devices_create(ahci_dev_t *, ddf_dev_t *);
@@ -124 +124 @@
 static void ahci_ahci_hw_start(ahci_dev_t *);
 
-static errno_t ahci_dev_add(ddf_dev_t *);
+static int ahci_dev_add(ddf_dev_t *);
 
 static void ahci_get_model_name(uint16_t *, char *);
@@ -177 +177 @@
  *
  */
-static errno_t get_sata_device_name(ddf_fun_t *fun,
+static int get_sata_device_name(ddf_fun_t *fun,
     size_t sata_dev_name_length, char *sata_dev_name)
 {
@@ -193 +193 @@
  *
  */
-static errno_t get_num_blocks(ddf_fun_t *fun, uint64_t *num_blocks)
+static int get_num_blocks(ddf_fun_t *fun, uint64_t *num_blocks)
 {
         sata_dev_t *sata = fun_sata_dev(fun);
@@ -208 +208 @@
  *
  */
-static errno_t get_block_size(ddf_fun_t *fun, size_t *block_size)
+static int get_block_size(ddf_fun_t *fun, size_t *block_size)
 {
         sata_dev_t *sata = fun_sata_dev(fun);
@@ -225 +225 @@
  *
  */
-static errno_t read_blocks(ddf_fun_t *fun, uint64_t blocknum,
+static int read_blocks(ddf_fun_t *fun, uint64_t blocknum,
     size_t count, void *buf)
 {
@@ -232 +232 @@
         uintptr_t phys;
         void *ibuf = AS_AREA_ANY;
-        errno_t rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB,
+        int rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB,
             AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &ibuf);
         if (rc != EOK) {
@@ -268 +268 @@
  *
  */
-static errno_t write_blocks(ddf_fun_t *fun, uint64_t blocknum,
+static int write_blocks(ddf_fun_t *fun, uint64_t blocknum,
     size_t count, void *buf)
 {
@@ -275 +275 @@
         uintptr_t phys;
         void *ibuf = AS_AREA_ANY;
-        errno_t rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB,
+        int rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB,
             AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &ibuf);
         if (rc != EOK) {
@@ -424 +424 @@
  *
  */
-static errno_t ahci_identify_device(sata_dev_t *sata)
+static int ahci_identify_device(sata_dev_t *sata)
 {
         if (sata->is_invalid_device) {
@@ -434 +434 @@
         uintptr_t phys;
         sata_identify_data_t *idata = AS_AREA_ANY;
-        errno_t rc = dmamem_map_anonymous(SATA_IDENTIFY_DEVICE_BUFFER_LENGTH,
+        int rc = dmamem_map_anonymous(SATA_IDENTIFY_DEVICE_BUFFER_LENGTH,
             DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
             (void *) &idata);
@@ -605 +605 @@
  *
  */
-static errno_t ahci_set_highest_ultra_dma_mode(sata_dev_t *sata)
+static int ahci_set_highest_ultra_dma_mode(sata_dev_t *sata)
 {
         if (sata->is_invalid_device) {
@@ -628 +628 @@
         uintptr_t phys;
         sata_identify_data_t *idata = AS_AREA_ANY;
-        errno_t rc = dmamem_map_anonymous(SATA_SET_FEATURE_BUFFER_LENGTH,
+        int rc = dmamem_map_anonymous(SATA_SET_FEATURE_BUFFER_LENGTH,
             DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
             (void *) &idata);
@@ -734 +734 @@
  *
  */
-static errno_t ahci_rb_fpdma(sata_dev_t *sata, uintptr_t phys, uint64_t blocknum)
+static int ahci_rb_fpdma(sata_dev_t *sata, uintptr_t phys, uint64_t blocknum)
 {
         if (sata->is_invalid_device) {
@@ -822 +822 @@
  *
  */
-static errno_t ahci_wb_fpdma(sata_dev_t *sata, uintptr_t phys, uint64_t blocknum)
+static int ahci_wb_fpdma(sata_dev_t *sata, uintptr_t phys, uint64_t blocknum)
 {
         if (sata->is_invalid_device) {
@@ -949 +949 @@
         
         /* Allocate and init retfis structure. */
-        errno_t rc = dmamem_map_anonymous(size, DMAMEM_4GiB,
+        int rc = dmamem_map_anonymous(size, DMAMEM_4GiB,
             AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &virt_fb);
         if (rc != EOK)
@@ -1038 +1038 @@
  *
  */
-static errno_t ahci_sata_create(ahci_dev_t *ahci, ddf_dev_t *dev,
+static int ahci_sata_create(ahci_dev_t *ahci, ddf_dev_t *dev,
     volatile ahci_port_t *port, unsigned int port_num)
 {
         ddf_fun_t *fun = NULL;
-        errno_t rc;
+        int rc;
         
         sata_dev_t *sata = ahci_sata_allocate(ahci, port);
@@ -1184 +1184 @@
         ct.ranges = ahci_ranges;
         
-        int irq_cap;
-        errno_t rc = register_interrupt_handler(dev,
-            hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct, &irq_cap);
-        if (rc != EOK) {
+        int irq_cap = register_interrupt_handler(dev,
+            hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct);
+        if (irq_cap < 0) {
                 ddf_msg(LVL_ERROR, "Failed registering interrupt handler.");
                 goto error_register_interrupt_handler;
         }
         
-        rc = hw_res_enable_interrupt(ahci->parent_sess,
+        int rc = hw_res_enable_interrupt(ahci->parent_sess,
             hw_res_parsed.irqs.irqs[0]);
         if (rc != EOK) {
@@ -1255 +1254 @@
  *
  */
-static errno_t ahci_dev_add(ddf_dev_t *dev)     
+static int ahci_dev_add(ddf_dev_t *dev) 
 {
         ahci_dev_t *ahci = ahci_ahci_create(dev);