Removed the XYZ_PIXEL() macros. They are no longer needed, and they did only work correctly for b&w.

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

5 files changed, 7 insertions, 15 deletions

diff --git a/firmware/drivers/lcd-h100-remote.c b/firmware/drivers/lcd-h100-remote.c
index c78382d..868350d 100644
--- a/firmware/drivers/lcd-h100-remote.c
+++ b/firmware/drivers/lcd-h100-remote.c
@@ -481,17 +481,17 @@ int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h)
 
 static void setpixel(int x, int y)
 {
-    REMOTE_DRAW_PIXEL(x, y);
+    lcd_remote_framebuffer[y>>3][x] |= 1 << (y & 7);
 }
 
 static void clearpixel(int x, int y)
 {
-    REMOTE_CLEAR_PIXEL(x, y);
+    lcd_remote_framebuffer[y>>3][x] &= ~(1 << (y & 7));
 }
 
 static void flippixel(int x, int y)
 {
-    REMOTE_INVERT_PIXEL(x, y);
+    lcd_remote_framebuffer[y>>3][x] ^= 1 << (y & 7);
 }
 
 static void nopixel(int x, int y)
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c
index b3696d7..702456e 100644
--- a/firmware/drivers/lcd-recorder.c
+++ b/firmware/drivers/lcd-recorder.c
@@ -371,17 +371,17 @@ int lcd_getstringsize(const unsigned char *str, int *w, int *h)
 
 static void setpixel(int x, int y)
 {
-    DRAW_PIXEL(x, y);
+    lcd_framebuffer[y>>3][x] |= 1 << (y & 7);
 }
 
 static void clearpixel(int x, int y)
 {
-    CLEAR_PIXEL(x, y);
+    lcd_framebuffer[y>>3][x] &= ~(1 << (y & 7));
 }
 
 static void flippixel(int x, int y)
 {
-    INVERT_PIXEL(x, y);
+    lcd_framebuffer[y>>3][x] ^= 1 << (y & 7);
 }
 
 static void nopixel(int x, int y)
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index f228502..bc7f84c 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -26,10 +26,6 @@
 
 #ifdef HAVE_REMOTE_LCD
 
-#define REMOTE_DRAW_PIXEL(x,y)	 lcd_remote_framebuffer[(y)>>3][(x)] |= (1<<((y)&7))
-#define REMOTE_CLEAR_PIXEL(x,y)	 lcd_remote_framebuffer[(y)>>3][(x)] &= ~(1<<((y)&7))
-#define REMOTE_INVERT_PIXEL(x,y) lcd_remote_framebuffer[(y)>>3][(x)] ^= (1<<((y)&7))
-
 #define STYLE_DEFAULT 0
 #define STYLE_INVERT  1
 
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index f5f16d0..8507c42 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -126,10 +126,6 @@ typedef void lcd_blockfunc_type(unsigned char *address, unsigned mask, unsigned
 
 #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR)
 
-#define DRAW_PIXEL(x,y) lcd_framebuffer[(y)>>3][(x)] |= (1<<((y)&7))
-#define CLEAR_PIXEL(x,y) lcd_framebuffer[(y)>>3][(x)] &= ~(1<<((y)&7))
-#define INVERT_PIXEL(x,y) lcd_framebuffer[(y)>>3][(x)] ^= (1<<((y)&7))
-
 /* Memory copy of display bitmap */
 #if LCD_DEPTH == 1
 extern unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH];
diff --git a/firmware/pcm_record.c b/firmware/pcm_record.c
index d114584..7ecd1d1 100644
--- a/firmware/pcm_record.c
+++ b/firmware/pcm_record.c
@@ -328,7 +328,7 @@ void pcmrec_callback(bool flush)
             if (y < 2) y=2;
             if (y >= LCD_REMOTE_HEIGHT-2) y = LCD_REMOTE_HEIGHT-2;
     
-            REMOTE_DRAW_PIXEL(x,y);
+            lcd_remote_drawpixel(x,y);
             
             offset += (EACH_BUFFER_SIZE/2) / LCD_REMOTE_WIDTH;  
         }