Changeset ab936440 in mainline for uspace/app/tester/hw/serial/serial1.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/app/tester/hw/serial/serial1.c (modified) (1 diff)

uspace/app/tester/hw/serial/serial1.c

@@ -136 +136 @@
         while (total < cnt) {
 
-                rc = chardev_read(chardev, buf, cnt - total, &nread);
+                rc = chardev_read(chardev, buf, cnt - total, &nread,
+                    chardev_f_none);
                 if (rc != EOK) {
                         (void) serial_set_comm_props(serial, old_baud,