From 4ae78a9466dbb945f94eb0a3c0f2f6b621ade2a7 Mon Sep 17 00:00:00 2001
From: KenDickey <Ken.Dickey@Whidbey.COM>
Date: Sun, 25 Jul 2021 13:37:57 -0700
Subject: [PATCH 1/7] Works on RasPi 3 with RasPi Linux

---
 platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c | 7 +++++--
 platforms/unix/vm-display-fbdev/sqUnixFBDev.c         | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c b/platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c
index 2b6bf6af8f..ecf9b4de0c 100644
--- a/platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c
+++ b/platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c
@@ -535,9 +535,12 @@ void kb_open(struct kb *kbdSelf, int vtSwitch, int vtLock)
   int rc;
 
   assert(kbDev.fd == -1);
-  kbDev.fd= open(kbDev.kbName= KEYBOARD_DEV_NAME, O_RDONLY|O_NONBLOCK);
+  if (kbDev.kbName == 0) {
+    kbDev.kbName= KEYBOARD_DEV_NAME;
+  }
+  kbDev.fd= open(kbDev.kbName, O_RDONLY|O_NONBLOCK);
   if (kbDev.fd < 0) {
-    DPRINTF("FAILED TO OPEN: %s\n", KEYBOARD_DEV_NAME);
+    DPRINTF("FAILED TO OPEN: %s\n", kbDev.kbName);
     failPermissions("console");
   } else {
     DPRINTF("evdev opened Keyboard device %s\n", kbDev.kbName);
diff --git a/platforms/unix/vm-display-fbdev/sqUnixFBDev.c b/platforms/unix/vm-display-fbdev/sqUnixFBDev.c
index 316e521dcc..e5c516f4e7 100644
--- a/platforms/unix/vm-display-fbdev/sqUnixFBDev.c
+++ b/platforms/unix/vm-display-fbdev/sqUnixFBDev.c
@@ -395,6 +395,7 @@ static void display_parseEnvironment(void)
   if ((ev= getenv("SQUEAK_FBDEV")))	fbDev=    strdup(ev);
   if ((ev= getenv("SQUEAK_KBMAP")))	kmPath=   strdup(ev);
   if ((ev= getenv("SQUEAK_MSDEV")))	msDev=    strdup(ev);
+  if ((ev= getenv("SQUEAK_KBDEV")))	kbDev.kbName=    strdup(ev);
   if ((ev= getenv("SQUEAK_MSPROTO")))	msProto=  strdup(ev);
   if ((ev= getenv("SQUEAK_VTLOCK")))	vtLock=   1;
   if ((ev= getenv("SQUEAK_VTSWITCH")))	vtSwitch= 1;
@@ -414,6 +415,7 @@ static int display_parseArgument(int argc, char **argv)
       if      (!strcmp(arg, "-fbdev"))	 fbDev=   argv[1];
       else if (!strcmp(arg, "-kbmap"))	 kmPath=  argv[1];
       else if (!strcmp(arg, "-msdev"))	 msDev=   argv[1];
+      else if (!strcmp(arg, "-kbdev"))	 kbDev.kbName=   argv[1]; 
       else if (!strcmp(arg, "-msproto")) msProto= argv[1];
       else
 	n= 0;	/* not recognised */

From 14ae6c383e3837d59151e07ac497b6a21e5417bc Mon Sep 17 00:00:00 2001
From: KenDickey <Ken.Dickey@Whidbey.COM>
Date: Sun, 25 Jul 2021 13:41:17 -0700
Subject: [PATCH 2/7] for RasPi3

---
 build.linux32ARMv6/squeak.cog.spur/build/mvm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.linux32ARMv6/squeak.cog.spur/build/mvm b/build.linux32ARMv6/squeak.cog.spur/build/mvm
index e1fd0f57bc..0ccb75edb6 100755
--- a/build.linux32ARMv6/squeak.cog.spur/build/mvm
+++ b/build.linux32ARMv6/squeak.cog.spur/build/mvm
@@ -2,7 +2,8 @@
 set -e
 # Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=sqcogspurlinuxhtRPi
-OPT="-m32 -g -O2 -DNDEBUG -DDEBUGVM=0"
+##OPT="-m32 -g -O2 -DNDEBUG -DDEBUGVM=0"
+OPT=" -g -O2 -DNDEBUG -DDEBUGVM=0 -D_GNU_SOURCE -DUSEEVDEV"
 
 if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift

From 5ef63ba3550921f8891ad4c9f4947807dbc1bd1f Mon Sep 17 00:00:00 2001
From: KenDickey <Ken.Dickey@Whidbey.COM>
Date: Mon, 26 Jul 2021 08:03:31 -0700
Subject: [PATCH 3/7] Help text now matches current

---
 platforms/unix/vm-display-fbdev/sqUnixFBDev.c    | 16 ++++++++--------
 .../vm-display-fbdev/sqUnixFBDevFramebuffer.c    |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/platforms/unix/vm-display-fbdev/sqUnixFBDev.c b/platforms/unix/vm-display-fbdev/sqUnixFBDev.c
index e5c516f4e7..600f0ed821 100644
--- a/platforms/unix/vm-display-fbdev/sqUnixFBDev.c
+++ b/platforms/unix/vm-display-fbdev/sqUnixFBDev.c
@@ -340,7 +340,7 @@ static void display_winInit(void)
 #if defined(AT_EXIT)
   AT_EXIT(closeDisplay);
 #else
-# warning: cannot release /dev/fb on exit!
+# warning: cannot release /dev/fb0 on exit!
 # endif
 
   (void)recordMouseEvent;
@@ -365,7 +365,7 @@ static void failPermissions(const char *who)
   fprintf(stderr, "     (you might be able to load one with 'modprobe'; look in\n");
   fprintf(stderr, "     /lib/modules for something called '<your-card>fb.o'\n");
   fprintf(stderr, "  -  you don't have write permission on some of the following\n");
-  fprintf(stderr, "       /dev/tty*, /dev/fb*, /dev/psaux, /dev/input/mice\n");
+  fprintf(stderr, "       /dev/tty*, /dev/fb*, /dev/input/event?, /dev/input/mouse0\n");
   fprintf(stderr, "  -  you need to run Squeak as root on your machine\n");
   exit(1);
 }
@@ -374,12 +374,12 @@ static void failPermissions(const char *who)
 static void display_printUsage(void)
 {
   printf("\nFBDev <option>s:\n");
-  printf("  -fbdev <dev>          use framebuffer device <dev> (default: /dev/fb)\n");
-  printf("  -kbmap <file>         load keymap from <file> (default: use kernel keymap)\n");
-  printf("  -msdev <dev>          use mouse device <dev> (default: /dev/psaux)\n");
-  printf("  -msproto <protocol>   use the given <protocol> for the mouse (default: ps2)\n");
-  printf("  -vtlock               disallow all vt switching (for any reason)\n");
-  printf("  -vtswitch             enable keyboard vt switching (Alt+FNx)\n");
+  printf("  -fbdev <dev>          use framebuffer device <dev> (default: /dev/fb0)\n");
+  /*  printf("  -kbmap <file>         load keymap from <file> (default: use kernel keymap)\n");*/
+  printf("  -msdev <dev>          use mouse device <dev> (default: /dev/input/event1)\n");
+  printf("  -kbdev <dev>          use keyboard device <dev> (default: /dev/input/event0)\n");
+  /*  printf("  -vtlock               disallow all vt switching (for any reason)\n");
+      printf("  -vtswitch             enable keyboard vt switching (Alt+FNx)\n"); */
 }
 
 
diff --git a/platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c b/platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c
index 237d1ef7c5..5db951cace 100644
--- a/platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c
+++ b/platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c
@@ -711,7 +711,7 @@ static int fb_open(_self, struct kb *kb, char *fbDev)
     self->fd= open(self->fbName= fbDev, O_RDWR);
   else
     {
-      char *fbs[]= { "/dev/fb", "/dev/fb0", "/dev/fb0current", 0 };
+      char *fbs[]= { "/dev/fb0", "/dev/fb", "/dev/fb0current", 0 };
       int i;
       for (i= 0;  fbs[i];  ++i)
 	if ((self->fd= open(self->fbName= fbs[i], O_RDWR)) >= 0)

From fe56d0620a1f12019206681ab2f7ffca3bf5edc5 Mon Sep 17 00:00:00 2001
From: KenDickey <Ken.Dickey@Whidbey.COM>
Date: Tue, 27 Jul 2021 12:16:54 -0700
Subject: [PATCH 4/7] -kbmap help

---
 platforms/unix/vm-display-fbdev/sqUnixFBDev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platforms/unix/vm-display-fbdev/sqUnixFBDev.c b/platforms/unix/vm-display-fbdev/sqUnixFBDev.c
index 600f0ed821..7854d5a70c 100644
--- a/platforms/unix/vm-display-fbdev/sqUnixFBDev.c
+++ b/platforms/unix/vm-display-fbdev/sqUnixFBDev.c
@@ -375,7 +375,8 @@ static void display_printUsage(void)
 {
   printf("\nFBDev <option>s:\n");
   printf("  -fbdev <dev>          use framebuffer device <dev> (default: /dev/fb0)\n");
-  /*  printf("  -kbmap <file>         load keymap from <file> (default: use kernel keymap)\n");*/
+  printf("  -kbmap <file>         load keymap from <file> \n");
+  printf("   [Make file by: 'dumpkeys -f -n --keys-only > squeak-kb.map' ]\n");
   printf("  -msdev <dev>          use mouse device <dev> (default: /dev/input/event1)\n");
   printf("  -kbdev <dev>          use keyboard device <dev> (default: /dev/input/event0)\n");
   /*  printf("  -vtlock               disallow all vt switching (for any reason)\n");

From b5011d4ea834cdd86584a610b7824933109806e2 Mon Sep 17 00:00:00 2001
From: KenDickey <Ken.Dickey@Whidbey.COM>
Date: Tue, 27 Jul 2021 12:17:56 -0700
Subject: [PATCH 5/7] DEBUG_EVENTS

---
 build.linux32ARMv6/squeak.cog.spur/build.debug/mvm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.linux32ARMv6/squeak.cog.spur/build.debug/mvm b/build.linux32ARMv6/squeak.cog.spur/build.debug/mvm
index 764e80f084..52550de261 100755
--- a/build.linux32ARMv6/squeak.cog.spur/build.debug/mvm
+++ b/build.linux32ARMv6/squeak.cog.spur/build.debug/mvm
@@ -2,7 +2,9 @@
 set -e
 # debug Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=debug/sqcogspurlinuxhtRPi
-OPT="-m32 -g3 -O0 -DDEBUGVM=1"
+#OPT="-m32 -g3 -O0 -DDEBUGVM=1"
+OPT="-g3 -O0 -DUSEEVDEV -DDEBUGVM=1 -DDEBUG=1 -DDEBUG_EVENTS"
+
 
 if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift

From 969f58704954dd914fa7d10a387feac8cfb65353 Mon Sep 17 00:00:00 2001
From: KenDickey <Ken.Dickey@Whidbey.COM>
Date: Wed, 28 Jul 2021 11:41:00 -0700
Subject: [PATCH 6/7] elide -DUSEEVDEV for (unused) -DNOEVDEV

---
 build.linux32ARMv6/squeak.cog.spur/build/mvm  | 30 -------------------
 .../squeak.stack.spur/build.debug/mvm         |  2 +-
 .../squeak.cog.spur/build.debug/mvm           |  5 ++--
 build.linux64ARMv8/squeak.cog.spur/build/mvm  |  3 +-
 .../squeak.stack.spur/build.debug/mvm         |  2 +-
 .../squeak.stack.spur/build/mvm               |  3 +-
 platforms/unix/vm-display-fbdev/sqUnixFBDev.c | 28 ++++++++---------
 7 files changed, 23 insertions(+), 50 deletions(-)
 delete mode 100755 build.linux32ARMv6/squeak.cog.spur/build/mvm

diff --git a/build.linux32ARMv6/squeak.cog.spur/build/mvm b/build.linux32ARMv6/squeak.cog.spur/build/mvm
deleted file mode 100755
index 0ccb75edb6..0000000000
--- a/build.linux32ARMv6/squeak.cog.spur/build/mvm
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-set -e
-# Spur VM with VM profiler and threaded heartbeat
-INSTALLDIR=sqcogspurlinuxhtRPi
-##OPT="-m32 -g -O2 -DNDEBUG -DDEBUGVM=0"
-OPT=" -g -O2 -DNDEBUG -DDEBUGVM=0 -D_GNU_SOURCE -DUSEEVDEV"
-
-if [ $# -ge 1 ]; then
-	INSTALLDIR="$1"; shift
-fi
-
-if ../../../scripts/checkSCCSversion ; then exit 1; fi
-echo -n "clean? "
-read a
-case $a in
-n|no|N|NO)	echo "ok but this isn't safe!!";;
-*)			test -f Makefile && make reallyclean
-esac
-test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
-test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
-test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \
-		--with-vmversion=5.0 --with-src=spursrc \
-		--without-npsqueak --enable-fast-bitblt \
-	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
-	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0"
-rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
diff --git a/build.linux32ARMv6/squeak.stack.spur/build.debug/mvm b/build.linux32ARMv6/squeak.stack.spur/build.debug/mvm
index 57dd6a5e84..b292aed4f7 100755
--- a/build.linux32ARMv6/squeak.stack.spur/build.debug/mvm
+++ b/build.linux32ARMv6/squeak.stack.spur/build.debug/mvm
@@ -2,7 +2,7 @@
 set -e
 # debug Stack Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=debug/sqstkspurlinuxhtRPi
-OPT="-m32 -g3 -O0 -DDEBUGVM=1"
+OPT="-m32 -g3 -O0 -DDEBUGVM=1  -DDEBUG_EVENTS=1  -DDEBUG_KEYBOARD_EVENTS -DDEBUG_MOUSE_EVENTS "
 
 if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift
diff --git a/build.linux64ARMv8/squeak.cog.spur/build.debug/mvm b/build.linux64ARMv8/squeak.cog.spur/build.debug/mvm
index 6227b8afe0..3c2062da95 100755
--- a/build.linux64ARMv8/squeak.cog.spur/build.debug/mvm
+++ b/build.linux64ARMv8/squeak.cog.spur/build.debug/mvm
@@ -4,7 +4,8 @@ set -e
 INSTALLDIR=debug/sqcogspur64ARMv8linuxht
 # armv8.N-a all fail in signalSemaphoreWithIndex for N in 1,2,3,4,5
 MACHINE="-march=armv8-a -mtune=cortex-a72"
-OPT="-g3 -O0 -DDEBUGVM=1 -DAIO_DEBUG=1"
+OPT="-g3 -O0 -DDEBUGVM=1 -DAIO_DEBUG=1 -DDEBUG -DDEBUG_EVENTS -DDEBUG_KEYBOARD_EVENTS -DDEBUG_MOUSE_EVENTS -DMUSL -D_GNU_SOURCE"
+
 
 if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift
@@ -20,7 +21,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../platforms/unix/config/configure \
 	--with-vmversion=5.0 --with-src=spur64src \
-	--without-vm-display-fbdev --without-npsqueak \
+	--without-npsqueak \
 	CFLAGS="$MACHINE $OPT -DCOGMTVM=0 -DDUAL_MAPPED_CODE_ZONE=1" \
 	LIBS="-lrt"
 
diff --git a/build.linux64ARMv8/squeak.cog.spur/build/mvm b/build.linux64ARMv8/squeak.cog.spur/build/mvm
index b2bcf24c4f..98e0e30a12 100755
--- a/build.linux64ARMv8/squeak.cog.spur/build/mvm
+++ b/build.linux64ARMv8/squeak.cog.spur/build/mvm
@@ -4,7 +4,8 @@ set -e
 INSTALLDIR=sqcogspur64ARMv8linuxht
 # armv8.N-a all fail in signalSemaphoreWithIndex for N in 1,2,3,4,5
 MACHINE="-march=armv8-a -mtune=cortex-a72"
-OPT="-g -O2 -DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV"
+OPT="-g -O2 -DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE"
+##OPT="-g -O2 -DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV"
 ##OPT="-g -O3 -DNDEBUG -DDEBUGVM=0"
 
 if [ $# -ge 1 ]; then
diff --git a/build.linux64ARMv8/squeak.stack.spur/build.debug/mvm b/build.linux64ARMv8/squeak.stack.spur/build.debug/mvm
index 7c2a9aa578..4304a621a6 100755
--- a/build.linux64ARMv8/squeak.stack.spur/build.debug/mvm
+++ b/build.linux64ARMv8/squeak.stack.spur/build.debug/mvm
@@ -2,7 +2,7 @@
 set -e
 # debug Stack Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=debug/sqstkspur64ARMv8linuxht
-OPT="-g3 -O0 -DDEBUG -DDEBUGVM=1 -DDEBUG_EVENTS -DDEBUG_KEYBOARD_EVENTS -DDEBUG_MOUSE_EVENTS -DUSEEVDEV -DMUSL"
+OPT="-g3 -O0 -DDEBUG -DDEBUGVM=1 -DDEBUG_EVENTS -DDEBUG_KEYBOARD_EVENTS -DDEBUG_MOUSE_EVENTS -DMUSL"
 
 ### OPT="-g3 -O0 -DDEBUGVM=1"
 
diff --git a/build.linux64ARMv8/squeak.stack.spur/build/mvm b/build.linux64ARMv8/squeak.stack.spur/build/mvm
index 91b3434ddc..07e393bea3 100755
--- a/build.linux64ARMv8/squeak.stack.spur/build/mvm
+++ b/build.linux64ARMv8/squeak.stack.spur/build/mvm
@@ -2,7 +2,8 @@
 set -e
 # Stack Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=sqstkspur64ARMv8linuxht
-OPT="-g -O2 -DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV"
+OPT="-g -O2 -DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE"
+##OPT="-g -O2 -DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV"
 ### OPT="-g -O2 -DNDEBUG -DDEBUGVM=0"
 
 if [ $# -ge 1 ]; then
diff --git a/platforms/unix/vm-display-fbdev/sqUnixFBDev.c b/platforms/unix/vm-display-fbdev/sqUnixFBDev.c
index 7854d5a70c..ed63a98fe4 100644
--- a/platforms/unix/vm-display-fbdev/sqUnixFBDev.c
+++ b/platforms/unix/vm-display-fbdev/sqUnixFBDev.c
@@ -124,12 +124,12 @@ static struct kb *kb= 0;
 static struct fb *fb= 0;
 
 #include "sqUnixFBDevUtil.c"
-#ifdef USEEVDEV
-#include "sqUnixEvdevKeycodeMap.c"
-#include "sqUnixEvdevKeyMouse.c"
-#else
+#ifdef NOEVDEV
 #include "sqUnixFBDevMouse.c"
 #include "sqUnixFBDevKeyboard.c"
+#else
+#include "sqUnixEvdevKeycodeMap.c"
+#include "sqUnixEvdevKeyMouse.c"
 #endif
 #include "sqUnixFBDevFramebuffer.c"
 
@@ -173,7 +173,7 @@ static void openKeyboard(void)
 {
   kb= kb_new();
   kb_open(kb, vtSwitch, vtLock);
-#ifndef USEEVDEV
+#ifdef NOEVDEV
   kb_setCallback(kb, enqueueKeyboardEvent);
 #endif
 }
@@ -182,11 +182,11 @@ static void closeKeyboard(void)
 {
   if (kb)
     {
-#ifndef USEEVDEV
+#ifdef NOEVDEV
       kb_setCallback(kb, 0);
 #endif
       kb_close(kb);
-#ifndef USEEVDEV
+#ifdef NOEVDEV
       kb_delete(kb);
 #endif
       kb= 0;
@@ -209,7 +209,7 @@ static void openMouse(void)
 {
   ms= ms_new();
   ms_open(ms, msDev, msProto);
-#ifndef USEEVDEV
+#ifdef NOEVDEV
   ms_setCallback(ms, enqueueMouseEvent);
 #endif
 }
@@ -218,11 +218,11 @@ static void closeMouse(void)
 {
   if (ms)
     {
-#ifndef USEEVDEV
+#ifdef NOEVDEV
       ms_setCallback(ms, 0);
 #endif
       ms_close(ms);
-#ifndef USEEVDEV
+#ifdef NOEVDEV
       ms_delete(ms);
 #endif
       ms= 0;
@@ -246,12 +246,12 @@ static sqInt display_ioRelinquishProcessorForMicroseconds(sqInt microSeconds)
 
 static sqInt display_ioProcessEvents(void)
 {
-#ifdef USEEVDEV
+#ifdef NOEVDEV
+  aioPoll(0);
+#else
   processLibEvdevMouseEvents();
   processLibEvdevKeyEvents(); /* sets modifier bits */
   processLibEvdevMouseEvents();
-#else
-  aioPoll(0);
 #endif
   return 0;
 }
@@ -314,7 +314,7 @@ static void openDisplay(void)
   openFramebuffer();
   // init mouse after setting graf mode on tty avoids packets being
   // snarfed by gpm
-#ifndef USEEVDEV
+#ifdef NOEVDEV
   ms->init(ms);
 #endif
 }

From abb5353795cdfb091b65e20b07698506ee2ff2c5 Mon Sep 17 00:00:00 2001
From: KenDickey <Ken.Dickey@Whidbey.COM>
Date: Wed, 28 Jul 2021 12:27:37 -0700
Subject: [PATCH 7/7] linux32ARMv6

---
 .../squeak.cog.spur/build.debug/mvm           |  2 +-
 build.linux32ARMv6/squeak.cog.spur/build/mvm  | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100755 build.linux32ARMv6/squeak.cog.spur/build/mvm

diff --git a/build.linux32ARMv6/squeak.cog.spur/build.debug/mvm b/build.linux32ARMv6/squeak.cog.spur/build.debug/mvm
index 52550de261..ef053288a2 100755
--- a/build.linux32ARMv6/squeak.cog.spur/build.debug/mvm
+++ b/build.linux32ARMv6/squeak.cog.spur/build.debug/mvm
@@ -3,7 +3,7 @@ set -e
 # debug Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=debug/sqcogspurlinuxhtRPi
 #OPT="-m32 -g3 -O0 -DDEBUGVM=1"
-OPT="-g3 -O0 -DUSEEVDEV -DDEBUGVM=1 -DDEBUG=1 -DDEBUG_EVENTS"
+OPT="-g3 -O0 -DDEBUGVM=1 -DDEBUG=1 -DDEBUG_EVENTS  -DDEBUG_KEYBOARD_EVENTS -DDEBUG_MOUSE_EVENTS -DMUSL -D_GNU_SOURCE"
 
 
 if [ $# -ge 1 ]; then
diff --git a/build.linux32ARMv6/squeak.cog.spur/build/mvm b/build.linux32ARMv6/squeak.cog.spur/build/mvm
new file mode 100755
index 0000000000..7a5cbe4d5d
--- /dev/null
+++ b/build.linux32ARMv6/squeak.cog.spur/build/mvm
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+set -e
+# Spur VM with VM profiler and threaded heartbeat
+INSTALLDIR=sqcogspurlinuxhtRPi
+OPT=" -g -O2 -DNDEBUG -DDEBUGVM=0"
+
+if [ $# -ge 1 ]; then
+	INSTALLDIR="$1"; shift
+fi
+
+if ../../../scripts/checkSCCSversion ; then exit 1; fi
+echo -n "clean? "
+read a
+case $a in
+n|no|N|NO)	echo "ok but this isn't safe!!";;
+*)			test -f Makefile && make reallyclean
+esac
+test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
+test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
+test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \
+		--with-vmversion=5.0 --with-src=spursrc \
+		--without-npsqueak --enable-fast-bitblt \
+	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
+	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0"
+rm -f vm/sqUnixMain.o # nuke version info
+rm -rf ../../../products/$INSTALLDIR
+# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
+# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
+make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG