Changeset 476f62c in mainline for uspace/lib/drv/generic/remote_char_dev.c

Timestamp:

2014-01-17T17:26:48Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5828554, cf982ff

Parents:

61b5b73d (diff), 66be0288 (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 libdrv cleanup.

• move 'client side' device iface to libdrv (from libc)
• hide remote_* libdrv headers
• add a bunch of const qualifiers and change static data to const
• cleanup: index initialized arrays, array size macro, removes duplicit enums, …

TODO:

move hw_res, pio_window and co to libdrv. (too entangled with libc to move right now)
move clock_dev iface to libdrv. (also tied to libc, we need a time provider solution)

File:

• uspace/lib/drv/generic/remote_char_dev.c (modified) (3 diffs)

uspace/lib/drv/generic/remote_char_dev.c

@@ -35 +35 @@
 #include <async.h>
 #include <errno.h>
+#include <macros.h>
 
 #include "ops/char_dev.h"
+#include "char_dev_iface.h"
 #include "ddf/driver.h"
 
 #define MAX_CHAR_RW_COUNT 256
+
+/** Read to or write from device.
+ *
+ * Helper function to read to or write from a device
+ * using its character interface.
+ *
+ * @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.
+ *
+ */
+static ssize_t char_dev_rw(async_sess_t *sess, void *buf, size_t size, bool read)
+{
+        ipc_call_t answer;
+        aid_t req;
+        int ret;
+        
+        async_exch_t *exch = async_exchange_begin(sess);
+        
+        if (read) {
+                req = async_send_1(exch, DEV_IFACE_ID(CHAR_DEV_IFACE),
+                    CHAR_DEV_READ, &answer);
+                ret = async_data_read_start(exch, buf, size);
+        } else {
+                req = async_send_1(exch, DEV_IFACE_ID(CHAR_DEV_IFACE),
+                    CHAR_DEV_WRITE, &answer);
+                ret = async_data_write_start(exch, buf, size);
+        }
+        
+        async_exchange_end(exch);
+        
+        sysarg_t rc;
+        if (ret != EOK) {
+                async_wait_for(req, &rc);
+                if (rc == EOK)
+                        return (ssize_t) ret;
+                
+                return (ssize_t) rc;
+        }
+        
+        async_wait_for(req, &rc);
+        
+        ret = (int) rc;
+        if (ret != EOK)
+                return (ssize_t) ret;
+        
+        return (ssize_t) IPC_GET_ARG1(answer);
+}
+
+/** Read from character device.
+ *
+ * @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.
+ *
+ */
+ssize_t char_dev_read(async_sess_t *sess, void *buf, size_t size)
+{
+        return char_dev_rw(sess, buf, size, true);
+}
+
+/** Write to character device.
+ *
+ * @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.
+ *
+ */
+ssize_t char_dev_write(async_sess_t *sess, void *buf, size_t size)
+{
+        return char_dev_rw(sess, buf, size, false);
+}
 
 static void remote_char_read(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -45 +131 @@
 
 /** Remote character interface operations. */
-static remote_iface_func_ptr_t remote_char_dev_iface_ops[] = {
-        &remote_char_read,
-        &remote_char_write
+static const remote_iface_func_ptr_t remote_char_dev_iface_ops[] = {
+        [CHAR_DEV_READ] = remote_char_read,
+        [CHAR_DEV_WRITE] = remote_char_write
 };
 
@@ -55 +141 @@
  * character interface.
  */
-remote_iface_t remote_char_dev_iface = {
-        .method_count = sizeof(remote_char_dev_iface_ops) /
-            sizeof(remote_iface_func_ptr_t),
+const remote_iface_t remote_char_dev_iface = {
+        .method_count = ARRAY_SIZE(remote_char_dev_iface_ops),
         .methods = remote_char_dev_iface_ops
 };