Changes in uspace/drv/char/ns8250/ns8250.c [d51838f:dd8ab1c] in mainline

File:

• uspace/drv/char/ns8250/ns8250.c (modified) (21 diffs)

uspace/drv/char/ns8250/ns8250.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Lenka Trochtova
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2017 Jiri Svoboda
  * All rights reserved.
  *
@@ -40 +40 @@
 #include <stdio.h>
 #include <errno.h>
+#include <str_error.h>
 #include <stdbool.h>
 #include <fibril_synch.h>
@@ -46 +47 @@
 #include <ctype.h>
 #include <macros.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <dirent.h>
 #include <ddi.h>
@@ -53 +54 @@
 #include <ddf/interrupt.h>
 #include <ddf/log.h>
-#include <ops/char_dev.h>
+#include <io/chardev_srv.h>
 
 #include <device/hw_res.h>
@@ -153 +154 @@
         /** DDF function node */
         ddf_fun_t *fun;
+        /** Character device service */
+        chardev_srvs_t cds;
         /** Parent session */
         async_sess_t *parent_sess;
@@ -189 +192 @@
 }
 
+/** Obtain soft-state structure from chardev srv */
+static ns8250_t *srv_ns8250(chardev_srv_t *srv)
+{
+        return (ns8250_t *)srv->srvs->sarg;
+}
+
+
 /** Find out if there is some incoming data available on the serial port.
  *
@@ -234 +244 @@
 /** Read data from the serial port device.
  *
- * @param fun           The serial port function
+ * @param srv           Server-side connection data
  * @param buf           The output buffer for read data.
  * @param count         The number of bytes to be read.
- *
- * @return              The number of bytes actually read on success, negative
- *                      error number otherwise.
- */
-static int ns8250_read(ddf_fun_t *fun, char *buf, size_t count)
-{
-        ns8250_t *ns = fun_ns8250(fun);
-        int ret = 0;
-        
-        if (count == 0) return 0;
+ * @param nread         Place to store number of bytes actually read
+ *
+ * @return              EOK on success or non-zero error code
+ */
+static int ns8250_read(chardev_srv_t *srv, void *buf, size_t count, size_t *nread)
+{
+        ns8250_t *ns = srv_ns8250(srv);
+        char *bp = (char *) buf;
+        size_t pos = 0;
+        
+        if (count == 0) {
+                *nread = 0;
+                return EOK;
+        }
         
         fibril_mutex_lock(&ns->mutex);
         while (buf_is_empty(&ns->input_buffer))
                 fibril_condvar_wait(&ns->input_buffer_available, &ns->mutex);
-        while (!buf_is_empty(&ns->input_buffer) && (size_t)ret < count) {
-                buf[ret] = (char)buf_pop_front(&ns->input_buffer);
-                ret++;
+        while (!buf_is_empty(&ns->input_buffer) && pos < count) {
+                bp[pos] = (char)buf_pop_front(&ns->input_buffer);
+                pos++;
         }
         fibril_mutex_unlock(&ns->mutex);
         
-        return ret;
+        *nread = pos;
+        return EOK;
 }
 
@@ -274 +289 @@
 /** Write data to the serial port.
  *
- * @param fun           The serial port function
+ * @param srv           Server-side connection data
  * @param buf           The data to be written
  * @param count         The number of bytes to be written
- * @return              Zero on success
- */
-static int ns8250_write(ddf_fun_t *fun, char *buf, size_t count)
-{
-        ns8250_t *ns = fun_ns8250(fun);
+ * @param nwritten      Place to store number of bytes successfully written
+ * @return              EOK on success or non-zero error code
+ */
+static int ns8250_write(chardev_srv_t *srv, const void *buf, size_t count,
+    size_t *nwritten)
+{
+        ns8250_t *ns = srv_ns8250(srv);
         size_t idx;
+        uint8_t *bp = (uint8_t *) buf;
         
         for (idx = 0; idx < count; idx++)
-                ns8250_putchar(ns, (uint8_t) buf[idx]);
-        
-        return count;
-}
-
-static ddf_dev_ops_t ns8250_dev_ops;
+                ns8250_putchar(ns, bp[idx]);
+        
+        *nwritten = count;
+        return EOK;
+}
+
+static int ns8250_open(chardev_srvs_t *, chardev_srv_t *);
+static int ns8250_close(chardev_srv_t *);
+static void ns8250_default_handler(chardev_srv_t *, ipc_callid_t, ipc_call_t *);
 
 /** The character interface's callbacks. */
-static char_dev_ops_t ns8250_char_dev_ops = {
-        .read = &ns8250_read,
-        .write = &ns8250_write
+static chardev_ops_t ns8250_chardev_ops = {
+        .open = ns8250_open,
+        .close = ns8250_close,
+        .read = ns8250_read,
+        .write = ns8250_write,
+        .def_handler = ns8250_default_handler
 };
+
+static void ns8250_char_conn(ipc_callid_t, ipc_call_t *, void *);
 
 static int ns8250_dev_add(ddf_dev_t *dev);
@@ -758 +784 @@
  *
  */
-static inline void ns8250_interrupt_handler(ipc_callid_t iid, ipc_call_t *icall,
-    ddf_dev_t *dev)
+static inline void ns8250_interrupt_handler(ipc_call_t *icall, ddf_dev_t *dev)
 {
         ns8250_t *ns = dev_ns8250(dev);
@@ -778 +803 @@
  * @param ns            Serial port device
  */
-static inline int ns8250_register_interrupt_handler(ns8250_t *ns)
+static inline int ns8250_register_interrupt_handler(ns8250_t *ns,
+    cap_handle_t *handle)
 {
         return register_interrupt_handler(ns->dev, ns->irq,
-            ns8250_interrupt_handler, NULL);
+            ns8250_interrupt_handler, NULL, handle);
 }
 
@@ -850 +876 @@
         
         /* Register interrupt handler. */
-        ns->irq_cap = ns8250_register_interrupt_handler(ns);
-        if (ns->irq_cap < 0) {
+        rc = ns8250_register_interrupt_handler(ns, &ns->irq_cap);
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to register interrupt handler.");
                 rc = EADDRNOTAVAIL;
@@ -862 +888 @@
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to enable the interrupt. Error code = "
-                    "%d.", rc);
+                    "%s.", str_error_name(rc));
                 goto fail;
         }
@@ -872 +898 @@
         }
         
-        /* Set device operations. */
-        ddf_fun_set_ops(fun, &ns8250_dev_ops);
+        ddf_fun_set_conn_handler(fun, ns8250_char_conn);
+        
+        chardev_srvs_init(&ns->cds);
+        ns->cds.ops = &ns8250_chardev_ops;
+        ns->cds.sarg = ns;
+        
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {
@@ -930 +960 @@
  * device.
  *
- * @param dev           The device.
- */
-static int ns8250_open(ddf_fun_t *fun)
-{
-        ns8250_t *ns = fun_ns8250(fun);
+ * @param srvs          Service structure
+ * @param srv           Server-side connection structure
+ */
+static int ns8250_open(chardev_srvs_t *srvs, chardev_srv_t *srv)
+{
+        ns8250_t *ns = srv_ns8250(srv);
         int res;
         
@@ -954 +985 @@
  * the device.
  *
- * @param dev           The device.
- */
-static void ns8250_close(ddf_fun_t *fun)
-{
-        ns8250_t *data = fun_ns8250(fun);
+ * @param srv           Server-side connection structure
+ */
+static int ns8250_close(chardev_srv_t *srv)
+{
+        ns8250_t *data = srv_ns8250(srv);
         
         fibril_mutex_lock(&data->mutex);
@@ -968 +999 @@
         
         fibril_mutex_unlock(&data->mutex);
+        
+        return EOK;
 }
 
@@ -1034 +1067 @@
  * Configure the parameters of the serial communication.
  */
-static void ns8250_default_handler(ddf_fun_t *fun, ipc_callid_t callid,
+static void ns8250_default_handler(chardev_srv_t *srv, ipc_callid_t callid,
     ipc_call_t *call)
 {
+        ns8250_t *ns8250 = srv_ns8250(srv);
         sysarg_t method = IPC_GET_IMETHOD(*call);
         int ret;
@@ -1043 +1077 @@
         switch (method) {
         case SERIAL_GET_COM_PROPS:
-                ns8250_get_props(ddf_fun_get_dev(fun), &baud_rate, &parity, &word_length,
+                ns8250_get_props(ns8250->dev, &baud_rate, &parity, &word_length,
                     &stop_bits);
                 async_answer_4(callid, EOK, baud_rate, parity, word_length,
@@ -1054 +1088 @@
                 word_length = IPC_GET_ARG3(*call);
                 stop_bits = IPC_GET_ARG4(*call);
-                ret = ns8250_set_props(ddf_fun_get_dev(fun), baud_rate, parity, word_length,
+                ret = ns8250_set_props(ns8250->dev, baud_rate, parity, word_length,
                     stop_bits);
                 async_answer_0(callid, ret);
@@ -1064 +1098 @@
 }
 
+void ns8250_char_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        ns8250_t *ns8250 = fun_ns8250((ddf_fun_t *)arg);
+
+        chardev_conn(iid, icall, &ns8250->cds);
+}
+
 /** Initialize the serial port driver.
  *
@@ -1072 +1113 @@
 {
         ddf_log_init(NAME);
-        
-        ns8250_dev_ops.open = &ns8250_open;
-        ns8250_dev_ops.close = &ns8250_close;
-        
-        ns8250_dev_ops.interfaces[CHAR_DEV_IFACE] = &ns8250_char_dev_ops;
-        ns8250_dev_ops.default_handler = &ns8250_default_handler;
 }