Changeset 99de22b in mainline for uspace/srv/bd/ata_bd/ata_bd.c

Timestamp:

2010-01-15T18:30:25Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

eeb643d

Parents:

387416b (diff), 563d6077 (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:

Merged latest trunk changes.

File:

• uspace/srv/bd/ata_bd/ata_bd.c (modified) (3 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -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;
                 }
@@ -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;