Changeset 79ae36dd in mainline for uspace/drv/uhci_rhd/main.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/uhci_rhd/main.c (modified) (7 diffs)

uspace/drv/uhci_rhd/main.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbuhcirh
  * @{
@@ -32 +33 @@
  * @brief UHCI root hub initialization routines
  */
+
 #include <ddf/driver.h>
 #include <devman.h>
@@ -48 +50 @@
 static int hc_get_my_registers(const ddf_dev_t *dev,
     uintptr_t *io_reg_address, size_t *io_reg_size);
-/*----------------------------------------------------------------------------*/
+
 static int uhci_rh_add_device(ddf_dev_t *device);
-/*----------------------------------------------------------------------------*/
+
 static driver_ops_t uhci_rh_driver_ops = {
         .add_device = uhci_rh_add_device,
 };
-/*----------------------------------------------------------------------------*/
+
 static driver_t uhci_rh_driver = {
         .name = NAME,
         .driver_ops = &uhci_rh_driver_ops
 };
-/*----------------------------------------------------------------------------*/
+
 /** Initialize global driver structures (NONE).
  *
@@ -74 +76 @@
         return ddf_driver_main(&uhci_rh_driver);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Initialize a new ddf driver instance of UHCI root hub.
  *
@@ -122 +124 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 /** Get address of I/O registers.
  *
@@ -134 +136 @@
 {
         assert(dev);
-
-        const int parent_phone = devman_parent_device_connect(dev->handle,
+        
+        async_sess_t *parent_sess =
+            devman_parent_device_connect(EXCHANGE_SERIALIZE, dev->handle,
             IPC_FLAG_BLOCKING);
-        if (parent_phone < 0) {
-                return parent_phone;
-        }
-
+        if (!parent_sess)
+                return ENOMEM;
+        
         hw_resource_list_t hw_resources;
-        const int ret = hw_res_get_resource_list(parent_phone, &hw_resources);
+        const int ret = hw_res_get_resource_list(parent_sess, &hw_resources);
         if (ret != EOK) {
-                async_hangup(parent_phone);
+                async_hangup(parent_sess);
                 return ret;
         }
-
+        
         uintptr_t io_address = 0;
         size_t io_size = 0;
         bool io_found = false;
-
+        
         size_t i = 0;
         for (; i < hw_resources.count; i++) {
@@ -160 +162 @@
                         io_found = true;
                 }
+        
         }
-        async_hangup(parent_phone);
-
-        if (!io_found) {
+        async_hangup(parent_sess);
+        
+        if (!io_found)
                 return ENOENT;
-        }
-        if (io_reg_address != NULL) {
+        
+        if (io_reg_address != NULL)
                 *io_reg_address = io_address;
-        }
-        if (io_reg_size != NULL) {
+        
+        if (io_reg_size != NULL)
                 *io_reg_size = io_size;
-        }
+        
         return EOK;
 }
+
 /**
  * @}