Changes in uspace/srv/bd/ata_bd/ata_bd.c [e092dc5:228e490] in mainline

File:

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

uspace/srv/bd/ata_bd/ata_bd.c

@@ -65 +65 @@
 #include <macros.h>
 
-#include "ata_hw.h"
 #include "ata_bd.h"
 
@@ -71 +70 @@
 #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;
@@ -81 +77 @@
 
 /** I/O base address of the command registers. */
-static uintptr_t cmd_physical;
+static uintptr_t cmd_physical = 0x1f0;
 /** I/O base address of the control registers. */
-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 uintptr_t ctl_physical = 0x170;
 
 static ata_cmd_t *cmd;
@@ -99 +87 @@
 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);
@@ -123 +110 @@
         int i, rc;
         int n_disks;
-        unsigned ctl_num;
-        char *eptr;
 
         printf(NAME ": ATA disk driver\n");
 
-        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);
+        printf("I/O address %p/%p\n", (void *) ctl_physical,
+            (void *) cmd_physical);
 
         if (ata_bd_init() != EOK)
@@ -168 +139 @@
                         continue;
                 
-                snprintf(name, 16, "%s/ata%udisk%d", NAMESPACE, ctl_num, i);
+                snprintf(name, 16, "%s/disk%d", NAMESPACE, i);
                 rc = devmap_device_register(name, &disk[i].devmap_handle);
                 if (rc != EOK) {
@@ -189 +160 @@
         /* Not reached */
         return 0;
-}
-
-
-static void print_syntax(void)
-{
-        printf("Syntax: " NAME " <controller_number>\n");
-        printf("Controller number = 1..4\n");
 }