Changeset 15d0046 in mainline for uspace/drv/block/ahci/ahci.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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:

Merge mainline changes

File:

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

uspace/drv/block/ahci/ahci.c

@@ -38 +38 @@
 #include <device/hw_res_parsed.h>
 #include <pci_dev_iface.h>
-#include <sysinfo.h>
-#include <ipc/irc.h>
-#include <ns.h>
+#include <irc.h>
 #include <ahci_iface.h>
 #include "ahci.h"
@@ -129 +127 @@
 
 static void ahci_get_model_name(uint16_t *, char *);
-static int ahci_enable_interrupt(int);
 
 static fibril_mutex_t sata_devices_count_lock;
@@ -234 +231 @@
         
         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 +274 @@
         
         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 +433 @@
         
         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 +627 @@
         
         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.");
@@ -893 +890 @@
 /** AHCI interrupt handler.
  *
- * @param dev   DDF device structure.
  * @param iid   The IPC call id.
  * @param icall The IPC call structure.
- *
- */
-static void ahci_interrupt(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *icall)
+ * @param dev   DDF device structure.
+ *
+ */
+static void ahci_interrupt(ipc_callid_t iid, ipc_call_t *icall, ddf_dev_t *dev)
 {
         ahci_dev_t *ahci = dev_ahci_dev(dev);
@@ -938 +935 @@
         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 +1152 @@
         
         /* 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;
@@ -1195 +1192 @@
         }
         
-        rc = ahci_enable_interrupt(hw_res_parsed.irqs.irqs[0]);
+        rc = irc_enable_interrupt(hw_res_parsed.irqs.irqs[0]);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed enable interupt.");
@@ -1315 +1312 @@
 }
 
-/** Enable interrupt using SERVICE_IRC.
- *
- * @param irq Requested irq number.
- *
- * @return EOK if succeed, error code otherwise.
- *
- */
-static int ahci_enable_interrupt(int irq)
-{
-        async_sess_t *irc_sess = NULL;
-        irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE, SERVICE_IRC, 0, 0);
-        if (!irc_sess)
-                return EINTR;
-        
-        async_exch_t *exch = async_exchange_begin(irc_sess);
-        const int rc = async_req_1_0(exch, IRC_ENABLE_INTERRUPT, irq);
-        async_exchange_end(exch);
-        
-        async_hangup(irc_sess);
-        return rc;
-}
-
 /*----------------------------------------------------------------------------*/
 /*-- AHCI Main routine -------------------------------------------------------*/