Changeset 5a6cc679 in mainline for uspace/lib/c/include/io/con_srv.h

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/lib/c/include/io/con_srv.h (modified) (2 diffs)

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

@@ -67 +67 @@
 
 struct con_ops {
-        int (*open)(con_srvs_t *, con_srv_t *);
-        int (*close)(con_srv_t *);
-        int (*read)(con_srv_t *, void *, size_t, size_t *);
-        int (*write)(con_srv_t *, void *, size_t, size_t *);
+        errno_t (*open)(con_srvs_t *, con_srv_t *);
+        errno_t (*close)(con_srv_t *);
+        errno_t (*read)(con_srv_t *, void *, size_t, size_t *);
+        errno_t (*write)(con_srv_t *, void *, size_t, size_t *);
         void (*sync)(con_srv_t *);
         void (*clear)(con_srv_t *);
         void (*set_pos)(con_srv_t *, sysarg_t col, sysarg_t row);
-        int (*get_pos)(con_srv_t *, sysarg_t *, sysarg_t *);
-        int (*get_size)(con_srv_t *, sysarg_t *, sysarg_t *);
-        int (*get_color_cap)(con_srv_t *, console_caps_t *);
+        errno_t (*get_pos)(con_srv_t *, sysarg_t *, sysarg_t *);
+        errno_t (*get_size)(con_srv_t *, sysarg_t *, sysarg_t *);
+        errno_t (*get_color_cap)(con_srv_t *, console_caps_t *);
         void (*set_style)(con_srv_t *, console_style_t);
         void (*set_color)(con_srv_t *, console_color_t, console_color_t,
@@ -82 +82 @@
         void (*set_rgb_color)(con_srv_t *, pixel_t, pixel_t);
         void (*set_cursor_visibility)(con_srv_t *, bool);
-        int (*get_event)(con_srv_t *, cons_event_t *);
+        errno_t (*get_event)(con_srv_t *, cons_event_t *);
 };
 
 extern void con_srvs_init(con_srvs_t *);
 
-extern int con_conn(ipc_callid_t, ipc_call_t *, con_srvs_t *);
+extern errno_t con_conn(ipc_callid_t, ipc_call_t *, con_srvs_t *);
 
 #endif