Changeset 7943c43 in mainline for uspace/srv/bd/rd/rd.c

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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/bd/rd/rd.c (modified) (3 diffs)

uspace/srv/bd/rd/rd.c

@@ -105 +105 @@
         unsigned int flags;
         if (async_share_out_receive(&callid, &comm_size, &flags)) {
-                fs_va = as_get_mappable_page(comm_size);
-                if (fs_va) {
-                        (void) async_share_out_finalize(callid, fs_va);
-                } else {
+                (void) async_share_out_finalize(callid, &fs_va);
+                if (fs_va == (void *) -1) {
                         async_answer_0(callid, EHANGUP);
                         return;
@@ -224 +222 @@
         
         rd_size = ALIGN_UP(size, block_size);
-        rd_addr = as_get_mappable_page(rd_size);
-        
         unsigned int flags =
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE;
-        ret = physmem_map((void *) addr_phys, rd_addr,
-            ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags);
-        if (ret < 0) {
+        
+        ret = physmem_map((void *) addr_phys,
+            ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags, &rd_addr);
+        if (ret != EOK) {
                 printf("%s: Error mapping RAM disk\n", NAME);
                 return false;
@@ -238 +235 @@
             (void *) addr_phys, size);
         
-        ret = loc_server_register(NAME, rd_connection);
+        async_set_client_connection(rd_connection);
+        ret = loc_server_register(NAME);
         if (ret < 0) {
                 printf("%s: Unable to register driver (%d)\n", NAME, ret);