revert f680f7c425fac829476983b707cb946eb017bb63

revert Merge pull request 'dev' (#2) from dev into main

Reviewed-on: #2

.gitignore

@@ -1,2 +1 @@
 out/
-*.bin

inc/mouse.h

@@ -1,17 +0,0 @@
-#ifndef MOUSE_H
-#define MOUSE_H
-
-#include "genesis.h"
-
-typedef struct {
-    u8  valid;       // =1 если мышь (сигнатура совпала)
-    u8  buttons;
-    s16 dx;
-    s16 dy;
-    u8  nibbles[10]; // для вывода RAW
-} MouseData;
-
-// Чтение мыши с порта
-void read_mouse(MouseData* dst, volatile u8* port);
-
-#endif

src/main.c

@@ -1,83 +1,77 @@
 #include "genesis.h"
-#include "mouse.h"
 
-#define PORT1 ((volatile u8*)0xA10003)
+#define MOUSE_PORT ((volatile u8*)0xA10003)
-#define PORT2 ((volatile u8*)0xA10005)
+#define Z80_HALT  *((volatile u16*)0xA11100)
+
+#define MOUSE_DELAY 32
+
+static inline void delay(void) {
+    __asm__ volatile (
+        "move.w %0,%%d0\n\t"
+        "1: subq.w #1,%%d0\n\t"
+        "bne.s 1b"
+        :
+        : "i"(MOUSE_DELAY)
+        : "d0"
+    );
+}
 
 int main() {
-	VDP_setTextPlane(0);
+    VDP_setTextPlane(0);
-	VDP_drawText("Sega Mega Mouse RAW reader", 7, 27);
+    VDP_drawText("Sega Mega Mouse RAW reader", 7, 27);
 	VDP_drawText("RAW nibbles:", 14,0);
-	
+    u8 nibbles[16] = {0};
-	s16 x1=0,y1=0, x2=0,y2=0;
+    s16 x = 0;
-	u8 frame = 0;
+    s16 y = 0;
-	char buf[40]; //буфер строки для вывода на экран
 
-	while(TRUE) {
+    char buf[40]; //буфер строки для вывода на экран
-		MouseData m1;
-		read_mouse(&m1, PORT1);
-		sprintf(buf, "+%X%X%X%X %X %X %X%X %X%X", 
-				m1.nibbles[0], m1.nibbles[1], m1.nibbles[2], m1.nibbles[3],
-				m1.nibbles[4], m1.nibbles[5], m1.nibbles[6], m1.nibbles[7],
-				m1.nibbles[8], m1.nibbles[9]);
-		VDP_clearTextArea(1,2,1,20);
-		VDP_drawText(buf, 1, 2 + frame%20);
 
-		if(m1.valid) {
+    while(TRUE) {
-			x1 += m1.dx; y1 += m1.dy;
-			if(x1>9999) x1=-9999; else if(x1<-9999) x1=9999;
-			if(y1>9999) y1=-9999; else if(y1<-9999) y1=9999;
 
-			sprintf(buf, "buttons: %c%c%c%c",
+        SYS_doVBlankProcess();
-					((m1.buttons>>3)&1)+'0',
+
-					((m1.buttons>>2)&1)+'0',
+		VDP_clearTextArea(0, 1, 40, 13);
-					((m1.buttons>>1)&1)+'0',
-					((m1.buttons>>0)&1)+'0');
-			VDP_drawText(buf, 2, 23);
 
-			sprintf(buf, "PORT1: dx:%+04d dy:%+04d x:%+05d y:%+05d", m1.dx,m1.dy,x1,y1);
-			VDP_drawText(buf, 1, 24);
-		} else {
-			VDP_clearTextArea(2,23,13,1);
-			sprintf(buf, "PORT1:            Mouse not recognized");
-			VDP_drawText(buf, 1, 24);
-		}
 		
-		MouseData m2;
+        //опрос мыши
-		read_mouse(&m2, PORT2);
+        Z80_HALT = 0x0100;
-		sprintf(buf, "%X%X%X%X %X %X %X%X %X%X+", 
+        *MOUSE_PORT = 0x60; delay();
-				m2.nibbles[0], m2.nibbles[1], m2.nibbles[2], m2.nibbles[3],
-				m2.nibbles[4], m2.nibbles[5], m2.nibbles[6], m2.nibbles[7],
-				m2.nibbles[8], m2.nibbles[9]);
-		VDP_clearTextArea(38,2,1,20);
-		VDP_drawText(buf, 24, 2 + frame%20);
 
-		if(m2.valid) {
+		nibbles[0] = *MOUSE_PORT & 0x0F;
-			x2 += m2.dx; y2 += m2.dy;
-			if(x2>9999) x2=-9999; else if(x2<-9999) x2=9999;
-			if(y2>9999) y2=-9999; else if(y2<-9999) y2=9999;
 
-			sprintf(buf, "buttons: %c%c%c%c",
-					((m2.buttons>>3)&1)+'0',
-					((m2.buttons>>2)&1)+'0',
-					((m2.buttons>>1)&1)+'0',
-					((m2.buttons>>0)&1)+'0');
-			VDP_drawText(buf, 25, 23);
 
-			sprintf(buf, "PORT2: dx:%+04d dy:%+04d x:%+05d y:%+05d", m2.dx,m2.dy,x2,y2);
+        for(int i=1;i<10;i++) {
-			VDP_drawText(buf, 1, 25);
+            *MOUSE_PORT = (i&1)?0x20:0x00;
-		} else {
+            delay();
-			sprintf(buf, "PORT2:            Mouse not recognized");
+            nibbles[i] = *MOUSE_PORT & 0x0F;
-			VDP_clearTextArea(25,23,13,1);
+            delay();
-			VDP_drawText(buf, 1, 25);
+        }
-		}
+
+        *MOUSE_PORT = 0x60; delay();
+        Z80_HALT = 0x0000;
+		//конец опроса мыши
+
+        // выводим нибблы на экран
+		sprintf(buf, "%X%X%X%X %X %X %X%X %X%X", nibbles[0],nibbles[1],nibbles[2],nibbles[3],nibbles[4],nibbles[5],nibbles[6],nibbles[7],nibbles[8],nibbles[9]);
+		VDP_drawText(buf, 13,1);
+
+        //считаем dx dy 
+		s16 dx = (nibbles[6] << 4) | nibbles[7];
+		s16 dy = (nibbles[8] << 4) | nibbles[9];
+		if (nibbles[4]&8) dy = 255;
+		if (nibbles[4]&4) dx = 255;
+		if (nibbles[4]&2) dy = dy|0xFF00; //sign-extend to 16-bit
+		if (nibbles[4]&1) dx = dx|0xFF00;
+		x+=dx;
+		y+=dy;
+
+		//выводим на экран полезные данные
+		sprintf(buf, "buttons: %c%c%c%c", (nibbles[5]&8&&1)+'0',(nibbles[5]&4&&1)+'0',(nibbles[5]&2&&1)+'0',(nibbles[5]&1&&1)+'0');
+		VDP_drawText(buf, 2, 10);
+		sprintf(buf, "dx: %+04d dy: %+04d x: %+04d y: %+04d", dx,dy,x,y);
+		VDP_drawText(buf, 2, 12);
 		
-		//счётчик кадров для вывода истории нибблов
+    }
-		frame++;
 
-		//конец кадра
+    return 0;
-		VDP_waitVSync();
-	}
-
-	return 0;
 }

src/mouse.c

@@ -1,47 +0,0 @@
-#include "mouse.h"
-
-#define MOUSE_DELAY 16
-#define Z80_HALT *((volatile u16*)0xA11100)
-
-static inline void delay(void) {
-    __asm__ volatile (
-        "move.w %0,%%d0\n\t"
-        "1: subq.w #1,%%d0\n\t"
-        "bne.s 1b"
-        :
-        : "i"(MOUSE_DELAY)
-        : "d0"
-    );
-}
-
-void read_mouse(MouseData* dst, volatile u8* port) {
-
-    dst->valid = 0;
-
-    Z80_HALT = 0x0100;
-    *port = 0x60; delay();
-
-    dst->nibbles[0] = *port & 0x0F;
-    for(int i=1; i<10; i++) {
-        *port = (i&1) ? 0x20 : 0x00;
-        delay();
-        dst->nibbles[i] = *port & 0x0F;
-        delay();
-    }
-
-    *port = 0x60; delay();
-    Z80_HALT = 0x0000;
-
-    // проверка сигнатуры 0BFF
-    if (dst->nibbles[0]==0x0 && dst->nibbles[1]==0xB && dst->nibbles[2]==0xF && dst->nibbles[3]==0xF) {
-        dst->valid = 1;
-        dst->dx = (dst->nibbles[6] << 4) | dst->nibbles[7];
-        dst->dy = (dst->nibbles[8] << 4) | dst->nibbles[9];
-        if (dst->nibbles[4] & 8) dst->dy = 255;
-        if (dst->nibbles[4] & 4) dst->dx = 255;
-        if (dst->nibbles[4] & 2) dst->dy |= 0xFF00; // sign-extend
-        if (dst->nibbles[4] & 1) dst->dx |= 0xFF00;
-
-        dst->buttons = dst->nibbles[5];
-    }
-}