summaryrefslogtreecommitdiff
path: root/firmware/target/arm/as3525
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-11-15 17:23:25 +0000
committerThomas Martitz <kugel@rockbox.org>2009-11-15 17:23:25 +0000
commita1bc3401f1c65524ded556f131283b8864ac3733 (patch)
tree815006b4bda1ce692c45751e41b0103b32a2dda8 /firmware/target/arm/as3525
parent8ceaf7bb7277f61b1ebfce816a0e05a3674d25c4 (diff)
downloadrockbox-a1bc3401f1c65524ded556f131283b8864ac3733.tar.gz
rockbox-a1bc3401f1c65524ded556f131283b8864ac3733.zip
Fix a few possible problems discovered in -O0 / eabi experiments.
- two essential parts of Sansa AMS drivers are optimzed away in newer gcc, so mark them volatile. - use "r" instead of "i" (which is apparently invalid syntax) for the input list in some inline assembly git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23634 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/as3525')
-rw-r--r--firmware/target/arm/as3525/ata_sd_as3525.c8
-rw-r--r--firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c
index 65df027c30..f00badba69 100644
--- a/firmware/target/arm/as3525/ata_sd_as3525.c
+++ b/firmware/target/arm/as3525/ata_sd_as3525.c
@@ -129,7 +129,13 @@ static volatile unsigned int transfer_error[NUM_VOLUMES];
129static unsigned char aligned_buffer[UNALIGNED_NUM_SECTORS* SECTOR_SIZE] __attribute__((aligned(32))); /* align on cache line size */ 129static unsigned char aligned_buffer[UNALIGNED_NUM_SECTORS* SECTOR_SIZE] __attribute__((aligned(32))); /* align on cache line size */
130static unsigned char *uncached_buffer = UNCACHED_ADDR(&aligned_buffer[0]); 130static unsigned char *uncached_buffer = UNCACHED_ADDR(&aligned_buffer[0]);
131 131
132static inline void mci_delay(void) { int i = 0xffff; while(i--) ; } 132static inline void mci_delay(void)
133{
134 int i = 0xffff;
135 do {
136 asm volatile("nop\n");
137 } while (--i);
138}
133 139
134#ifdef HAVE_HOTSWAP 140#ifdef HAVE_HOTSWAP
135static int sd1_oneshot_callback(struct timeout *tmo) 141static int sd1_oneshot_callback(struct timeout *tmo)
diff --git a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
index 735020cfad..c9dd69d47b 100644
--- a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
+++ b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
@@ -46,7 +46,7 @@ static int xoffset = 20; /* needed for flip */
46/* we need to write a red pixel for correct button reads 46/* we need to write a red pixel for correct button reads
47 * (see lcd_button_support()),but that must not happen while the lcd is updating 47 * (see lcd_button_support()),but that must not happen while the lcd is updating
48 * so block lcd_button_support the during updates */ 48 * so block lcd_button_support the during updates */
49static bool lcd_busy = false; 49static volatile int lcd_busy = false;
50 50
51static inline void lcd_delay(int x) 51static inline void lcd_delay(int x)
52{ 52{