github.com/mist-devel.mist-firmware
1
0
Fork 0
mirror of https://github.com/mist-devel/mist-firmware.git synced 2026-04-17 00:15:25 +00:00
Code Releases Activity

UIO_SERIAL_XXX codes are clashing with UIO_KEYBOARD/MOUSE

Browse Source
This commit is contained in:
Gyorgy Szombathelyi
2019-07-27 14:40:50 +02:00
parent 6ad47a5036
commit 1f87b8b443
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
user_io.c
View File

@@ -416,7 +416,10 @@ void user_io_joystick(unsigned char joystick, unsigned char map) {
// transmit serial/rs232 data into core
void user_io_serial_tx(char *chr, uint16_t cnt) {
spi_uio_cmd_cont(UIO_SERIAL_OUT);
if (core_type == CORE_TYPE_MIST)
spi_uio_cmd_cont(UIO_SERIAL_OUT);
else
spi_uio_cmd_cont(UIO_SERIAL_OUT2);
while(cnt--) spi8(*chr++);
DisableIO();
}
@@ -913,7 +916,11 @@ void user_io_poll() {
// arm rs232 and mixes with debug output. Useful for debugging only of
// e.g. the diagnostic cartridge
if(!pl2303_is_blocked()) {
spi_uio_cmd_cont(UIO_SERIAL_IN);
if (core_type == CORE_TYPE_MIST)
spi_uio_cmd_cont(UIO_SERIAL_IN);
else
spi_uio_cmd_cont(UIO_SERIAL_IN2);
while(spi_in() && !pl2303_is_blocked()) {
c = spi_in();
@@ -1396,10 +1403,9 @@ static void send_keycode(unsigned short code) {
if((core_type == CORE_TYPE_MIST) ||
(core_type == CORE_TYPE_MIST2)) {
// atari has "break" marker in msb
if(code & BREAK) code = (code & 0xff) | 0x80;
ikbd_keyboard(code);
// atari has "break" marker in msb
ikbd_keyboard((code & BREAK) ? ((code & 0xff) | 0x80) : code);
}
if((core_type == CORE_TYPE_8BIT) ||