Changeset 7137fe3f in mainline

Timestamp:

2012-09-18T18:57:18Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

df7f9fb5

Parents:

289fa65 (diff), ce1df04 (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 mainline changes

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/app/devctl/devctl.c (modified) (1 diff)
• uspace/lib/drv/generic/remote_clock_dev.c (modified) (2 diffs)

boot/Makefile.common

@@ -198 +198 @@
         $(USPACE_PATH)/app/websrv/websrv \
         $(USPACE_PATH)/app/date/date \
-        $(USPACE_PATH)/app/vdemo/vdemo \
-        $(USPACE_PATH)/app/vlaunch/vlaunch \
-        $(USPACE_PATH)/app/vterm/vterm \
         $(USPACE_PATH)/app/vdemo/vdemo
 

uspace/app/devctl/devctl.c

@@ -151 +151 @@
         rc = devman_fun_offline(funh);
         if (rc != EOK) {
-                printf(NAME ": Failed to offline function '%s'.\n", path);
+                printf(NAME ": Failed to offline function '%s' (%s)\n", path,
+                    str_error(rc));
                 return rc;
         }

uspace/lib/drv/generic/remote_clock_dev.c

@@ -85 +85 @@
         if (!clock_dev_ops->time_get) {
                 /* The driver does not provide the time_get() functionality */
-                async_data_read_finalize(cid, NULL, 0);
+                async_answer_0(cid, ENOTSUP);
                 async_answer_0(callid, ENOTSUP);
                 return;
@@ -94 +94 @@
         if (rc != EOK) {
                 /* Some error occurred */
-                async_data_read_finalize(cid, NULL, 0);
+                async_answer_0(cid, rc);
                 async_answer_0(callid, rc);
                 return;