Changeset 132ab5d1 in mainline for uspace/srv/hid/isdv4_tablet/main.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/srv/hid/isdv4_tablet/main.c (modified) (3 diffs)

uspace/srv/hid/isdv4_tablet/main.c

@@ -27 +27 @@
  */
 
-#include <char_dev_iface.h>
+#include <async.h>
 #include <errno.h>
-#include <ipc/serial_ctl.h>
+#include <fibril_synch.h>
+#include <io/serial.h>
+#include <ipc/mouseev.h>
 #include <loc.h>
+#include <stddef.h>
 #include <stdio.h>
-#include <fibril_synch.h>
-#include <abi/ipc/methods.h>
-#include <ipc/mouseev.h>
-#include <inttypes.h>
 #include <task.h>
 
@@ -179 +178 @@
         sysarg_t baud = 38400;
         service_id_t svc_id;
+        serial_t *serial;
         char *serial_port_name = NULL;
 
@@ -268 +268 @@
         if (!sess) {
                 fprintf(stderr, "Failed connecting to service\n");
-        }
-
-        async_exch_t *exch = async_exchange_begin(sess);
-        rc = async_req_4_0(exch, SERIAL_SET_COM_PROPS, baud,
-            SERIAL_NO_PARITY, 8, 1);
-        async_exchange_end(exch);
-
+                return 2;
+        }
+
+        rc = serial_open(sess, &serial);
+        if (rc != EOK) {
+                fprintf(stderr, "Failed opening serial port\n");
+                return 2;
+        }
+
+        rc = serial_set_comm_props(serial, baud, SERIAL_NO_PARITY, 8, 1);
         if (rc != EOK) {
                 fprintf(stderr, "Failed setting serial properties\n");