Changeset 132ab5d1 in mainline for uspace/app/sportdmp/sportdmp.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/app/sportdmp/sportdmp.c (modified) (5 diffs)

uspace/app/sportdmp/sportdmp.c

@@ -27 +27 @@
  */
 
-#include <char_dev_iface.h>
 #include <errno.h>
-#include <ipc/serial_ctl.h>
+#include <io/chardev.h>
+#include <io/serial.h>
 #include <loc.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #define BUF_SIZE 1
@@ -44 +45 @@
         sysarg_t baud = 9600;
         service_id_t svc_id;
+        chardev_t *chardev;
+        serial_t *serial;
+        size_t nread;
 
         int arg = 1;
@@ -113 +117 @@
         async_sess_t *sess = loc_service_connect(svc_id, INTERFACE_DDF,
             IPC_FLAG_BLOCKING);
-        if (!sess) {
+        if (sess == NULL) {
                 fprintf(stderr, "Failed connecting to service\n");
+                return 2;
         }
 
-        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);
+        rc = chardev_open(sess, &chardev);
+        if (rc != EOK) {
+                fprintf(stderr, "Failed opening character device\n");
+                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");
@@ -134 +147 @@
 
         while (true) {
-                ssize_t read = char_dev_read(sess, buf, BUF_SIZE);
-                if (read < 0) {
-                        fprintf(stderr, "Failed reading from serial device\n");
+                rc = chardev_read(chardev, buf, BUF_SIZE, &nread);
+                for (size_t i = 0; i < nread; i++) {
+                        printf("%02hhx ", buf[i]);
+                }
+                if (rc != EOK) {
+                        fprintf(stderr, "\nFailed reading from serial device\n");
                         break;
-                }
-                ssize_t i;
-                for (i = 0; i < read; i++) {
-                        printf("%02hhx ", buf[i]);
                 }
                 fflush(stdout);
@@ -147 +159 @@
 
         free(buf);
+        serial_close(serial);
+        chardev_close(chardev);
+        async_hangup(sess);
         return 0;
 }