claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed several things, including built-in video on the Toshiba T1000 and T1200.

Browse Source
This commit is contained in:
OBattler
2018-03-02 21:57:37 +01:00
parent 33bc831f19
commit cb79f53c54
6 changed files with 32 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/video/vid_oak_oti.c
View File

@@ -8,7 +8,7 @@
*
* Oak OTI037C/67/077 emulation.
*
* Version: @(#)vid_oak_oti.c 1.0.6 2018/03/02
* Version: @(#)vid_oak_oti.c 1.0.7 2018/03/02
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -301,10 +301,11 @@ oti037c_available(void)
return(rom_present(BIOS_37C_PATH));
}
static int
oti067_available(void)
oti067_077_available(void)
{
return(rom_present(BIOS_67_PATH));
return(rom_present(BIOS_77_PATH));
}
@@ -330,13 +331,6 @@ static device_config_t oti067_config[] =
};
static int
oti077_available(void)
{
return(rom_present(BIOS_77_PATH));
}
static device_config_t oti077_config[] =
{
{
@@ -380,7 +374,7 @@ device_t oti067_device =
DEVICE_ISA,
2,
oti_init, oti_close, NULL,
oti067_available,
oti067_077_available,
oti_speed_changed,
oti_force_redraw,
oti_add_status_info,
@@ -393,7 +387,7 @@ device_t oti077_device =
DEVICE_ISA,
5,
oti_init, oti_close, NULL,
oti077_available,
oti067_077_available,
oti_speed_changed,
oti_force_redraw,
oti_add_status_info,

7
src/video/video.c
View File

@@ -40,7 +40,7 @@
* W = 3 bus clocks
* L = 4 bus clocks
*
* Version: @(#)video.c 1.0.17 2018/03/02
* Version: @(#)video.c 1.0.18 2018/03/02
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -346,6 +346,7 @@ static video_timings_t timing_pc1512 = {VIDEO_BUS, 0,0,0, 0,0,0}; /*PC1512 vid
static video_timings_t timing_pc1640 = {VIDEO_ISA, 8,16,32, 8,16,32};
static video_timings_t timing_pc200 = {VIDEO_ISA, 8,16,32, 8,16,32};
static video_timings_t timing_m24 = {VIDEO_ISA, 8,16,32, 8,16,32};
static video_timings_t timing_t1000 = {VIDEO_ISA, 8,16,32, 8,16,32};
static video_timings_t timing_pvga1a = {VIDEO_ISA, 6, 8,16, 6, 8,16};
static video_timings_t timing_wd90c11 = {VIDEO_ISA, 3, 3, 6, 5, 5,10};
static video_timings_t timing_vga = {VIDEO_ISA, 8,16,32, 8,16,32};
@@ -385,6 +386,10 @@ video_update_timing(void)
case ROM_PC3086:
timing = &timing_pvga1a;
break;
case ROM_T1000:
case ROM_T1200:
timing = &timing_t1000;
break;
case ROM_MEGAPC:
case ROM_MEGAPCDX:
timing = &timing_wd90c11;