Changeset 371bd7d in mainline for uspace/srv/bd/ata_bd/ata_bd.c

Timestamp:

2010-03-27T09:22:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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) (8 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -55 +55 @@
 #include <async.h>
 #include <as.h>
-#include <fibril_sync.h>
-#include <string.h>
+#include <fibril_synch.h>
+#include <str.h>
 #include <devmap.h>
 #include <sys/types.h>
+#include <inttypes.h>
 #include <errno.h>
 #include <bool.h>
@@ -66 +67 @@
 #include "ata_bd.h"
 
-#define NAME "ata_bd"
+#define NAME       "ata_bd"
+#define NAMESPACE  "bd"
 
 /** Physical block size. Should be always 512. */
@@ -111 +113 @@
         printf(NAME ": ATA disk driver\n");
 
-        printf("I/O address 0x%p/0x%p\n", ctl_physical, cmd_physical);
+        printf("I/O address %p/%p\n", ctl_physical, cmd_physical);
 
         if (ata_bd_init() != EOK)
@@ -135 +137 @@
                 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;
                 }
@@ -180 +181 @@
         }
 
-        printf(" %llu blocks", d->blocks, d->blocks / (2 * 1024));
+        printf(" %" PRIu64 " blocks", d->blocks, d->blocks / (2 * 1024));
 
         mbytes = d->blocks / (2 * 1024);
         if (mbytes > 0)
-                printf(" %llu MB.", mbytes);
+                printf(" %" PRIu64 " MB.", mbytes);
 
         printf("\n");
@@ -296 +297 @@
                         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;
@@ -495 +500 @@
 
         d = &disk[disk_id];
-        bc.h = 0;       /* Silence warning. */
+        
+        /* Silence warning. */
+        memset(&bc, 0, sizeof(bc));
 
         /* Compute block coordinates. */
@@ -569 +576 @@
 
         d = &disk[disk_id];
-        bc.h = 0;       /* Silence warning. */
+        
+        /* Silence warning. */
+        memset(&bc, 0, sizeof(bc));
 
         /* Compute block coordinates. */