mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-23 09:58:19 -07:00
Code Issues Packages Projects Releases Activity

Merge pull request #983 from richardg867/master

Browse Source 
Un-devbranch Virtual PC 2007
This commit is contained in:
Miran Grča
2020-08-27 19:36:37 +02:00
committed by GitHub
parent baaedc0ea4 37ce51ffb7
commit 93cafb06bf
4 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/machine.h
View File

@@ -424,9 +424,7 @@ extern int machine_at_ax6bc_init(const machine_t *);
extern int machine_at_atc6310bxii_init(const machine_t *);
extern int machine_at_tsunamiatx_init(const machine_t *);
extern int machine_at_p6sba_init(const machine_t *);
#if defined(DEV_BRANCH) && defined(USE_VIRTUALPC)
extern int machine_at_vpc2007_init(const machine_t *);
#endif
#ifdef EMU_DEVICE_H
extern const device_t *at_tsunamiatx_get_device(void);

4
src/machine/m_at_slot1.c
View File

@@ -530,7 +530,6 @@ at_tsunamiatx_get_device(void)
}
#if defined(DEV_BRANCH) && defined(USE_VIRTUALPC)
int
machine_at_vpc2007_init(const machine_t *model)
{
@@ -558,7 +557,7 @@ machine_at_vpc2007_init(const machine_t *model)
pci_register_slot(0x0F, PCI_CARD_NORMAL, 1, 2, 3, 4);
device_add(&i440bx_device);
device_add(&piix4e_device);
device_add(&w83977tf_device);
device_add(&w83977f_370_device);
device_add(&keyboard_ps2_ami_pci_device);
device_add(&intel_flash_bxt_device);
device_add(&vpc2007_device);
@@ -566,4 +565,3 @@ machine_at_vpc2007_init(const machine_t *model)
return ret;
}
#endif

2
src/machine/machine_table.c
View File

@@ -361,9 +361,7 @@ const machine_t machines[] = {
{ "[i440BX] A-Trend ATC6310BXII", "atc6310bxii", MACHINE_TYPE_SLOT1, {{"Intel", cpus_PentiumII}, {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"", NULL},{"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 768, 8, 255, machine_at_atc6310bxii_init, NULL },
{ "[i440BX] Tyan Tsunami ATX", "tsunamiatx", MACHINE_TYPE_SLOT1, {{"Intel", cpus_PentiumII}, {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"", NULL},{"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_SOUND, 8, 1024, 8, 255, machine_at_tsunamiatx_init, at_tsunamiatx_get_device },
{ "[i440BX] SuperMicro Super P6SBA", "p6sba", MACHINE_TYPE_SLOT1, {{"Intel", cpus_PentiumII}, {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"", NULL},{"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 768, 8, 255, machine_at_p6sba_init, NULL },
#if defined(DEV_BRANCH) && defined(USE_VIRTUALPC)
{ "[i440BX] Microsoft Virtual PC 2007", "vpc2007", MACHINE_TYPE_SLOT1, {{"Intel", cpus_PentiumIID}, {"Intel/PGA370", cpus_Celeron},{"", NULL}, {"", NULL},{"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 1024, 8, 255, machine_at_vpc2007_init, NULL },
#endif
/* Slot 2 machines(Including Slot 1/2 Hybrids) */
/* 440GX */

13
src/win/Makefile.mingw
View File

@@ -87,9 +87,6 @@ ifeq ($(DEV_BUILD), y)
ifndef VGAWONDER
VGAWONDER := y
endif
ifndef VIRTUALPC
VIRTUALPC := y
endif
ifndef VNC
VNC := y
endif
@@ -169,9 +166,6 @@ else
ifndef VGAWONDER
VGAWONDER := n
endif
ifndef VIRTUALPC
VIRTUALPC := y
endif
ifndef VNC
VNC := n
endif
@@ -582,11 +576,6 @@ ifeq ($(VGAWONDER), y)
OPTS += -DUSE_VGAWONDER
endif
ifeq ($(VIRTUALPC), y)
OPTS += -DUSE_VIRTUALPC
DEVBROBJ += vpc2007.o
endif
ifeq ($(WIN471), y)
OPTS += -DUSE_WIN471
endif
@@ -659,7 +648,7 @@ MCHOBJ := machine.o machine_table.o \
m_at_socket4_5.o m_at_socket7_s7.o m_at_sockets7.o \
m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o
DEVOBJ := bugger.o hwm.o hwm_lm75.o hwm_lm78.o hwm_gl518sm.o ibm_5161.o isamem.o isartc.o lpt.o postcard.o serial.o \
DEVOBJ := bugger.o hwm.o hwm_lm75.o hwm_lm78.o hwm_gl518sm.o ibm_5161.o isamem.o isartc.o lpt.o postcard.o serial.o vpc2007.o \
smbus.o smbus_piix4.o \
keyboard.o \
keyboard_xt.o keyboard_at.o \