Changeset 79ae36dd in mainline for uspace/drv/pciintel/pci.c

Timestamp:

2011-06-08T19:01:55Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0eff68e

Parents:

764d71e

Message:

new async framework with integrated exchange tracking

• strict isolation between low-level IPC and high-level async framework with integrated exchange tracking
  • each IPC connection is represented by an async_sess_t structure
  • each IPC exchange is represented by an async_exch_t structure
  • exchange management is either based on atomic messages (EXCHANGE_ATOMIC), locking (EXCHANGE_SERIALIZE) or connection cloning (EXCHANGE_CLONE)
• async_obsolete: temporary compatibility layer to keep old async clients working (several pieces of code are currently broken, but only non-essential functionality)
• IPC_M_PHONE_HANGUP is now method no. 0 (for elegant boolean evaluation)
• IPC_M_DEBUG_ALL has been renamed to IPC_M_DEBUG
• IPC_M_PING has been removed (VFS protocol now has VFS_IN_PING)
• console routines in libc have been rewritten for better abstraction
• additional use for libc-private header files (FILE structure opaque to the client)
• various cstyle changes (typos, indentation, missing externs in header files, improved comments, etc.)

File:

• uspace/drv/pciintel/pci.c (modified) (7 diffs)

uspace/drv/pciintel/pci.c

@@ -53 +53 @@
 #include <ipc/dev_iface.h>
 #include <ipc/irc.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <ipc/services.h>
 #include <sysinfo.h>
@@ -92 +92 @@
         assert(fnode);
         pci_fun_t *dev_data = (pci_fun_t *) fnode->driver_data;
-
+        
         sysarg_t apic;
         sysarg_t i8259;
-
-        int irc_phone = ENOTSUP;
-
+        
+        async_sess_t *irc_sess = NULL;
+        
         if (((sysinfo_get_value("apic", &apic) == EOK) && (apic))
             || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))) {
-                irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
-        }
-
-        if (irc_phone < 0) {
+                irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
+                    SERVICE_IRC, 0, 0);
+        }
+        
+        if (!irc_sess)
                 return false;
-        }
-
+        
         size_t i = 0;
         hw_resource_list_t *res = &dev_data->hw_resources;
@@ -112 +112 @@
                 if (res->resources[i].type == INTERRUPT) {
                         const int irq = res->resources[i].res.interrupt.irq;
+                        
+                        async_exch_t *exch = async_exchange_begin(irc_sess);
                         const int rc =
-                            async_req_1_0(irc_phone, IRC_ENABLE_INTERRUPT, irq);
+                            async_req_1_0(exch, IRC_ENABLE_INTERRUPT, irq);
+                        async_exchange_end(exch);
+                        
                         if (rc != EOK) {
-                                async_hangup(irc_phone);
+                                async_hangup(irc_sess);
                                 return false;
                         }
                 }
         }
-
-        async_hangup(irc_phone);
+        
+        async_hangup(irc_sess);
         return true;
 }
 
-static int pci_config_space_write_32(
-    ddf_fun_t *fun, uint32_t address, uint32_t data)
+static int pci_config_space_write_32(ddf_fun_t *fun, uint32_t address,
+    uint32_t data)
 {
         if (address > 252)
@@ -576 +580 @@
         
         ddf_msg(LVL_DEBUG, "pci_add_device");
-        dnode->parent_phone = -1;
+        dnode->parent_sess = NULL;
         
         bus = pci_bus_new();
@@ -587 +591 @@
         dnode->driver_data = bus;
         
-        dnode->parent_phone = devman_parent_device_connect(dnode->handle,
-            IPC_FLAG_BLOCKING);
-        if (dnode->parent_phone < 0) {
+        dnode->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE,
+            dnode->handle, IPC_FLAG_BLOCKING);
+        if (!dnode->parent_sess) {
                 ddf_msg(LVL_ERROR, "pci_add_device failed to connect to the "
-                    "parent's driver.");
-                rc = dnode->parent_phone;
+                    "parent driver.");
+                rc = ENOENT;
                 goto fail;
         }
@@ -598 +602 @@
         hw_resource_list_t hw_resources;
         
-        rc = hw_res_get_resource_list(dnode->parent_phone, &hw_resources);
+        rc = hw_res_get_resource_list(dnode->parent_sess, &hw_resources);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "pci_add_device failed to get hw resources "
@@ -651 +655 @@
         if (bus != NULL)
                 pci_bus_delete(bus);
-        if (dnode->parent_phone >= 0)
-                async_hangup(dnode->parent_phone);
+        
+        if (dnode->parent_sess)
+                async_hangup(dnode->parent_sess);
+        
         if (got_res)
                 hw_res_clean_resource_list(&hw_resources);
+        
         if (ctl != NULL)
                 ddf_fun_destroy(ctl);
-
+        
         return rc;
 }