Merge pull request #2 from pablomarx/squeak377

Squeak VM 3.7-7

Author: pablomarx

bcm2835/sqRpiHid.c

@@ -14,9 +14,9 @@ int keyBufPut = 0;                      /* index of next item of keyBuf to write
 int keyBufOverflows = 0;        /* number of characters dropped */
 
 /*** Variables -- Imported from Virtual Machine ***/
-extern int interruptCheckCounter;
-extern int interruptKeycode;
-extern int interruptPending;  /* set to true by RecordKeystroke if interrupt key is pressed */
+int interruptCheckCounter = 0;
+int interruptKeycode = -1;
+int interruptPending = 0;  /* set to true by RecordKeystroke if interrupt key is pressed */
 
 /*** Variables -- Event Recording ***/
 #define MillisecondClockMask 536870911
@@ -29,6 +29,7 @@ static char lastKeys[255];
 static int lastMouseX = 0;
 static int lastMouseY = 0;
 static int lastMouseButton = 0;
+static int lastPollTime = 0;
 
 void RecordKeystroke(unsigned char key, struct KeyboardModifiers modifiers) {
 	int keystate;
@@ -157,7 +158,7 @@ void rpiRegisterKeyboardEvent(int keyCode, int pressCode, int modifiers) {
 	evt->pressCode = pressCode;
 	evt->modifiers = modifiers;
 
-	evt->reserved1=evt->reserved2=evt->reserved3= 0;
+	evt->reserved1=evt->reserved2= 0;
 }
 
 void rpiProcessKeyboardEvents(void) {
@@ -216,6 +217,11 @@ void rpiProcessKeyboardEvents(void) {
 }
 
 int ioGetNextEvent(sqInputEvent *evt) {
+	if (ioMSecs() - lastPollTime < 75) {
+		return false;
+	}
+	lastPollTime = ioMSecs();
+
 	ioProcessEvents();
 	rpiProcessMouseEvents();
 	rpiProcessKeyboardEvents();

lib/memutils.c

@@ -9,13 +9,13 @@ extern void abort(void);
 void * malloc ( unsigned int size )
 {
     void *ret;
-	printf("malloc(%i now:", size);
+//	printf("malloc(%i now:", size);
 	size = ROUND_UP(size, 8);
-	printf("%i) => ", size);
+//	printf("%i) => ", size);
 
     ret=(void *)malloc_base;
 
-	printf("0x%08x\n", ret);
+//	printf("0x%08x\n", ret);
 
     malloc_base+=size;
 
@@ -30,14 +30,14 @@ void *calloc(unsigned int nmemb, unsigned int size) {
 
 void *memalign(unsigned int alignment, unsigned int n) {
     void *ret;
-	printf("malloc(%i) => (malloc_base was: 0x%08x, ", n, malloc_base);
+//	printf("malloc(%i) => (malloc_base was: 0x%08x, ", n, malloc_base);
 
 	ret = (void *)ROUND_UP(malloc_base, alignment);
 
 	malloc_base += n;
 	malloc_base = ROUND_UP(malloc_base, alignment);
 
-	printf("malloc_base now: 0x%08x) ret => 0x%08x\n", malloc_base, ret);
+//	printf("malloc_base now: 0x%08x) ret => 0x%08x\n", malloc_base, ret);
 	return ret;
 }