Changeset 5f70118 in mainline for uspace/srv/bd/ata_bd/ata_bd.c

Timestamp:

2010-01-10T12:16:59Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c77a64f

Parents:

309ede1 (diff), 1ac3a52 (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/ata_bd/ata_bd.c (modified) (6 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -55 +55 @@
 #include <async.h>
 #include <as.h>
-#include <fibril_sync.h>
+#include <fibril_synch.h>
 #include <string.h>
 #include <devmap.h>
@@ -66 +66 @@
 #include "ata_bd.h"
 
-#define NAME "ata_bd"
+#define NAME       "ata_bd"
+#define NAMESPACE  "bd"
 
 /** Physical block size. Should be always 512. */
@@ -135 +136 @@
                 if (disk[i].present == false)
                         continue;
-
-                snprintf(name, 16, "disk%d", i);
+                
+                snprintf(name, 16, "%s/disk%d", NAMESPACE, i);
                 rc = devmap_device_register(name, &disk[i].dev_handle);
                 if (rc != EOK) {
                         devmap_hangup_phone(DEVMAP_DRIVER);
-                        printf(NAME ": Unable to register device %s.\n",
-                                name);
+                        printf(NAME ": Unable to register device %s.\n", name);
                         return rc;
                 }
@@ -252 +252 @@
         ipc_answer_0(iid, EOK);
 
-        if (!ipc_share_out_receive(&callid, &comm_size, &flags)) {
+        if (!async_share_out_receive(&callid, &comm_size, &flags)) {
                 ipc_answer_0(callid, EHANGUP);
                 return;
@@ -263 +263 @@
         }
 
-        (void) ipc_share_out_finalize(callid, fs_va);
+        (void) async_share_out_finalize(callid, fs_va);
 
         while (1) {
@@ -296 +296 @@
                         ipc_answer_1(callid, EOK, block_size);
                         continue;
+                case BD_GET_NUM_BLOCKS:
+                        ipc_answer_2(callid, EOK, LOWER32(disk[disk_id].blocks),
+                            UPPER32(disk[disk_id].blocks));
+                        continue;
                 default:
                         retval = EINVAL;