summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Bukat <marcin.bukat@gmail.com>2010-05-10 13:24:44 +0000
committerMarcin Bukat <marcin.bukat@gmail.com>2010-05-10 13:24:44 +0000
commitfc330110c9ddacf54014788d9ab6373faf465333 (patch)
tree971ce3b99bf741700b171ed4f6a3854f20f4dd04
parenta62db97b38595235c0016e87f23c7a9b421eb5c0 (diff)
downloadrockbox-fc330110c9ddacf54014788d9ab6373faf465333.tar.gz
rockbox-fc330110c9ddacf54014788d9ab6373faf465333.zip
HD200 - Disable asm optimised reads as it showed to be broken. Enable asm optimised writes. test_disk was failing because of broken read routine.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25931 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/coldfire/mpio/ata-as-mpio.S4
-rw-r--r--firmware/target/coldfire/mpio/ata-target.h9
2 files changed, 6 insertions, 7 deletions
diff --git a/firmware/target/coldfire/mpio/ata-as-mpio.S b/firmware/target/coldfire/mpio/ata-as-mpio.S
index 4a6bd3e613..2a76072918 100644
--- a/firmware/target/coldfire/mpio/ata-as-mpio.S
+++ b/firmware/target/coldfire/mpio/ata-as-mpio.S
@@ -23,6 +23,7 @@
23 23
24 .equ .ata_port, 0x20000020 24 .equ .ata_port, 0x20000020
25 .equ .swapmask, 0x00FF00FF 25 .equ .swapmask, 0x00FF00FF
26#if 0
26 .align 2 27 .align 2
27 .global copy_read_sectors 28 .global copy_read_sectors
28 .type copy_read_sectors,@function 29 .type copy_read_sectors,@function
@@ -374,12 +375,12 @@ copy_read_sectors:
374 375
375.r_end: 376.r_end:
376 .size copy_read_sectors,.r_end-copy_read_sectors 377 .size copy_read_sectors,.r_end-copy_read_sectors
378#endif
377 379
378 .align 2 380 .align 2
379 .global copy_write_sectors 381 .global copy_write_sectors
380 .type copy_write_sectors,@function 382 .type copy_write_sectors,@function
381 383
382#if 0
383/* Write a number of words to the ATA data port 384/* Write a number of words to the ATA data port
384 * 385 *
385 * Utilises line bursts, assumes there is at least one full line to copy. 386 * Utilises line bursts, assumes there is at least one full line to copy.
@@ -754,4 +755,3 @@ copy_write_sectors:
754 755
755.w_end: 756.w_end:
756 .size copy_write_sectors,.w_end-copy_write_sectors 757 .size copy_write_sectors,.w_end-copy_write_sectors
757#endif
diff --git a/firmware/target/coldfire/mpio/ata-target.h b/firmware/target/coldfire/mpio/ata-target.h
index 1fa4c5af41..32e97ff56e 100644
--- a/firmware/target/coldfire/mpio/ata-target.h
+++ b/firmware/target/coldfire/mpio/ata-target.h
@@ -21,9 +21,8 @@
21#ifndef ATA_TARGET_H 21#ifndef ATA_TARGET_H
22#define ATA_TARGET_H 22#define ATA_TARGET_H
23 23
24/* asm optimised read & write loops - we skip this for now*/ 24/* #define ATA_OPTIMIZED_READING */
25#define ATA_OPTIMIZED_READING 25#define ATA_OPTIMIZED_WRITING
26//#define ATA_OPTIMIZED_WRITING
27 26
28#define SWAP_WORDS 27#define SWAP_WORDS
29 28
@@ -72,6 +71,6 @@ void ata_enable(bool on);
72void ata_device_init(void); 71void ata_device_init(void);
73bool ata_is_coldstart(void); 72bool ata_is_coldstart(void);
74 73
75void copy_read_sectors(unsigned char* buf, int wordcount); 74/* void copy_read_sectors(unsigned char* buf, int wordcount); */
76//void copy_write_sectors(const unsigned char* buf, int wordcount); 75void copy_write_sectors(const unsigned char* buf, int wordcount);
77#endif 76#endif