Initial dirty ATA support

diff --git a/conf/mips.rmk b/conf/mips.rmk
index 03765ad8e22cf909fc8435931ea9d30ab30e4b1b..cd99cca75f0fc953105e65539bf4b03da045ac21 100644 (file)
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -198,4 +198,10 @@ at_keyboard_mod_SOURCES = term/at_keyboard.c
 at_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
 at_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For ata_pthru.mod.
+pkglib_MODULES += ata_pthru.mod
+ata_pthru_mod_SOURCES = disk/ata_pthru.c
+ata_pthru_mod_CFLAGS = $(COMMON_CFLAGS)
+ata_pthru_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 include $(srcdir)/conf/common.mk

diff --git a/disk/ata.c b/disk/ata.c
index 00e3709606479334c5a08e8e6f072b98b2c306f1..5b74bb67314d5fdcc1d0a9efdda3ed8051cc1f31 100644 (file)
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -27,8 +27,10 @@
 #include <grub/machine/machine.h>
 
 /* At the moment, only two IDE ports are supported.  */
-static const grub_port_t grub_ata_ioaddress[] = { 0x1f0, 0x170 };
-static const grub_port_t grub_ata_ioaddress2[] = { 0x3f6, 0x376 };
+static const grub_port_t grub_ata_ioaddress[] = { 0xbfd001f0};
+static const grub_port_t grub_ata_ioaddress2[] = { 0xbfd003f6};
+//static const grub_port_t grub_ata_ioaddress[] = { 0x1f0, 0x170 };
+//static const grub_port_t grub_ata_ioaddress2[] = { 0x3f6, 0x376 };
 
 static struct grub_ata_device *grub_ata_devices;
 
@@ -388,6 +390,7 @@ grub_ata_device_initialize (int port, int device, int addr, int addr2)
   return 0;
 }
 
+#if 0
 static int NESTED_FUNC_ATTR
 grub_ata_pciinit (grub_pci_device_t dev,
                  grub_pci_id_t pciid __attribute__((unused)))
@@ -485,6 +488,48 @@ grub_ata_initialize (void)
   grub_pci_iterate (grub_ata_pciinit);
   return 0;
 }
+#endif
+
+static grub_err_t
+grub_ata_initialize (void)
+{
+  int rega;
+  int regb;
+
+  rega = grub_ata_ioaddress[0];
+  regb = grub_ata_ioaddress2[0];
+
+  grub_dprintf ("ata",
+               "rega=0x%x regb=0x%x\n",
+               rega, regb);
+
+  if (rega && regb)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      grub_ata_device_initialize (0, 0, rega, regb);
+      
+      /* Most errors raised by grub_ata_device_initialize() are harmless.
+        They just indicate this particular drive is not responding, most
+        likely because it doesn't exist.  We might want to ignore specific
+        error types here, instead of printing them.  */
+      if (grub_errno)
+       {
+         grub_print_error ();
+         grub_errno = GRUB_ERR_NONE;
+       }
+      
+      grub_ata_device_initialize (0, 1, rega, regb);
+      
+         /* Likewise.  */
+      if (grub_errno)
+       {
+         grub_print_error ();
+         grub_errno = GRUB_ERR_NONE;
+       }
+    }
+
+  return 0;
+}
 
 
 static void