Changeset 74017ce in mainline for uspace/lib

Timestamp:

2017-11-22T17:36:54Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7a6065c

Parents:

c4c6025

git-author:

Jiri Svoboda <jiri@…> (2017-11-22 15:53:34)

git-committer:

Jiri Svoboda <jiri@…> (2017-11-22 17:36:54)

Message:

Convert char_dev_iface users to chardev.

Location:

uspace/lib

Files:

• c/generic/io/chardev_srv.c (modified) (1 diff)
• c/include/io/chardev_srv.h (modified) (1 diff)
• c/include/ipc/chardev.h (modified) (1 diff)
• c/include/ipc/serial_ctl.h (modified) (2 diffs)
• drv/Makefile (modified) (1 diff)
• drv/generic/dev_iface.c (modified) (2 diffs)
• drv/generic/private/remote_char_dev.h (deleted)
• drv/generic/remote_char_dev.c (deleted)

uspace/lib/c/generic/io/chardev_srv.c

@@ -169 +169 @@
                         break;
                 default:
-                        async_answer_0(callid, EINVAL);
+                        if (srv->srvs->ops->def_handler != NULL)
+                                srv->srvs->ops->def_handler(srv, callid, &call);
+                        else
+                                async_answer_0(callid, ENOTSUP);
                 }
         }

uspace/lib/c/include/io/chardev_srv.h

@@ -61 +61 @@
         int (*read)(chardev_srv_t *, void *, size_t, size_t *);
         int (*write)(chardev_srv_t *, const void *, size_t, size_t *);
+        void (*def_handler)(chardev_srv_t *, ipc_callid_t, ipc_call_t *);
 };
 

uspace/lib/c/include/ipc/chardev.h

@@ -41 +41 @@
 typedef enum {
         CHARDEV_READ = IPC_FIRST_USER_METHOD,
-        CHARDEV_WRITE
+        CHARDEV_WRITE,
 } chardev_request_t;
+
+enum {
+        CHARDEV_LIMIT = CHARDEV_WRITE + 1
+};
 
 #endif

uspace/lib/c/include/ipc/serial_ctl.h

@@ -30 +30 @@
 #define LIBC_IPC_SERIAL_CTL_H_
 
-#include <ipc/dev_iface.h>
+#include <ipc/chardev.h>
 
 /** IPC methods for getting/setting serial communication properties
@@ -41 +41 @@
  */
 typedef enum {
-        SERIAL_GET_COM_PROPS = DEV_FIRST_CUSTOM_METHOD,
+        SERIAL_GET_COM_PROPS = CHARDEV_LIMIT,
         SERIAL_SET_COM_PROPS
 } serial_ctl_t;

uspace/lib/drv/Makefile

@@ -43 +43 @@
         generic/remote_hw_res.c \
         generic/remote_pio_window.c \
-        generic/remote_char_dev.c \
         generic/remote_nic.c \
         generic/remote_ieee80211.c \

uspace/lib/drv/generic/dev_iface.c

@@ -42 +42 @@
 #include "remote_hw_res.h"
 #include "remote_pio_window.h"
-#include "remote_char_dev.h"
 #include "remote_clock_dev.h"
 #include "remote_led_dev.h"
@@ -62 +61 @@
                 [HW_RES_DEV_IFACE] = &remote_hw_res_iface,
                 [PIO_WINDOW_DEV_IFACE] = &remote_pio_window_iface,
-                [CHAR_DEV_IFACE] = &remote_char_dev_iface,
                 [NIC_DEV_IFACE] = &remote_nic_iface,
                 [IEEE80211_DEV_IFACE] = &remote_ieee80211_iface,