diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2008-11-01 16:14:28 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2008-11-01 16:14:28 +0000 |
commit | 2f8a0081c64534da23fc0fa9cc685eb7454fd9c9 (patch) | |
tree | 84dbdbd5326cb48f43d2ebd5a4c86e992c1d5288 /bootloader/iriver_h1x0.c | |
parent | 646cac0bde7b11fa7bcb670d1d76eec78e360485 (diff) | |
download | rockbox-2f8a0081c64534da23fc0fa9cc685eb7454fd9c9.tar.gz rockbox-2f8a0081c64534da23fc0fa9cc685eb7454fd9c9.zip |
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
Diffstat (limited to 'bootloader/iriver_h1x0.c')
-rw-r--r-- | bootloader/iriver_h1x0.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c index 7f051bccb5..83e545540b 100644 --- a/bootloader/iriver_h1x0.c +++ b/bootloader/iriver_h1x0.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include "scroll_engine.h" | 31 | #include "scroll_engine.h" |
32 | #include "kernel.h" | 32 | #include "kernel.h" |
33 | #include "thread.h" | 33 | #include "thread.h" |
34 | #include "ata.h" | 34 | #include "storage.h" |
35 | #include "usb.h" | 35 | #include "usb.h" |
36 | #include "disk.h" | 36 | #include "disk.h" |
37 | #include "font.h" | 37 | #include "font.h" |
@@ -148,10 +148,10 @@ void shutdown(void) | |||
148 | if (ide_powered()) | 148 | if (ide_powered()) |
149 | { | 149 | { |
150 | /* Make sure ATA has been initialized. */ | 150 | /* Make sure ATA has been initialized. */ |
151 | ata_init(); | 151 | storage_init(); |
152 | 152 | ||
153 | /* And put the disk into sleep immediately. */ | 153 | /* And put the disk into sleep immediately. */ |
154 | ata_sleepnow(); | 154 | storage_sleepnow(); |
155 | } | 155 | } |
156 | 156 | ||
157 | sleep(HZ*2); | 157 | sleep(HZ*2); |
@@ -560,7 +560,7 @@ void main(void) | |||
560 | } | 560 | } |
561 | #endif | 561 | #endif |
562 | ide_power_enable(true); | 562 | ide_power_enable(true); |
563 | ata_enable(false); | 563 | storage_enable(false); |
564 | sleep(HZ/20); | 564 | sleep(HZ/20); |
565 | usb_enable(true); | 565 | usb_enable(true); |
566 | cpu_idle_mode(true); | 566 | cpu_idle_mode(true); |
@@ -571,7 +571,7 @@ void main(void) | |||
571 | remote_line = 0; | 571 | remote_line = 0; |
572 | check_battery(); | 572 | check_battery(); |
573 | 573 | ||
574 | ata_spin(); /* Prevent the drive from spinning down */ | 574 | storage_spin(); /* Prevent the drive from spinning down */ |
575 | sleep(HZ); | 575 | sleep(HZ); |
576 | 576 | ||
577 | /* Backlight OFF */ | 577 | /* Backlight OFF */ |
@@ -585,7 +585,7 @@ void main(void) | |||
585 | lcd_update(); | 585 | lcd_update(); |
586 | } | 586 | } |
587 | 587 | ||
588 | rc = ata_init(); | 588 | rc = storage_init(); |
589 | if(rc) | 589 | if(rc) |
590 | { | 590 | { |
591 | reset_screen(); | 591 | reset_screen(); |