claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '86Box:master' into nec-v20

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-02-17 17:32:08 -05:00
committed by GitHub
parent 732f79db50 7f0c8fae5c
commit b147748ec3
14 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/chipset/via_pipc.c
View File

@@ -1577,7 +1577,7 @@ pipc_init(const device_t *info)
dev->ac97 = device_add(&ac97_via_device);
ac97_via_set_slot(dev->ac97, dev->slot, PCI_INTC);
dev->sb = device_add(&sb_pro_compat_device);
dev->sb = device_add_inst(&sb_pro_compat_device, 2);
#ifndef VIA_PIPC_FM_EMULATION
dev->sb->opl_enabled = 1;
#endif

2
src/device/isapnp.c
View File

@@ -268,7 +268,7 @@ isapnp_read_data(uint16_t addr, void *priv)
case 0x01: /* Serial Isolation */
card = dev->first_card;
while (card) {
if (card->enable && (card->state == PNP_STATE_ISOLATION))
if (card->enable && card->rom && (card->state == PNP_STATE_ISOLATION))
break;
card = card->next;
}

8
src/include_make/86box/version.h
View File

@@ -20,12 +20,12 @@
#define EMU_NAME "86Box"
#define EMU_NAME_W LSTR(EMU_NAME)
#define EMU_VERSION "3.2"
#define EMU_VERSION "3.2.1"
#define EMU_VERSION_W LSTR(EMU_VERSION)
#define EMU_VERSION_EX "3.02"
#define EMU_VERSION_EX "3.21"
#define EMU_VERSION_MAJ 3
#define EMU_VERSION_MIN 0
#define EMU_VERSION_PATCH 0
#define EMU_VERSION_MIN 2
#define EMU_VERSION_PATCH 1
#define EMU_BUILD_NUM 0

2
src/mem/sst_flash.c
View File

@@ -442,7 +442,7 @@ sst_init(const device_t *info)
f = nvr_fopen(flash_path, "rb");
if (f) {
if (fread(&(dev->array[0x00000]), 1, dev->size, f) != dev->size)
fatal("Less than %i bytes read from the SST Flash ROM file\n", dev->size);
pclog("Less than %i bytes read from the SST Flash ROM file\n", dev->size);
fclose(f);
} else
dev->dirty = 1; /* It is by definition dirty on creation. */

12
src/qt/qt_machinestatus.cpp
View File

@@ -259,8 +259,8 @@ void MachineStatus::iterateCDROM(const std::function<void (int)> &cb) {
for (size_t i = 0; i < CDROM_NUM; i++) {
/* Could be Internal or External IDE.. */
if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) &&
!hasIDE() && hdc_name != QStringLiteral("ide") &&
hdc_name != QStringLiteral("xtide"))
!hasIDE() && hdc_name.left(3) != QStringLiteral("ide") &&
hdc_name.left(5) != QStringLiteral("xtide"))
continue;
if ((cdrom[i].bus_type == CDROM_BUS_SCSI) && !hasSCSI() &&
(scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) &&
@@ -277,8 +277,8 @@ void MachineStatus::iterateZIP(const std::function<void (int)> &cb) {
for (size_t i = 0; i < ZIP_NUM; i++) {
/* Could be Internal or External IDE.. */
if ((zip_drives[i].bus_type == ZIP_BUS_ATAPI) &&
!hasIDE() && hdc_name != QStringLiteral("ide") &&
hdc_name != QStringLiteral("xtide"))
!hasIDE() && hdc_name.left(3) != QStringLiteral("ide") &&
hdc_name.left(5) != QStringLiteral("xtide"))
continue;
if ((zip_drives[i].bus_type == ZIP_BUS_SCSI) && !hasSCSI() &&
(scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) &&
@@ -295,8 +295,8 @@ void MachineStatus::iterateMO(const std::function<void (int)> &cb) {
for (size_t i = 0; i < MO_NUM; i++) {
/* Could be Internal or External IDE.. */
if ((mo_drives[i].bus_type == MO_BUS_ATAPI) &&
!hasIDE() && hdc_name != QStringLiteral("ide") &&
hdc_name != QStringLiteral("xtide"))
!hasIDE() && hdc_name.left(3) != QStringLiteral("ide") &&
hdc_name.left(5) != QStringLiteral("xtide"))
continue;
if ((mo_drives[i].bus_type == MO_BUS_SCSI) && !hasSCSI() &&
(scsi_card_current[0] == 0) && (scsi_card_current[1] == 0) &&

4
src/qt/qt_mainwindow.cpp
View File

@@ -445,6 +445,10 @@ void MainWindow::closeEvent(QCloseEvent *event) {
}
qt_nvr_save();
config_save();
#ifdef __unix__
extern void xinput2_exit();
if (QApplication::platformName() == "xcb") xinput2_exit();
#endif
event->accept();
}

1
src/qt/qt_platform.cpp
View File

@@ -337,6 +337,7 @@ extern int nvr_save(void);
void
plat_power_off(void)
{
plat_mouse_capture(0);
confirm_exit = 0;
nvr_save();
config_save();

24
src/qt/xinput2_mouse.cpp
View File

@@ -120,6 +120,14 @@ void xinput2_proc()
prev_rel_coords[0] = relative_coords[0];
prev_rel_coords[1] = relative_coords[1];
prev_time = rawev->time;
if (!mouse_capture) break;
XWindowAttributes winattrib{};
if (XGetWindowAttributes(disp, main_window->winId(), &winattrib)) {
auto globalPoint = main_window->mapToGlobal(QPoint(main_window->width() / 2, main_window->height() / 2));
XWarpPointer(disp, XRootWindow(disp, XScreenNumberOfScreen(winattrib.screen)), XRootWindow(disp, XScreenNumberOfScreen(winattrib.screen)), 0, 0, 0, 0, globalPoint.x(), globalPoint.y());
XFlush(disp);
}
}
case XI_Motion: {
if (XKeysymToKeycode(disp, XK_Home) == 69) {
@@ -144,9 +152,12 @@ void xinput2_proc()
void xinput2_exit()
{
exitthread = true;
procThread->wait(5000);
procThread->terminate();
if (!exitthread)
{
exitthread = true;
procThread->wait(5000);
procThread->terminate();
}
}
void xinput2_init()
@@ -175,13 +186,6 @@ void xinput2_poll()
{
mouse_x = xi2_mouse_x;
mouse_y = xi2_mouse_y;
XWindowAttributes winattrib{};
if (XGetWindowAttributes(disp, main_window->winId(), &winattrib))
{
auto globalPoint = main_window->mapToGlobal(QPoint(main_window->width() / 2, main_window->height() / 2));
XWarpPointer(disp, XRootWindow(disp, XScreenNumberOfScreen(winattrib.screen)), XRootWindow(disp, XScreenNumberOfScreen(winattrib.screen)), 0, 0, 0, 0, globalPoint.x(), globalPoint.y());
XFlush(disp);
}
}
xi2_mouse_x = 0;
xi2_mouse_y = 0;

4
src/sound/snd_cs423x.c
View File

@@ -708,7 +708,7 @@ cs423x_reset(void *priv)
/* Reset PnP resource data, state and logical devices. */
dev->pnp_enable = 1;
cs423x_pnp_enable(dev, 1, 1);
if (dev->pnp_card)
if (dev->pnp_card && dev->sb)
isapnp_reset_card(dev->pnp_card);
/* Reset SLAM. */
@@ -780,7 +780,7 @@ cs423x_init(const device_t *info)
dev->pnp_card = isapnp_add_card(NULL, 0, cs423x_pnp_config_changed, NULL, NULL, NULL, dev);
/* Initialize SBPro codec. The WSS codec is initialized later by cs423x_reset */
dev->sb = device_add(&sb_pro_compat_device);
dev->sb = device_add_inst(&sb_pro_compat_device, 1);
sound_set_cd_audio_filter(sbpro_filter_cd_audio, dev->sb); /* CD audio filter for the default context */
/* Initialize RAM, registers and WSS codec. */

2
src/win/win_about.c
View File

@@ -39,7 +39,7 @@ AboutDialogCreate(HWND hwnd)
int i;
TASKDIALOGCONFIG tdconfig = {0};
TASKDIALOG_BUTTON tdbuttons[] = {
{IDOK, EMU_SITE},
{IDOK, EMU_SITE_W},
{IDCANCEL, MAKEINTRESOURCE(IDS_2127)}
};