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

ks1.3 z3chip support

Browse Source
This commit is contained in:
Toni Wilen 2010-06-05 22:32:00 +03:00
parent 69e8b30713
commit a4b1ddb7b4
7 changed files with 962 additions and 844 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
expansion.cpp
View File

@ -1020,34 +1020,34 @@ static void expamem_init_filesys (void)
* Zorro III expansion memory
*/
static void expamem_map_z3fastmem_2 (addrbank *bank, uaecptr *startp, uae_u32 size, uae_u32 allocated)
static void expamem_map_z3fastmem_2 (addrbank *bank, uaecptr *startp, uae_u32 size, uae_u32 allocated, int chip)
{
int z3fs = ((expamem_hi | (expamem_lo >> 4)) << 16);
int start = *startp;
if (start != z3fs) {
write_log (L"WARNING: Z3FAST mapping changed from $%08x to $%08x\n", start, z3fs);
write_log (L"WARNING: Z3MEM mapping changed from $%08x to $%08x\n", start, z3fs);
map_banks (&dummy_bank, start >> 16, size >> 16,
allocated);
*startp = z3fs;
map_banks (bank, start >> 16, size >> 16,
allocated);
}
write_log (L"Fastmem (32bit): mapped @$%08x: %d MB Zorro III fast memory \n",
start, allocated / 0x100000);
write_log (L"Z3MEM (32bit): mapped @$%08x: %d MB Zorro III %s memory \n",
start, allocated / 0x100000, chip ? L"chip" : L"fast");
}
static void expamem_map_z3fastmem (void)
{
expamem_map_z3fastmem_2 (&z3fastmem_bank, &z3fastmem_start, currprefs.z3fastmem_size, allocated_z3fastmem);
expamem_map_z3fastmem_2 (&z3fastmem_bank, &z3fastmem_start, currprefs.z3fastmem_size, allocated_z3fastmem, 0);
}
static void expamem_map_z3fastmem2 (void)
{
expamem_map_z3fastmem_2 (&z3fastmem2_bank, &z3fastmem2_start, currprefs.z3fastmem2_size, allocated_z3fastmem2);
expamem_map_z3fastmem_2 (&z3fastmem2_bank, &z3fastmem2_start, currprefs.z3fastmem2_size, allocated_z3fastmem2, 0);
}
static void expamem_map_z3chipmem (void)
{
expamem_map_z3fastmem_2 (&z3chipmem_bank, &z3chipmem_start, currprefs.z3chipmem_size, allocated_z3chipmem);
expamem_map_z3fastmem_2 (&z3chipmem_bank, &z3chipmem_start, currprefs.z3chipmem_size, allocated_z3chipmem, 1);
}
@ -1334,6 +1334,8 @@ static uaecptr check_boot_rom (void)
return b;
if (currprefs.chipmem_size > 2 * 1024 * 1024)
return b;
if (currprefs.z3chipmem_size)
return b;
return 0;
}
@ -1425,12 +1427,16 @@ void expamem_reset (void)
z3fastmem2_start = currprefs.z3fastmem_start + currprefs.z3fastmem_size;
if (z3fastmem != NULL) {
z3num = 0;
card_init[cardno] = expamem_init_z3fastmem;
card_map[cardno++] = expamem_map_z3fastmem;
if (kickstart_version >= 36) {
card_init[cardno] = expamem_init_z3fastmem;
card_map[cardno++] = expamem_map_z3fastmem;
}
map_banks (&z3fastmem_bank, z3fastmem_start >> 16, currprefs.z3fastmem_size >> 16, allocated_z3fastmem);
if (z3fastmem2 != NULL) {
card_init[cardno] = expamem_init_z3fastmem2;
card_map[cardno++] = expamem_map_z3fastmem2;
if (kickstart_version >= 36) {
card_init[cardno] = expamem_init_z3fastmem2;
card_map[cardno++] = expamem_map_z3fastmem2;
}
map_banks (&z3fastmem2_bank, z3fastmem2_start >> 16, currprefs.z3fastmem2_size >> 16, allocated_z3fastmem2);
}
}
@ -1439,8 +1445,10 @@ void expamem_reset (void)
z3chipmem_start += 16 * 1024 * 1024;
if (z3chipmem != NULL) {
z3num = 0;
card_init[cardno] = expamem_init_z3chipmem;
card_map[cardno++] = expamem_map_z3chipmem;
if (kickstart_version >= 36) {
card_init[cardno] = expamem_init_z3chipmem;
card_map[cardno++] = expamem_map_z3chipmem;
}
map_banks (&z3chipmem_bank, z3chipmem_start >> 16, currprefs.z3chipmem_size >> 16, allocated_z3chipmem);
}
#ifdef CDTV

30
filesys.asm
View File

@ -22,6 +22,7 @@
; 2008.12.25 mousehack cursor sync
; 2009.01.20 clipboard sharing
; 2009.12.27 console hook
; 2010.05.27 Z3Chip
AllocMem = -198
FreeMem = -210
@ -225,17 +226,22 @@ FSIN_none:
filesys_dev_storeinfo ; add >2MB chip RAM to memory list
moveq #3,d4 ; MEMF_CHIP | MEMF_PUBLIC
cmp.w #36,20(a6)
bcs.s FSIN_ksold
or.w #256,d4 ; MEMF_LOCAL
FSIN_ksold
move.w #$FF80,d0
bsr.w getrtbase
jsr (a0)
moveq.l #3,d1
moveq.l #-10,d2
move.l d4,d1
moveq #-10,d2
move.l #$200000,a0
sub.l a0,d0
bcs.b FSIN_chip_done
beq.b FSIN_chip_done
moveq.l #0,d4
move.l d4,a1
sub.l a1,a1
jsr -618(a6) ; AddMemList
FSIN_chip_done
@ -243,7 +249,7 @@ FSIN_chip_done
move.w #$FF80,d0
bsr.w getrtbase
jsr (a0) ; d1 = size, a1 = start address
tst.l d1
move.l d1,d2
beq.s FSIN_fchip_done
move.l a1,a2
jsr -$0078(a6) ; Disable
@ -251,17 +257,27 @@ FSIN_chip_done
FSIN_scanfchip:
move.l (a0),a0 ; first MemList
tst.l (a0)
beq.s FSIN_fchip_done
bne.s FSIN_fchip_found
; not in memlist, AddMem() it
move.l a2,a0
move.l d2,d0
move.l d4,d1
moveq #-5,d2
lea fchipname(pc),a1
jsr -618(a6) ; AddMemList
bra.s FSIN_fchip_done2
FSIN_fchip_found
move.l 20(a0),d0 ; mh_Lower
clr.w d0
cmp.l d0,a2
bne.s FSIN_scanfchip
move.w 14(a0),d0 ; attributes
and.w #~4,d0 ; MEMF_FAST
or.w #2+1+256,d0 ; MEMF_CHIP | MEMF_PUBLIC | MEMF_LOCAL
or.w d4,d0
move.w d0,14(a0)
lea fchipname(pc),a1
move.l a1,10(a0)
FSIN_fchip_done2
jsr -$007e(a6) ; Enable
FSIN_fchip_done

8
filesys.cpp
View File

@ -223,7 +223,7 @@ static void close_filesys_unit (UnitInfo *uip)
uip->open = 0;
}
static UnitInfo *getuip(struct uae_prefs *p, int index)
static UnitInfo *getuip (struct uae_prefs *p, int index)
{
if (index < 0)
return NULL;
@ -2423,7 +2423,7 @@ static void notify_check (Unit *unit, a_inode *a)
int hash = notifyhash (a->aname);
for (n = unit->notifyhash[hash]; n; n = n->next) {
uaecptr nr = n->notifyrequest;
if (same_aname(n->partname, a->aname)) {
if (same_aname (n->partname, a->aname)) {
int err;
a_inode *a2 = find_aino (unit, 0, n->fullname, &err);
if (err == 0 && a == a2)
@ -2434,7 +2434,7 @@ static void notify_check (Unit *unit, a_inode *a)
hash = notifyhash (a->parent->aname);
for (n = unit->notifyhash[hash]; n; n = n->next) {
uaecptr nr = n->notifyrequest;
if (same_aname(n->partname, a->parent->aname)) {
if (same_aname (n->partname, a->parent->aname)) {
int err;
a_inode *a2 = find_aino (unit, 0, n->fullname, &err);
if (err == 0 && a->parent == a2)
@ -2517,7 +2517,7 @@ static void
}
}
}
//write_log (L"Tried to free non-existing NotifyRequest %08X\n", nr);
write_log (L"Tried to free non-existing NotifyRequest %08X\n", nr);
PUT_PCK_RES1 (packet, DOS_TRUE);
}

1469
filesys_bootrom.cpp
View File

File diff suppressed because it is too large Load Diff

8
include/inputdevice.h
View File

@ -89,10 +89,10 @@ extern int inputdevice_get_device_total (int type);
extern int inputdevice_get_widget_num (int devnum);
extern int inputdevice_get_widget_type (int devnum, int num, TCHAR *name);
extern int input_get_default_mouse (struct uae_input_device *uid, int num, int port);
extern int input_get_default_lightpen (struct uae_input_device *uid, int num, int port);
extern int input_get_default_joystick (struct uae_input_device *uid, int num, int port, int mode);
extern int input_get_default_joystick_analog (struct uae_input_device *uid, int num, int port);
extern int input_get_default_mouse (struct uae_input_device *uid, int num, int port, int af);
extern int input_get_default_lightpen (struct uae_input_device *uid, int num, int port, int af);
extern int input_get_default_joystick (struct uae_input_device *uid, int num, int port, int af, int mode);
extern int input_get_default_joystick_analog (struct uae_input_device *uid, int num, int port, int af);
extern int input_get_default_keyboard (int num);
#define DEFEVENT(A, B, C, D, E, F) INPUTEVENT_ ## A,

251
inputdevice.cpp
View File

@ -117,7 +117,7 @@ static uae_u8 scancodeused[MAX_INPUT_DEVICES][256];
// fire/left mouse button pullup resistors enabled?
static bool mouse_pullup = true;
static bool joystick_pullup = true;
static bool joystick_pullup = false;
static int input_acquired;
static int testmode, testmode_read, testmode_toggle;
@ -573,17 +573,30 @@ static void write_config2 (struct zfile *f, int idnum, int i, int offset, TCHAR
if (k == MAX_INPUT_SUB_EVENT)
break;
}
if (id->port[i + offset][0] > 0 && !(id->flags[i + offset][0] & ID_FLAG_GAMEPORTSCUSTOM))
break;
if (p > tmp2) {
*p++ = ',';
*p = 0;
}
if (custom && _tcslen (custom) > 0)
bool ok = false;
if (custom && _tcslen (custom) > 0) {
_stprintf (p, L"'%s'.%d", custom, id->flags[i + offset][j] & ID_FLAG_SAVE_MASK);
else if (evt <= 0)
ok = true;
} else if (evt <= 0) {
_stprintf (p, L"NULL");
else
} else {
_stprintf (p, L"%s.%d", events[evt].confname, id->flags[i + offset][j] & ID_FLAG_SAVE_MASK);
ok = true;
}
p += _tcslen (p);
if (ok) {
if (id->port[i + offset][j] > 0) {
_stprintf (p, L".%d", id->port[i + offset][j] - 1);
p += _tcslen (p);
}
}
}
if (p > tmp2) {
_stprintf (tmp3, L"input.%d.%s%d", idnum + 1, tmp1, i);
@ -647,6 +660,8 @@ static void write_kbr_config (struct zfile *f, int idnum, int devnum, struct uae
}
k++;
}
if (kbr->port[i][0] > 0 && !(kbr->flags[i][0] & ID_FLAG_GAMEPORTSCUSTOM))
skip = 1;
if (kbr->eventid[i][0] == 0 && (kbr->flags[i][0] & ID_FLAG_SAVE_MASK) == 0 && keyboard_default[k].scancode < 0)
skip = 1;
if (skip) {
@ -670,13 +685,23 @@ static void write_kbr_config (struct zfile *f, int idnum, int devnum, struct uae
*p++ = ',';
*p = 0;
}
if (custom && _tcslen (custom) > 0)
bool ok = false;
if (custom && _tcslen (custom) > 0) {
_stprintf (p, L"'%s'.%d", custom, kbr->flags[i][j] & ID_FLAG_SAVE_MASK);
else if (evt > 0)
ok = true;
} else if (evt > 0) {
_stprintf (p, L"%s.%d", events[evt].confname, kbr->flags[i][j] & ID_FLAG_SAVE_MASK);
else
ok = true;
} else {
_tcscat (p, L"NULL");
}
p += _tcslen(p);
if (ok) {
if (kbr->port[i][j] > 0) {
_stprintf (p, L".%d", kbr->port[i][j] - 1);
p += _tcslen (p);
}
}
}
_stprintf (tmp3, L"%d", kbr->extra[i][0]);
kbrlabel (tmp3);
@ -844,7 +869,7 @@ void read_inputdevice_config (struct uae_prefs *pr, TCHAR *option, TCHAR *value)
{
struct uae_input_device *id = 0;
struct inputevent *ie;
int devnum, num, button, joystick, flags, i, subnum, idnum, keynum;
int devnum, num, button, joystick, flags, port, i, subnum, idnum, keynum;
int mask;
TCHAR *p, *p2, *custom;
@ -1005,8 +1030,18 @@ void read_inputdevice_config (struct uae_prefs *pr, TCHAR *option, TCHAR *value)
}
}
flags = 0;
port = 0;
if (p[-1] == '.')
flags = getnum (&p);
if (p[-1] == '.') {
port = getnum (&p) + 1;
}
while (*p != 0) {
if (p[-1] == ',')
break;
p++;
}
if (custom == NULL && ie->name == NULL) {
if (!_tcscmp(p2, L"NULL")) {
if (joystick < 0) {
@ -1027,6 +1062,7 @@ void read_inputdevice_config (struct uae_prefs *pr, TCHAR *option, TCHAR *value)
continue;
id->eventid[keynum][subnum] = ie - events;
id->flags[keynum][subnum] = flags;
id->port[keynum][subnum] = port;
xfree (id->custom[keynum][subnum]);
id->custom[keynum][subnum] = custom;
} else if (button) {
@ -1038,6 +1074,7 @@ void read_inputdevice_config (struct uae_prefs *pr, TCHAR *option, TCHAR *value)
continue;
id->eventid[num + ID_BUTTON_OFFSET][subnum] = ie - events;
id->flags[num + ID_BUTTON_OFFSET][subnum] = flags;
id->port[num + ID_BUTTON_OFFSET][subnum] = port;
xfree (id->custom[num + ID_BUTTON_OFFSET][subnum]);
id->custom[num + ID_BUTTON_OFFSET][subnum] = custom;
} else {
@ -1049,6 +1086,7 @@ void read_inputdevice_config (struct uae_prefs *pr, TCHAR *option, TCHAR *value)
continue;
id->eventid[num + ID_AXIS_OFFSET][subnum] = ie - events;
id->flags[num + ID_AXIS_OFFSET][subnum] = flags;
id->port[num + ID_AXIS_OFFSET][subnum] = port;
xfree (id->custom[num + ID_AXIS_OFFSET][subnum]);
id->custom[num + ID_AXIS_OFFSET][subnum] = custom;
}
@ -2017,7 +2055,7 @@ static void cap_check (void)
joypot = joydirpot[joy][i];
if (analog_port[joy][i] && pot_cap[joy][i] < joypot)
charge = 1; // slow charge via pot variable resistor
if (((joystick_pullup && digital_port[joy][i]) || (mouse_pullup && mouse_port[joy])))
if (((joystick_pullup && digital_port[joy][i]) || (mouse_pullup && mouse_port[joy] && digital_port[joy][i])))
charge = 1; // slow charge via pull-up resistor
}
if (!(potgo_value & pdir)) { // input?
@ -2061,7 +2099,7 @@ static void cap_check (void)
}
/* official Commodore mouse has pull-up resistors in button lines
* NOTE: 3rd party mice may not have pullups! */
if (dong < 0 && (mouse_pullup && mouse_port[joy]) && charge == 0)
if (dong < 0 && (mouse_pullup && mouse_port[joy] && digital_port[joy][i]) && charge == 0)
charge = 2;
/* emulate pullup resistor if button mapped because there too many broken
* programs that read second button in input-mode (and most 2+ button pads have
@ -3533,7 +3571,24 @@ static void checkcompakb (int *kb, int *srcmap)
}
}
static void setcompakb (int *kb, int *srcmap, int index)
static void setautofireevent (struct uae_input_device *uid, int num, int sub, int af, int index)
{
if (!af)
return;
int *afp = af_ports[index];
for (int k = 0; afp[k] >= 0; k++) {
if (afp[k] == uid->eventid[num][sub]) {
uid->flags[num][sub] &= ~(ID_FLAG_AUTOFIRE | ID_FLAG_TOGGLE);
if (af >= JPORT_AF_NORMAL)
uid->flags[num][sub] |= ID_FLAG_AUTOFIRE;
if (af == JPORT_AF_TOGGLE)
uid->flags[num][sub] |= ID_FLAG_TOGGLE;
return;
}
}
}
static void setcompakb (int *kb, int *srcmap, int index, int af)
{
int j, k;
k = j = 0;
@ -3549,6 +3604,7 @@ static void setcompakb (int *kb, int *srcmap, int index)
uid->port[l][0] = index + 1;
xfree (uid->custom[l][0]);
uid->custom[l][0] = NULL;
setautofireevent (uid, l, 0, af, index);
break;
}
}
@ -3664,28 +3720,34 @@ static void remove_compa_config (struct uae_prefs *prefs, int index)
}
}
static void cleardevgp (struct uae_input_device *uid, int num, int index)
static void cleardevgp (struct uae_input_device *uid, int num, bool nocustom, int index)
{
for (int i = 0; i < MAX_INPUT_DEVICE_EVENTS; i++) {
for (int j = 0; j < MAX_INPUT_SUB_EVENT; j++) {
if (uid[num].port[i][j] == index + 1) {
if (nocustom && (uid[num].flags[i][j] & ID_FLAG_GAMEPORTSCUSTOM))
continue;
uid[num].eventid[i][j] = 0;
uid[num].flags[i][j] = 0;
xfree (uid[num].custom[i][j]);
uid[num].custom[i][j] = NULL;
uid[num].port[i][j] = 0;
}
}
}
}
static void cleardevkbrgp (struct uae_input_device *uid, int num, int index)
static void cleardevkbrgp (struct uae_input_device *uid, int num, bool nocustom, int index)
{
for (int i = 0; i < MAX_INPUT_DEVICE_EVENTS; i++) {
for (int j = 0; j < MAX_INPUT_SUB_EVENT; j++) {
if (uid[num].port[i][j] == index + 1) {
if (nocustom && (uid[num].flags[i][j] & ID_FLAG_GAMEPORTSCUSTOM))
continue;
uid[num].eventid[i][j] = 0;
uid[num].flags[i][j] = 0;
xfree (uid[num].custom[i][j]);
uid[num].custom[i][j] = NULL;
uid[num].port[i][j] = 0;
if (j == 0)
set_kbr_default_event (&uid[num], keyboard_default, i);
}
@ -3693,12 +3755,12 @@ static void cleardevkbrgp (struct uae_input_device *uid, int num, int index)
}
}
static void remove_custom_config (struct uae_prefs *prefs, int index)
static void remove_custom_config (struct uae_prefs *prefs, bool nocustom, int index)
{
for (int l = 0; l < MAX_INPUT_DEVICES; l++) {
cleardevgp (joysticks, l, index);
cleardevgp (mice, l, index);
cleardevkbrgp (keyboards, l, index);
cleardevgp (joysticks, l, nocustom, index);
cleardevgp (mice, l, nocustom, index);
cleardevkbrgp (keyboards, l, nocustom, index);
}
}
@ -3715,7 +3777,7 @@ void inputdevice_compa_prepare_custom (struct uae_prefs *prefs, int index)
prefs->jports[index].id = -2;
remove_compa_config (prefs, index);
remove_custom_config (prefs, index);
remove_custom_config (prefs, false, index);
}
// clear device before switching to new one
void inputdevice_compa_clear (struct uae_prefs *prefs, int index)
@ -3737,34 +3799,34 @@ static void cleardev (struct uae_input_device *uid, int num)
}
}
static void enablejoydevice (struct uae_input_device *uid, int evtnum)
static void enablejoydevice (struct uae_input_device *uid, bool gameportsmode, int evtnum)
{
for (int i = 0; i < MAX_INPUT_DEVICE_EVENTS; i++) {
for (int j = 0; j < MAX_INPUT_SUB_EVENT; j++) {
if (uid->eventid[i][j] == evtnum) {
if ((gameportsmode && uid->eventid[i][j] == evtnum) || uid->port[i][j] > 0) {
uid->enabled = 1;
}
}
}
}
static void setjoydevices (struct uae_prefs *prefs, int port)
static void setjoydevices (struct uae_prefs *prefs, bool gameportsmode, int port)
{
for (int i = 0; joyinputs[port] && joyinputs[port][i] >= 0; i++) {
int evtnum = joyinputs[port][i];
for (int l = 0; l < MAX_INPUT_DEVICES; l++) {
enablejoydevice (&prefs->joystick_settings[GAMEPORT_INPUT_SETTINGS][l], evtnum);
enablejoydevice (&prefs->mouse_settings[GAMEPORT_INPUT_SETTINGS][l], evtnum);
enablejoydevice (&prefs->keyboard_settings[GAMEPORT_INPUT_SETTINGS][l], evtnum);
enablejoydevice (&joysticks[l], gameportsmode, evtnum);
enablejoydevice (&mice[l], gameportsmode, evtnum);
enablejoydevice (&keyboards[l], gameportsmode, evtnum);
}
for (int k = 0; axistable[k] >= 0; k += 3) {
if (evtnum == axistable[k] || evtnum == axistable[k + 1] || evtnum == axistable[k + 2]) {
for (int j = 0; j < 3; j++) {
int evtnum2 = axistable[k + j];
for (int l = 0; l < MAX_INPUT_DEVICES; l++) {
enablejoydevice (&prefs->joystick_settings[GAMEPORT_INPUT_SETTINGS][l], evtnum2);
enablejoydevice (&prefs->mouse_settings[GAMEPORT_INPUT_SETTINGS][l], evtnum2);
enablejoydevice (&prefs->keyboard_settings[GAMEPORT_INPUT_SETTINGS][l], evtnum2);
enablejoydevice (&joysticks[l], gameportsmode, evtnum2);
enablejoydevice (&mice[l], gameportsmode, evtnum2);
enablejoydevice (&keyboards[l], gameportsmode, evtnum2);
}
}
break;
@ -3824,9 +3886,9 @@ static void setautofire (struct uae_input_device *uid, int port, int af)
static void setautofires (struct uae_prefs *prefs, int port, int af)
{
for (int l = 0; l < MAX_INPUT_DEVICES; l++) {
setautofire (&prefs->joystick_settings[GAMEPORT_INPUT_SETTINGS][l], port, af);
setautofire (&prefs->mouse_settings[GAMEPORT_INPUT_SETTINGS][l], port, af);
setautofire (&prefs->keyboard_settings[GAMEPORT_INPUT_SETTINGS][l], port, af);
setautofire (&joysticks[l], port, af);
setautofire (&mice[l], port, af);
setautofire (&keyboards[l], port, af);
}
}
@ -3841,15 +3903,15 @@ static void compatibility_copy (struct uae_prefs *prefs, bool gameports)
joyinputs[i]= NULL;
// remove all mappings from this port, except if custom
if (prefs->jports[i].id != JPORT_CUSTOM) {
if (gameports) {
if (gameports)
remove_compa_config (prefs, i);
remove_custom_config (prefs, i);
}
}
remove_custom_config (prefs, prefs->jports[i].id == JPORT_CUSTOM, i);
setjoyinputs (prefs, i);
}
for (i = 0; i < 2; i++) {
int af = prefs->jports[i].autofire;
if (prefs->jports[i].id >= 0 && joymodes[i] <= 0) {
int mode = prefs->jports[i].mode;
if (jsem_ismouse (i, prefs) >= 0) {
@ -3924,20 +3986,22 @@ static void compatibility_copy (struct uae_prefs *prefs, bool gameports)
}
for (i = 0; i < 2; i++) {
int af = prefs->jports[i].autofire;
if (prefs->jports[i].id >= 0) {
int mode = prefs->jports[i].mode;
if ((joy = jsem_ismouse (i, prefs)) >= 0) {
cleardev (mice, joy);
if (gameports)
cleardev (mice, joy);
switch (mode)
{
case JSEM_MODE_DEFAULT:
case JSEM_MODE_MOUSE:
default:
input_get_default_mouse (mice, joy, i);
input_get_default_mouse (mice, joy, i, af);
joymodes[i] = JSEM_MODE_MOUSE;
break;
case JSEM_MODE_LIGHTPEN:
input_get_default_lightpen (mice, joy, i);
input_get_default_lightpen (mice, joy, i, af);
joymodes[i] = JSEM_MODE_LIGHTPEN;
break;
}
@ -3948,11 +4012,13 @@ static void compatibility_copy (struct uae_prefs *prefs, bool gameports)
}
for (i = 1; i >= 0; i--) {
int af = prefs->jports[i].autofire;
if (prefs->jports[i].id >= 0) {
int mode = prefs->jports[i].mode;
joy = jsem_isjoy (i, prefs);
if (joy >= 0) {
cleardev (joysticks, joy);
if (gameports)
cleardev (joysticks, joy);
switch (mode)
{
case JSEM_MODE_DEFAULT:
@ -3961,25 +4027,25 @@ static void compatibility_copy (struct uae_prefs *prefs, bool gameports)
default:
{
bool iscd32 = mode == JSEM_MODE_JOYSTICK_CD32 || (mode == JSEM_MODE_DEFAULT && prefs->cs_cd32cd);
input_get_default_joystick (joysticks, joy, i, iscd32 ? JSEM_MODE_JOYSTICK_CD32 : 0);
input_get_default_joystick (joysticks, joy, i, af, iscd32 ? JSEM_MODE_JOYSTICK_CD32 : 0);
joymodes[i] = iscd32 ? JSEM_MODE_JOYSTICK_CD32 : JSEM_MODE_JOYSTICK;
break;
}
case JSEM_MODE_JOYSTICK_ANALOG:
input_get_default_joystick_analog (joysticks, joy, i);
input_get_default_joystick_analog (joysticks, joy, i, af);
joymodes[i] = JSEM_MODE_JOYSTICK_ANALOG;
break;
case JSEM_MODE_MOUSE:
input_get_default_mouse (joysticks, joy, i);
input_get_default_mouse (joysticks, joy, i, af);
joymodes[i] = JSEM_MODE_MOUSE;
break;
case JSEM_MODE_LIGHTPEN:
input_get_default_lightpen (joysticks, joy, i);
input_get_default_lightpen (joysticks, joy, i, af);
joymodes[i] = JSEM_MODE_LIGHTPEN;
break;
case JSEM_MODE_MOUSE_CDTV:
joymodes[i] = JSEM_MODE_MOUSE_CDTV;
input_get_default_joystick (joysticks, joy, i, mode);
input_get_default_joystick (joysticks, joy, i, af, mode);
break;
}
@ -4008,6 +4074,7 @@ static void compatibility_copy (struct uae_prefs *prefs, bool gameports)
if (prefs->jports[i].id >= 0) {
int *kb = NULL;
int mode = prefs->jports[i].mode;
int af = prefs->jports[i].autofire;
for (joy = 0; used[joy]; joy++);
if (JSEM_ISANYKBD (i, prefs)) {
bool cd32 = mode == JSEM_MODE_JOYSTICK_CD32 || (mode == JSEM_MODE_DEFAULT && prefs->cs_cd32cd);
@ -4038,15 +4105,15 @@ static void compatibility_copy (struct uae_prefs *prefs, bool gameports)
case JSEM_MODE_JOYSTICK_CD32:
case JSEM_MODE_DEFAULT:
if (cd32) {
setcompakb (kb, i ? ip_joycd322 : ip_joycd321, i);
setcompakb (kb, i ? ip_joycd322 : ip_joycd321, i, af);
joymodes[i] = JSEM_MODE_JOYSTICK_CD32;
} else {
setcompakb (kb, i ? ip_joy2 : ip_joy1, i);
setcompakb (kb, i ? ip_joy2 : ip_joy1, i, af);
joymodes[i] = JSEM_MODE_JOYSTICK;
}
break;
case JSEM_MODE_MOUSE:
setcompakb (kb, i ? ip_mouse2 : ip_mouse1, i);
setcompakb (kb, i ? ip_mouse2 : ip_mouse1, i, af);
joymodes[i] = JSEM_MODE_MOUSE;
break;
}
@ -4056,19 +4123,21 @@ static void compatibility_copy (struct uae_prefs *prefs, bool gameports)
}
}
if (arcadia_bios) {
setcompakb (keyboard_default_kbmaps[KBR_DEFAULT_MAP_ARCADIA], ip_arcadia, 0);
setcompakb (keyboard_default_kbmaps[KBR_DEFAULT_MAP_ARCADIA], ip_arcadia, 0, 0);
if (JSEM_ISXARCADE1 (i, prefs) || JSEM_ISXARCADE2 (i, prefs))
setcompakb (keyboard_default_kbmaps[KBR_DEFAULT_MAP_ARCADIA_XA], ip_arcadiaxa, JSEM_ISXARCADE2 (i, prefs) ? 1 : 0);
setcompakb (keyboard_default_kbmaps[KBR_DEFAULT_MAP_ARCADIA_XA], ip_arcadiaxa, JSEM_ISXARCADE2 (i, prefs) ? 1 : 0, prefs->jports[i].autofire);
}
// parport
for (i = 2; i < MAX_JPORTS; i++) {
int af = prefs->jports[i].autofire;
if (prefs->jports[i].id >= 0) {
int *kb = NULL;
joy = jsem_isjoy (i, prefs);
if (joy >= 0) {
cleardev (joysticks, joy);
input_get_default_joystick (joysticks, joy, i, 0);
if (gameports)
cleardev (joysticks, joy);
input_get_default_joystick (joysticks, joy, i, af, 0);
_tcsncpy (prefs->jports[i].name, idev[IDTYPE_MOUSE].get_friendlyname (joy), MAX_JPORTNAME - 1);
_tcsncpy (prefs->jports[i].configname, idev[IDTYPE_MOUSE].get_uniquename (joy), MAX_JPORTNAME - 1);
used[joy] = 1;
@ -4092,7 +4161,7 @@ static void compatibility_copy (struct uae_prefs *prefs, bool gameports)
else if (JSEM_ISXARCADE2 (i, prefs))
kb = keyboard_default_kbmaps[KBR_DEFAULT_MAP_XA2];
if (kb) {
setcompakb (kb, i == 3 ? ip_parjoy2 : ip_parjoy1, i);
setcompakb (kb, i == 3 ? ip_parjoy2 : ip_parjoy1, i, prefs->jports[i].autofire);
used[joy] = 1;
joymodes[i] = JSEM_MODE_JOYSTICK;
}
@ -4100,12 +4169,33 @@ static void compatibility_copy (struct uae_prefs *prefs, bool gameports)
}
}
for (i = 0; i < MAX_JPORTS; i++)
setautofires (prefs, i, prefs->jports[i].autofire);
for (i = 0; i < MAX_JPORTS; i++) {
if (gameports)
setautofires (prefs, i, prefs->jports[i].autofire);
}
for (i = 0; i < MAX_JPORTS; i++) {
setjoyinputs (prefs, i);
setjoydevices (prefs, i);
setjoydevices (prefs, gameports, i);
}
}
static void disableifempty2 (struct uae_input_device *uid)
{
for (int i = 0; i < MAX_INPUT_DEVICE_EVENTS; i++) {
for (int j = 0; j < MAX_INPUT_SUB_EVENT; j++) {
if (uid->eventid[i][j] > 0 || uid->custom[i][j] != NULL)
return;
}
}
uid->enabled = false;
}
static void disableifempty (struct uae_prefs *prefs)
{
for (int l = 0; l < MAX_INPUT_DEVICES; l++) {
disableifempty2 (&joysticks[l]);
disableifempty2 (&mice[l]);
disableifempty2 (&keyboards[l]);
}
}
@ -4253,6 +4343,7 @@ void inputdevice_updateconfig (struct uae_prefs *prefs)
compatibility_copy (prefs, false);
}
disableifempty (prefs);
scanevents (prefs);
config_changed = 1;
@ -4319,7 +4410,7 @@ void inputdevice_devicechange (struct uae_prefs *prefs)
// set default prefs to all input configuration settings
void inputdevice_default_prefs (struct uae_prefs *p)
{
int i, j;
int i;
inputdevice_init ();
p->input_selected_setting = GAMEPORT_INPUT_SETTINGS;
@ -4332,20 +4423,12 @@ void inputdevice_default_prefs (struct uae_prefs *p)
p->input_mouse_speed = 100;
p->input_autofire_linecnt = 600;
for (i = 0; i < MAX_INPUT_SETTINGS; i++) {
if (i != GAMEPORT_INPUT_SETTINGS) {
set_kbr_default (p, i, -1);
for (j = 0; j < MAX_INPUT_DEVICES; j++) {
if (input_get_default_mouse (p->mouse_settings[i], j, j & 1))
p->mouse_settings[i]->enabled = 1;
if (input_get_default_joystick (p->joystick_settings[i], j, j & 1, 0))
p->joystick_settings[i]->enabled = 1;
}
} else {
if (p->jports[0].id != -2 || p->jports[0].id != -2) {
if (i == GAMEPORT_INPUT_SETTINGS) {
if (p->jports[0].id != JPORT_CUSTOM || p->jports[0].id != JPORT_CUSTOM) {
reset_inputdevice_slot (p, i);
}
set_kbr_default (p, i, -1);
}
set_kbr_default (p, i, -1);
}
}
@ -4517,23 +4600,32 @@ static int get_event_data (const struct inputdevice_functions *id, int devnum, i
if (type == IDEV_WIDGET_BUTTON || type == IDEV_WIDGET_BUTTONAXIS) {
i = num - id->get_widget_first (devnum, IDEV_WIDGET_BUTTON) + ID_BUTTON_OFFSET;
*eventid = uid->eventid[i][sub];
*flags = uid->flags[i][sub];
*port = uid->port[i][sub];
*custom = uid->custom[i][sub];
if (flags)
*flags = uid->flags[i][sub];
if (port)
*port = uid->port[i][sub];
if (custom)
*custom = uid->custom[i][sub];
return i;
} else if (type == IDEV_WIDGET_AXIS) {
i = num - id->get_widget_first (devnum, type) + ID_AXIS_OFFSET;
*eventid = uid->eventid[i][sub];
*flags = uid->flags[i][sub];
*port = uid->port[i][sub];
*custom = uid->custom[i][sub];
if (flags)
*flags = uid->flags[i][sub];
if (port)
*port = uid->port[i][sub];
if (custom)
*custom = uid->custom[i][sub];
return i;
} else if (type == IDEV_WIDGET_KEY) {
i = num - id->get_widget_first (devnum, type);
*eventid = uid->eventid[i][sub];
*flags = uid->flags[i][sub];
*port = uid->port[i][sub];
*custom = uid->custom[i][sub];
if (flags)
*flags = uid->flags[i][sub];
if (port)
*port = uid->port[i][sub];
if (custom)
*custom = uid->custom[i][sub];
return i;
}
return -1;
@ -4575,12 +4667,11 @@ static int put_event_data (const struct inputdevice_functions *id, int devnum, i
static int is_event_used (const struct inputdevice_functions *id, int devnum, int isnum, int isevent)
{
struct uae_input_device *uid = get_uid (id, devnum);
int num, evt, flag, sub;
TCHAR *custom;
int num, evt, sub;
for (num = 0; num < id->get_widget_num (devnum); num++) {
for (sub = 0; sub < MAX_INPUT_SUB_EVENT; sub++) {
if (get_event_data (id, devnum, num, &evt, &custom, &flag, NULL, sub) >= 0) {
if (get_event_data (id, devnum, num, &evt, NULL, NULL, NULL, sub) >= 0) {
if (evt == isevent && isnum != num)
return 1;
}
@ -4711,7 +4802,6 @@ int inputdevice_iterate (int devnum, int num, TCHAR *name, int *af)
struct inputevent *ie;
int mask, data, flags, type;
int devindex = inputdevice_get_device_index (devnum);
TCHAR *custom;
*af = 0;
*name = 0;
@ -4754,7 +4844,7 @@ int inputdevice_iterate (int devnum, int num, TCHAR *name, int *af)
}
if (!(ie->allow_mask & mask))
continue;
get_event_data (idf, devindex, num, &data, &custom, &flags, NULL, 0);
get_event_data (idf, devindex, num, &data, NULL, &flags, NULL, 0);
inputdevice_get_eventname (ie, name);
*af = (flags & ID_FLAG_AUTOFIRE) ? 1 : 0;
return 1;
@ -4969,7 +5059,8 @@ void inputdevice_swap_ports (struct uae_prefs *p, int devnum)
k = 1;
while (events[k].confname) {
ie2 = &events[k];
if (ie2->type == ie->type && ie2->data == ie->data && ie2->unit - 1 == ((ie->unit - 1) ^ 1) && ie2->allow_mask == ie->allow_mask) {
if (ie2->type == ie->type && ie2->data == ie->data && ie2->unit - 1 == ((ie->unit - 1) ^ 1) &&
ie2->allow_mask == ie->allow_mask && uid->port[i][j] == 0) {
uid->eventid[i][j] = k;
break;
}

6
uaelib.cpp
View File

@ -139,7 +139,7 @@ static uae_u32 REGPARAM2 emulib_ChgCMemSize (uae_u32 memsize)
}
m68k_dreg (regs, 0) = 0;
currprefs.chipmem_size = memsize;
changed_prefs.chipmem_size = memsize;
uae_reset(0);
return 1;
}
@ -157,7 +157,7 @@ static uae_u32 REGPARAM2 emulib_ChgSMemSize (uae_u32 memsize)
}
m68k_dreg (regs, 0) = 0;
currprefs.bogomem_size = memsize;
changed_prefs.bogomem_size = memsize;
uae_reset (0);
return 1;
}
@ -174,7 +174,7 @@ static uae_u32 REGPARAM2 emulib_ChgFMemSize (uae_u32 memsize)
write_log (L"Unsupported fastmem size!\n");
}
m68k_dreg (regs, 0) = 0;
currprefs.fastmem_size = memsize;
changed_prefs.fastmem_size = memsize;
uae_reset (0);
return 0;
}