LIV2/WinUAE
1
0
Fork 0
mirror of https://github.com/LIV2/WinUAE.git synced 2025-12-06 00:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

DraCo updates

Browse Source
This commit is contained in:
Toni Wilen 2024-01-04 21:12:20 +02:00
parent 5a86534e5d
commit 6589ede049
16 changed files with 1569 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cia.cpp
View File

@ -1161,7 +1161,7 @@ void keyboard_connected(bool connect)
static void check_keyboard(void) static void check_keyboard(void)
{ {
if (currprefs.keyboard_connected) { if (currprefs.keyboard_connected && currprefs.cs_compatible != CP_DRACO) {
if ((keys_available() || kbstate < 3) && !kblostsynccnt ) { if ((keys_available() || kbstate < 3) && !kblostsynccnt ) {
switch (kbstate) switch (kbstate)
{ {

2
devices.cpp
View File

@ -353,7 +353,7 @@ void virtualdevice_free(void)
ethernet_enumerate_free(); ethernet_enumerate_free();
rtarea_free(); rtarea_free();
#ifdef WITH_DRACO #ifdef WITH_DRACO
draco_reset(); draco_free();
#endif #endif
execute_device_items(device_leaves, device_leave_cnt); execute_device_items(device_leaves, device_leave_cnt);
} }

348
draco.cpp
View File

@ -18,9 +18,12 @@
#include "ncr_scsi.h" #include "ncr_scsi.h"
#include "draco.h" #include "draco.h"
#include "zfile.h" #include "zfile.h"
#include "keybuf.h"
static int maxcnt = 100; static int maxcnt = 100;
#define ONEWIRE_DEBUG 1
#define KBD_DEBUG 1
/* /*
.asciz "kbd/soft" | 1: native keyboard, soft ints .asciz "kbd/soft" | 1: native keyboard, soft ints
@ -133,8 +136,17 @@ void serial_reset();
void serial_write(uint16_t addr, uint8_t val, void *p); void serial_write(uint16_t addr, uint8_t val, void *p);
uint8_t serial_read(uint16_t addr, void *p); uint8_t serial_read(uint16_t addr, void *p);
void draco_serial_init(void **s1, void **s2); void draco_serial_init(void **s1, void **s2);
void mouse_serial_poll(int x, int y, int z, int b, void *p);
void *mouse_serial_init_draco();
void keyboard_at_write(uint8_t val, void *priv);
uint8_t keyboard_at_read(uint16_t port, void *priv);
void *draco_keyboard_init(void);
void draco_key_process(uint16_t scan, int down);
int draco_kbc_translate(uint8_t val);
static void *draco_serial[2]; static void *draco_serial[2];
static void *draco_mouse_base, *draco_keyboard;
static uae_u8 draco_intena, draco_intpen, draco_svga_irq_state; static uae_u8 draco_intena, draco_intpen, draco_svga_irq_state;
static uae_u16 draco_timer, draco_timer_latch; static uae_u16 draco_timer, draco_timer_latch;
@ -143,10 +155,17 @@ static bool draco_fdc_intpen;
static uae_u8 draco_superio_cfg[16]; static uae_u8 draco_superio_cfg[16];
static uae_s8 draco_superio_idx; static uae_s8 draco_superio_idx;
static uae_u8 draco_reg[0x20]; static uae_u8 draco_reg[0x20];
static int draco_watchdog;
static int draco_scsi_intpen, draco_serial_intpen;
static void draco_irq(void) static void draco_irq(void)
{ {
uae_u16 irq = 0; uae_u16 irq = 0;
if (draco_scsi_intpen) {
draco_intpen |= 2;
} else {
draco_intpen &= ~2;
}
if (draco_intena & 1) { if (draco_intena & 1) {
uae_u16 mask = draco_intena & draco_intpen; uae_u16 mask = draco_intena & draco_intpen;
if (mask) { if (mask) {
@ -166,13 +185,13 @@ static void draco_irq(void)
if (draco_svga_irq_state) { if (draco_svga_irq_state) {
irq |= 0x0010; // INT3 irq |= 0x0010; // INT3
} }
if (draco_fdc_intpen && (draco_reg[1] & DRCNTRL_FDCINTENA)) { if ((draco_fdc_intpen || draco_serial_intpen) && (draco_reg[1] & DRCNTRL_FDCINTENA)) {
irq = 0x1000; // INT5 irq = 0x1000; // INT5
} }
if ((draco_reg[7] & DRSTAT2_TMRINTENA) && (draco_reg[7] & DRSTAT2_TMRIRQPEN)) { if ((draco_reg[7] & DRSTAT2_TMRINTENA) && (draco_reg[7] & DRSTAT2_TMRIRQPEN)) {
irq |= 1; irq |= 1;
} }
if ((draco_reg[3] & DRSTAT_KBDRECV) && (draco_reg[1] & DRCNTRL_KBDINTENA)) { if (draco_reg[3] & DRSTAT_KBDRECV) {
irq |= 1; irq |= 1;
} }
} }
@ -190,79 +209,136 @@ void draco_svga_irq(bool state)
draco_irq(); draco_irq();
} }
static uae_u8 draco_kbd_state, draco_kbd_state2; static uae_u8 draco_kbd_state;
static uae_s8 draco_kbd_state2, draco_kbd_poll;
static uae_u16 draco_kbd_code; static uae_u16 draco_kbd_code;
static int draco_kbd_poll;
static uae_u8 draco_kbd_buffer[10]; static uae_u8 draco_kbd_buffer[10];
static uae_u8 draco_kbd_buffer_len; static uae_u8 draco_kbd_buffer_len;
static uae_s8 draco_kdb_params;
static uae_u16 draco_kbd_in_buffer[16];
static int draco_kbd_in_buffer_len;
static uae_u8 draco_keyboard_read(uae_u8 v) static void draco_keyboard_reset(void)
{ {
if (draco_kbd_state2) { draco_kbd_buffer_len = 0;
draco_reg[3] &= ~DRSTAT_KBDCLKIN; draco_kbd_in_buffer_len = 0;
draco_kbd_state = 0;
draco_kbd_poll = 0;
draco_kbd_code = 0;
draco_kdb_params = 0;
draco_kbd_state2 = -1;
}
static void draco_keyboard_read(void)
{
uae_u8 v = draco_reg[3];
if (draco_kbd_poll > 0) {
draco_kbd_poll--;
if (draco_kbd_poll == 0) {
draco_reg[3] &= ~DRSTAT_KBDCLKIN;
v &= ~DRSTAT_KBDCLKIN;
draco_kbd_poll = -4;
}
draco_reg[3] = v;
return;
}
if (draco_kbd_poll < 0) {
draco_kbd_poll++; draco_kbd_poll++;
if (draco_kbd_state2 > 0 && draco_kbd_poll >= 4) { if (draco_kbd_poll == 0) {
draco_reg[3] |= DRSTAT_KBDCLKIN; draco_kbd_poll = 4;
v |= DRSTAT_KBDCLKIN;
uae_u16 bit = (draco_reg[1] & DRCNTRL_KBDDATOUT) ? 0x8000 : 0;
#if KBD_DEBUG > 1
write_log("draco keyboard got bit %d: %d\n", draco_kbd_state2, bit ? 1 : 0);
#endif
draco_kbd_code >>= 1; draco_kbd_code >>= 1;
draco_kbd_code |= (draco_reg[1] & DRCNTRL_KBDDATOUT) ? 0x8000 : 0; draco_kbd_code |= bit;
draco_kbd_state2++; draco_kbd_state2++;
draco_kbd_poll = 0;
if (draco_kbd_state2 == 11) {
draco_kbd_code >>= 5;
draco_kbd_code &= 0xff;
#if KBD_DEBUG
write_log("draco->keyboard code %02x\n", draco_kbd_code);
#endif
draco_reg[3] = v;
keyboard_at_write((uae_u8)draco_kbd_code, draco_keyboard);
v = draco_reg[3];
}
} }
} }
return v;
draco_reg[3] = v;
} }
static void draco_keyboard_write(uae_u8 v) static void draco_keyboard_write(uae_u8 v)
{ {
v &= DRCNTRL_KBDDATOUT | DRCNTRL_KBDCLKOUT; v &= DRCNTRL_KBDDATOUT | DRCNTRL_KBDCLKOUT;
if (v == draco_kbd_state) { if (v == draco_kbd_state) {
return; return;
} }
if ((v & DRCNTRL_KBDDATOUT) != (draco_kbd_state & DRCNTRL_KBDDATOUT)) {
#if KBD_DEBUG > 1
write_log("DRCNTRL_KBDDATOUT %d -> %d\n", (draco_kbd_state & DRCNTRL_KBDDATOUT) ? 1 : 0, (v & DRCNTRL_KBDDATOUT) ? 1 : 0);
#endif
}
if ((v & DRCNTRL_KBDCLKOUT) != (draco_kbd_state & DRCNTRL_KBDCLKOUT)) {
#if KBD_DEBUG > 1
write_log("DRCNTRL_KBDCLKOUT %d -> %d\n", (draco_kbd_state & DRCNTRL_KBDCLKOUT) ? 1 : 0, (v & DRCNTRL_KBDCLKOUT) ? 1 : 0);
#endif
}
// start receive // start receive
if ((v & DRCNTRL_KBDCLKOUT) && !(draco_kbd_state & DRCNTRL_KBDCLKOUT)) { if (draco_kbd_state2 < 0 && (v & DRCNTRL_KBDCLKOUT) && !(draco_kbd_state & DRCNTRL_KBDCLKOUT)) {
draco_reg[3] |= DRSTAT_KBDCLKIN; draco_reg[3] |= DRSTAT_KBDCLKIN;
draco_kbd_code = 0; draco_kbd_code = 0;
draco_kbd_state2 = 1; draco_kbd_state2 = 0;
draco_kbd_poll = 0; draco_kbd_poll = 4;
} }
draco_kbd_state = v; draco_kbd_state = v;
} }
static void draco_keyboard_done(void)
{
if (draco_kbd_state2 == 12) {
draco_kbd_code >>= 5;
draco_kbd_code &= 0xff;
write_log("draco received keyboard data %04x\n", draco_kbd_code);
if (draco_kbd_code == 0xf2) {
draco_kbd_buffer[0] = 0xab;
draco_kbd_buffer[1] = 0x83;
draco_kbd_buffer_len = 2;
}
}
draco_reg[3] &= ~DRSTAT_KBDCLKIN;
draco_reg[3] &= ~DRSTAT_KBDRECV;
draco_kbd_state2 = 0;
draco_kbd_poll = 0;
}
static void draco_keyboard_send(void) static void draco_keyboard_send(void)
{ {
if (draco_kbd_buffer_len <= 0) { if (draco_kbd_buffer_len > 0 && !(draco_reg[3] & DRSTAT_KBDRECV)) {
return; uae_u8 code = draco_kbd_buffer[0];
} for (int i = 1; i < draco_kbd_buffer_len; i++) {
if (!(draco_reg[3] & DRSTAT_KBDRECV)) { draco_kbd_buffer[i - i] = draco_kbd_buffer[i];
}
draco_kbd_buffer_len--; draco_kbd_buffer_len--;
uae_u8 code = draco_kbd_buffer[draco_kbd_buffer_len];
draco_reg[5] = code; draco_reg[5] = code;
draco_reg[3] |= DRSTAT_KBDRECV; draco_reg[3] |= DRSTAT_KBDRECV;
#if KBD_DEBUG
write_log("keyboard->draco code %02x\n", code);
#endif
draco_irq(); draco_irq();
} }
} }
static void draco_keyboard_done(void)
{
#if KBD_DEBUG > 1
write_log("draco keyboard interface reset\n");
#endif
draco_reg[3] &= ~DRSTAT_KBDCLKIN;
draco_reg[3] &= ~DRSTAT_KBDRECV;
draco_reg[1] &= ~DRCNTRL_KBDDATOUT;
draco_reg[1] &= ~DRCNTRL_KBDCLKOUT;
draco_kbd_state2 = -1;
draco_kbd_poll = 0;
draco_keyboard_send();
}
void draco_kdb_queue_add(void *d, uint8_t val, int state)
{
draco_kbd_buffer[draco_kbd_buffer_len++] = val;
}
static uae_u8 draco_1wire_data[40], draco_1wire_state, draco_1wire_dir; static uae_u8 draco_1wire_data[40], draco_1wire_state, draco_1wire_dir;
static uae_u8 draco_1wire_sram[512 + 32], draco_1wire_scratchpad[32 + 3], draco_1wire_rom[8]; static uae_u8 draco_1wire_sram[512 + 32], draco_1wire_scratchpad[32 + 3], draco_1wire_rom[8];
static uae_u8 draco_1wire_cmd, draco_1wire_bytes, draco_1wire_dat; static uae_u8 draco_1wire_cmd, draco_1wire_bytes, draco_1wire_dat;
@ -274,6 +350,8 @@ static bool draco_1wire_bit;
#define DS_ROM_SEARCH 0xf0 #define DS_ROM_SEARCH 0xf0
#define DS_ROM_SKIP 0xcc #define DS_ROM_SKIP 0xcc
#define DS_ROM_READ 0x33 #define DS_ROM_READ 0x33
#define DS_READ_MEMORY 0xf0
#define DS_WRITE_SCRATCHPAD 0x0f #define DS_WRITE_SCRATCHPAD 0x0f
#define DS_READ_SCRATCHPAD 0xaa #define DS_READ_SCRATCHPAD 0xaa
#define DS_COPY_SCRATCHPAD 0x55 #define DS_COPY_SCRATCHPAD 0x55
@ -331,18 +409,20 @@ static void draco_1wire_set_bit(void)
} }
} }
static uae_u8 draco_1wire_read(uae_u8 v) static void draco_1wire_read(void)
{ {
uae_u8 v = draco_reg[3];
if (draco_1wire_bit) { if (draco_1wire_bit) {
draco_reg[3] |= DRSTAT_CLKDAT;
v |= DRSTAT_CLKDAT; v |= DRSTAT_CLKDAT;
} else { } else {
draco_reg[3] &= ~DRSTAT_CLKDAT;
v &= ~DRSTAT_CLKDAT; v &= ~DRSTAT_CLKDAT;
} }
if (draco_1wire_cnt == 8 && !(draco_reg[3] & DRSTAT_CLKBUSY)) { if (draco_1wire_cnt == 8 && !(v & DRSTAT_CLKBUSY)) {
#if ONEWIRE_DEBUG > 1
write_log("draco read 1-wire SRAM byte %02x, %02x\n", draco_1wire_dat, draco_1wire_bytes); write_log("draco read 1-wire SRAM byte %02x, %02x\n", draco_1wire_dat, draco_1wire_bytes);
#endif
draco_1wire_cnt = 0; draco_1wire_cnt = 0;
draco_1wire_bytes++; draco_1wire_bytes++;
if (draco_1wire_rom_offset >= 0) { if (draco_1wire_rom_offset >= 0) {
@ -365,14 +445,14 @@ static uae_u8 draco_1wire_read(uae_u8 v)
} }
} }
if (draco_reg[3] & DRSTAT_CLKBUSY) { if (v & DRSTAT_CLKBUSY) {
draco_1wire_busycnt--; draco_1wire_busycnt--;
if (draco_1wire_busycnt < 0) { if (draco_1wire_busycnt < 0) {
draco_reg[3] &= ~DRSTAT_CLKBUSY; v &= ~DRSTAT_CLKBUSY;
} }
} }
return v; draco_reg[3] = v;
} }
static void draco_1wire_busy(void) static void draco_1wire_busy(void)
@ -410,22 +490,28 @@ static void draco_1wire_send(int bit)
for (int i = sizeof(draco_1wire_data) - 1; i >= 1; i--) { for (int i = sizeof(draco_1wire_data) - 1; i >= 1; i--) {
draco_1wire_data[i] = draco_1wire_data[i - 1]; draco_1wire_data[i] = draco_1wire_data[i - 1];
} }
#if ONEWIRE_DEBUG > 1
write_log("draco received 1-wire byte %02x, cnt %02x\n", draco_1wire_data[0], draco_1wire_bytes); write_log("draco received 1-wire byte %02x, cnt %02x\n", draco_1wire_data[0], draco_1wire_bytes);
#endif
draco_1wire_cnt = 0; draco_1wire_cnt = 0;
draco_1wire_bytes++; draco_1wire_bytes++;
// read data command + 2 address bytes? // read data command + 2 address bytes
if (draco_1wire_cmd == DS_ROM_SEARCH && draco_1wire_data[3] == DS_ROM_SEARCH) { if (draco_1wire_cmd == DS_READ_MEMORY && draco_1wire_data[3] == DS_READ_MEMORY) {
draco_1wire_sram_offset = (draco_1wire_data[1] << 8) | draco_1wire_data[2]; draco_1wire_sram_offset = (draco_1wire_data[1] << 8) | draco_1wire_data[2];
draco_1wire_dir = 1; draco_1wire_dir = 1;
draco_1wire_bytes = 0; draco_1wire_bytes = 0;
#if ONEWIRE_DEBUG
write_log("draco received 1-wire SRAM read command, offset %04x\n", draco_1wire_sram_offset); write_log("draco received 1-wire SRAM read command, offset %04x\n", draco_1wire_sram_offset);
#endif
} }
// write scratchpad + 2 address bytes? // write scratchpad + 2 address bytes
if (draco_1wire_cmd == DS_WRITE_SCRATCHPAD && draco_1wire_data[3] == DS_WRITE_SCRATCHPAD) { if (draco_1wire_cmd == DS_WRITE_SCRATCHPAD && draco_1wire_data[3] == DS_WRITE_SCRATCHPAD) {
draco_1wire_sram_offset = (draco_1wire_data[1] << 8) | draco_1wire_data[2]; draco_1wire_sram_offset = (draco_1wire_data[1] << 8) | draco_1wire_data[2];
draco_1wire_sram_offset_copy = draco_1wire_sram_offset; draco_1wire_sram_offset_copy = draco_1wire_sram_offset;
memset(draco_1wire_scratchpad, 0, sizeof(draco_1wire_scratchpad)); memset(draco_1wire_scratchpad, 0, sizeof(draco_1wire_scratchpad));
#if ONEWIRE_DEBUG
write_log("draco received 1-wire SRAM scratchpad write command, offset %04x\n", draco_1wire_sram_offset); write_log("draco received 1-wire SRAM scratchpad write command, offset %04x\n", draco_1wire_sram_offset);
#endif
} }
// read scratchpad // read scratchpad
if (draco_1wire_cmd == DS_READ_SCRATCHPAD) { if (draco_1wire_cmd == DS_READ_SCRATCHPAD) {
@ -433,7 +519,9 @@ static void draco_1wire_send(int bit)
draco_1wire_dir = 1; draco_1wire_dir = 1;
draco_1wire_bytes = 0; draco_1wire_bytes = 0;
draco_1wire_set_bit(); draco_1wire_set_bit();
#if ONEWIRE_DEBUG
write_log("draco received 1-wire SRAM scratchpad read command\n"); write_log("draco received 1-wire SRAM scratchpad read command\n");
#endif
} }
// copy scratchpad // copy scratchpad
if (draco_1wire_cmd == DS_COPY_SCRATCHPAD && draco_1wire_data[4] == DS_COPY_SCRATCHPAD) { if (draco_1wire_cmd == DS_COPY_SCRATCHPAD && draco_1wire_data[4] == DS_COPY_SCRATCHPAD) {
@ -444,10 +532,14 @@ static void draco_1wire_send(int bit)
draco_1wire_data[3] == draco_1wire_scratchpad[0]) { draco_1wire_data[3] == draco_1wire_scratchpad[0]) {
int start = draco_1wire_sram_offset_copy & 31; int start = draco_1wire_sram_offset_copy & 31;
int offset = draco_1wire_sram_offset_copy & ~31; int offset = draco_1wire_sram_offset_copy & ~31;
#if ONEWIRE_DEBUG
write_log("draco received 1-wire SRAM scratchpad copy command, accepted\n"); write_log("draco received 1-wire SRAM scratchpad copy command, accepted\n");
#endif
for (int i = 0; i < 32; i++) { for (int i = 0; i < 32; i++) {
draco_1wire_sram[offset + start] = draco_1wire_scratchpad[start + 3]; draco_1wire_sram[offset + start] = draco_1wire_scratchpad[start + 3];
#if ONEWIRE_DEBUG > 1
write_log("draco 1-wire SRAM scratchpad copy %02x -> %04x\n", draco_1wire_sram[offset + start], offset + start); write_log("draco 1-wire SRAM scratchpad copy %02x -> %04x\n", draco_1wire_sram[offset + start], offset + start);
#endif
if (start == (draco_1wire_scratchpad[2] & 31)) { if (start == (draco_1wire_scratchpad[2] & 31)) {
break; break;
} }
@ -459,7 +551,9 @@ static void draco_1wire_send(int bit)
draco_1wire_busy(); draco_1wire_busy();
draco_1wire_bit = 0; draco_1wire_bit = 0;
} else { } else {
#if ONEWIRE_DEBUG
write_log("draco received 1-wire SRAM scratchpad copy command, rejected\n"); write_log("draco received 1-wire SRAM scratchpad copy command, rejected\n");
#endif
draco_1wire_busy(); draco_1wire_busy();
} }
} }
@ -485,7 +579,9 @@ static void draco_1wire_reset(void)
} else if (len < 32) { } else if (len < 32) {
draco_1wire_scratchpad[2] |= 0x20; draco_1wire_scratchpad[2] |= 0x20;
} }
#if ONEWIRE_DEBUG
write_log("draco received 1-wire SRAM scratchpad write, %d bytes received\n", len); write_log("draco received 1-wire SRAM scratchpad write, %d bytes received\n", len);
#endif
} }
} }
@ -496,7 +592,9 @@ static void draco_1wire_reset(void)
draco_1wire_bytes = 0; draco_1wire_bytes = 0;
draco_1wire_sram_offset = -1; draco_1wire_sram_offset = -1;
draco_1wire_rom_offset = 0; draco_1wire_rom_offset = 0;
#if ONEWIRE_DEBUG
write_log("draco 1-wire reset\n"); write_log("draco 1-wire reset\n");
#endif
} }
static uae_u32 REGPARAM2 draco_lget(uaecptr addr) static uae_u32 REGPARAM2 draco_lget(uaecptr addr)
@ -505,12 +603,13 @@ static uae_u32 REGPARAM2 draco_lget(uaecptr addr)
if ((addr & 0x07c00000) == 0x04000000) { if ((addr & 0x07c00000) == 0x04000000) {
write_log("draco scsi lput %08x %08x\n", addr, l); //write_log("draco scsi lput %08x %08x\n", addr, l);
int reg = addr & 0xffff; int reg = addr & 0xffff;
l = cpuboard_ncr710_io_bget(reg + 0) << 24;
l |= cpuboard_ncr710_io_bget(reg + 1) << 16;
l |= cpuboard_ncr710_io_bget(reg + 2) << 8;
l |= cpuboard_ncr710_io_bget(reg + 3) << 0; l |= cpuboard_ncr710_io_bget(reg + 3) << 0;
l |= cpuboard_ncr710_io_bget(reg + 2) << 8;
l |= cpuboard_ncr710_io_bget(reg + 1) << 16;
l |= cpuboard_ncr710_io_bget(reg + 0) << 24;
} else { } else {
write_log(_T("draco_lget %08x %08x\n"), addr, M68K_GETPC); write_log(_T("draco_lget %08x %08x\n"), addr, M68K_GETPC);
} }
@ -524,6 +623,12 @@ static uae_u32 REGPARAM2 draco_wget(uaecptr addr)
return 0; return 0;
} }
void draco_bustimeout(uaecptr addr)
{
write_log("draco bus timeout %08x\n", addr);
draco_reg[3] |= DRSTAT_BUSTIMO;
}
static uae_u32 REGPARAM2 draco_bget(uaecptr addr) static uae_u32 REGPARAM2 draco_bget(uaecptr addr)
{ {
uae_u8 v = 0; uae_u8 v = 0;
@ -534,8 +639,7 @@ static uae_u32 REGPARAM2 draco_bget(uaecptr addr)
} }
if (addr >= 0x20000000) { if (addr >= 0x20000000) {
write_log("draco bus timeout %08x\n", addr); draco_bustimeout(addr);
draco_reg[3] |= DRSTAT_BUSTIMO;
return 0; return 0;
} }
@ -543,7 +647,7 @@ static uae_u32 REGPARAM2 draco_bget(uaecptr addr)
int reg = addr & 0xffff; int reg = addr & 0xffff;
v = cpuboard_ncr710_io_bget(reg); v = cpuboard_ncr710_io_bget(reg);
write_log("draco scsi read %08x\n", addr); // write_log("draco scsi read %08x\n", addr);
} else if ((addr & 0x07c00000) == 0x02400000) { } else if ((addr & 0x07c00000) == 0x02400000) {
@ -597,6 +701,10 @@ static uae_u32 REGPARAM2 draco_bget(uaecptr addr)
v = serial_read(reg, draco_serial[1]); v = serial_read(reg, draco_serial[1]);
break; break;
case 0x278:
// parallel
break;
default: default:
write_log("draco superio read %04x = %02x\n", (addr >> 2) & 0xfff, v); write_log("draco superio read %04x = %02x\n", (addr >> 2) & 0xfff, v);
break; break;
@ -606,16 +714,19 @@ static uae_u32 REGPARAM2 draco_bget(uaecptr addr)
} else if ((addr & 0x07c00000) == 0x02000000) { } else if ((addr & 0x07c00000) == 0x02000000) {
// io // io
if ((addr & 0xffffff) > 0x1f)
write_log("x");
int reg = addr & 0x1f; int reg = addr & 0x1f;
v = draco_reg[reg]; v = draco_reg[reg];
switch(reg) switch(reg)
{ {
case 3: case 3:
v = draco_keyboard_read(v); draco_keyboard_read();
v = draco_1wire_read(v); draco_1wire_read();
v = draco_reg[reg];
break;
case 5:
#if KBD_DEBUG > 1
write_log("draco keyboard scan code read %02x\n", v);
#endif
break; break;
case 9: case 9:
v = 4; v = 4;
@ -665,12 +776,12 @@ static void REGPARAM2 draco_lput(uaecptr addr, uae_u32 l)
{ {
if ((addr & 0x07c00000) == 0x04000000) { if ((addr & 0x07c00000) == 0x04000000) {
write_log("draco scsi lput %08x %08x\n", addr, l); //write_log("draco scsi lput %08x %08x\n", addr, l);
int reg = addr & 0xffff; int reg = addr & 0xffff;
cpuboard_ncr710_io_bput(reg + 0, l >> 24); cpuboard_ncr710_io_bput(reg + 3, l >> 0);
cpuboard_ncr710_io_bput(reg + 2, l >> 8);
cpuboard_ncr710_io_bput(reg + 1, l >> 16); cpuboard_ncr710_io_bput(reg + 1, l >> 16);
cpuboard_ncr710_io_bput(reg + 2, l >> 8); cpuboard_ncr710_io_bput(reg + 0, l >> 24);
cpuboard_ncr710_io_bput(reg + 3, l >> 0);
} else { } else {
@ -696,7 +807,7 @@ static void REGPARAM2 draco_bput(uaecptr addr, uae_u32 b)
if ((addr & 0x07c00000) == 0x04000000) { if ((addr & 0x07c00000) == 0x04000000) {
write_log("draco scsi put %08x\n", addr); // write_log("draco scsi put %08x\n", addr);
int reg = addr & 0xffff; int reg = addr & 0xffff;
cpuboard_ncr710_io_bput(reg, b); cpuboard_ncr710_io_bput(reg, b);
@ -755,6 +866,11 @@ static void REGPARAM2 draco_bput(uaecptr addr, uae_u32 b)
case 0x2ff: case 0x2ff:
serial_write(reg, b, draco_serial[1]); serial_write(reg, b, draco_serial[1]);
break; break;
case 0x278:
// parallel
break;
default: default:
write_log("draco superio write %04x = %02x\n", (addr >> 2) & 0xfff, b); write_log("draco superio write %04x = %02x\n", (addr >> 2) & 0xfff, b);
break; break;
@ -771,12 +887,14 @@ static void REGPARAM2 draco_bput(uaecptr addr, uae_u32 b)
int reg = addr & 0x1f; int reg = addr & 0x1f;
uae_u8 oldval = draco_reg[reg]; uae_u8 oldval = draco_reg[reg];
draco_reg[reg] = b; draco_reg[reg] = b;
//draco_reg[1] |= DRCNTRL_FDCINTENA;
//write_log(_T("draco_bput %08x %02x %08x\n"), addr, b & 0xff, M68K_GETPC); //write_log(_T("draco_bput %08x %02x %08x\n"), addr, b & 0xff, M68K_GETPC);
switch(reg) switch(reg)
{ {
case 1: case 1:
if (b & DRCNTRL_WDOGDAT) {
draco_watchdog = 0;
}
draco_irq(); draco_irq();
draco_keyboard_write(b); draco_keyboard_write(b);
break; break;
@ -868,9 +986,29 @@ void casablanca_map_overlay(void)
map_banks(&draco_bank, 0x03000000 >> 16, 0x01000000 >> 16, 0); map_banks(&draco_bank, 0x03000000 >> 16, 0x01000000 >> 16, 0);
} }
void draco_ext_interrupt(bool i6)
{
if (i6) {
draco_intpen |= 8;
} else {
draco_intpen |= 4;
}
draco_irq();
}
void draco_keycode(uae_u8 scancode, uae_u8 state)
{
if (currprefs.cs_compatible == CP_DRACO) {
draco_kbd_in_buffer[draco_kbd_in_buffer_len++] = scancode | (state ? 0x8000 : 0x00);
if (draco_kbd_buffer_len == 0 && !(draco_reg[3] & DRSTAT_KBDRECV)) {
draco_key_process(scancode, state);
}
}
}
static void draco_hsync(void) static void draco_hsync(void)
{ {
uae_u16 tm = 1, ot; uae_u16 tm = 5, ot;
static int hcnt; static int hcnt;
ot = draco_timer; ot = draco_timer;
@ -886,31 +1024,49 @@ static void draco_hsync(void)
if (draco_kbd_buffer_len > 0) { if (draco_kbd_buffer_len > 0) {
draco_keyboard_send(); draco_keyboard_send();
} }
if (draco_kbd_buffer_len == 0 && draco_kbd_in_buffer_len > 0 && !(draco_reg[3] & DRSTAT_KBDRECV)) {
uae_u8 code = (uae_u8)draco_kbd_in_buffer[0];
uae_u8 state = (draco_kbd_in_buffer[0] & 0x8000) ? 1 : 0;
for (int i = 1; i < draco_kbd_in_buffer_len; i++) {
draco_kbd_in_buffer[i - i] = draco_kbd_in_buffer[i];
}
draco_kbd_in_buffer_len--;
draco_key_process(code, state);
}
hcnt++; hcnt++;
if (hcnt >= 60) { if (hcnt >= 60) {
draco_1wire_rtc_count(); draco_1wire_rtc_count();
hcnt = 0; hcnt = 0;
} }
draco_watchdog++;
if (0 && draco_watchdog > 312 * 50) {
IRQ_forced(7, -1);
activate_debugger();
draco_watchdog = 0;
}
} }
void draco_set_scsi_irq(int id, int level) void draco_set_scsi_irq(int id, int level)
{ {
if (level) { draco_scsi_intpen = level;
draco_intpen |= 2;
} else {
draco_intpen &= ~2;
}
draco_irq(); draco_irq();
} }
static void x86_irq(int irq, bool state) static void x86_irq(int irq, bool state)
{ {
draco_fdc_intpen = state; if (irq == 4) {
draco_serial_intpen = state;
} else {
draco_fdc_intpen = state;
}
draco_irq(); draco_irq();
} }
void draco_reset(void) void draco_free(void)
{ {
TCHAR path[MAX_DPATH]; TCHAR path[MAX_DPATH];
cfgfile_resolve_path_out_load(currprefs.flashfile, path, MAX_DPATH, PATH_ROM); cfgfile_resolve_path_out_load(currprefs.flashfile, path, MAX_DPATH, PATH_ROM);
@ -922,13 +1078,17 @@ void draco_reset(void)
zfile_fwrite(draco_1wire_sram, sizeof(draco_1wire_sram), 1, draco_flashfile); zfile_fwrite(draco_1wire_sram, sizeof(draco_1wire_sram), 1, draco_flashfile);
zfile_fclose(draco_flashfile); zfile_fclose(draco_flashfile);
} }
xfree(draco_mouse_base);
draco_mouse_base = NULL;
} }
void draco_init(void) void draco_reset(int hardreset)
{ {
if (currprefs.cs_compatible != CP_DRACO) {
return; x86_initfloppy(x86_irq);
} draco_serial_init(&draco_serial[0], &draco_serial[1]);
draco_mouse_base = mouse_serial_init_draco();
draco_keyboard = draco_keyboard_init();
draco_intena = 0; draco_intena = 0;
draco_intpen = 0; draco_intpen = 0;
@ -938,8 +1098,9 @@ void draco_init(void)
draco_svga_irq_state = 0; draco_svga_irq_state = 0;
draco_fdc_intpen = false; draco_fdc_intpen = false;
draco_superio_idx = -2; draco_superio_idx = -2;
draco_kbd_buffer_len = 0; draco_watchdog = 0;
draco_kbd_state2 = 0; draco_scsi_intpen = 0;
draco_serial_intpen = 0;
memset(draco_superio_cfg, 0, sizeof(draco_superio_cfg)); memset(draco_superio_cfg, 0, sizeof(draco_superio_cfg));
draco_superio_cfg[0] = 0x3b; draco_superio_cfg[0] = 0x3b;
draco_superio_cfg[1] = 0x9f; draco_superio_cfg[1] = 0x9f;
@ -949,7 +1110,9 @@ void draco_init(void)
draco_superio_cfg[13] = 0x65; draco_superio_cfg[13] = 0x65;
draco_superio_cfg[14] = 1; draco_superio_cfg[14] = 1;
memset(draco_reg, 0, sizeof(draco_reg)); memset(draco_reg, 0, sizeof(draco_reg));
draco_reg[1] = DRCNTRL_FDCINTENA | DRCNTRL_KBDINTENA;
draco_keyboard_reset();
draco_1wire_rtc_validate(); draco_1wire_rtc_validate();
draco_1wire_rom[0] = 0x04; draco_1wire_rom[0] = 0x04;
draco_1wire_rom[1] = 1; draco_1wire_rom[1] = 1;
@ -960,6 +1123,14 @@ void draco_init(void)
draco_1wire_rom[6] = 6; draco_1wire_rom[6] = 6;
draco_1wire_rom[7] = 0xaa; draco_1wire_rom[7] = 0xaa;
}
void draco_init(void)
{
if (currprefs.cs_compatible != CP_DRACO) {
return;
}
TCHAR path[MAX_DPATH]; TCHAR path[MAX_DPATH];
cfgfile_resolve_path_out_load(currprefs.flashfile, path, MAX_DPATH, PATH_ROM); cfgfile_resolve_path_out_load(currprefs.flashfile, path, MAX_DPATH, PATH_ROM);
struct zfile *draco_flashfile = zfile_fopen(path, _T("rb"), ZFD_NORMAL); struct zfile *draco_flashfile = zfile_fopen(path, _T("rb"), ZFD_NORMAL);
@ -970,11 +1141,22 @@ void draco_init(void)
zfile_fclose(draco_flashfile); zfile_fclose(draco_flashfile);
} }
x86_initfloppy(x86_irq); draco_reset(1);
draco_serial_init(&draco_serial[0], &draco_serial[1]);
device_add_rethink(draco_irq); device_add_rethink(draco_irq);
device_add_hsync(draco_hsync); device_add_hsync(draco_hsync);
device_add_reset(draco_reset);
}
bool draco_mouse(int port, int x, int y, int z, int b)
{
if (currprefs.cs_compatible == CP_DRACO) {
if (b < 0)
return true;
mouse_serial_poll(x, y, z, b, draco_mouse_base);
return true;
}
return false;
} }
void draco_map_overlay(void) void draco_map_overlay(void)

35
gfxboard.cpp
View File

@ -57,6 +57,7 @@ static bool memlogw = true;
#include "pcem/pcemglue.h" #include "pcem/pcemglue.h"
#include "qemuvga/qemuuaeglue.h" #include "qemuvga/qemuuaeglue.h"
#include "qemuvga/vga.h" #include "qemuvga/vga.h"
#include "draco.h"
extern void put_io_pcem(uaecptr, uae_u32, int); extern void put_io_pcem(uaecptr, uae_u32, int);
extern uae_u32 get_io_pcem(uaecptr, int); extern uae_u32 get_io_pcem(uaecptr, int);
@ -5547,10 +5548,12 @@ static void special_pcem_put(uaecptr addr, uae_u32 v, int size)
if (boardnum == GFXBOARD_ID_ALTAIS_Z3) { if (boardnum == GFXBOARD_ID_ALTAIS_Z3) {
addr &= 0xffff; if ((addr & 0xffff) < 0x100) {
if (addr >= 0x40) { draco_bustimeout(addr);
gfxboard_bput_io_swap_pcem(addr, v); return;
} }
addr &= 0xffff;
gfxboard_bput_io_swap_pcem(addr, v);
} else if (boardnum == GFXBOARD_ID_RETINA_Z2) { } else if (boardnum == GFXBOARD_ID_RETINA_Z2) {
@ -5900,28 +5903,12 @@ static uae_u32 special_pcem_get(uaecptr addr, int size)
if (boardnum == GFXBOARD_ID_ALTAIS_Z3) { if (boardnum == GFXBOARD_ID_ALTAIS_Z3) {
addr &= 0xffff; if ((addr & 0xffff) < 0x100) {
if (addr >= 0x40) { draco_bustimeout(addr);
v = gfxboard_bget_io_swap_pcem(addr); return v;
} else {
switch(addr)
{
case 3:
v = 2 + 4 + 8;
break;
case 7:
v = 19;
break;
case 11:
v = 0x47;
break;
case 15:
v = 0x54;
break;
}
} }
addr &= 0xffff;
v = gfxboard_bget_io_swap_pcem(addr);
} else if (boardnum == GFXBOARD_ID_RETINA_Z2) { } else if (boardnum == GFXBOARD_ID_RETINA_Z2) {

7
include/draco.h
View File

@ -2,5 +2,8 @@
void casablanca_map_overlay(void); void casablanca_map_overlay(void);
void draco_map_overlay(void); void draco_map_overlay(void);
void draco_init(void); void draco_init(void);
void draco_reset(void); void draco_free(void);
bool draco_mouse(int port, int x, int y, int z, int b);
void draco_bustimeout(uaecptr addr);
void draco_ext_interrupt(bool);
void draco_keycode(uae_u8 scancode, uae_u8 state);

2
include/x86.h
View File

@ -9,7 +9,7 @@ bool a2386_init(struct autoconfig_info *aci);
bool isa_expansion_init(struct autoconfig_info *aci); bool isa_expansion_init(struct autoconfig_info *aci);
void x86_bridge_sync_change(void); void x86_bridge_sync_change(void);
void x86_update_sound(float); void x86_update_sound(float);
void x86_mouse(int port, int x, int y, int z, int b); bool x86_mouse(int port, int x, int y, int z, int b);
#define X86_STATE_INACTIVE 0 #define X86_STATE_INACTIVE 0
#define X86_STATE_STOP 1 #define X86_STATE_STOP 1

40
inputdevice.cpp
View File

@ -50,6 +50,7 @@
#include "cia.h" #include "cia.h"
#include "autoconf.h" #include "autoconf.h"
#include "x86.h" #include "x86.h"
#include "draco.h"
#ifdef RETROPLATFORM #ifdef RETROPLATFORM
#include "rp.h" #include "rp.h"
#endif #endif
@ -3393,9 +3394,17 @@ static int getvelocity (int num, int subnum, int pct)
static void mouseupdate (int pct, bool vsync) static void mouseupdate (int pct, bool vsync)
{ {
int max = 120; int max = 120;
bool pcmouse = false;
static int mxd, myd; static int mxd, myd;
if (vsync) { if (vsync) {
if (x86_mouse(0, 0, 0, 0, -1) || draco_mouse(0, 0, 0, 0, -1)) {
pcmouse = true;
pct = 1000;
}
if (mxd < 0) { if (mxd < 0) {
if (mouseedge_x > 0) if (mouseedge_x > 0)
mouseedge_x = 0; mouseedge_x = 0;
@ -3473,19 +3482,24 @@ static void mouseupdate (int pct, bool vsync)
if (!mouse_deltanoreset[i][2]) if (!mouse_deltanoreset[i][2])
mouse_delta[i][2] = 0; mouse_delta[i][2] = 0;
if (getbuttonstate(i, JOYBUTTON_1)) if (pcmouse) {
pc_mouse_buttons[i] |= 1; if (getbuttonstate(i, JOYBUTTON_1))
else pc_mouse_buttons[i] |= 1;
pc_mouse_buttons[i] &= ~1; else
if (getbuttonstate(i, JOYBUTTON_2)) pc_mouse_buttons[i] &= ~1;
pc_mouse_buttons[i] |= 2; if (getbuttonstate(i, JOYBUTTON_2))
else pc_mouse_buttons[i] |= 2;
pc_mouse_buttons[i] &= ~2; else
if (getbuttonstate(i, JOYBUTTON_3)) pc_mouse_buttons[i] &= ~2;
pc_mouse_buttons[i] |= 4; if (getbuttonstate(i, JOYBUTTON_3))
else pc_mouse_buttons[i] |= 4;
pc_mouse_buttons[i] &= ~4; else
x86_mouse(i, v1, v2, v3, pc_mouse_buttons[i]); pc_mouse_buttons[i] &= ~4;
x86_mouse(0, v1, v2, v3, pc_mouse_buttons[i]);
draco_mouse(0, v1, v2, v3, pc_mouse_buttons[i]);
}
#if OUTPUTDEBUG #if OUTPUTDEBUG
if (v1 || v2) { if (v1 || v2) {

5
keybuf.cpp
View File

@ -295,6 +295,11 @@ int record_key_direct(int kc, bool direct)
int kpb_next = kpb_first + 1; int kpb_next = kpb_first + 1;
int kcd = (kc << 7) | (kc >> 1); int kcd = (kc << 7) | (kc >> 1);
if (currprefs.cs_compatible == CP_DRACO) {
inputdevice_draco_key(kc);
return 1;
}
if (!direct) { if (!direct) {
if (key_swap_hack2) { if (key_swap_hack2) {
// $0D <> $0C // $0D <> $0C

17
newcpu.cpp
View File

@ -52,6 +52,7 @@
#include "x86.h" #include "x86.h"
#include "bsdsocket.h" #include "bsdsocket.h"
#include "devices.h" #include "devices.h"
#include "draco.h"
#ifdef JIT #ifdef JIT
#include "jit/compemu.h" #include "jit/compemu.h"
#include <signal.h> #include <signal.h>
@ -4274,12 +4275,16 @@ void safe_interrupt_set(int num, int id, bool i6)
atomic_or(p, 1 << id); atomic_or(p, 1 << id);
atomic_or(&uae_interrupt, 1); atomic_or(&uae_interrupt, 1);
} else { } else {
int inum = i6 ? 13 : 3; if (currprefs.cs_compatible == CP_DRACO) {
uae_u16 v = 1 << inum; draco_ext_interrupt(i6);
if (currprefs.cpu_cycle_exact || currprefs.cpu_compatible) { } else {
INTREQ_INT(inum, 0); int inum = i6 ? 13 : 3;
} else if (!(intreq & v)) { uae_u16 v = 1 << inum;
INTREQ_0(0x8000 | v); if (currprefs.cpu_cycle_exact || currprefs.cpu_compatible) {
INTREQ_INT(inum, 0);
} else if (!(intreq & v)) {
INTREQ_0(0x8000 | v);
}
} }
} }
} }

1160
od-win32/winuae_msvc15/keyboard_at_draco.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

1
od-win32/winuae_msvc15/winuae_msvc.vcxproj
View File

@ -1569,6 +1569,7 @@
<ClCompile Include="..\..\jit\compemu_support.cpp" /> <ClCompile Include="..\..\jit\compemu_support.cpp" />
<ClCompile Include="..\..\jit\compstbl.cpp" /> <ClCompile Include="..\..\jit\compstbl.cpp" />
<ClCompile Include="..\..\moduleripper.cpp" /> <ClCompile Include="..\..\moduleripper.cpp" />
<ClCompile Include="keyboard_at_draco.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="..\fpux64_80.asm"> <CustomBuild Include="..\fpux64_80.asm">

3
od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
View File

@ -1003,6 +1003,9 @@
<ClCompile Include="..\..\pcem\vid_ncr.cpp"> <ClCompile Include="..\..\pcem\vid_ncr.cpp">
<Filter>pcem</Filter> <Filter>pcem</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="keyboard_at_draco.cpp">
<Filter>pcem</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\resources\35floppy.ico"> <None Include="..\resources\35floppy.ico">

40
pcem/mouse_serial.cpp
View File

@ -21,7 +21,7 @@ void mouse_serial_poll(int x, int y, int z, int b, void *p)
if (!(serial->ier & 1)) if (!(serial->ier & 1))
return; return;
if (!x && !y && b == mouse->oldb) if (!x && !y && b == mouse->oldb && !b)
return; return;
mouse->oldb = b; mouse->oldb = b;
@ -48,25 +48,26 @@ void mouse_serial_poll(int x, int y, int z, int b, void *p)
} }
} }
void mousecallback(void *p)
{
mouse_serial_t *mouse = (mouse_serial_t *)p;
if (mouse->mousepos == -1)
{
mouse->mousepos = 0;
serial_write_fifo(mouse->serial, 'M');
}
}
void mouse_serial_rcr(struct SERIAL *serial, void *p) void mouse_serial_rcr(struct SERIAL *serial, void *p)
{ {
mouse_serial_t *mouse = (mouse_serial_t *)p; mouse_serial_t *mouse = (mouse_serial_t *)p;
mouse->mousepos = -1; mouse->mousepos = -1;
timer_set_delay_u64(&mouse->mousedelay_timer, TIMER_USEC * 5000); mousecallback(p);
// timer_set_delay_u64(&mouse->mousedelay_timer, TIMER_USEC * 5000);
} }
void mousecallback(void *p)
{
mouse_serial_t *mouse = (mouse_serial_t *)p;
if (mouse->mousepos == -1)
{
mouse->mousepos = 0;
serial_write_fifo(mouse->serial, 'M');
}
}
void *mouse_serial_init() void *mouse_serial_init()
{ {
mouse_serial_t *mouse = (mouse_serial_t *)malloc(sizeof(mouse_serial_t)); mouse_serial_t *mouse = (mouse_serial_t *)malloc(sizeof(mouse_serial_t));
@ -80,6 +81,19 @@ void *mouse_serial_init()
return mouse; return mouse;
} }
void *mouse_serial_init_draco()
{
mouse_serial_t *mouse = (mouse_serial_t *)malloc(sizeof(mouse_serial_t));
memset(mouse, 0, sizeof(mouse_serial_t));
mouse->serial = &serial2;
serial2.rcr_callback = mouse_serial_rcr;
serial2.rcr_callback_p = mouse;
return mouse;
}
void mouse_serial_close(void *p) void mouse_serial_close(void *p)
{ {
mouse_serial_t *mouse = (mouse_serial_t *)p; mouse_serial_t *mouse = (mouse_serial_t *)p;

55
pcem/serial.cpp
View File

@ -15,6 +15,9 @@ enum
SERIAL serial1, serial2; SERIAL serial1, serial2;
static bool draco_serial;
void x86_clearirq(uint8_t irqnum);
void x86_doirq(uint8_t irqnum);
void serial_reset() void serial_reset()
{ {
@ -22,6 +25,8 @@ void serial_reset()
serial2.iir = serial2.ier = serial2.lcr = 0; serial2.iir = serial2.ier = serial2.lcr = 0;
serial1.fifo_read = serial1.fifo_write = 0; serial1.fifo_read = serial1.fifo_write = 0;
serial2.fifo_read = serial2.fifo_write = 0; serial2.fifo_read = serial2.fifo_write = 0;
serial1.iir = 1;
serial2.iir = 1;
} }
void serial_update_ints(SERIAL *serial) void serial_update_ints(SERIAL *serial)
@ -51,10 +56,31 @@ void serial_update_ints(SERIAL *serial)
serial->iir = 0; serial->iir = 0;
} }
if (stat && ((serial->mctrl & 8) || PCJR)) if (stat && ((serial->mctrl & 8) || PCJR)) {
picintlevel(1 << serial->irq); if (draco_serial) {
else x86_doirq(serial->irq);
} else {
picintlevel(1 << serial->irq);
}
} else {
if (draco_serial) {
x86_clearirq(serial->irq);
} else {
picintc(1 << serial->irq); picintc(1 << serial->irq);
}
}
}
void serial_receive_callback(void *p)
{
SERIAL *serial = (SERIAL *)p;
if (serial->fifo_read != serial->fifo_write)
{
serial->lsr |= 1;
serial->int_status |= SERIAL_INT_RECEIVE;
serial_update_ints(serial);
}
} }
void serial_write_fifo(SERIAL *serial, uint8_t dat) void serial_write_fifo(SERIAL *serial, uint8_t dat)
@ -185,8 +211,13 @@ uint8_t serial_read(uint16_t addr, void *p)
serial->int_status &= ~SERIAL_INT_RECEIVE; serial->int_status &= ~SERIAL_INT_RECEIVE;
serial_update_ints(serial); serial_update_ints(serial);
temp = serial_read_fifo(serial); temp = serial_read_fifo(serial);
if (serial->fifo_read != serial->fifo_write) if (serial->fifo_read != serial->fifo_write) {
if (draco_serial) {
serial_receive_callback(p);
} else {
timer_set_delay_u64(&serial->receive_timer, 1000 * TIMER_USEC); timer_set_delay_u64(&serial->receive_timer, 1000 * TIMER_USEC);
}
}
break; break;
case 1: case 1:
if (serial->lcr & 0x80) if (serial->lcr & 0x80)
@ -235,18 +266,6 @@ uint8_t serial_read(uint16_t addr, void *p)
return temp; return temp;
} }
void serial_receive_callback(void *p)
{
SERIAL *serial = (SERIAL *)p;
if (serial->fifo_read != serial->fifo_write)
{
serial->lsr |= 1;
serial->int_status |= SERIAL_INT_RECEIVE;
serial_update_ints(serial);
}
}
/*Tandy might need COM1 at 2f8*/ /*Tandy might need COM1 at 2f8*/
void serial1_init(uint16_t addr, int irq, int has_fifo) void serial1_init(uint16_t addr, int irq, int has_fifo)
{ {
@ -257,6 +276,7 @@ void serial1_init(uint16_t addr, int irq, int has_fifo)
serial1.rcr_callback = NULL; serial1.rcr_callback = NULL;
timer_add(&serial1.receive_timer, serial_receive_callback, &serial1, 0); timer_add(&serial1.receive_timer, serial_receive_callback, &serial1, 0);
serial1.has_fifo = has_fifo; serial1.has_fifo = has_fifo;
draco_serial = false;
} }
void serial1_set(uint16_t addr, int irq) void serial1_set(uint16_t addr, int irq)
{ {
@ -305,7 +325,10 @@ void draco_serial_init(void **s1, void **s2)
serial_reset(); serial_reset();
serial1.has_fifo = 1; serial1.has_fifo = 1;
serial2.has_fifo = 1; serial2.has_fifo = 1;
serial1.irq = 4;
serial2.irq = 4;
*s1 = &serial1; *s1 = &serial1;
*s2 = &serial2; *s2 = &serial2;
draco_serial = true;
} }

2
rommgr.cpp
View File

@ -300,7 +300,7 @@ static struct romdata roms[] = {
{ _T("DraCo Boot ROM v1.3"), 1, 3, 1, 3, _T("DRACO\0"), 131072, 234, 2 | 4, 0, ROMTYPE_EXTCDTV, 0, 0, NULL, { _T("DraCo Boot ROM v1.3"), 1, 3, 1, 3, _T("DRACO\0"), 131072, 234, 2 | 4, 0, ROMTYPE_EXTCDTV, 0, 0, NULL,
0x0e9c5899,0x82151324,0x01207554,0x60c8a068,0x4793ec18,0x3f744d74, NULL, NULL, 4 }, 0x0e9c5899,0x82151324,0x01207554,0x60c8a068,0x4793ec18,0x3f744d74, NULL, NULL, 4 },
{ _T("DraCo Boot ROM v1.5"), 1, 5, 1, 5, _T("DRACO\0"), 131072, 311, 2 | 4, 0, ROMTYPE_EXTCDTV, 0, 0, NULL, { _T("DraCo Boot ROM v1.5"), 1, 5, 1, 5, _T("DRACO\0"), 131072, 311, 2 | 4, 0, ROMTYPE_EXTCDTV, 0, 0, NULL,
0x0f2959d5,0xe8fd5d15,0x08797693,0x99f1df97,0x2fe792fd,0x8146cf1d, NULL, NULL, 4 }, 0x7b4cdd4a,0x4d383adb,0x85c681a3,0xb625dcda,0x7a229a17,0x6af4d161, NULL, NULL, 4 },
{ _T("CD32 KS ROM v3.1"), 3, 1, 40, 60, _T("CD32\0"), 524288, 18, 1, 0, ROMTYPE_KICKCD32, 0, 0, NULL, { _T("CD32 KS ROM v3.1"), 3, 1, 40, 60, _T("CD32\0"), 524288, 18, 1, 0, ROMTYPE_KICKCD32, 0, 0, NULL,
0x1e62d4a5, 0x3525BE88,0x87F79B59,0x29E017B4,0x2380A79E,0xDFEE542D, NULL, NULL, 1 }, 0x1e62d4a5, 0x3525BE88,0x87F79B59,0x29E017B4,0x2380A79E,0xDFEE542D, NULL, NULL, 1 },

15
x86.cpp
View File

@ -3303,6 +3303,8 @@ int is_x86_cpu(struct uae_prefs *p)
} }
if (!xb || xb->x86_reset) if (!xb || xb->x86_reset)
return X86_STATE_STOP; return X86_STATE_STOP;
if (xb && xb->type < 0)
return X86_STATE_INACTIVE;
return X86_STATE_ACTIVE; return X86_STATE_ACTIVE;
} }
@ -3575,22 +3577,27 @@ static void set_vga(struct x86_bridge *xb)
void mouse_serial_poll(int x, int y, int z, int b, void *p); void mouse_serial_poll(int x, int y, int z, int b, void *p);
void mouse_ps2_poll(int x, int y, int z, int b, void *p); void mouse_ps2_poll(int x, int y, int z, int b, void *p);
void x86_mouse(int port, int x, int y, int z, int b) bool x86_mouse(int port, int x, int y, int z, int b)
{ {
struct x86_bridge *xb = bridges[0]; struct x86_bridge *xb = bridges[0];
if (!xb || !xb->mouse_port || !xb->mouse_base || xb->mouse_port != port + 1) if (!xb || !xb->mouse_port || !xb->mouse_base || xb->mouse_port != port + 1)
return; return false;
switch (xb->mouse_type) switch (xb->mouse_type)
{ {
case 0: case 0:
default: default:
if (b < 0)
return true;
mouse_serial_poll(x, y, z, b, xb->mouse_base); mouse_serial_poll(x, y, z, b, xb->mouse_base);
break; return true;
case 1: case 1:
case 2: case 2:
if (b < 0)
return true;
mouse_ps2_poll(x, y, z, b, xb->mouse_base); mouse_ps2_poll(x, y, z, b, xb->mouse_base);
break; return true;
} }
return false;
} }
void *mouse_serial_init(); void *mouse_serial_init();