Major changes to NVR, system initialization (pc.c), and what goes on in the Windows startup (win.c.) Not fully done yet, but good enough for a first commit.

This commit is contained in:
waltje
2017-10-07 00:46:54 -04:00
parent 95fe21b651
commit 2b37b7fbfb
108 changed files with 5628 additions and 5912 deletions

View File

@@ -1,7 +1,6 @@
#include <stdio.h>
#include <stdint.h>
#include <string.h>
//#include <stddef.h>
#include <stdlib.h>
#include <wchar.h>
#include <math.h>
@@ -7460,7 +7459,8 @@ static void voodoo_speed_changed(void *p)
// pclog("Voodoo read_time=%i write_time=%i burst_time=%i %08x %08x\n", voodoo->read_time, voodoo->write_time, voodoo->burst_time, voodoo->fbiInit1, voodoo->fbiInit4);
}
void *voodoo_card_init()
void *voodoo_card_init(void)
{
int c;
voodoo_t *voodoo = malloc(sizeof(voodoo_t));
@@ -7597,7 +7597,7 @@ void *voodoo_card_init()
return voodoo;
}
void *voodoo_init()
void *voodoo_init(device_t *info)
{
voodoo_set_t *voodoo_set = malloc(sizeof(voodoo_set_t));
uint32_t tmuConfig = 1;
@@ -7838,8 +7838,10 @@ device_t voodoo_device =
{
"3DFX Voodoo Graphics",
DEVICE_PCI,
0,
voodoo_init,
voodoo_close,
NULL,
NULL,
voodoo_speed_changed,
NULL,