Made sure several machine types call video_reset() before initializing their internal video, fixes #1423.
This commit is contained in:
@@ -2441,6 +2441,8 @@ machine_amstrad_init(const machine_t *model, int type)
|
|||||||
|
|
||||||
ams->language = 7;
|
ams->language = 7;
|
||||||
|
|
||||||
|
video_reset(gfxcard);
|
||||||
|
|
||||||
if (gfxcard == VID_INTERNAL) switch(type) {
|
if (gfxcard == VID_INTERNAL) switch(type) {
|
||||||
case AMS_PC1512:
|
case AMS_PC1512:
|
||||||
loadfont("roms/machines/pc1512/40078", 8);
|
loadfont("roms/machines/pc1512/40078", 8);
|
||||||
|
|||||||
@@ -823,6 +823,8 @@ machine_at_compaq_init(const machine_t *model, int type)
|
|||||||
write_ram, write_ramw, write_raml,
|
write_ram, write_ramw, write_raml,
|
||||||
0xa0000+ram, MEM_MAPPING_INTERNAL, NULL);
|
0xa0000+ram, MEM_MAPPING_INTERNAL, NULL);
|
||||||
|
|
||||||
|
video_reset(gfxcard);
|
||||||
|
|
||||||
switch(type) {
|
switch(type) {
|
||||||
case COMPAQ_PORTABLEII:
|
case COMPAQ_PORTABLEII:
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -824,6 +824,7 @@ machine_pcjr_init(const machine_t *model)
|
|||||||
cpu_set();
|
cpu_set();
|
||||||
|
|
||||||
/* Initialize the video controller. */
|
/* Initialize the video controller. */
|
||||||
|
video_reset(gfxcard);
|
||||||
loadfont("roms/video/mda/mda.rom", 0);
|
loadfont("roms/video/mda/mda.rom", 0);
|
||||||
mem_mapping_add(&pcjr->mapping, 0xb8000, 0x08000,
|
mem_mapping_add(&pcjr->mapping, 0xb8000, 0x08000,
|
||||||
vid_read, NULL, NULL,
|
vid_read, NULL, NULL,
|
||||||
|
|||||||
@@ -1509,6 +1509,8 @@ machine_tandy1k_init(const machine_t *model, int type)
|
|||||||
if (fdc_type == FDC_INTERNAL)
|
if (fdc_type == FDC_INTERNAL)
|
||||||
device_add(&fdc_xt_tandy_device);
|
device_add(&fdc_xt_tandy_device);
|
||||||
|
|
||||||
|
video_reset(gfxcard);
|
||||||
|
|
||||||
switch(type) {
|
switch(type) {
|
||||||
case TYPE_TANDY:
|
case TYPE_TANDY:
|
||||||
keyboard_set_table(scancode_tandy);
|
keyboard_set_table(scancode_tandy);
|
||||||
|
|||||||
@@ -742,6 +742,7 @@ int
|
|||||||
machine_xt_m24_init(const machine_t *model)
|
machine_xt_m24_init(const machine_t *model)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
m24_kbd_t *m24_kbd;
|
||||||
|
|
||||||
ret = bios_load_interleaved("roms/machines/m24/olivetti_m24_version_1.43_low.bin",
|
ret = bios_load_interleaved("roms/machines/m24/olivetti_m24_version_1.43_low.bin",
|
||||||
"roms/machines/m24/olivetti_m24_version_1.43_high.bin",
|
"roms/machines/m24/olivetti_m24_version_1.43_high.bin",
|
||||||
@@ -750,11 +751,6 @@ machine_xt_m24_init(const machine_t *model)
|
|||||||
if (bios_only || !ret)
|
if (bios_only || !ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (gfxcard == VID_INTERNAL)
|
|
||||||
device_add(&ogc_m24_device);
|
|
||||||
|
|
||||||
m24_kbd_t *m24_kbd;
|
|
||||||
|
|
||||||
m24_kbd = (m24_kbd_t *) malloc(sizeof(m24_kbd_t));
|
m24_kbd = (m24_kbd_t *) malloc(sizeof(m24_kbd_t));
|
||||||
memset(m24_kbd, 0x00, sizeof(m24_kbd_t));
|
memset(m24_kbd, 0x00, sizeof(m24_kbd_t));
|
||||||
|
|
||||||
@@ -777,6 +773,11 @@ machine_xt_m24_init(const machine_t *model)
|
|||||||
|
|
||||||
nmi_init();
|
nmi_init();
|
||||||
|
|
||||||
|
video_reset(gfxcard);
|
||||||
|
|
||||||
|
if (gfxcard == VID_INTERNAL)
|
||||||
|
device_add(&ogc_m24_device);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -858,6 +859,11 @@ machine_xt_m19_init(const machine_t *model)
|
|||||||
|
|
||||||
nmi_init();
|
nmi_init();
|
||||||
|
|
||||||
|
video_reset(gfxcard);
|
||||||
|
|
||||||
|
if (gfxcard == VID_INTERNAL)
|
||||||
|
device_add(&ogc_m24_device);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user