Changeset 97c7682 in mainline for uspace/srv/hid/fb/fb.c

Timestamp:

2012-07-14T11:18:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

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

uspace/srv/hid/fb/fb.c

@@ -305 +305 @@
         
         int rc = async_share_out_finalize(callid, &frontbuf->data);
-        if ((rc != EOK) || (frontbuf->data == (void *) -1)) {
+        if ((rc != EOK) || (frontbuf->data == AS_MAP_FAILED)) {
                 free(frontbuf);
                 async_answer_0(iid, ENOMEM);
@@ -348 +348 @@
         
         int rc = async_share_out_finalize(callid, &imagemap->data);
-        if ((rc != EOK) || (imagemap->data == (void *) -1)) {
+        if ((rc != EOK) || (imagemap->data == AS_MAP_FAILED)) {
                 free(imagemap);
                 async_answer_0(iid, ENOMEM);
@@ -990 +990 @@
         int rc = loc_server_register(NAME);
         if (rc != EOK) {
-                printf("%s: Unable to register driver (%d)\n", NAME, rc);
-                return 1;
+                printf("%s: Unable to register driver\n", NAME);
+                return rc;
         }