Fix the scaling not being initialized properly.

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

5 files changed, 11 insertions, 16 deletions

diff --git a/apps/plugins/rockboy/emu.c b/apps/plugins/rockboy/emu.c
index f639a62772..8ee925cd02 100644
--- a/apps/plugins/rockboy/emu.c
+++ b/apps/plugins/rockboy/emu.c
@@ -51,6 +51,7 @@ void emu_run(void)
     int framesin=0,frames=0,timeten=*rb->current_tick, timehun=*rb->current_tick;
 //      int delay;
 
+    setvidmode(options.fullscreen);
     vid_begin();
     lcd_begin();
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
diff --git a/apps/plugins/rockboy/lcd.c b/apps/plugins/rockboy/lcd.c
index f98b4f6935..1b285ec1b9 100644
--- a/apps/plugins/rockboy/lcd.c
+++ b/apps/plugins/rockboy/lcd.c
@@ -919,12 +919,12 @@ void lcd_begin(void)
     WY = R_WY;
 }
 
-int SCALEWL IDATA_ATTR=DY;
-int SCALEWS IDATA_ATTR=DYI;
-int SCALEHL IDATA_ATTR=DY;
-int SCALEHS IDATA_ATTR=DYI;
-int swidth IDATA_ATTR=(160*DY)>>16;
-int sremain IDATA_ATTR=LCD_WIDTH-((160*DY)>>16);
+int SCALEWL IDATA_ATTR=1<<16;
+int SCALEWS IDATA_ATTR=1<<16;
+int SCALEHL IDATA_ATTR=1<<16;
+int SCALEHS IDATA_ATTR=1<<16;
+int swidth IDATA_ATTR=160;
+int sremain IDATA_ATTR=LCD_WIDTH-160;
 
 void setvidmode(int mode)
 {
@@ -969,7 +969,6 @@ void setvidmode(int mode)
     sremain=LCD_WIDTH-swidth;
 }
 
-
 char frameout[30];
 void lcd_refreshline(void)
 {
diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c
index e27be48e9b..aa79b5db4b 100644
--- a/apps/plugins/rockboy/menu.c
+++ b/apps/plugins/rockboy/menu.c
@@ -25,8 +25,6 @@
 #define MENU_BUTTON_RIGHT BUTTON_RIGHT
 #endif
 
-void setvidmode(int);
-
 /* load/save state function declarations */
 static void do_opt_menu(void);
 static void do_slot_menu(bool is_load);
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index ccc05cef06..47af58c975 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -47,7 +47,7 @@ void die(char *message, ...)
     errormsg=message;
 }
 
-struct options options IBSS_ATTR;
+struct options options;
 
 void *audio_bufferbase;
 void *audio_bufferpointer;
@@ -78,8 +78,6 @@ void setmallocpos(void *pointer)
     audio_buffer_free = audio_bufferpointer - audio_bufferbase;
 }
 
-void setvidmode(int);
-
 void setoptions (void)
 {
    int fd;
@@ -149,9 +147,7 @@ void setoptions (void)
    else
       read(fd,&options, sizeof(options));
 
-    setvidmode(options.fullscreen);
-
-   close(fd);
+    close(fd);
 }
 
 void savesettings(void)
@@ -195,7 +191,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
         < audio_buffer_free)
         audio_buffer_free = plugin_start_addr - (unsigned char *)audio_bufferbase;
 #endif
-   setoptions();
+    setoptions();
 #ifdef USE_IRAM
     memcpy(iramstart, iramcopy, iramend-iramstart);
     memset(iedata, 0, iend - iedata);
diff --git a/apps/plugins/rockboy/rockmacros.h b/apps/plugins/rockboy/rockmacros.h
index 5de98deef7..3d780a79ac 100644
--- a/apps/plugins/rockboy/rockmacros.h
+++ b/apps/plugins/rockboy/rockmacros.h
@@ -45,6 +45,7 @@ void ev_poll(void);
 int do_user_menu(void);
 void loadstate(int fd);
 void savestate(int fd);
+void setvidmode(int mode);
 #define USER_MENU_QUIT -2
 
 /* Disable ICODE for the ARMs */