mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-26 05:53:15 -07:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into feature/mtrr

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-08-10 16:47:47 -04:00
parent 5f34b9b14f 352f71a506
commit 25608133ea
51 changed files with 639 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/machine/m_amstrad.c
View File

@@ -156,7 +156,7 @@ typedef struct {
fdc_t *fdc;
} amstrad_t;
int amstrad_latch;
uint32_t amstrad_latch;
static uint8_t key_queue[16];
static int key_queue_start = 0,
@@ -2255,7 +2255,7 @@ ams_read(uint16_t port, void *priv)
else if (video_is_mda())
ret |= 0xc0;
switch (amstrad_latch) {
switch (amstrad_latch & 0x7fffffff) {
case AMSTRAD_NOLATCH:
ret &= ~0x20;
break;
@@ -2293,6 +2293,7 @@ machine_amstrad_init(const machine_t *model, int type)
ams = (amstrad_t *) malloc(sizeof(amstrad_t));
memset(ams, 0x00, sizeof(amstrad_t));
ams->type = type;
amstrad_latch = 0x80000000;
switch (type) {
case AMS_PC200:

10
src/machine/m_at_286_386sx.c
View File

@@ -67,15 +67,17 @@ machine_at_mr286_init(const machine_t *model)
}
static void
machine_at_headland_common_init(int ht386)
machine_at_headland_common_init(int type)
{
device_add(&keyboard_at_ami_device);
if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device);
if (ht386)
if (type == 2)
device_add(&headland_ht18b_device);
else if (type == 1)
device_add(&headland_gc113_device);
else
device_add(&headland_gc10x_device);
}
@@ -93,7 +95,7 @@ machine_at_tg286m_init(const machine_t *model)
machine_at_common_ide_init(model);
machine_at_headland_common_init(0);
machine_at_headland_common_init(1);
return ret;
}
@@ -114,7 +116,7 @@ machine_at_ama932j_init(const machine_t *model)
if (gfxcard == VID_INTERNAL)
device_add(&oti067_ama932j_device);
machine_at_headland_common_init(1);
machine_at_headland_common_init(2);
return ret;
}