summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-04-01 08:29:30 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-04-01 08:29:30 +0000
commit92411e8a96d9658022787530b564ff5926b18387 (patch)
tree43d6e1b2f8abcefdfb499081449c6cc20429f609
parentb79ca5919469efaac3b4b53a545b61f78a2d5315 (diff)
downloadrockbox-92411e8a96d9658022787530b564ff5926b18387.zip
rockbox-92411e8a96d9658022787530b564ff5926b18387.tar.gz
rockbox-92411e8a96d9658022787530b564ff5926b18387.tar.bz2
rockbox-92411e8a96d9658022787530b564ff5926b18387.tar.xz
Fuzev2 LCD: replace delays by calls to lcd_delay() (delays not changed)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25422 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c
index 7e5b30d..53d8f73 100644
--- a/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c
+++ b/firmware/target/arm/as3525/sansa-fuzev2/lcd-fuzev2.c
@@ -115,7 +115,6 @@ static void as3525_dbop_init(void)
static inline void dbop_set_mode(int mode)
{
- int delay = 10;
unsigned long ctrl = DBOP_CTRL;
int words = (ctrl >> 13) & 3; // bits 14:13
if (mode == 32 && words != 2)
@@ -124,7 +123,7 @@ static inline void dbop_set_mode(int mode)
DBOP_CTRL = (ctrl & ~(1<<14)) | (1<<13); // 2 serial words
else
return;
- while(delay--) asm volatile("nop");
+ lcd_delay(10);
}
static void dbop_write_data(const int16_t* p_bytes, int count)
@@ -166,7 +165,7 @@ static void dbop_write_data(const int16_t* p_bytes, int count)
static void lcd_write_cmd(unsigned short cmd)
{
volatile int i;
- for(i=0;i<0x20;i++) asm volatile ("nop\n");
+ lcd_delay(0x20);
DBOP_CTRL |= 1<<13;
DBOP_CTRL &= ~(1<<14); // 2 serial words