Merge branch 'sf/mmb-mzone2'

src/Makefile.am

@@ -83,6 +83,7 @@ b_em_SOURCES = \
     mc6809nc/mc6809_dis.c \
 	main.c \
 	mem.c \
+	mmb.c \
 	model.c \
 	mouse.c \
     mmccard.c \

src/cmos.c

@@ -1,3 +1,4 @@
+#define _DEBUG
 /*B-em v2.2 by Tom Walker
   Master 128 CMOS emulation*/
 
@@ -161,8 +162,10 @@ static uint8_t get_cmos(unsigned addr)
             else if (curtube == 9)
                 value = cmos_fix_tube_lang(value, 7);
         }
-        else if (addr == 0x1e && autoboot)
-            value |= 0x10;
+        else if (addr == 0x1e && autoboot) {
+            log_debug("cmos: faking boot option for autoboot");
+            value &= ~0x10;
+        }
         return value;
     }
 }

src/config.c

@@ -9,6 +9,7 @@
 #include "keyboard.h"
 #include "main.h"
 #include "mem.h"
+#include "mmb.h"
 #include "model.h"
 #include "mouse.h"
 #include "mmccard.h"

src/gui-allegro.c

@@ -14,6 +14,7 @@
 #include "keydef-allegro.h"
 #include "main.h"
 #include "mem.h"
+#include "mmb.h"
 #include "model.h"
 #include "mouse.h"
 #include "music5000.h"

src/keyboard.c

@@ -1187,13 +1187,15 @@ void key_scan(int row, int col) {
 }
 
 bool key_is_down(void) {
-    if (keyrow == 0 && keycol >= 2 && keycol <= 9) {
-        if (keycol == 6 && autoboot > 0)
+    if (keyrow == 0) {
+        if (keycol == 0 && autoboot > 0) {
+            log_debug("keyboard: return shift is down (autoboot=%d), pc=%04X", autoboot, pc);
             return true;
-        return kbdips & (1 << (9 - keycol));
+        }
+        else if (keycol >= 2 && keycol <= 9)
+            return kbdips & (1 << (9 - keycol));
     }
-    else
-        return bbcmatrix[keycol][keyrow];
+    return bbcmatrix[keycol][keyrow];
 }
 
 bool key_any_down(void)

src/main.c

@@ -29,6 +29,7 @@
 #include "main.h"
 #include "6809tube.h"
 #include "mem.h"
+#include "mmb.h"
 #include "mouse.h"
 #include "midi.h"
 #include "music4000.h"