Changeset 5a6cc679 in mainline for uspace/drv/hid/ps2mouse

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

Location:

uspace/drv/hid/ps2mouse

Files:

• main.c (modified) (2 diffs)
• ps2mouse.c (modified) (9 diffs)
• ps2mouse.h (modified) (1 diff)

uspace/drv/hid/ps2mouse/main.c

@@ -45 +45 @@
 #define NAME "ps2mouse"
 
-static int mouse_add(ddf_dev_t *device);
+static errno_t mouse_add(ddf_dev_t *device);
 
 /** DDF driver ops. */
@@ -78 +78 @@
  * @return Error code.
  */
-static int mouse_add(ddf_dev_t *device)
+static errno_t mouse_add(ddf_dev_t *device)
 {
-        int rc;
+        errno_t rc;
 
         if (!device)

uspace/drv/hid/ps2mouse/ps2mouse.c

@@ -77 +77 @@
         uint8_t data = 0; \
         size_t nread; \
-        const int rc = chardev_read((mouse)->chardev, &data, 1, &nread); \
+        const errno_t rc = chardev_read((mouse)->chardev, &data, 1, &nread); \
         if (rc != EOK) { \
                 ddf_msg(LVL_ERROR, "Failed reading byte: %s", str_error_name(rc));\
@@ -94 +94 @@
         uint8_t data = (value); \
         size_t nwr; \
-        const int rc = chardev_write((mouse)->chardev, &data, 1, &nwr); \
+        const errno_t rc = chardev_write((mouse)->chardev, &data, 1, &nwr); \
         if (rc != EOK) { \
                 ddf_msg(LVL_ERROR, "Failed writing byte: %s", str_error_name(rc)); \
@@ -101 +101 @@
 } while (0)
 
-static int polling_ps2(void *);
-static int polling_intellimouse(void *);
-static int probe_intellimouse(ps2_mouse_t *, bool);
+static errno_t polling_ps2(void *);
+static errno_t polling_intellimouse(void *);
+static errno_t probe_intellimouse(ps2_mouse_t *, bool);
 static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
 
@@ -120 +120 @@
  * @return EOK on success or non-zero error code
  */
-int ps2_mouse_init(ps2_mouse_t *mouse, ddf_dev_t *dev)
+errno_t ps2_mouse_init(ps2_mouse_t *mouse, ddf_dev_t *dev)
 {
         async_sess_t *parent_sess;
         bool bound = false;
-        int rc;
+        errno_t rc;
 
         mouse->client_sess = NULL;
@@ -165 +165 @@
 
         /* Probe IntelliMouse extensions. */
-        int (*polling_f)(void*) = polling_ps2;
+        errno_t (*polling_f)(void*) = polling_ps2;
         if (probe_intellimouse(mouse, false) == EOK) {
                 ddf_msg(LVL_NOTE, "Enabled IntelliMouse extensions");
@@ -223 +223 @@
  * @return EOK on success or non-zero error code
  */
-static int ps2_mouse_read_packet(ps2_mouse_t *mouse, void *pbuf, size_t psize)
-{
-        int rc;
+static errno_t ps2_mouse_read_packet(ps2_mouse_t *mouse, void *pbuf, size_t psize)
+{
+        errno_t rc;
         size_t pos;
         size_t nread;
@@ -248 +248 @@
  * @return Never.
  */
-int polling_ps2(void *arg)
+errno_t polling_ps2(void *arg)
 {
         ps2_mouse_t *mouse = (ps2_mouse_t *) arg;
-        int rc;
+        errno_t rc;
 
         bool buttons[PS2_BUTTON_COUNT] = {};
@@ -300 +300 @@
  * @return Never.
  */
-static int polling_intellimouse(void *arg)
+static errno_t polling_intellimouse(void *arg)
 {
         ps2_mouse_t *mouse = (ps2_mouse_t *) arg;
-        int rc;
+        errno_t rc;
 
         bool buttons[INTELLIMOUSE_BUTTON_COUNT] = {};
@@ -373 +373 @@
  * See http://www.computer-engineering.org/ps2mouse/ for details.
  */
-static int probe_intellimouse(ps2_mouse_t *mouse, bool buttons)
+static errno_t probe_intellimouse(ps2_mouse_t *mouse, bool buttons)
 {
         MOUSE_WRITE_BYTE(mouse, PS2_MOUSE_SET_SAMPLE_RATE);

uspace/drv/hid/ps2mouse/ps2mouse.h

@@ -53 +53 @@
 } ps2_mouse_t;
 
-extern int ps2_mouse_init(ps2_mouse_t *, ddf_dev_t *);
+extern errno_t ps2_mouse_init(ps2_mouse_t *, ddf_dev_t *);
 
 #endif