Changeset 79ae36dd in mainline for uspace/lib/c/generic/device

Timestamp:

2011-06-08T19:01:55Z (14 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.)

Location:

uspace/lib/c/generic/device

Files:

• char_dev.c (modified) (3 diffs)
• hw_res.c (modified) (1 diff)

uspace/lib/c/generic/device/char_dev.c

@@ -45 +45 @@
  * using its character interface.
  *
- * @param dev_phone     Phone to the device.
- * @param buf           Buffer for the data read from or written to the device.
- * @param size          Maximum size of data (in bytes) to be read or written.
- * @param read          Read from the device if true, write to it otherwise.
+ * @param sess Session to the device.
+ * @param buf  Buffer for the data read from or written to the device.
+ * @param size Maximum size of data (in bytes) to be read or written.
+ * @param read Read from the device if true, write to it otherwise.
  *
- * @return              Non-negative number of bytes actually read from or
- *                      written to the device on success, negative error number
- *                      otherwise.
+ * @return Non-negative number of bytes actually read from or
+ *         written to the device on success, negative error number
+ *         otherwise.
+ *
  */
-static ssize_t char_dev_rw(int dev_phone, void *buf, size_t size, bool read)
+static ssize_t char_dev_rw(async_sess_t *sess, void *buf, size_t size, bool read)
 {
-        async_serialize_start();
-        
         ipc_call_t answer;
         aid_t req;
         int ret;
         
+        async_exch_t *exch = async_exchange_begin(sess);
+        
         if (read) {
-                req = async_send_1(dev_phone, DEV_IFACE_ID(CHAR_DEV_IFACE),
+                req = async_send_1(exch, DEV_IFACE_ID(CHAR_DEV_IFACE),
                     CHAR_DEV_READ, &answer);
-                ret = async_data_read_start(dev_phone, buf, size);
+                ret = async_data_read_start(exch, buf, size);
         } else {
-                req = async_send_1(dev_phone, DEV_IFACE_ID(CHAR_DEV_IFACE),
+                req = async_send_1(exch, DEV_IFACE_ID(CHAR_DEV_IFACE),
                     CHAR_DEV_WRITE, &answer);
-                ret = async_data_write_start(dev_phone, buf, size);
+                ret = async_data_write_start(exch, buf, size);
         }
+        
+        async_exchange_end(exch);
         
         sysarg_t rc;
         if (ret != EOK) {
                 async_wait_for(req, &rc);
-                async_serialize_end();
                 if (rc == EOK)
                         return (ssize_t) ret;
@@ -83 +85 @@
         
         async_wait_for(req, &rc);
-        async_serialize_end();
         
         ret = (int) rc;
@@ -94 +95 @@
 /** Read from character device.
  *
- * @param dev_phone     Phone to the device.
- * @param buf           Output buffer for the data read from the device.
- * @param size          Maximum size (in bytes) of the data to be read.
+ * @param sess Session to the device.
+ * @param buf  Output buffer for the data read from the device.
+ * @param size Maximum size (in bytes) of the data to be read.
  *
- * @return              Non-negative number of bytes actually read from the
- *                      device on success, negative error number otherwise.
+ * @return Non-negative number of bytes actually read from the
+ *         device on success, negative error number otherwise.
+ *
  */
-ssize_t char_dev_read(int dev_phone, void *buf, size_t size)
+ssize_t char_dev_read(async_sess_t *sess, void *buf, size_t size)
 {
-        return char_dev_rw(dev_phone, buf, size, true);
+        return char_dev_rw(sess, buf, size, true);
 }
 
 /** Write to character device.
  *
- * @param dev_phone     Phone to the device.
- * @param buf           Input buffer containg the data to be written to the
- *                      device.
- * @param size          Maximum size (in bytes) of the data to be written.
+ * @param sess Session to the device.
+ * @param buf  Input buffer containg the data to be written to the
+ *             device.
+ * @param size Maximum size (in bytes) of the data to be written.
  *
- * @return              Non-negative number of bytes actually written to the
- *                      device on success, negative error number otherwise.
+ * @return Non-negative number of bytes actually written to the
+ *         device on success, negative error number otherwise.
+ *
  */
-ssize_t char_dev_write(int dev_phone, void *buf, size_t size)
+ssize_t char_dev_write(async_sess_t *sess, void *buf, size_t size)
 {
-        return char_dev_rw(dev_phone, buf, size, false);
+        return char_dev_rw(sess, buf, size, false);
 }
 

uspace/lib/c/generic/device/hw_res.c

@@ -38 +38 @@
 #include <malloc.h>
 
-int hw_res_get_resource_list(int dev_phone, hw_resource_list_t *hw_resources)
+int hw_res_get_resource_list(async_sess_t *sess,
+    hw_resource_list_t *hw_resources)
 {
         sysarg_t count = 0;
-
-        int rc = async_req_1_1(dev_phone, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+        
+        async_exch_t *exch = async_exchange_begin(sess);
+        int rc = async_req_1_1(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
             HW_RES_GET_RESOURCE_LIST, &count);
-
-        hw_resources->count = count;
-        if (rc != EOK)
+        
+        if (rc != EOK) {
+                async_exchange_end(exch);
                 return rc;
+        }
         
         size_t size = count * sizeof(hw_resource_t);
-        hw_resources->resources = (hw_resource_t *)malloc(size);
-        if (!hw_resources->resources)
+        hw_resource_t *resources = (hw_resource_t *) malloc(size);
+        if (resources == NULL) {
+                // FIXME: This is protocol violation
+                async_exchange_end(exch);
                 return ENOMEM;
+        }
         
-        rc = async_data_read_start(dev_phone, hw_resources->resources, size);
+        rc = async_data_read_start(exch, resources, size);
+        async_exchange_end(exch);
+        
         if (rc != EOK) {
-                free(hw_resources->resources);
-                hw_resources->resources = NULL;
+                free(resources);
                 return rc;
         }
+        
+        hw_resources->resources = resources;
+        hw_resources->count = count;
         
         return EOK;
 }
 
-bool hw_res_enable_interrupt(int dev_phone)
+bool hw_res_enable_interrupt(async_sess_t *sess)
 {
-        int rc = async_req_1_0(dev_phone, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+        async_exch_t *exch = async_exchange_begin(sess);
+        int rc = async_req_1_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
             HW_RES_ENABLE_INTERRUPT);
-
-        return rc == EOK;
+        async_exchange_end(exch);
+        
+        return (rc == EOK);
 }