Changeset b7068da in mainline for uspace/srv/hid/fb/fb.c

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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

File:

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

uspace/srv/hid/fb/fb.c

@@ -304 +304 @@
         }
         
-        frontbuf->data = as_get_mappable_page(frontbuf->size);
-        int rc = async_answer_1(callid, EOK, (sysarg_t) frontbuf->data);
-        if (rc != EOK) {
+        int rc = async_share_out_finalize(callid, &frontbuf->data);
+        if ((rc != EOK) || (frontbuf->data == (void *) -1)) {
                 free(frontbuf);
                 async_answer_0(iid, ENOMEM);
@@ -348 +347 @@
         }
         
-        imagemap->data = as_get_mappable_page(imagemap->size);
-        int rc = async_answer_1(callid, EOK, (sysarg_t) imagemap->data);
-        if (rc != EOK) {
+        int rc = async_share_out_finalize(callid, &imagemap->data);
+        if ((rc != EOK) || (imagemap->data == (void *) -1)) {
                 free(imagemap);
                 async_answer_0(iid, ENOMEM);
@@ -989 +987 @@
         
         /* Register server */
-        int rc = loc_server_register(NAME, client_connection);
+        async_set_client_connection(client_connection);
+        int rc = loc_server_register(NAME);
         if (rc != EOK) {
                 printf("%s: Unable to register driver (%d)\n", NAME, rc);