Changeset e092dc5 in mainline

Timestamp:

2010-12-30T14:26:29Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e682af1

Parents:

d770deb

Message:

Fix incorrect control block base address. Add base adresses for three more legacy ATA controllers. Allow selecting ATA controller via command line argument.

Location:

uspace

Files:

• app/init/init.c (modified) (1 diff)
• srv/bd/ata_bd/ata_bd.c (modified) (6 diffs)
• srv/bd/ata_bd/ata_bd.h (modified) (2 diffs)

uspace/app/init/init.c

@@ -61 +61 @@
 
 #define DATA_FS_TYPE      "fat"
-#define DATA_DEVICE       "bd/disk0"
+#define DATA_DEVICE       "bd/ata1disk0"
 #define DATA_MOUNT_POINT  "/data"
 

uspace/srv/bd/ata_bd/ata_bd.c

@@ -71 +71 @@
 #define NAMESPACE  "bd"
 
+/** Number of defined legacy controller base addresses. */
+#define LEGACY_CTLS 4
+
 /** Physical block size. Should be always 512. */
 static const size_t block_size = 512;
@@ -78 +81 @@
 
 /** I/O base address of the command registers. */
-static uintptr_t cmd_physical = 0x1f0;
+static uintptr_t cmd_physical;
 /** I/O base address of the control registers. */
-static uintptr_t ctl_physical = 0x170;
+static uintptr_t ctl_physical;
+
+/** I/O base addresses for legacy (ISA-compatible) controllers. */
+static ata_base_t legacy_base[LEGACY_CTLS] = {
+        { 0x1f0, 0x3f0 },
+        { 0x170, 0x370 },
+        { 0x1e8, 0x3e8 },
+        { 0x168, 0x368 }
+};
 
 static ata_cmd_t *cmd;
@@ -88 +99 @@
 static disk_t disk[MAX_DISKS];
 
+static void print_syntax(void);
 static int ata_bd_init(void);
 static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall);
@@ -111 +123 @@
         int i, rc;
         int n_disks;
+        unsigned ctl_num;
+        char *eptr;
 
         printf(NAME ": ATA disk driver\n");
 
-        printf("I/O address %p/%p\n", (void *) ctl_physical,
-            (void *) cmd_physical);
+        if (argc > 1) {
+                ctl_num = strtoul(argv[1], &eptr, 0);
+                if (*eptr != '\0' || ctl_num == 0 || ctl_num > 4) {
+                        printf("Invalid argument.\n");
+                        print_syntax();
+                        return -1;
+                }
+        } else {
+                ctl_num = 1;
+        }
+
+        cmd_physical = legacy_base[ctl_num - 1].cmd;
+        ctl_physical = legacy_base[ctl_num - 1].ctl;
+
+        printf("I/O address %p/%p\n", (void *) cmd_physical,
+            (void *) ctl_physical);
 
         if (ata_bd_init() != EOK)
@@ -140 +168 @@
                         continue;
                 
-                snprintf(name, 16, "%s/disk%d", NAMESPACE, i);
+                snprintf(name, 16, "%s/ata%udisk%d", NAMESPACE, ctl_num, i);
                 rc = devmap_device_register(name, &disk[i].devmap_handle);
                 if (rc != EOK) {
@@ -161 +189 @@
         /* Not reached */
         return 0;
+}
+
+
+static void print_syntax(void)
+{
+        printf("Syntax: " NAME " <controller_number>\n");
+        printf("Controller number = 1..4\n");
 }
 

uspace/srv/bd/ata_bd/ata_bd.h

@@ -39 +39 @@
 #include <fibril_synch.h>
 #include <str.h>
+
+/** Base addresses for ATA I/O blocks. */
+typedef struct {
+        uintptr_t cmd;  /**< Command block base address. */
+        uintptr_t ctl;  /**< Control block base address. */
+} ata_base_t;
 
 /** Timeout definitions. Unit is 10 ms. */
@@ -81 +87 @@
 } block_coord_t;
 
+/** ATA device state structure. */
 typedef struct {
         bool present;