Apply FS#9500. This adds a storage_*() abstraction to replace ata_*(). To do that, it also introduces sd_*, nand_*, and mmc_*.

This should be a good first step to allow multi-driver targets, like the Elio (ATA/SD), or the D2 (NAND/SD).


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18960 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 6 insertions, 6 deletions

diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c
index 9d839aed29..d15efb9b72 100644
--- a/bootloader/iriver_h300.c
+++ b/bootloader/iriver_h300.c
@@ -31,7 +31,7 @@
 #include "scroll_engine.h"
 #include "kernel.h"
 #include "thread.h"
-#include "ata.h"
+#include "storage.h"
 #include "usb.h"
 #include "disk.h"
 #include "font.h"
@@ -93,10 +93,10 @@ void shutdown(void)
     if (ide_powered())
     {
         /* Make sure ATA has been initialized. */
-        ata_init();
+        storage_init();
         
         /* And put the disk into sleep immediately. */
-        ata_sleepnow();
+        storage_sleepnow();
     }
 
     sleep(HZ*2);
@@ -317,7 +317,7 @@ void main(void)
         lcd_remote_update();
 
         ide_power_enable(true);
-        ata_enable(false);
+        storage_enable(false);
         sleep(HZ/20);
         usb_enable(true);
         cpu_idle_mode(true);
@@ -328,7 +328,7 @@ void main(void)
             remote_line = 0;
             check_battery();
             
-            ata_spin(); /* Prevent the drive from spinning down */
+            storage_spin(); /* Prevent the drive from spinning down */
             sleep(HZ);
         }
 
@@ -339,7 +339,7 @@ void main(void)
         lcd_update();
     }
 
-    rc = ata_init();
+    rc = storage_init();
     if(rc)
     {
         reset_screen();