Get rid of disabling irq. Simply blocking does it too, it also caused problems (particulary with scrolling lines).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20040 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 26 insertions, 21 deletions

diff --git a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
index ea06551..60a32b5 100644
--- a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
+++ b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
@@ -36,6 +36,10 @@
 static bool display_on = false; /* is the display turned on? */
 static bool display_flipped = false;
 static int y_offset = 0; /* needed for flip */
+/* we need to write a red pixel for correct button reads
+ * (see lcd_button_support()), but that must not happen while the lcd is updating
+ * so block lcd_button_support the during updates */
+static volatile bool lcd_busy = false;
 
 /* register defines */
 #define R_START_OSC             0x00
@@ -365,12 +369,10 @@ void lcd_update(void)
 {
     if (!display_on)
         return;
-        
-    /* we must disable interrupts because buttondriver also writes to lcd */
-    disable_irq();   
-    
+
     lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ);
 
+    lcd_busy = true;
     /* Set start position and window */
     lcd_write_reg(R_HORIZ_RAM_ADDR_POS, (LCD_WIDTH-1) << 8);
     lcd_write_reg(R_VERT_RAM_ADDR_POS, 
@@ -381,7 +383,7 @@ void lcd_update(void)
 
     lcd_write_data((unsigned short *)lcd_framebuffer, LCD_WIDTH*LCD_HEIGHT);
 
-    enable_irq();
+    lcd_busy = false;
 } /* lcd_update */
 
 
@@ -393,7 +395,7 @@ void lcd_update_rect(int x, int y, int width, int height)
 
     if (!display_on)
         return;
-        
+
     if (x + width > LCD_WIDTH)
         width = LCD_WIDTH - x; /* Clip right */
     if (x < 0)
@@ -409,10 +411,8 @@ void lcd_update_rect(int x, int y, int width, int height)
     if (y >= ymax)
         return; /* nothing left to do */
 
-    /* we must disable interrupts because buttondriver also writes to lcd */   
-    disable_irq();
-        
     lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ);
+    lcd_busy = true;
     /* Set start position and window */
     lcd_write_reg(R_HORIZ_RAM_ADDR_POS, 
                   ((x + width-1) << 8) | x);
@@ -430,8 +430,8 @@ void lcd_update_rect(int x, int y, int width, int height)
         ptr += LCD_WIDTH;
     }
     while (++y < ymax);
-    
-    enable_irq();
+
+    lcd_busy = false;
 } /* lcd_update_rect */
 
 /* writes one read pixel outside the visible area, needed for correct dbop reads */
@@ -440,9 +440,12 @@ void lcd_button_support(void)
     int x=LCD_HEIGHT+1;
     int y=LCD_WIDTH+1;
     int width=1;
-    int height=1;    
+    int height=1;
     unsigned short data = (0xf<<12);
-    
+
+    if (lcd_busy)
+        return;
+
     lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ);
     /* Set start position and window */
     lcd_write_reg(R_HORIZ_RAM_ADDR_POS, 
diff --git a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
index f9de3c3..7443426 100644
--- a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
+++ b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c
@@ -41,8 +41,10 @@
 static bool display_on = false; /* is the display turned on? */
 static bool display_flipped = false;
 static int xoffset = 20; /* needed for flip */
-
-static volatile int _ystart, _ymax, _xstart, _xmax;
+/* we need to write a red pixel for correct button reads
+ * (see lcd_button_support()), but that must not happen while the lcd is updating
+ * so block lcd_button_support the during updates */
+static volatile bool lcd_busy = false;
 
 static void as3525_dbop_init(void)
 {
@@ -285,8 +287,7 @@ void lcd_update(void)
 
     lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ);
 
-    /* we must disable interrupts because buttondriver also writes to lcd */
-    disable_irq();
+    lcd_busy = true;
     lcd_window_x(0, LCD_WIDTH - 1);
     lcd_window_y(0, LCD_HEIGHT - 1);
 
@@ -295,7 +296,7 @@ void lcd_update(void)
 
     /* Write data */
     lcd_write_data((unsigned short *)lcd_framebuffer, LCD_WIDTH*LCD_HEIGHT);
-    enable_irq();
+    lcd_busy = false;
 }
 
 /* Update a fraction of the display. */
@@ -327,8 +328,7 @@ void lcd_update_rect(int x, int y, int width, int height)
 
     lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ);
 
-    /* we must disable interrupts because buttondriver also writes to lcd */
-    disable_irq();
+    lcd_busy = true;
     lcd_window_x(x, xmax);
     lcd_window_y(y, ymax);
 
@@ -343,13 +343,15 @@ void lcd_update_rect(int x, int y, int width, int height)
         ptr += LCD_WIDTH;
     }
     while (++y <= ymax);
-    enable_irq();
+    lcd_busy = false;
 }
 
 /* writes one read pixel outside the visible area, needed for correct dbop reads */
 void lcd_button_support(void)
 {
     fb_data data = 0xf<<12;
+    if (lcd_busy)
+        return;
     lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ);
     /* Set start position and window */