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

A few lconsistency changes form M&K branch

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-02-20 19:11:58 -05:00
parent 243f6281da
commit f18da85438
6 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -201,7 +201,7 @@ add_subdirectory(scsi)
add_subdirectory(sound) add_subdirectory(sound)
add_subdirectory(video) add_subdirectory(video)
if (APPLE) if (APPLE)
add_subdirectory(mac) add_subdirectory(mac)
endif() endif()
if (QT) if (QT)

22
src/include/86box/device.h
View File

@@ -40,17 +40,17 @@
# define EMU_DEVICE_H # define EMU_DEVICE_H
#define CONFIG_STRING 0 #define CONFIG_STRING 0
#define CONFIG_INT 1 #define CONFIG_INT 1
#define CONFIG_BINARY 2 #define CONFIG_BINARY 2
#define CONFIG_SELECTION 3 #define CONFIG_SELECTION 3
#define CONFIG_MIDI_OUT 4 #define CONFIG_MIDI_OUT 4
#define CONFIG_FNAME 5 #define CONFIG_FNAME 5
#define CONFIG_SPINNER 6 #define CONFIG_SPINNER 6
#define CONFIG_HEX16 7 #define CONFIG_HEX16 7
#define CONFIG_HEX20 8 #define CONFIG_HEX20 8
#define CONFIG_MAC 9 #define CONFIG_MAC 9
#define CONFIG_MIDI_IN 10 #define CONFIG_MIDI_IN 10
enum { enum {

2
src/video/vid_et4000.c
View File

@@ -54,7 +54,7 @@
#include <86box/vid_svga_render.h> #include <86box/vid_svga_render.h>
#define BIOS_ROM_PATH "roms/video/et4000/ET4000.BIN" #define BIOS_ROM_PATH "roms/video/et4000/ET4000.BIN"
#define KOREAN_BIOS_ROM_PATH "roms/video/et4000/tgkorvga.bin" #define KOREAN_BIOS_ROM_PATH "roms/video/et4000/tgkorvga.bin"
#define KOREAN_FONT_ROM_PATH "roms/video/et4000/tg_ksc5601.rom" #define KOREAN_FONT_ROM_PATH "roms/video/et4000/tg_ksc5601.rom"
#define KASAN_BIOS_ROM_PATH "roms/video/et4000/et4000_kasan16.bin" #define KASAN_BIOS_ROM_PATH "roms/video/et4000/et4000_kasan16.bin"

7
src/video/vid_oak_oti.c
View File

@@ -30,11 +30,11 @@
#include <86box/vid_svga.h> #include <86box/vid_svga.h>
#include <86box/vid_svga_render.h> #include <86box/vid_svga_render.h>
#define BIOS_037C_PATH "roms/video/oti/bios.bin" #define BIOS_037C_PATH "roms/video/oti/bios.bin"
#define BIOS_067_AMA932J_PATH "roms/machines/ama932j/OTI067.BIN" #define BIOS_067_AMA932J_PATH "roms/machines/ama932j/OTI067.BIN"
#define BIOS_067_M300_08_PATH "roms/machines/m30008/EVC_BIOS.ROM" #define BIOS_067_M300_08_PATH "roms/machines/m30008/EVC_BIOS.ROM"
#define BIOS_067_M300_15_PATH "roms/machines/m30015/EVC_BIOS.ROM" #define BIOS_067_M300_15_PATH "roms/machines/m30015/EVC_BIOS.ROM"
#define BIOS_077_PATH "roms/video/oti/oti077.vbi" #define BIOS_077_PATH "roms/video/oti/oti077.vbi"
enum { enum {
@@ -476,18 +476,21 @@ oti037c_available(void)
return(rom_present(BIOS_037C_PATH)); return(rom_present(BIOS_037C_PATH));
} }
static int static int
oti067_ama932j_available(void) oti067_ama932j_available(void)
{ {
return(rom_present(BIOS_067_AMA932J_PATH)); return(rom_present(BIOS_067_AMA932J_PATH));
} }
static int static int
oti067_077_available(void) oti067_077_available(void)
{ {
return(rom_present(BIOS_077_PATH)); return(rom_present(BIOS_077_PATH));
} }
static int static int
oti067_m300_available(void) oti067_m300_available(void)
{ {

1
src/video/vid_svga.c
View File

@@ -783,6 +783,7 @@ svga_poll(void *p)
svga->ma = svga->maback = ((svga->crtc[5] & 0x60) >> 5); svga->ma = svga->maback = ((svga->crtc[5] & 0x60) >> 5);
svga->ma = (svga->ma << 2); svga->ma = (svga->ma << 2);
svga->maback = (svga->maback << 2); svga->maback = (svga->maback << 2);
svga->sc = 0; svga->sc = 0;
if (svga->attrregs[0x10] & 0x20) { if (svga->attrregs[0x10] & 0x20) {
svga->scrollcache = 0; svga->scrollcache = 0;

1
src/win/Makefile.mingw
View File

@@ -1,4 +1,5 @@
# #
#
# 86Box A hypervisor and IBM PC system emulator that specializes in # 86Box A hypervisor and IBM PC system emulator that specializes in
# running old operating systems and software designed for IBM # running old operating systems and software designed for IBM
# PC systems and compatibles from 1981 through fairly recent # PC systems and compatibles from 1981 through fairly recent