Changeset 75751db6 in mainline for uspace/drv/char/pl050/pl050.c

Timestamp:

2014-08-29T20:32:20Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

af0a2c7

Parents:

312e5ff

Message:

Factor out chardev IPC from pl050, i8042, xtkbd and ps2mouse.

File:

• uspace/drv/char/pl050/pl050.c (modified) (12 diffs)

uspace/drv/char/pl050/pl050.c

@@ -38 +38 @@
 #include <ddf/log.h>
 #include <device/hw_res_parsed.h>
+#include <io/chardev_srv.h>
 
 #define NAME "pl050"
@@ -45 +46 @@
 
 #define PL050_STAT_RXFULL  (1 << 4)
-
-enum {
-        IPC_CHAR_READ = DEV_FIRST_CUSTOM_METHOD,
-        IPC_CHAR_WRITE,
-};
 
 enum {
@@ -59 +55 @@
 static int pl050_fun_offline(ddf_fun_t *);
 static void pl050_char_conn(ipc_callid_t, ipc_call_t *, void *);
+static int pl050_read(chardev_srv_t *, void *, size_t);
+static int pl050_write(chardev_srv_t *, const void *, size_t);
 
 static driver_ops_t driver_ops = {
@@ -71 +69 @@
 };
 
+static chardev_ops_t pl050_chardev_ops = {
+        .read = pl050_read,
+        .write = pl050_write
+};
+
 typedef struct {
+        async_sess_t *parent_sess;
         ddf_dev_t *dev;
+
         ddf_fun_t *fun_a;
-        async_sess_t *parent_sess;
+        chardev_srvs_t cds;
+
         uintptr_t iobase;
         size_t iosize;
@@ -135 +141 @@
         size_t nidx;
 
+        ddf_msg(LVL_NOTE, "Interrupt");
+
         fibril_mutex_lock(&pl050->buf_lock);
         nidx = (pl050->buf_wp + 1) % buffer_size;
@@ -209 +217 @@
 }
 
-static int pl050_read(pl050_t *pl050, void *buffer, size_t size)
-{
+static int pl050_read(chardev_srv_t *srv, void *buffer, size_t size)
+{
+        pl050_t *pl050 = (pl050_t *)srv->srvs->sarg;
         uint8_t *bp = buffer;
+        size_t left;
         fibril_mutex_lock(&pl050->buf_lock);
 
-        while (size > 0) {
+        left = size;
+        while (left > 0) {
                 while (pl050->buf_rp == pl050->buf_wp)
                         fibril_condvar_wait(&pl050->buf_cv, &pl050->buf_lock);
                 *bp++ = pl050->buffer[pl050->buf_rp];
-                --size;
+                --left;
                 pl050->buf_rp = (pl050->buf_rp + 1) % buffer_size;
         }
@@ -224 +235 @@
         fibril_mutex_unlock(&pl050->buf_lock);
 
-        return EOK;
-}
-
-static int pl050_write(pl050_t *pl050, void *data, size_t size)
-{
-        return EOK;
+        return size;
+}
+
+static int pl050_write(chardev_srv_t *srv, const void *data, size_t size)
+{
+        return size;
 }
 
@@ -236 +247 @@
         pl050_t *pl050 = pl050_from_fun((ddf_fun_t *)arg);
 
-        /* Accept the connection */
-        async_answer_0(iid, EOK);
-
-        while (true) {
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-                sysarg_t method = IPC_GET_IMETHOD(call);
-                size_t size = IPC_GET_ARG1(call);
-
-                if (!method) {
-                        /* The other side has hung up */
-                        async_answer_0(callid, EOK);
-                        break;
-                }
-
-                switch (method) {
-                case IPC_CHAR_READ:
-                        if (size <= 4 * sizeof(sysarg_t)) {
-                                sysarg_t message[4] = {};
-
-                                pl050_read(pl050, (char *) message, size);
-                                async_answer_4(callid, size, message[0], message[1],
-                                    message[2], message[3]);
-                        } else
-                                async_answer_0(callid, ELIMIT);
-                        break;
-
-                case IPC_CHAR_WRITE:
-                        if (size <= 3 * sizeof(sysarg_t)) {
-                                const sysarg_t message[3] = {
-                                        IPC_GET_ARG2(call),
-                                        IPC_GET_ARG3(call),
-                                        IPC_GET_ARG4(call)
-                                };
-
-                                pl050_write(pl050, (char *) message, size);
-                                async_answer_0(callid, size);
-                        } else
-                                async_answer_0(callid, ELIMIT);
-
-                default:
-                        async_answer_0(callid, EINVAL);
-                }
-        }
+        chardev_conn(iid, icall, &pl050->cds);
 }
 
@@ -289 +257 @@
         int rc;
 
-        ddf_msg(LVL_DEBUG, "pl050_dev_add()");
+        ddf_msg(LVL_NOTE, "pl050_dev_add()");
 
         pl050 = ddf_dev_data_alloc(dev, sizeof(pl050_t));
@@ -308 +276 @@
         pl050->dev = dev;
 
+if (1) {
         rc = pl050_init(pl050);
         if (rc != EOK)
                 goto error;
-
+}
         rc = ddf_fun_add_match_id(fun_a, "char/xtkbd", 10);
         if (rc != EOK) {
@@ -319 +288 @@
         }
 
+        ddf_msg(LVL_NOTE, "Init srvs");
+        if (1) {
+        chardev_srvs_init(&pl050->cds);
+        pl050->cds.ops = &pl050_chardev_ops;
+        pl050->cds.sarg = pl050;
+
         ddf_fun_set_conn_handler(fun_a, pl050_char_conn);
-
+}
         rc = ddf_fun_bind(fun_a);
         if (rc != EOK) {
@@ -328 +303 @@
         }
 
+        ddf_msg(LVL_NOTE, "Device added");
         ddf_msg(LVL_DEBUG, "Device added.");
         return EOK;