80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Cleanup

Browse Source
This commit is contained in:
Jos van Mourik
2024-07-26 02:11:21 +02:00
parent bd58ad48da
commit 66d2cc6101
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/device/mouse_microtouch_touchscreen.c
View File

@@ -20,7 +20,7 @@
/* TODO: /* TODO:
- Properly implement GP/SP commands (formats are not documented at all, like anywhere; no dumps yet). - Properly implement GP/SP commands (formats are not documented at all, like anywhere; no dumps yet).
- Dynamic baud rate selection from software following this. - Dynamic baud rate selection from software following this.
- Add additional SMT2/3 commands plus config option for controller type. - Add additional SMT2/3 commands plus config option for controller type.
*/ */
#include <ctype.h> #include <ctype.h>
#include <stdint.h> #include <stdint.h>
@@ -40,7 +40,7 @@
enum mtouch_modes { enum mtouch_modes {
MODE_RAW = 1, MODE_RAW = 1,
MODE_TABLET = 2, MODE_TABLET = 2,
MODE_HEX = 3 MODE_HEX = 3
}; };
@@ -117,7 +117,7 @@ microtouch_process_commands(mouse_microtouch_t *mtouch)
} }
if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'H') { /* Format Hexadecimal */ if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'H') { /* Format Hexadecimal */
/* Do not reset Mode Status for now as Photo Play 2000 relies on it */ /* Do not reset Mode Status for now as Photo Play 2000 relies on it */
mtouch->mode = MODE_HEX; mtouch->mode = MODE_HEX;
fifo8_push(&mtouch->resp, 1); fifo8_push(&mtouch->resp, 1);
fifo8_push_all(&mtouch->resp, (uint8_t *)"0\r", 2); fifo8_push_all(&mtouch->resp, (uint8_t *)"0\r", 2);
} }
@@ -176,8 +176,9 @@ microtouch_process_commands(mouse_microtouch_t *mtouch)
fifo8_push(&mtouch->resp, 1); fifo8_push(&mtouch->resp, 1);
fifo8_push_all(&mtouch->resp, (uint8_t *) "A\r", 2); fifo8_push_all(&mtouch->resp, (uint8_t *) "A\r", 2);
} }
if (fifo8_num_used(&mtouch->resp) != fifo_used) if (fifo8_num_used(&mtouch->resp) != fifo_used) {
pclog("Command received: %s\n", mtouch->cmd); pclog("Command received: %s\n", mtouch->cmd);
}
} }
void void
@@ -193,10 +194,9 @@ mtouch_write_to_host(void *priv)
goto no_write_to_machine; goto no_write_to_machine;
} }
} }
if (dev->in_reset) {
if (dev->in_reset)
goto no_write_to_machine; goto no_write_to_machine;
}
if (fifo8_num_used(&dev->resp)) { if (fifo8_num_used(&dev->resp)) {
serial_write_fifo(dev->serial, fifo8_pop(&dev->resp)); serial_write_fifo(dev->serial, fifo8_pop(&dev->resp));
} }
@@ -269,16 +269,16 @@ mtouch_poll(void *priv)
abs_y = 1.0; abs_y = 1.0;
} }
if (dev->cal_cntr || (!b && !dev->b)) { /* Calibration or no buttonpress */ if (dev->cal_cntr || (!b && !dev->b)) { /* Calibration or no buttonpress */
if (!b && dev->b) { if (!b && dev->b) {
microtouch_calibrate_timer(dev); microtouch_calibrate_timer(dev);
} }
dev->b = b; /* Save lack of buttonpress */ dev->b = b; /* Save lack of buttonpress */
return 0; return 0;
} }
if (dev->mode == MODE_TABLET) { if (dev->mode == MODE_TABLET) {
abs_x_int = abs_x * 16383; abs_x_int = abs_x * 16383;
abs_y_int = 16383 - abs_y * 16383; abs_y_int = 16383 - abs_y * 16383;
if (b) { /* Touchdown/Continuation */ if (b) { /* Touchdown/Continuation */
@@ -315,10 +315,10 @@ mtouch_poll(void *priv)
} else if (dev->b) { /* Liftoff */ } else if (dev->b) { /* Liftoff */
snprintf(buffer, sizeof(buffer), "\x18%03X,%03X\r", abs_x_int, abs_y_int); snprintf(buffer, sizeof(buffer), "\x18%03X,%03X\r", abs_x_int, abs_y_int);
} }
fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer)); fifo8_push_all(&dev->resp, (uint8_t *)buffer, strlen(buffer));
} }
dev->b = b; /* Save buttonpress */ dev->b = b; /* Save buttonpress */
return 0; return 0;
} }