pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor WinUAE merges in custom and devices

Browse source
This commit is contained in:
Dimitris Panokostas 2020-05-11 22:11:58 +02:00
parent 9fe0c0b4c8
commit 64b1c5f55a
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/custom.cpp
View file

@ -2017,8 +2017,8 @@ static int flush_plane_data_hr(int fm)
}
for (int j = 0; j < 4; j++) {
toscr_1_hr(32, fm);
i += 32;
toscr_1_hr(32, fm);
i += 32;
}
int toshift = 32 << fm;
@ -3278,7 +3278,8 @@ static void decide_line (int hpos)
start_bpl_dma (hstart);
// if ECS: pre-set plf_end_hpos if we have already passed virtual ddfstop
if (ecs) {
if (last_decide_line_hpos < hstart && hstart >= plfstop && hstart - plfstop <= DDF_OFFSET) {
// DDFSTRT=$18: always skip this condition. For some unknown reason.
if (last_decide_line_hpos < hstart && hstart >= plfstop && hstart - plfstop <= DDF_OFFSET && hstart != HARD_DDF_START_REAL + DDF_OFFSET) {
plf_end_hpos = plfstop + DDF_OFFSET;
nextstate = plf_passed_stop;
}
@ -3426,14 +3427,14 @@ static void record_register_change (int hpos, int regno, uae_u16 value)
if (regno == 0x100) { // BPLCON0
if (value & 0x800)
thisline_decision.ham_seen = 1;
thisline_decision.ehb_seen = isehb (value, bplcon2);
isbrdblank (hpos, value, bplcon3);
issprbrd (hpos, value, bplcon3);
thisline_decision.ehb_seen = isehb(value, bplcon2);
isbrdblank(hpos, value, bplcon3);
issprbrd(hpos, value, bplcon3);
} else if (regno == 0x104) { // BPLCON2
thisline_decision.ehb_seen = isehb (bplcon0, value);
thisline_decision.ehb_seen = isehb(bplcon0, value);
} else if (regno == 0x106) { // BPLCON3
isbrdblank (hpos, bplcon0, value);
issprbrd (hpos, bplcon0, value);
isbrdblank(hpos, bplcon0, value);
issprbrd(hpos, bplcon0, value);
}
record_color_change (hpos, regno + 0x1000, value);
}

5
src/devices.cpp
View file

@ -196,6 +196,9 @@ void devices_reset(int hardreset)
device_func_reset();
#ifdef AUTOCONFIG
rtarea_reset();
#endif
#ifdef RETROPLATFORM
rp_reset();
#endif
uae_int_requested = 0;
}
@ -307,7 +310,7 @@ void do_leave_program (void)
void virtualdevice_init (void)
{
reset_device_items();
#ifdef CD32
akiko_init();
#endif