Merge branch 'master' into wip/plainconf

diff --cc source/arm11.c
index bb57488bfa92b9fea37d408162e8d8f9b65e4e7c,d985f9d383086074d6a418bd489eaaf57d28de74..acd77c6560f4dcc0385a4cbed60df280f1194e32
--- 1/source/arm11.c
--- 2/source/arm11.c
+++ b/source/arm11.c
@@@ -146,11 -146,20 +146,20 @@@ void clearScreens(void) 
  void screen_mode(uint32_t mode) {
      static uint32_t stride, init_top, init_bottom, bright;
  
 -    bright = brightness[config->options[OPTION_BRIGHTNESS]];
 +    bright = brightness[get_opt_u32(OPTION_BRIGHTNESS)];
  
-     stride = 240 * 3;
-     if (mode == RGBA8)
-         stride = 240 * 4;
+     stride = 240;
+     switch(mode) {
+         case RGB8:
+             stride *= 3;
+             break;
+         case RGBA8:
+             stride *= 4;
+             break;
+         default:
+             stride *= 2;
+             break;
+     }
  
      init_top    = MAKE_FRAMEBUFFER_PIXFMT(mode, 0, 1);
      init_bottom = MAKE_FRAMEBUFFER_PIXFMT(mode, 0, 0);