Changeset 72d120e in mainline for uspace/drv/block/ahci/ahci.c

Timestamp:

2014-06-16T20:17:44Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a78e4e

Parents:

9d653e3 (diff), 334bf28 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Integrate from mainline.

File:

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

uspace/drv/block/ahci/ahci.c

@@ -234 +234 @@
         
         uintptr_t phys;
-        void *ibuf;
+        void *ibuf = AS_AREA_ANY;
         int rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB,
             AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &ibuf);
@@ -277 +277 @@
         
         uintptr_t phys;
-        void *ibuf;
+        void *ibuf = AS_AREA_ANY;
         int rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB,
             AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &ibuf);
@@ -436 +436 @@
         
         uintptr_t phys;
-        sata_identify_data_t *idata;
+        sata_identify_data_t *idata = AS_AREA_ANY;
         int rc = dmamem_map_anonymous(SATA_IDENTIFY_DEVICE_BUFFER_LENGTH,
             DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
-            (void **) &idata);
+            (void *) &idata);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Cannot allocate buffer to identify device.");
@@ -630 +630 @@
         
         uintptr_t phys;
-        sata_identify_data_t *idata;
+        sata_identify_data_t *idata = AS_AREA_ANY;
         int rc = dmamem_map_anonymous(SATA_SET_FEATURE_BUFFER_LENGTH,
             DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
-            (void **) &idata);
+            (void *) &idata);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Cannot allocate buffer for device set mode.");
@@ -938 +938 @@
         size_t size = 4096;
         uintptr_t phys = 0;
-        void *virt_fb = NULL;
-        void *virt_cmd = NULL;
-        void *virt_table = NULL;
+        void *virt_fb = AS_AREA_ANY;
+        void *virt_cmd = AS_AREA_ANY;
+        void *virt_table = AS_AREA_ANY;
         ddf_fun_t *fun;
         
@@ -1155 +1155 @@
         
         /* Map AHCI registers. */
-        ahci->memregs = NULL;
+        ahci->memregs = AS_AREA_ANY;
         
         physmem_map(RNGABS(hw_res_parsed.mem_ranges.ranges[0]),
             AHCI_MEMREGS_PAGES_COUNT, AS_AREA_READ | AS_AREA_WRITE,
-            (void **) &ahci->memregs);
+            (void *) &ahci->memregs);
         if (ahci->memregs == NULL)
                 goto error_map_registers;