- always generate MP tables (WinXP guest needs this)

- new code is now enabled again
This commit is contained in:
Volker Ruppert 2006-09-29 17:37:31 +00:00
parent 518c64b64f
commit 5ba61b49c8
3 changed files with 4 additions and 7 deletions

Binary file not shown.

View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: rombios.c,v 1.168 2006-09-29 12:23:34 vruppert Exp $ // $Id: rombios.c,v 1.169 2006-09-29 17:37:08 vruppert Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2002 MandrakeSoft S.A. // Copyright (C) 2002 MandrakeSoft S.A.
@ -143,7 +143,7 @@
#define BX_FLOPPY_ON_CNT 37 /* 2 seconds */ #define BX_FLOPPY_ON_CNT 37 /* 2 seconds */
#define BX_PCIBIOS 1 #define BX_PCIBIOS 1
#define BX_APM 1 #define BX_APM 1
#define BX_ROMBIOS32 0 #define BX_ROMBIOS32 1
#define BX_USE_ATADRV 1 #define BX_USE_ATADRV 1
#define BX_ELTORITO_BOOT 1 #define BX_ELTORITO_BOOT 1
@ -938,7 +938,7 @@ Bit16u cdrom_boot();
#endif // BX_ELTORITO_BOOT #endif // BX_ELTORITO_BOOT
static char bios_cvs_version_string[] = "$Revision: 1.168 $ $Date: 2006-09-29 12:23:34 $"; static char bios_cvs_version_string[] = "$Revision: 1.169 $ $Date: 2006-09-29 17:37:08 $";
#define BIOS_COPYRIGHT_STRING "(c) 2002 MandrakeSoft S.A. Written by Kevin Lawton & the Bochs team." #define BIOS_COPYRIGHT_STRING "(c) 2002 MandrakeSoft S.A. Written by Kevin Lawton & the Bochs team."

View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: rombios32.c,v 1.2 2006-09-29 12:23:34 vruppert Exp $ // $Id: rombios32.c,v 1.3 2006-09-29 17:37:08 vruppert Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// 32 bit Bochs BIOS init code // 32 bit Bochs BIOS init code
@ -843,9 +843,6 @@ static void mptable_init(void)
int ioapic_id, i, len; int ioapic_id, i, len;
int mp_config_table_size; int mp_config_table_size;
if (smp_cpus <= 1)
return;
#ifdef BX_USE_EBDA_TABLES #ifdef BX_USE_EBDA_TABLES
mp_config_table = (uint8_t *)(ram_size - ACPI_DATA_SIZE - MPTABLE_MAX_SIZE); mp_config_table = (uint8_t *)(ram_size - ACPI_DATA_SIZE - MPTABLE_MAX_SIZE);
#else #else