diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-07-08 19:09:17 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-07-08 19:09:17 +0000 |
commit | b5fc2530a796d4414f0dbe8f7b8c4e768cc1aeca (patch) | |
tree | ad81ed70c30f527cec224e829d4c26541c0c5a79 /firmware | |
parent | a39026ac5e6e9e5abeda32c1f98fa832ac0e7814 (diff) | |
download | rockbox-b5fc2530a796d4414f0dbe8f7b8c4e768cc1aeca.tar.gz rockbox-b5fc2530a796d4414f0dbe8f7b8c4e768cc1aeca.zip |
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
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/lcd-h100-remote.c | 6 | ||||
-rw-r--r-- | firmware/drivers/lcd-recorder.c | 6 | ||||
-rw-r--r-- | firmware/export/lcd-remote.h | 4 | ||||
-rw-r--r-- | firmware/export/lcd.h | 4 | ||||
-rw-r--r-- | firmware/pcm_record.c | 2 |
5 files changed, 7 insertions, 15 deletions
diff --git a/firmware/drivers/lcd-h100-remote.c b/firmware/drivers/lcd-h100-remote.c index c78382d9e3..868350d308 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) | |||
481 | 481 | ||
482 | static void setpixel(int x, int y) | 482 | static void setpixel(int x, int y) |
483 | { | 483 | { |
484 | REMOTE_DRAW_PIXEL(x, y); | 484 | lcd_remote_framebuffer[y>>3][x] |= 1 << (y & 7); |
485 | } | 485 | } |
486 | 486 | ||
487 | static void clearpixel(int x, int y) | 487 | static void clearpixel(int x, int y) |
488 | { | 488 | { |
489 | REMOTE_CLEAR_PIXEL(x, y); | 489 | lcd_remote_framebuffer[y>>3][x] &= ~(1 << (y & 7)); |
490 | } | 490 | } |
491 | 491 | ||
492 | static void flippixel(int x, int y) | 492 | static void flippixel(int x, int y) |
493 | { | 493 | { |
494 | REMOTE_INVERT_PIXEL(x, y); | 494 | lcd_remote_framebuffer[y>>3][x] ^= 1 << (y & 7); |
495 | } | 495 | } |
496 | 496 | ||
497 | static void nopixel(int x, int y) | 497 | static void nopixel(int x, int y) |
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c index b3696d7db5..702456e42e 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) | |||
371 | 371 | ||
372 | static void setpixel(int x, int y) | 372 | static void setpixel(int x, int y) |
373 | { | 373 | { |
374 | DRAW_PIXEL(x, y); | 374 | lcd_framebuffer[y>>3][x] |= 1 << (y & 7); |
375 | } | 375 | } |
376 | 376 | ||
377 | static void clearpixel(int x, int y) | 377 | static void clearpixel(int x, int y) |
378 | { | 378 | { |
379 | CLEAR_PIXEL(x, y); | 379 | lcd_framebuffer[y>>3][x] &= ~(1 << (y & 7)); |
380 | } | 380 | } |
381 | 381 | ||
382 | static void flippixel(int x, int y) | 382 | static void flippixel(int x, int y) |
383 | { | 383 | { |
384 | INVERT_PIXEL(x, y); | 384 | lcd_framebuffer[y>>3][x] ^= 1 << (y & 7); |
385 | } | 385 | } |
386 | 386 | ||
387 | static void nopixel(int x, int y) | 387 | static void nopixel(int x, int y) |
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h index f2285026c1..bc7f84ca83 100644 --- a/firmware/export/lcd-remote.h +++ b/firmware/export/lcd-remote.h | |||
@@ -26,10 +26,6 @@ | |||
26 | 26 | ||
27 | #ifdef HAVE_REMOTE_LCD | 27 | #ifdef HAVE_REMOTE_LCD |
28 | 28 | ||
29 | #define REMOTE_DRAW_PIXEL(x,y) lcd_remote_framebuffer[(y)>>3][(x)] |= (1<<((y)&7)) | ||
30 | #define REMOTE_CLEAR_PIXEL(x,y) lcd_remote_framebuffer[(y)>>3][(x)] &= ~(1<<((y)&7)) | ||
31 | #define REMOTE_INVERT_PIXEL(x,y) lcd_remote_framebuffer[(y)>>3][(x)] ^= (1<<((y)&7)) | ||
32 | |||
33 | #define STYLE_DEFAULT 0 | 29 | #define STYLE_DEFAULT 0 |
34 | #define STYLE_INVERT 1 | 30 | #define STYLE_INVERT 1 |
35 | 31 | ||
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index f5f16d0f0a..8507c42280 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 | |||
126 | 126 | ||
127 | #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR) | 127 | #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR) |
128 | 128 | ||
129 | #define DRAW_PIXEL(x,y) lcd_framebuffer[(y)>>3][(x)] |= (1<<((y)&7)) | ||
130 | #define CLEAR_PIXEL(x,y) lcd_framebuffer[(y)>>3][(x)] &= ~(1<<((y)&7)) | ||
131 | #define INVERT_PIXEL(x,y) lcd_framebuffer[(y)>>3][(x)] ^= (1<<((y)&7)) | ||
132 | |||
133 | /* Memory copy of display bitmap */ | 129 | /* Memory copy of display bitmap */ |
134 | #if LCD_DEPTH == 1 | 130 | #if LCD_DEPTH == 1 |
135 | extern unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH]; | 131 | extern unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH]; |
diff --git a/firmware/pcm_record.c b/firmware/pcm_record.c index d11458427d..7ecd1d1bbb 100644 --- a/firmware/pcm_record.c +++ b/firmware/pcm_record.c | |||
@@ -328,7 +328,7 @@ void pcmrec_callback(bool flush) | |||
328 | if (y < 2) y=2; | 328 | if (y < 2) y=2; |
329 | if (y >= LCD_REMOTE_HEIGHT-2) y = LCD_REMOTE_HEIGHT-2; | 329 | if (y >= LCD_REMOTE_HEIGHT-2) y = LCD_REMOTE_HEIGHT-2; |
330 | 330 | ||
331 | REMOTE_DRAW_PIXEL(x,y); | 331 | lcd_remote_drawpixel(x,y); |
332 | 332 | ||
333 | offset += (EACH_BUFFER_SIZE/2) / LCD_REMOTE_WIDTH; | 333 | offset += (EACH_BUFFER_SIZE/2) / LCD_REMOTE_WIDTH; |
334 | } | 334 | } |