Changeset ebc9c2c in mainline for uspace/drv/block/ahci/ahci.c

Timestamp:

2014-07-18T09:05:46Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

350274a

Parents:

e5424e9

Message:

Other clients should also use the IRC client stub.

File:

• uspace/drv/block/ahci/ahci.c (modified) (4 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;
@@ -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 -------------------------------------------------------*/