diff options
Diffstat (limited to 'apps/plugins/rockboy')
-rw-r--r-- | apps/plugins/rockboy/lcd.c | 15 | ||||
-rw-r--r-- | apps/plugins/rockboy/sys_rockbox.c | 10 |
2 files changed, 19 insertions, 6 deletions
diff --git a/apps/plugins/rockboy/lcd.c b/apps/plugins/rockboy/lcd.c index 387a88c3df..92db851ee8 100644 --- a/apps/plugins/rockboy/lcd.c +++ b/apps/plugins/rockboy/lcd.c | |||
@@ -64,6 +64,12 @@ unsigned char *vdest; | |||
64 | fb_data *vdest; | 64 | fb_data *vdest; |
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | static fb_data* get_framebuffer(void) | ||
68 | { | ||
69 | struct viewport *vp_main = *(rb->screens[SCREEN_MAIN]->current_viewport); | ||
70 | return vp_main->buffer->fb_ptr; | ||
71 | } | ||
72 | |||
67 | #ifndef ASM_UPDATEPATPIX | 73 | #ifndef ASM_UPDATEPATPIX |
68 | static void updatepatpix(void) ICODE_ATTR; | 74 | static void updatepatpix(void) ICODE_ATTR; |
69 | static void updatepatpix(void) | 75 | static void updatepatpix(void) |
@@ -741,10 +747,11 @@ static void spr_scan(void) | |||
741 | 747 | ||
742 | void lcd_begin(void) | 748 | void lcd_begin(void) |
743 | { | 749 | { |
750 | fb_data *lcd_fb = get_framebuffer(); | ||
744 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) | 751 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) |
745 | vdest=(unsigned char*)*rb->lcd_framebuffer; | 752 | vdest=(unsigned char*)lcd_fb; |
746 | #else | 753 | #else |
747 | vdest=*rb->lcd_framebuffer; | 754 | vdest=lcd_fb; |
748 | #endif | 755 | #endif |
749 | 756 | ||
750 | #ifdef HAVE_LCD_COLOR | 757 | #ifdef HAVE_LCD_COLOR |
@@ -975,9 +982,9 @@ void lcd_refreshline(void) | |||
975 | 982 | ||
976 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) | 983 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) |
977 | if(options.scaling==3) { | 984 | if(options.scaling==3) { |
978 | rb->lcd_blit_pal256((unsigned char*)*rb->lcd_framebuffer,(LCD_WIDTH-160)/2, (LCD_HEIGHT-144)/2, (LCD_WIDTH-160)/2, (LCD_HEIGHT-144)/2, 160, 144); | 985 | rb->lcd_blit_pal256((unsigned char*)lcd_fb,(LCD_WIDTH-160)/2, (LCD_HEIGHT-144)/2, (LCD_WIDTH-160)/2, (LCD_HEIGHT-144)/2, 160, 144); |
979 | } else { | 986 | } else { |
980 | rb->lcd_blit_pal256((unsigned char*)*rb->lcd_framebuffer,0,0,0,0,LCD_WIDTH,LCD_HEIGHT); | 987 | rb->lcd_blit_pal256((unsigned char*)lcd_fb,0,0,0,0,LCD_WIDTH,LCD_HEIGHT); |
981 | } | 988 | } |
982 | #else | 989 | #else |
983 | if(options.scaling==3) { | 990 | if(options.scaling==3) { |
diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c index 364176ce2d..64acd37563 100644 --- a/apps/plugins/rockboy/sys_rockbox.c +++ b/apps/plugins/rockboy/sys_rockbox.c | |||
@@ -282,6 +282,12 @@ fb_data *frameb; | |||
282 | void vid_update(int scanline) | 282 | void vid_update(int scanline) |
283 | { | 283 | { |
284 | register int cnt=0; | 284 | register int cnt=0; |
285 | static fb_data *lcd_fb = NULL; | ||
286 | if (!lcd_fb) | ||
287 | { | ||
288 | struct viewport *vp_main = *(rb->screens[SCREEN_MAIN]->current_viewport); | ||
289 | lcd_fb = vp_main->buffer->fb_ptr; | ||
290 | } | ||
285 | int scanline_remapped; | 291 | int scanline_remapped; |
286 | #if (LCD_HEIGHT == 64) && (LCD_DEPTH == 1) /* Archos, Clip, m200v4 */ | 292 | #if (LCD_HEIGHT == 64) && (LCD_DEPTH == 1) /* Archos, Clip, m200v4 */ |
287 | int balance = 0; | 293 | int balance = 0; |
@@ -290,7 +296,7 @@ void vid_update(int scanline) | |||
290 | else if (fb.mode==2) | 296 | else if (fb.mode==2) |
291 | scanline-=8; | 297 | scanline-=8; |
292 | scanline_remapped = scanline / 16; | 298 | scanline_remapped = scanline / 16; |
293 | frameb = *rb->lcd_framebuffer + scanline_remapped * LCD_WIDTH; | 299 | frameb = lcd_fb + scanline_remapped * LCD_WIDTH; |
294 | while (cnt < 160) { | 300 | while (cnt < 160) { |
295 | balance += LCD_WIDTH; | 301 | balance += LCD_WIDTH; |
296 | if (balance > 0) | 302 | if (balance > 0) |
@@ -316,7 +322,7 @@ void vid_update(int scanline) | |||
316 | else if (fb.mode==2) | 322 | else if (fb.mode==2) |
317 | scanline-=8; | 323 | scanline-=8; |
318 | scanline_remapped = scanline / 4; | 324 | scanline_remapped = scanline / 4; |
319 | frameb = *rb->lcd_framebuffer + scanline_remapped * LCD_WIDTH; | 325 | frameb = lcd_fb + scanline_remapped * LCD_WIDTH; |
320 | while (cnt < 160) { | 326 | while (cnt < 160) { |
321 | *(frameb++) = (scan.buf[0][cnt]&0x3) | | 327 | *(frameb++) = (scan.buf[0][cnt]&0x3) | |
322 | ((scan.buf[1][cnt]&0x3)<<2) | | 328 | ((scan.buf[1][cnt]&0x3)<<2) | |