Changes in uspace/drv/char/ns8250/ns8250.c [b7fd2a0:38d150e] in mainline

File:

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

uspace/drv/char/ns8250/ns8250.c

@@ -40 +40 @@
 #include <stdio.h>
 #include <errno.h>
-#include <str_error.h>
 #include <stdbool.h>
 #include <fibril_synch.h>
@@ -251 +250 @@
  * @return              EOK on success or non-zero error code
  */
-static errno_t ns8250_read(chardev_srv_t *srv, void *buf, size_t count, size_t *nread)
+static int ns8250_read(chardev_srv_t *srv, void *buf, size_t count, size_t *nread)
 {
         ns8250_t *ns = srv_ns8250(srv);
@@ -295 +294 @@
  * @return              EOK on success or non-zero error code
  */
-static errno_t ns8250_write(chardev_srv_t *srv, const void *buf, size_t count,
+static int ns8250_write(chardev_srv_t *srv, const void *buf, size_t count,
     size_t *nwritten)
 {
@@ -309 +308 @@
 }
 
-static errno_t ns8250_open(chardev_srvs_t *, chardev_srv_t *);
-static errno_t ns8250_close(chardev_srv_t *);
+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 *);
 
@@ -324 +323 @@
 static void ns8250_char_conn(ipc_callid_t, ipc_call_t *, void *);
 
-static errno_t ns8250_dev_add(ddf_dev_t *dev);
-static errno_t ns8250_dev_remove(ddf_dev_t *dev);
+static int ns8250_dev_add(ddf_dev_t *dev);
+static int ns8250_dev_remove(ddf_dev_t *dev);
 
 /** The serial port device driver's standard operations. */
@@ -405 +404 @@
  *
  * @param ns            Serial port device
- * @return              Zero on success, error number otherwise
- */
-static errno_t ns8250_dev_initialize(ns8250_t *ns)
-{
-        errno_t ret = EOK;
+ * @return              Zero on success, negative error number otherwise
+ */
+static int ns8250_dev_initialize(ns8250_t *ns)
+{
+        int ret = EOK;
         
         ddf_msg(LVL_DEBUG, "ns8250_dev_initialize %s", ddf_dev_get_name(ns->dev));
@@ -499 +498 @@
  *
  * @param ns            Serial port device
- * @return              Zero on success, error number otherwise
- */
-static errno_t ns8250_interrupt_enable(ns8250_t *ns)
+ * @return              Zero on success, negative error number otherwise
+ */
+static int ns8250_interrupt_enable(ns8250_t *ns)
 {
         /* Enable interrupt using IRC service. */
-        errno_t rc = hw_res_enable_interrupt(ns->parent_sess, ns->irq);
+        int rc = hw_res_enable_interrupt(ns->parent_sess, ns->irq);
         if (rc != EOK)
                 return EIO;
@@ -544 +543 @@
  * @param port          The base address of the serial port device's ports.
  * @param baud_rate     The baud rate to be used by the device.
- * @return              Zero on success, error number otherwise (EINVAL
+ * @return              Zero on success, negative error number otherwise (EINVAL
  *                      if the specified baud_rate is not valid).
  */
-static errno_t ns8250_port_set_baud_rate(ns8250_regs_t *regs, unsigned int baud_rate)
+static int ns8250_port_set_baud_rate(ns8250_regs_t *regs, unsigned int baud_rate)
 {
         uint16_t divisor;
@@ -646 +645 @@
  *                      is invalid.
  */
-static errno_t ns8250_port_set_com_props(ns8250_regs_t *regs, unsigned int parity,
+static int ns8250_port_set_com_props(ns8250_regs_t *regs, unsigned int parity,
     unsigned int word_length, unsigned int stop_bits)
 {
@@ -803 +802 @@
  * @param ns            Serial port device
  */
-static inline errno_t ns8250_register_interrupt_handler(ns8250_t *ns,
-    cap_handle_t *handle)
+static inline int ns8250_register_interrupt_handler(ns8250_t *ns)
 {
         return register_interrupt_handler(ns->dev, ns->irq,
-            ns8250_interrupt_handler, NULL, handle);
+            ns8250_interrupt_handler, NULL);
 }
 
@@ -814 +812 @@
  * @param ns            Serial port device
  */
-static inline errno_t ns8250_unregister_interrupt_handler(ns8250_t *ns)
+static inline int ns8250_unregister_interrupt_handler(ns8250_t *ns)
 {
         return unregister_interrupt_handler(ns->dev, ns->irq_cap);
@@ -825 +823 @@
  * @param dev           The serial port device.
  */
-static errno_t ns8250_dev_add(ddf_dev_t *dev)
+static int ns8250_dev_add(ddf_dev_t *dev)
 {
         ns8250_t *ns = NULL;
@@ -831 +829 @@
         bool need_cleanup = false;
         bool need_unreg_intr_handler = false;
-        errno_t rc;
+        int rc;
         
         ddf_msg(LVL_DEBUG, "ns8250_dev_add %s (handle = %d)",
@@ -876 +874 @@
         
         /* Register interrupt handler. */
-        rc = ns8250_register_interrupt_handler(ns, &ns->irq_cap);
-        if (rc != EOK) {
+        ns->irq_cap = ns8250_register_interrupt_handler(ns);
+        if (ns->irq_cap < 0) {
                 ddf_msg(LVL_ERROR, "Failed to register interrupt handler.");
                 rc = EADDRNOTAVAIL;
@@ -888 +886 @@
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to enable the interrupt. Error code = "
-                    "%s.", str_error_name(rc));
+                    "%d.", rc);
                 goto fail;
         }
@@ -928 +926 @@
 }
 
-static errno_t ns8250_dev_remove(ddf_dev_t *dev)
+static int ns8250_dev_remove(ddf_dev_t *dev)
 {
         ns8250_t *ns = dev_ns8250(dev);
-        errno_t rc;
+        int rc;
         
         fibril_mutex_lock(&ns->mutex);
@@ -963 +961 @@
  * @param srv           Server-side connection structure
  */
-static errno_t ns8250_open(chardev_srvs_t *srvs, chardev_srv_t *srv)
+static int ns8250_open(chardev_srvs_t *srvs, chardev_srv_t *srv)
 {
         ns8250_t *ns = srv_ns8250(srv);
-        errno_t res;
+        int res;
         
         fibril_mutex_lock(&ns->mutex);
@@ -987 +985 @@
  * @param srv           Server-side connection structure
  */
-static errno_t ns8250_close(chardev_srv_t *srv)
+static int ns8250_close(chardev_srv_t *srv)
 {
         ns8250_t *data = srv_ns8250(srv);
@@ -1040 +1038 @@
  * @param stop_bits     The number of stop bits to be used.
  */
-static errno_t ns8250_set_props(ddf_dev_t *dev, unsigned int baud_rate,
+static int ns8250_set_props(ddf_dev_t *dev, unsigned int baud_rate,
     unsigned int parity, unsigned int word_length, unsigned int stop_bits)
 {
@@ -1049 +1047 @@
         ns8250_t *data = dev_ns8250(dev);
         ns8250_regs_t *regs = data->regs;
-        errno_t ret;
+        int ret;
         
         fibril_mutex_lock(&data->mutex);
@@ -1072 +1070 @@
         ns8250_t *ns8250 = srv_ns8250(srv);
         sysarg_t method = IPC_GET_IMETHOD(*call);
-        errno_t ret;
+        int ret;
         unsigned int baud_rate, parity, word_length, stop_bits;