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

Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

Browse Source
This commit is contained in:
RichardG867
2022-02-14 12:53:29 -03:00
parent e85c76b226 c554ba0fdf
commit 17a6aabcec
17 changed files with 128 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -135,6 +135,9 @@ endif()
cmake_dependent_option(AMD_K5 "AMD K5" ON "DEV_BRANCH" OFF)
cmake_dependent_option(CYRIX_6X86 "Cyrix 6x86" ON "DEV_BRANCH" OFF)
cmake_dependent_option(GUSMAX "Gravis UltraSound MAX" ON "DEV_BRANCH" OFF)
cmake_dependent_option(ISAMEM_RAMPAGE "AST Rampage" ON "DEV_BRANCH" OFF)
cmake_dependent_option(ISAMEM_IAB "Intel Above Board" ON "DEV_BRANCH" OFF)
cmake_dependent_option(ISAMEM_BRAT "BocaRAM/AT" ON "DEV_BRANCH" OFF)
cmake_dependent_option(LASERXT "VTech Laser XT" ON "DEV_BRANCH" OFF)
cmake_dependent_option(MGA "Matrox Mystique graphics adapters" ON "DEV_BRANCH" OFF)
cmake_dependent_option(NO_SIO "Machines without emulated Super I/O chips" ON "DEV_BRANCH" OFF)
@@ -142,12 +145,10 @@ cmake_dependent_option(OLIVETTI "Olivetti M290"
cmake_dependent_option(OPEN_AT "OpenAT" ON "DEV_BRANCH" OFF)
cmake_dependent_option(PAS16 "Pro Audio Spectrum 16" OFF "DEV_BRANCH" OFF)
cmake_dependent_option(SIO_DETECT "Super I/O Detection Helper" ON "DEV_BRANCH" OFF)
cmake_dependent_option(TANDY_ISA "Tandy PSG ISA clone boards" ON "DEV_BRANCH" OFF)
cmake_dependent_option(VGAWONDER "ATI VGA Wonder (ATI-18800)" ON "DEV_BRANCH" OFF)
cmake_dependent_option(VNC "VNC renderer" OFF "DEV_BRANCH" OFF)
cmake_dependent_option(XL24 "ATI VGA Wonder XL24 (ATI-28800-6)" ON "DEV_BRANCH" OFF)
cmake_dependent_option(ISAMEM_RAMPAGE "AST Rampage" ON "DEV_BRANCH" OFF)
cmake_dependent_option(ISAMEM_IAB "Intel Above Board" ON "DEV_BRANCH" OFF)
cmake_dependent_option(ISAMEM_BRAT "BocaRAM/AT" ON "DEV_BRANCH" OFF)
# Ditto but for Qt
if (QT)

9
src/CMakeLists.txt
View File

@@ -11,14 +11,13 @@
# Authors: David Hrdlička, <hrdlickadavid@outlook.com>
# dob205
#
# Copyright 2020,2021 David Hrdlička.
# Copyright 2020-2022 David Hrdlička.
# Copyright 2021 dob205.
#
# WIN32 marks us as a GUI app on Windows
add_executable(86Box WIN32 MACOSX_BUNDLE 86box.c config.c log.c random.c timer.c io.c acpi.c apm.c
dma.c ddma.c discord.c nmi.c pic.c pit.c port_6x.c port_92.c ppi.c pci.c mca.c usb.c fifo8.c
device.c nvr.c nvr_at.c nvr_ps2.c)
add_executable(86Box 86box.c config.c log.c random.c timer.c io.c acpi.c apm.c
dma.c ddma.c discord.c nmi.c pic.c pit.c port_6x.c port_92.c ppi.c pci.c
mca.c usb.c fifo8.c device.c nvr.c nvr_at.c nvr_ps2.c)
if(CPPTHREADS)
target_sources(86Box PRIVATE thread.cpp)

8
src/device/CMakeLists.txt
View File

@@ -19,10 +19,6 @@ add_library(dev OBJECT bugger.c cassette.c cartridge.c hasp.c hwm.c hwm_lm75.c h
smbus_piix4.c smbus_ali7101.c keyboard.c keyboard_xt.c keyboard_at.c
mouse.c mouse_bus.c mouse_serial.c mouse_ps2.c phoenix_486_jumper.c)
if(LASERXT)
target_compile_definitions(dev PRIVATE USE_LASERXT)
endif()
if(ISAMEM_RAMPAGE)
target_compile_definitions(dev PRIVATE USE_ISAMEM_RAMPAGE)
endif()
@@ -34,3 +30,7 @@ endif()
if(ISAMEM_BRAT)
target_compile_definitions(dev PRIVATE USE_ISAMEM_BRAT)
endif()
if(LASERXT)
target_compile_definitions(dev PRIVATE USE_LASERXT)
endif()

18
src/disk/hdc_ide.c
View File

@@ -3018,8 +3018,11 @@ ide_reset(void *p)
{
ide_log("Resetting IDE...\n");
ide_board_reset(0);
ide_board_reset(1);
if (ide_boards[0] != NULL)
ide_board_reset(0);
if (ide_boards[1] != NULL)
ide_board_reset(1);
}
@@ -3029,8 +3032,15 @@ ide_close(void *priv)
{
ide_log("Closing IDE...\n");
ide_board_close(0);
ide_board_close(1);
if (ide_boards[0] != NULL) {
ide_board_close(0);
ide_boards[0] = NULL;
}
if (ide_boards[1] != NULL) {
ide_board_close(1);
ide_boards[1] = NULL;
}
}

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

@@ -103,9 +103,11 @@ extern const device_t pas16_device;
extern const device_t ps1snd_device;
/* Tandy PSSJ */
extern const device_t tndy_device;
extern const device_t pssj_device;
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
extern const device_t pssj_isa_device;
extern const device_t tndy_device;
#endif
/* Creative Labs Sound Blaster */
extern const device_t sb_1_device;

20
src/qt/CMakeLists.txt
View File

@@ -204,8 +204,7 @@ macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var _prefix)
set(_qt_plugin_dest "${_prefix}/PlugIns/${_qt_plugin_type}")
install(FILES "${_qt_plugin_path}"
DESTINATION "${_qt_plugin_dest}")
set(${_qt_plugins_var}
"${${_qt_plugins_var}};\$ENV{DEST_DIR}\${CMAKE_INSTALL_PREFIX}/${_qt_plugin_dest}/${_qt_plugin_file}")
list(APPEND ${_qt_plugins_var} "${_qt_plugin_dest}/${_qt_plugin_file}")
else()
message(FATAL_ERROR "QT plugin ${_qt_plugin_name} not found")
endif()
@@ -231,12 +230,6 @@ if (APPLE AND CMAKE_MACOSX_BUNDLE)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
DESTINATION "${INSTALL_CMAKE_DIR}")
# Note Mac specific extension .app
set(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/86Box.app")
# Directories to look for dependencies
set(DIRS "${CMAKE_BINARY_DIR}")
# Path used for searching by FIND_XXX(), with appropriate suffixes added
if(CMAKE_PREFIX_PATH)
foreach(dir ${CMAKE_PREFIX_PATH})
@@ -249,13 +242,14 @@ if (APPLE AND CMAKE_MACOSX_BUNDLE)
include(InstallRequiredSystemLibraries)
message(STATUS "APPS: ${APPS}")
message(STATUS "QT_PLUGINS: ${QT_PLUGINS}")
message(STATUS "DIRS: ${DIRS}")
install(CODE "
include(BundleUtilities)
fixup_bundle(\"${APPS}\" \"${QT_PLUGINS}\" \"${DIRS}\")")
get_filename_component(CMAKE_INSTALL_PREFIX_ABSOLUTE \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX} ABSOLUTE)
foreach(PLUGIN ${QT_PLUGINS})
get_filename_component(PLUGIN_ABSOLUTE \${PLUGIN} ABSOLUTE BASE_DIR \${CMAKE_INSTALL_PREFIX_ABSOLUTE})
list(APPEND QT_PLUGINS_ABSOLUTE \${PLUGIN_ABSOLUTE})
endforeach()
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX_ABSOLUTE}/86Box.app\" \"${QT_PLUGINS_ABSOLUTE}\" \"${DIRS}\")")
endif()
if (UNIX AND NOT APPLE)

2
src/qt/languages/ja-JP.po
View File

@@ -599,7 +599,7 @@ msgid "Fatal error"
msgstr "致命的なエラー"
msgid " - PAUSED"
msgstr " - PAUSED"
msgstr " - 一時停止"
msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
msgstr "Ctrl+Alt+PgDnでウィンドウモードに戻ります。"

12
src/qt/languages/zh-CN.po
View File

@@ -599,10 +599,10 @@ msgid "Fatal error"
msgstr "致命错误"
msgid " - PAUSED"
msgstr " - PAUSED"
msgstr " - 已暂停"
msgid "Press Ctrl+Alt+PgDn to return to windowed mode."
msgstr "按 Ctrl+Alt+PgDn 组合键返回到窗口模式。"
msgstr "按下 Ctrl+Alt+PgDn 返回到窗口模式。"
msgid "Speed"
msgstr "速度"
@@ -683,10 +683,10 @@ msgid "Click to capture mouse"
msgstr "单击窗口捕捉鼠标"
msgid "Press F8+F12 to release mouse"
msgstr "按 F8+F12 释放鼠标"
msgstr "按下 F8+F12 释放鼠标"
msgid "Press F8+F12 or middle button to release mouse"
msgstr "按 F8+F12 或鼠标中键释放鼠标"
msgstr "按下 F8+F12 或鼠标中键释放鼠标"
msgid "Unable to initialize FluidSynth"
msgstr "无法初始化 FluidSynth"
@@ -932,10 +932,10 @@ msgid "Pause execution"
msgstr "暂停执行"
msgid "Press Ctrl+Alt+Del"
msgstr "按 Ctrl+Alt+Del"
msgstr "按下 Ctrl+Alt+Del"
msgid "Press Ctrl+Alt+Esc"
msgstr "按 Ctrl+Alt+Esc"
msgstr "按下 Ctrl+Alt+Esc"
msgid "Hard reset"
msgstr "硬重置"

1
src/qt/qt_progsettings.hpp
View File

@@ -32,7 +32,6 @@ public:
if (strcmp(sourceText, "Take s&creenshot") == 0) sourceText = "Take s&creenshot\tCtrl+F11";
if (strcmp(sourceText, "Begin trace") == 0) sourceText = "Begin trace\tCtrl+T";
if (strcmp(sourceText, "End trace") == 0) sourceText = "End trace\tCtrl+T";
if (strcmp(sourceText, "Dump &video RAM") == 0) sourceText = "Dump &video RAM\tCtrl+F1";
if (strcmp(sourceText, "&Qt (Software)") == 0)
{
QString finalstr = QTranslator::translate("", "&SDL (Software)", disambiguation, n);

23
src/qt/qt_settingsmachine.cpp
View File

@@ -74,12 +74,21 @@ SettingsMachine::SettingsMachine(QWidget *parent) :
int selectedMachineType = 0;
auto* machineTypesModel = ui->comboBoxMachineType->model();
for (int i = 0; i < MACHINE_TYPE_MAX; ++i) {
Models::AddEntry(machineTypesModel, machine_types[i].name, machine_types[i].id);
if (machine_types[i].id == machine_get_type(machine)) {
selectedMachineType = i;
for (int i = 1; i < MACHINE_TYPE_MAX; ++i) {
int j = 0;
while (machine_get_internal_name_ex(j) != nullptr) {
if (machine_available(j) && (machine_get_type(j) == i)) {
int row = Models::AddEntry(machineTypesModel, machine_types[i].name, machine_types[i].id);
if (machine_types[i].id == machine_get_type(machine)) {
selectedMachineType = row;
}
break;
}
j++;
}
}
ui->comboBoxMachineType->setCurrentIndex(-1);
ui->comboBoxMachineType->setCurrentIndex(selectedMachineType);
}
@@ -124,12 +133,16 @@ void SettingsMachine::save() {
}
void SettingsMachine::on_comboBoxMachineType_currentIndexChanged(int index) {
if (index < 0) {
return;
}
auto* model = ui->comboBoxMachine->model();
int removeRows = model->rowCount();
int selectedMachineRow = 0;
for (int i = 0; i < machine_count(); ++i) {
if ((machine_get_type(i) == index) && machine_available(i)) {
if ((machine_get_type(i) == ui->comboBoxMachineType->currentData().toInt()) && machine_available(i)) {
int row = Models::AddEntry(model, machines[i].name, i);
if (i == machine) {
selectedMachineRow = row - removeRows;

4
src/sound/CMakeLists.txt
View File

@@ -55,5 +55,9 @@ if(GUSMAX)
target_compile_definitions(snd PRIVATE USE_GUSMAX)
endif()
if(TANDY_ISA)
target_compile_definitions(snd PRIVATE USE_TANDY_ISA)
endif()
add_subdirectory(resid-fp)
target_link_libraries(86Box resid-fp)

6
src/sound/snd_pssj.c
View File

@@ -215,6 +215,7 @@ void *pssj_1e0_init(const device_t *info)
return pssj;
}
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
void *pssj_isa_init(const device_t *info)
{
pssj_t *pssj = malloc(sizeof(pssj_t));
@@ -230,6 +231,7 @@ void *pssj_isa_init(const device_t *info)
return pssj;
}
#endif
void pssj_close(void *p)
{
@@ -238,6 +240,7 @@ void pssj_close(void *p)
free(pssj);
}
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
static const device_config_t pssj_isa_config[] =
{
{
@@ -261,6 +264,7 @@ static const device_config_t pssj_isa_config[] =
"", "", -1
}
};
#endif
const device_t pssj_device =
{
@@ -290,6 +294,7 @@ const device_t pssj_1e0_device =
NULL
};
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
const device_t pssj_isa_device =
{
"Tandy PSSJ Clone",
@@ -304,3 +309,4 @@ const device_t pssj_isa_device =
NULL,
pssj_isa_config
};
#endif

7
src/sound/snd_sn76489.c
View File

@@ -224,6 +224,7 @@ void *ncr8496_device_init(const device_t *info)
return sn76489;
}
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
void *tndy_device_init(const device_t *info)
{
sn76489_t *sn76489 = malloc(sizeof(sn76489_t));
@@ -235,6 +236,7 @@ void *tndy_device_init(const device_t *info)
return sn76489;
}
#endif
void sn76489_device_close(void *p)
{
@@ -243,6 +245,7 @@ void sn76489_device_close(void *p)
free(sn76489);
}
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
static const device_config_t tndy_config[] =
{
{
@@ -266,6 +269,7 @@ static const device_config_t tndy_config[] =
"", "", -1
}
};
#endif
const device_t sn76489_device =
{
@@ -291,6 +295,7 @@ const device_t ncr8496_device =
NULL
};
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
const device_t tndy_device =
{
"TNDY",
@@ -300,5 +305,7 @@ const device_t tndy_device =
tndy_device_init,
sn76489_device_close,
NULL, { NULL }, NULL,
NULL,
tndy_config
};
#endif

4
src/sound/sound.c
View File

@@ -123,8 +123,10 @@ static const SOUND_CARD sound_cards[] =
#if defined(DEV_BRANCH) && defined(USE_PAS16)
{ &pas16_device },
#endif
{ &tndy_device },
#if defined(DEV_BRANCH) && defined(USE_TANDY_ISA)
{ &pssj_isa_device },
{ &tndy_device },
#endif
{ &wss_device },
{ &adlib_mca_device },
{ &ncr_business_audio_device },

70
src/win/Makefile.mingw
View File

@@ -42,6 +42,15 @@ ifeq ($(DEV_BUILD), y)
ifndef GUSMAX
GUSMAX := y
endif
ifndef ISAMEM_RAMPAGE
ISAMEM_RAMPAGE := y
endif
ifndef ISAMEM_IAB
ISAMEM_IAB := y
endif
ifndef ISAMEM_BRAT
ISAMEM_BRAT := y
endif
ifndef LASERXT
LASERXT := y
endif
@@ -63,21 +72,15 @@ ifeq ($(DEV_BUILD), y)
ifndef VGAWONDER
VGAWONDER := y
endif
ifndef TANDY_ISA
TANDY_ISA := y
endif
ifndef VNC
VNC := y
endif
ifndef XL24
XL24 := y
endif
ifndef ISAMEM_RAMPAGE
ISAMEM_RAMPAGE := y
endif
ifndef ISAMEM_IAB
ISAMEM_IAB := y
endif
ifndef ISAMEM_BRAT
ISAMEM_BRAT := y
endif
ifndef OLIVETTI
OLIVETTI := y
endif
@@ -100,6 +103,15 @@ else
ifndef GUSMAX
GUSMAX := n
endif
ifndef ISAMEM_RAMPAGE
ISAMEM_RAMPAGE := n
endif
ifndef ISAMEM_IAB
ISAMEM_IAB := n
endif
ifndef ISAMEM_BRAT
ISAMEM_BRAT := n
endif
ifndef LASERXT
LASERXT := n
endif
@@ -121,21 +133,15 @@ else
ifndef VGAWONDER
VGAWONDER := n
endif
ifndef TANDY_ISA
TANDY_ISA := n
endif
ifndef VNC
VNC := n
endif
ifndef XL24
XL24 := n
endif
ifndef ISAMEM_RAMPAGE
ISAMEM_RAMPAGE := n
endif
ifndef ISAMEM_IAB
ISAMEM_IAB := n
endif
ifndef ISAMEM_BRAT
ISAMEM_BRAT := n
endif
ifndef OLIVETTI
OLIVETTI := n
endif
@@ -428,6 +434,18 @@ ifeq ($(GUSMAX), y)
OPTS += -DUSE_GUSMAX
endif
ifeq ($(ISAMEM_RAMPAGE), y)
OPTS += -DUSE_ISAMEM_RAMPAGE
endif
ifeq ($(ISAMEM_IAB), y)
OPTS += -DUSE_ISAMEM_IAB
endif
ifeq ($(ISAMEM_BRAT), y)
OPTS += -DUSE_ISAMEM_BRAT
endif
ifeq ($(LASERXT), y)
OPTS += -DUSE_LASERXT
DEVBROBJ += m_xt_laserxt.o
@@ -456,6 +474,10 @@ OPTS += -DUSE_SIO_DETECT
DEVBROBJ += sio_detect.o
endif
ifeq ($(TANDY_ISA), y)
OPTS += -DUSE_TANDY_ISA
endif
ifeq ($(VGAWONDER), y)
OPTS += -DUSE_VGAWONDER
endif
@@ -464,18 +486,6 @@ ifeq ($(XL24), y)
OPTS += -DUSE_XL24
endif
ifeq ($(ISAMEM_RAMPAGE), y)
OPTS += -DUSE_ISAMEM_RAMPAGE
endif
ifeq ($(ISAMEM_IAB), y)
OPTS += -DUSE_ISAMEM_IAB
endif
ifeq ($(ISAMEM_BRAT), y)
OPTS += -DUSE_ISAMEM_BRAT
endif
ifeq ($(OLIVETTI), y)
OPTS += -DUSE_OLIVETTI
DEVBROBJ += olivetti_eva.o

2
src/win/languages/ja-JP.rc
View File

@@ -371,7 +371,7 @@ BEGIN
2048 "86Box"
IDS_2049 "エラー"
IDS_2050 "致命的なエラー"
IDS_2051 " - PAUSED"
IDS_2051 " - 一時停止"
IDS_2052 "Ctrl+Alt+PgDnでウィンドウモードに戻ります。"
IDS_2053 "速度"
IDS_2054 "ZIP %03i %i (%s): %ls"

12
src/win/languages/zh-CN.rc
View File

@@ -371,8 +371,8 @@ BEGIN
2048 "86Box"
IDS_2049 "错误"
IDS_2050 "致命错误"
IDS_2051 " - PAUSED"
IDS_2052 "按 Ctrl+Alt+PgDn 组合键返回到窗口模式。"
IDS_2051 " - 已暂停"
IDS_2052 "按下 Ctrl+Alt+PgDn 返回到窗口模式。"
IDS_2053 "速度"
IDS_2054 "ZIP %03i %i (%s): %ls"
IDS_2055 "ZIP 镜像 (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
@@ -402,8 +402,8 @@ BEGIN
IDS_2075 "其他外围设备"
IDS_2076 "表面镜像 (*.86F)\0*.86F\0"
IDS_2077 "单击窗口捕捉鼠标"
IDS_2078 "按 F8+F12 释放鼠标"
IDS_2079 "按 F8+F12 或鼠标中键释放鼠标"
IDS_2078 "按下 F8+F12 释放鼠标"
IDS_2079 "按下 F8+F12 或鼠标中键释放鼠标"
END
STRINGTABLE DISCARDABLE
@@ -505,8 +505,8 @@ BEGIN
IDS_2153 "无法初始化 OpenGL (3.0 核心) 渲染器。请使用其他渲染器。"
IDS_2154 "恢复执行"
IDS_2155 "暂停执行"
IDS_2156 "按 Ctrl+Alt+Del"
IDS_2157 "按 Ctrl+Alt+Esc"
IDS_2156 "按下 Ctrl+Alt+Del"
IDS_2157 "按下 Ctrl+Alt+Esc"
IDS_2158 "硬重置"
IDS_2159 "ACPI 关机"
IDS_2160 "设置"