Changes to allow for auto- or selectable Internal HD controller, and some other minor changes.

This commit is contained in:
waltje
2017-10-01 16:29:15 -04:00
parent f21fc0ca44
commit 2dbf5409c0
35 changed files with 374 additions and 254 deletions

View File

@@ -269,7 +269,7 @@ int video_timing[6][4] =
{VIDEO_BUS, 3, 3, 4}
};
void video_updatetiming()
void video_updatetiming(void)
{
if (video_timing[video_speed][0] == VIDEO_ISA)
{
@@ -294,9 +294,11 @@ int video_res_x, video_res_y, video_bpp;
void (*video_blit_memtoscreen_func)(int x, int y, int y1, int y2, int w, int h);
void (*video_blit_memtoscreen_8_func)(int x, int y, int w, int h);
void video_init()
void
video_reset(void)
{
pclog("Video_init %i %i\n",romset,gfxcard);
pclog("Video_reset(rom=%i, gfx=%i)\n", romset, gfxcard);
#ifndef __unix
cga_palette = 0;
@@ -533,7 +535,8 @@ int calc_16to32(int c)
return (b | g | r);
}
void initvideo()
void
video_init(void)
{
int c, d, e;
@@ -604,7 +607,8 @@ void initvideo()
blit_data.blit_thread = thread_create(blit_thread, NULL);
}
void closevideo()
void
video_close(void)
{
thread_kill(blit_data.blit_thread);
thread_destroy_event(blit_data.buffer_not_in_use);
@@ -636,19 +640,19 @@ static void blit_thread(void *param)
}
}
void video_blit_complete()
void video_blit_complete(void)
{
blit_data.buffer_in_use = 0;
thread_set_event(blit_data.buffer_not_in_use);
}
void video_wait_for_blit()
void video_wait_for_blit(void)
{
while (blit_data.busy)
thread_wait_event(blit_data.blit_complete, -1);
thread_reset_event(blit_data.blit_complete);
}
void video_wait_for_buffer()
void video_wait_for_buffer(void)
{
while (blit_data.buffer_in_use)
thread_wait_event(blit_data.buffer_not_in_use, -1);
@@ -686,27 +690,6 @@ void video_blit_memtoscreen_8(int x, int y, int w, int h)
thread_set_event(blit_data.wake_blit_thread);
}
#ifdef __unix
void d3d_fs_take_screenshot(char *fn)
{
}
void d3d_take_screenshot(char *fn)
{
}
void ddraw_fs_take_screenshot(char *fn)
{
}
void ddraw_take_screenshot(char *fn)
{
}
void take_screenshot()
{
}
#else
time_t now;
struct tm *info;
wchar_t screenshot_fn_partial[2048];
@@ -763,4 +746,3 @@ void take_screenshot(void)
}
}
}
#endif