80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed the VLSI 82c480 chipset and removed the HP Vectra 486 from the Dev branch.

Browse Source
This commit is contained in:
OBattler
2021-04-28 08:59:52 +02:00
parent 472101dd20
commit 278b73e339
6 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/chipset/vl82c480.c
View File

@@ -68,10 +68,10 @@ vl82c480_recalc(vl82c480_t *dev)
shadowbios = 0; shadowbios = 0;
shadowbios_write = 0; shadowbios_write = 0;
for (i = 0; i < 8; i += 2) { for (i = 0; i < 6; i++) {
for (j = 0; j < 6; j++) { for (j = 0; j < 8; j += 2) {
base = 0x000a0000 + (i << 13) + (j << 16); base = 0x000a0000 + (i << 16) + (j << 13);
access = dev->regs[0x0d + j] & (3 << i); access = (dev->regs[0x0d + i] >> j) & 3;
mem_set_mem_state(base, 0x4000, vl82c480_shflags(access)); mem_set_mem_state(base, 0x4000, vl82c480_shflags(access));
shadowbios |= ((base >= 0xe0000) && (access & 0x02)); shadowbios |= ((base >= 0xe0000) && (access & 0x02));
shadowbios_write |= ((base >= 0xe0000) && (access & 0x01)); shadowbios_write |= ((base >= 0xe0000) && (access & 0x01));

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

@@ -314,9 +314,7 @@ extern int machine_at_opti495_init(const machine_t *);
extern int machine_at_opti495_ami_init(const machine_t *); extern int machine_at_opti495_ami_init(const machine_t *);
extern int machine_at_opti495_mr_init(const machine_t *); extern int machine_at_opti495_mr_init(const machine_t *);
#if defined(DEV_BRANCH) && defined(USE_VECT486VL)
extern int machine_at_vect486vl_init(const machine_t *); extern int machine_at_vect486vl_init(const machine_t *);
#endif
extern int machine_at_403tg_init(const machine_t *); extern int machine_at_403tg_init(const machine_t *);
extern int machine_at_pc330_6573_init(const machine_t *); extern int machine_at_pc330_6573_init(const machine_t *);
@@ -359,9 +357,7 @@ extern int machine_at_pcm5330_init(const machine_t *);
#ifdef EMU_DEVICE_H #ifdef EMU_DEVICE_H
extern const device_t *at_acera1g_get_device(void); extern const device_t *at_acera1g_get_device(void);
#if defined(DEV_BRANCH) && defined(USE_VECT486VL)
extern const device_t *at_vect486vl_get_device(void); extern const device_t *at_vect486vl_get_device(void);
#endif
extern const device_t *at_valuepoint433_get_device(void); extern const device_t *at_valuepoint433_get_device(void);
#endif #endif

4
src/machine/CMakeLists.txt
View File

@@ -55,7 +55,3 @@ endif()
if(M6117) if(M6117)
target_compile_definitions(mch PRIVATE USE_M6117) target_compile_definitions(mch PRIVATE USE_M6117)
endif() endif()
if(VECT486VL)
target_compile_definitions(mch PRIVATE USE_VECT486VL)
endif()

2
src/machine/m_at_386dx_486.c
View File

@@ -330,7 +330,6 @@ machine_at_pb410a_init(const machine_t *model)
} }
#if defined(DEV_BRANCH) && defined(USE_VECT486VL)
int int
machine_at_vect486vl_init(const machine_t *model) // has HDC problems machine_at_vect486vl_init(const machine_t *model) // has HDC problems
{ {
@@ -361,7 +360,6 @@ at_vect486vl_get_device(void)
{ {
return &gd5428_onboard_device; return &gd5428_onboard_device;
} }
#endif
int int

2
src/machine/machine_table.c
View File

@@ -219,9 +219,7 @@ const machine_t machines[] = {
{ "[SiS 471] Phoenix SiS 471", "px471", MACHINE_TYPE_486, CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0, MACHINE_VLB | MACHINE_IDE, 1024,131072, 1024, 127, machine_at_px471_init, NULL }, { "[SiS 471] Phoenix SiS 471", "px471", MACHINE_TYPE_486, CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0, MACHINE_VLB | MACHINE_IDE, 1024,131072, 1024, 127, machine_at_px471_init, NULL },
{ "[VIA VT82C495] FIC 486-VC-HD", "486vchd", MACHINE_TYPE_486, CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0, MACHINE_AT, 1024, 64512, 1024, 127, machine_at_486vchd_init, NULL }, { "[VIA VT82C495] FIC 486-VC-HD", "486vchd", MACHINE_TYPE_486, CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0, MACHINE_AT, 1024, 64512, 1024, 127, machine_at_486vchd_init, NULL },
{ "[VLSI 82C480] IBM PS/1 model 2133", "ibmps1_2133", MACHINE_TYPE_486, CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0, MACHINE_VLB | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_NONMI | MACHINE_VIDEO, 2048, 32768, 1024, 127, machine_ps1_m2133_init, ps1_m2133_get_device }, { "[VLSI 82C480] IBM PS/1 model 2133", "ibmps1_2133", MACHINE_TYPE_486, CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0, MACHINE_VLB | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_NONMI | MACHINE_VIDEO, 2048, 32768, 1024, 127, machine_ps1_m2133_init, ps1_m2133_get_device },
#if defined(DEV_BRANCH) && defined(USE_VECT486VL)
{ "[VLSI 82C480] HP Vectra 486VL", "vect486vl", MACHINE_TYPE_486, CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0, MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO, 2048, 65536, 1024, 127, machine_at_vect486vl_init, at_vect486vl_get_device }, { "[VLSI 82C480] HP Vectra 486VL", "vect486vl", MACHINE_TYPE_486, CPU_PKG_SOCKET1, 0, 0, 0, 0, 0, 0, 0, MACHINE_AT | MACHINE_BUS_PS2 | MACHINE_IDE | MACHINE_VIDEO, 2048, 65536, 1024, 127, machine_at_vect486vl_init, at_vect486vl_get_device },
#endif
/* 486 machines with utilize the MCA bus */ /* 486 machines with utilize the MCA bus */
#if defined(DEV_BRANCH) && defined(USE_PS2M70T4) #if defined(DEV_BRANCH) && defined(USE_PS2M70T4)

4
src/win/Makefile.mingw
View File

@@ -575,10 +575,6 @@ ifeq ($(XL24), y)
OPTS += -DUSE_XL24 OPTS += -DUSE_XL24
endif endif
ifeq ($(VECT486VL), y)
OPTS += -DUSE_VECT486VL
endif
ifeq ($(OLIVETTI), y) ifeq ($(OLIVETTI), y)
OPTS += -DUSE_OLIVETTI OPTS += -DUSE_OLIVETTI
DEVBROBJ += olivetti_eva.o DEVBROBJ += olivetti_eva.o