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 /apps/plugins/mpegplayer | |
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 'apps/plugins/mpegplayer')
-rw-r--r-- | apps/plugins/mpegplayer/disk_buf.c | 6 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/stream_mgr.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/plugins/mpegplayer/disk_buf.c b/apps/plugins/mpegplayer/disk_buf.c index 7ba4025f1e..df5e005b50 100644 --- a/apps/plugins/mpegplayer/disk_buf.c +++ b/apps/plugins/mpegplayer/disk_buf.c | |||
@@ -171,7 +171,7 @@ static inline void disk_buf_buffer(void) | |||
171 | if (!stream_get_window(&sw)) | 171 | if (!stream_get_window(&sw)) |
172 | { | 172 | { |
173 | disk_buf.state = TSTATE_DATA; | 173 | disk_buf.state = TSTATE_DATA; |
174 | rb->ata_sleep(); | 174 | rb->storage_sleep(); |
175 | break; | 175 | break; |
176 | } | 176 | } |
177 | 177 | ||
@@ -186,7 +186,7 @@ static inline void disk_buf_buffer(void) | |||
186 | /* Free space is less than one page */ | 186 | /* Free space is less than one page */ |
187 | disk_buf.state = TSTATE_DATA; | 187 | disk_buf.state = TSTATE_DATA; |
188 | disk_buf.low_wm = DISK_BUF_LOW_WATERMARK; | 188 | disk_buf.low_wm = DISK_BUF_LOW_WATERMARK; |
189 | rb->ata_sleep(); | 189 | rb->storage_sleep(); |
190 | break; | 190 | break; |
191 | } | 191 | } |
192 | 192 | ||
@@ -208,7 +208,7 @@ static inline void disk_buf_buffer(void) | |||
208 | { | 208 | { |
209 | /* Error or end of stream */ | 209 | /* Error or end of stream */ |
210 | disk_buf.state = TSTATE_EOS; | 210 | disk_buf.state = TSTATE_EOS; |
211 | rb->ata_sleep(); | 211 | rb->storage_sleep(); |
212 | break; | 212 | break; |
213 | } | 213 | } |
214 | 214 | ||
diff --git a/apps/plugins/mpegplayer/stream_mgr.h b/apps/plugins/mpegplayer/stream_mgr.h index c94fa84089..e3ea9207e6 100644 --- a/apps/plugins/mpegplayer/stream_mgr.h +++ b/apps/plugins/mpegplayer/stream_mgr.h | |||
@@ -153,7 +153,7 @@ static inline bool stream_can_seek(void) | |||
153 | static inline void stream_keep_disk_active(void) | 153 | static inline void stream_keep_disk_active(void) |
154 | { | 154 | { |
155 | #ifdef HAVE_DISK_STORAGE | 155 | #ifdef HAVE_DISK_STORAGE |
156 | rb->ata_spin(); | 156 | rb->storage_spin(); |
157 | #endif | 157 | #endif |
158 | } | 158 | } |
159 | 159 | ||