Changeset 5481d1bb in mainline

Timestamp:

2009-06-13T09:45:33Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

d9f4c76

Parents:

4f5caea

Message:

Use named constants.

Location:

uspace/srv/bd/ata_bd

Files:

• ata_bd.c (modified) (5 diffs)
• ata_bd.h (modified) (1 diff)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -69 +69 @@
 static atomic_t dev_futex = FUTEX_INITIALIZER;
 
-static disk_t disk[2];
+static disk_t disk[MAX_DISKS];
 
 static int ata_bd_init(void);
@@ -97 +97 @@
         printf("Reset drives...\n");
         pio_write_8(&ctl->device_control, DCR_SRST);
-/*      printf("wait for busy\n");
-        do {
-                status = pio_read_8(&cmd->status);
-        } while ((status & SR_BSY) == 0);
-*/
+        /* FIXME: Find out how to do this properly. */
         async_usleep(100);
         pio_write_8(&ctl->device_control, 0);
@@ -154 +150 @@
         pio_write_8(&cmd->drive_head, ((disk_id != 0) ? DHR_DRV : 0));
         async_usleep(100);
-        pio_write_8(&cmd->command, 0xEC);
+        pio_write_8(&cmd->command, CMD_IDENTIFY_DRIVE);
 
         status = pio_read_8(&cmd->status);
@@ -170 +166 @@
         }
 
-        for (i = 0; i < 256; i++) {
+        for (i = 0; i < block_size / 2; i++) {
                 do {
                         status = pio_read_8(&cmd->status);
@@ -367 +363 @@
         pio_write_8(&cmd->cylinder_low, c & 0xff);
         pio_write_8(&cmd->cylinder_high, c >> 16);
-        pio_write_8(&cmd->command, 0x20);
+        pio_write_8(&cmd->command, CMD_READ_SECTORS);
 
         /* Read data from the disk buffer. */
 
-        for (i = 0; i < 256; i++) {
+        for (i = 0; i < block_size / 2; i++) {
                 do {
                         status = pio_read_8(&cmd->status);

uspace/srv/bd/ata_bd/ata_bd.h

@@ -118 +118 @@
 };
 
+enum ata_command {
+        CMD_IDENTIFY_DRIVE      = 0xEC,
+        CMD_READ_SECTORS        = 0x20,
+        CMD_WRITE_SECTORS       = 0x30
+};
+
 typedef struct {
         bool present;