Changeset ac307b2 in mainline for uspace/app/sportdmp/sportdmp.c

Timestamp:

2017-11-25T11:12:23Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

98cb5e0d

Parents:

f571ca49 (diff), 0851a3d (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 branch 'master' into callcaps

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 <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;
@@ -119 +122 @@
         }
 
+        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) {
@@ -138 +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);
@@ -152 +160 @@
         free(buf);
         serial_close(serial);
+        chardev_close(chardev);
         async_hangup(sess);
         return 0;