From cc48a7be124cc273f73c0610e44418dd0b4bb252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= Date: Sun, 29 Dec 2013 00:44:40 +0000 Subject: [PATCH] emulator compiles now --- BaS_gcc/x86emu/biosemu.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/BaS_gcc/x86emu/biosemu.c b/BaS_gcc/x86emu/biosemu.c index 5cef33f..8cd040e 100644 --- a/BaS_gcc/x86emu/biosemu.c +++ b/BaS_gcc/x86emu/biosemu.c @@ -576,20 +576,11 @@ void run_bios(struct radeonfb_info *rinfo) unsigned long addr; unsigned short initialcs; unsigned short initialip; - unsigned short devfn = (unsigned short)( ((rinfo->handle & 0xFF) << 3) + ((((rinfo->handle >> 16) / PCI_MAX_FUNCTION) & 0xFF) << 8)); // was dev->bus->secondary << 8 | dev->path.u.pci.devfn; + unsigned short devfn = (unsigned short) rinfo->handle; X86EMU_intrFuncs intFuncs[256]; if ((rinfo->mmio_base == NULL) || (rinfo->io_base == NULL)) return; -#ifndef COLDFIRE - /* try to not init the board with the X86 VGA BIOS, too long on CT60 (more than 20 seconds, 2 seconds on Coldfire) */ - if (os_magic) - return; - if (restart /* CTRL-ALT-DEL else 0 if reset */ - && (*memvalid == MEMVALID_MAGIC) && (*memval2 == MEMVAL2_MAGIC) - && (*((unsigned long *) 0x51AL) == 0x5555AAAA)) /* memval3 */ - return; -#endif rinfo_biosemu = rinfo; config_address_reg = 0; offset_port = 0x300; @@ -721,9 +712,9 @@ void run_bios(struct radeonfb_info *rinfo) X86EMU_set_debug(DEBUG_DECODE_F | DEBUG_TRACE_F); #endif DPRINT("X86EMU entering emulator\r\n"); - *vblsem = 0; + //*vblsem = 0; X86EMU_exec(); - *vblsem = 1; + //*vblsem = 1; DPRINT("X86EMU halted\r\n"); // biosfn_set_video_mode(0x13); /* 320 x 200 x 256 colors */ #ifdef USE_SDRAM