mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-21 17:15:32 -07:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' of https://github.com/akmed772/86Box55

Browse Source
This commit is contained in:
Akamaki
2026-02-13 08:48:19 +09:00
parent d5d59c608a 63f2714f82
commit 2b486fdd00
14 changed files with 1495 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -705,6 +705,7 @@ extern int machine_at_d824_init(const machine_t *);
/* VLSI 82C486 */
extern int machine_at_pcs44c_init(const machine_t *);
extern int machine_at_sensation1_init(const machine_t *);
extern int machine_at_tuliptc38_init(const machine_t *);
/* ZyMOS Poach */
@@ -739,6 +740,9 @@ extern int machine_at_valuepoint433_init(const machine_t *);
extern int machine_at_monsoon_init(const machine_t *);
extern int machine_at_martin_init(const machine_t *);
/* VLSI 82C486 */
extern int machine_at_sensation2_init(const machine_t *);
/* m_at_socket3.c */
/* ALi M1429G */
extern int machine_at_atc1762_init(const machine_t *);

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

@@ -250,6 +250,9 @@ extern const device_t pssj_1e0_device;
/* Tandy PSG */
extern const device_t tndy_device;
/* Tandy Sensation */
extern const device_t sensationaud_device;
/* Windows Sound System */
extern const device_t wss_device;
extern const device_t ncr_business_audio_device;

29
src/machine/m_at_socket1.c
View File

@@ -375,6 +375,35 @@ machine_at_pcs44c_init(const machine_t *model)
return ret;
}
int
machine_at_sensation1_init(const machine_t *model)
{
int ret;
ret = bios_load_linear("roms/machines/sensation1/P1033PCD_01.10.01_11-11-92_E687_Sensation_1_BIOS.bin",
0x000e0000, 131072, 0);
if (bios_only || !ret)
return ret;
machine_at_common_ide_init(model);
device_add(&vl82c486_device);
device_add(&vl82c113_device);
device_add(&pssj_1e0_device);
if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_nsc_dp8473_device);
/* TODO: Add onboard WD90C31 once it's implemented */
if (sound_card_current[0] == SOUND_INTERNAL)
machine_snd = device_add(machine_get_snd_device(machine));
return ret;
}
int
machine_at_tuliptc38_init(const machine_t *model)
{

25
src/machine/m_at_socket2.c
View File

@@ -419,3 +419,28 @@ machine_at_martin_init(const machine_t *model)
return ret;
}
/* VLSI 82C486 */
int
machine_at_sensation2_init(const machine_t *model)
{
int ret;
ret = bios_load_linear("roms/machines/sensation2/TANDY_SENSATION_2_011004_10051993.BIN",
0x000e0000, 131072, 0);
if (bios_only || !ret)
return ret;
machine_at_common_ide_init(model);
device_add(&vl82c486_device);
device_add(&vl82c113_device);
device_add_params(&fdc37c6xx_device, (void *) (FDC37C651 | FDC37C6XX_IDE_PRI));
if (gfxcard[0] == VID_INTERNAL)
device_add(machine_get_vid_device(machine));
return ret;
}

6
src/machine/m_xt.c
View File

@@ -1275,7 +1275,7 @@ static const device_config_t pc500_config[] = {
};
const device_t pc500_device = {
.name = "Multitech PC-500",
.name = "Multitech PC-500 / Franklin PC 8000",
.internal_name = "pc500_device",
.flags = 0,
.local = 0,
@@ -1394,7 +1394,7 @@ static const device_config_t pc500plus_config[] = {
};
const device_t pc500plus_device = {
.name = "Multitech PC-500 plus",
.name = "Multitech PC-500+",
.internal_name = "pc500plus_device",
.flags = 0,
.local = 0,
@@ -1472,7 +1472,7 @@ static const device_config_t pc700_config[] = {
};
const device_t pc700_device = {
.name = "Multitech PC-700",
.name = "Multitech PC-700 / Siemens SICOMP PC 16 05",
.internal_name = "pc700_device",
.flags = 0,
.local = 0,

176
src/machine/machine_table.c
View File

@@ -1140,7 +1140,7 @@ const machine_t machines[] = {
.net_device = NULL
},
{
.name = "[8088] Multitech PC-500 plus",
.name = "[8088] Multitech PC-500+",
.internal_name = "pc500plus",
.type = MACHINE_TYPE_8088,
.chipset = MACHINE_CHIPSET_DISCRETE,
@@ -2689,6 +2689,49 @@ const machine_t machines[] = {
.snd_device = NULL,
.net_device = NULL
},
{
.name = "[8086] IBM Multistation 5550",
.internal_name = "ibm5550",
.type = MACHINE_TYPE_8086,
.chipset = MACHINE_CHIPSET_DISCRETE,
.init = machine_xt_ibm5550_init,
.p1_handler = NULL,
.gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE,
.gpio_acpi_handler = NULL,
.cpu = {
.package = CPU_PKG_8086,
.block = CPU_BLOCK_NONE,
.min_bus = 0,
.max_bus = 0,
.min_voltage = 0,
.max_voltage = 0,
.min_multi = 0,
.max_multi = 0
},
.bus_flags = MACHINE_PC,
.flags = MACHINE_VIDEO_FIXED | MACHINE_KEYBOARD,
.ram = {
.min = 256,
.max = 640,
.step = 128
},
.nvrmask = 15,
.jumpered_ecp_dma = 0,
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.kbc_p1 = 0xff,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = NULL,
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.snd_device = NULL,
.net_device = NULL
},
{
.name = "[8086] Mazovia 1016",
.internal_name = "maz1016",
@@ -3033,49 +3076,6 @@ const machine_t machines[] = {
.snd_device = NULL,
.net_device = NULL
},
{
.name = "[8086] IBM Multistation 5550",
.internal_name = "ibm5550",
.type = MACHINE_TYPE_8086,
.chipset = MACHINE_CHIPSET_DISCRETE,
.init = machine_xt_ibm5550_init,
.p1_handler = NULL,
.gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE,
.gpio_acpi_handler = NULL,
.cpu = {
.package = CPU_PKG_8086,
.block = CPU_BLOCK_NONE,
.min_bus = 0,
.max_bus = 0,
.min_voltage = 0,
.max_voltage = 0,
.min_multi = 0,
.max_multi = 0
},
.bus_flags = MACHINE_PC,
.flags = MACHINE_VIDEO_FIXED | MACHINE_KEYBOARD,
.ram = {
.min = 256,
.max = 640,
.step = 128
},
.nvrmask = 15,
.jumpered_ecp_dma = 0,
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.kbc_p1 = 0xff,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = NULL,
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.snd_device = NULL,
.net_device = NULL
},
/* 286 AT machines */
/* Has IBM AT KBC firmware. */
@@ -7872,6 +7872,50 @@ const machine_t machines[] = {
.net_device = NULL
},
/* Has a VLSI VL82C113A SCAMP Combination I/O which holds the KBC. */
{
.name = "[VLSI 82C486] Tandy Sensation! (25-1650)",
.internal_name = "sensation1",
.type = MACHINE_TYPE_486,
.chipset = MACHINE_CHIPSET_VLSI_VL82C486,
.init = machine_at_sensation1_init,
.p1_handler = machine_generic_p1_handler,
.gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE,
.gpio_acpi_handler = NULL,
.cpu = {
.package = CPU_PKG_SOCKET1,
.block = CPU_BLOCK_NONE,
.min_bus = 0,
.max_bus = 0,
.min_voltage = 0,
.max_voltage = 0,
.min_multi = 0,
.max_multi = 0
},
.bus_flags = MACHINE_PS2,
.flags = MACHINE_IDE | MACHINE_SOUND | MACHINE_GAMEPORT | MACHINE_APM,
.ram = {
.min = 2048,
.max = 32768,
.step = 2048
},
.nvrmask = 127,
.jumpered_ecp_dma = 0,
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.kbc_p1 = 0x000004f0,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = NULL,
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.snd_device = &sensationaud_device,
.net_device = NULL
},
/* Has a VLSI VL82C113A SCAMP Combination I/O which holds the KBC. */
{
.name = "[VLSI 82C486] Tulip 486 DC/DT",
.internal_name = "tuliptc38",
@@ -8624,6 +8668,50 @@ const machine_t machines[] = {
.snd_device = NULL,
.net_device = NULL
},
/* Has a VLSI VL82C113A SCAMP Combination I/O which holds the KBC. */
{
.name = "[VLSI 82C486] Tandy Sensation! II (25-1651)/3100/MMPC",
.internal_name = "sensation2",
.type = MACHINE_TYPE_486_S2,
.chipset = MACHINE_CHIPSET_VLSI_VL82C486,
.init = machine_at_sensation2_init,
.p1_handler = machine_generic_p1_handler,
.gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE,
.gpio_acpi_handler = NULL,
.cpu = {
.package = CPU_PKG_SOCKET3,
.block = CPU_BLOCK_NONE,
.min_bus = 0,
.max_bus = 0,
.min_voltage = 0,
.max_voltage = 0,
.min_multi = 0,
.max_multi = 0
},
.bus_flags = MACHINE_PS2,
.flags = MACHINE_IDE | MACHINE_VIDEO | MACHINE_APM,
.ram = {
.min = 2048,
.max = 65536,
.step = 2048
},
.nvrmask = 127,
.jumpered_ecp_dma = 0,
.default_jumpered_ecp_dma = -1,
.kbc_device = NULL,
.kbc_params = 0x00000000,
.kbc_p1 = 0x000004f0,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = NULL,
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = &gd5428_vlb_onboard_device,
.snd_device = NULL,
.net_device = NULL
},
/* 486 machines - Socket 3 */
/* 486 machines with just the ISA slot */

2
src/network/net_switch.c
View File

@@ -505,7 +505,7 @@ net_switch_init(const netcard_t *card, const uint8_t *mac_addr, void *priv, char
if (netcard->secret[0] != '\0') {
uint8_t temp[32];
net_switch_secret_hash((const uint8_t *)netcard->secret, (uint8_t *) temp);
net_switch_secret_hash((const char *) netcard->secret, (uint8_t *) temp);
memcpy(netswitch->secret_hash, temp, 32);
netswitch->secret_enabled = 1;
} else {

2
src/qt/languages/zh-TW.po
View File

@@ -2840,7 +2840,7 @@ msgid "Remote Switch"
msgstr "遠端交換器"
msgid "Shared secret:"
msgstr "共用秘鑰:"
msgstr "共用密鑰:"
msgid "Hub Mode"
msgstr "集線器模式"

3
src/qt/qt_settingsfloppycdrom.cpp
View File

@@ -434,7 +434,8 @@ void
SettingsFloppyCDROM::on_comboBoxFloppyType_activated(int index)
{
auto currentIndex = ui->tableViewFloppy->selectionModel()->currentIndex();
setFloppyType(ui->tableViewFloppy->model(), currentIndex, index);
auto typeIndex = currentIndex.siblingAtColumn(0);
setFloppyType(ui->tableViewFloppy->model(), typeIndex, index);
// Trigger row changed to rebuild audio profile list
onFloppyRowChanged(currentIndex);

20
src/qt/qt_softwarerenderer.cpp
View File

@@ -21,6 +21,8 @@
#include <QClipboard>
#include <QPainter>
#include <QResizeEvent>
#include <QScreen>
#include "qt_util.hpp"
extern "C" {
#include <86box/86box.h>
@@ -114,16 +116,30 @@ SoftwareRenderer::onBlit(int buf_idx, int x, int y, int w, int h)
plat_tempfile(fn, NULL, (char *) ".png");
strcat(path, fn);
qreal win_scale = util::screenOfWidget(this)->devicePixelRatio();
QSize qs = RendererCommon::parentWidget->size();
QPixmap pixmap(RendererCommon::parentWidget->size());
RendererCommon::parentWidget->render(&pixmap);
QImage image = pixmap.toImage();
QImage image;
if (win_scale == 1.0)
image = pixmap.toImage();
else
image = pixmap.toImage().scaled(qs * win_scale, Qt::IgnoreAspectRatio,
Qt::SmoothTransformation);
image.save(path, "png");
monitors[r_monitor_index].mon_screenshots--;
}
if (monitors[r_monitor_index].mon_screenshots_clipboard) {
qreal win_scale = util::screenOfWidget(this)->devicePixelRatio();
QSize qs = RendererCommon::parentWidget->size();
QPixmap pixmap(RendererCommon::parentWidget->size());
RendererCommon::parentWidget->render(&pixmap);
QImage image = pixmap.toImage();
QImage image;
if (win_scale == 1.0)
image = pixmap.toImage();
else
image = pixmap.toImage().scaled(qs * win_scale, Qt::IgnoreAspectRatio,
Qt::SmoothTransformation);
QClipboard *clipboard = QApplication::clipboard();
clipboard->setImage(image, QClipboard::Clipboard);
monitors[r_monitor_index].mon_screenshots_clipboard--;

2
src/sio/sio_vl82c113.c
View File

@@ -136,6 +136,8 @@ vl82c113_init(UNUSED(const device_t *info))
if (machines[machine].init == machine_at_martin_init)
dev->nvr = device_add(&martin_nvr_device);
else if (machines[machine].init == machine_at_sensation1_init || machines[machine].init == machine_at_sensation2_init)
dev->nvr = device_add(&at_nvr_device);
else
dev->nvr = device_add(&amstrad_megapc_nvr_device);

1
src/sound/CMakeLists.txt
View File

@@ -52,6 +52,7 @@ add_library(snd OBJECT
snd_ym7128.c
snd_optimc.c
snd_opl_esfm.c
snd_sensation.c
snd_ymf701.c
snd_ymf71x.c
sound_util.c

1259
src/sound/snd_sensation.c Normal file
View File

File diff suppressed because it is too large Load Diff

26
src/video/vid_cl54xx.c
View File

@@ -1870,10 +1870,12 @@ gd54xx_recalctimings(svga_t *svga)
svga->interlace = (svga->crtc[0x1a] & 0x01);
if (!(svga->gdcreg[6] & 1) && !(svga->attrregs[0x10] & 1)) { /*Text mode*/
svga->interlace = 0;
if (!svga->scrblank && svga->attr_palette_enable) {
if (!(svga->gdcreg[6] & 1) && !(svga->attrregs[0x10] & 1)) /*Text mode*/
svga->interlace = 0;
}
pclog("CRTC1a=%x, interlace=%x.\n", svga->crtc[0x1a] & 0x01, svga->interlace);
clocksel = (svga->miscout >> 2) & 3;
if (!gd54xx->vclk_n[clocksel] || !gd54xx->vclk_d[clocksel])
@@ -2059,19 +2061,19 @@ gd54xx_recalctimings(svga_t *svga)
}
}
svga->vram_display_mask = (svga->crtc[0x1b] & 2) ? gd54xx->vram_mask : 0x3ffff;
svga->vram_display_mask = (svga->crtc[0x1b] & 0x02) ? gd54xx->vram_mask : 0x3ffff;
if (svga->crtc[0x27] >= CIRRUS_ID_CLGD5430)
svga->htotal += ((svga->crtc[0x1c] >> 3) & 0x07);
if (!(svga->gdcreg[6] & 1) && !(svga->attrregs[0x10] & 1)) { /*Text mode*/
if (!(svga->gdcreg[6] & 0x01) && !(svga->attrregs[0x10] & 0x01)) { /*Text mode*/
if (svga->seqregs[1] & 8)
svga->render = svga_render_text_40;
else
svga->render = svga_render_text_80;
}
if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA)) {
if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA) && (((svga->gdcreg[6] >> 2) & 0x03) != 0x01)) {
svga->extra_banks[0] = 0;
svga->extra_banks[1] = 0x8000;
}
@@ -2288,7 +2290,7 @@ gd54xx_write(uint32_t addr, uint8_t val, void *priv)
xga_write_test(addr, val, svga);
if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA)) {
if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA) && (((svga->gdcreg[6] >> 2) & 0x03) != 0x01)) {
svga_write(addr, val, svga);
return;
}
@@ -2318,7 +2320,7 @@ gd54xx_writew(uint32_t addr, uint16_t val, void *priv)
xga_write_test(addr, val, svga);
xga_write_test(addr + 1, val >> 8, svga);
if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA)) {
if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA) && (((svga->gdcreg[6] >> 2) & 0x03) != 0x01)) {
svga_writew(addr, val, svga);
return;
}
@@ -2357,7 +2359,7 @@ gd54xx_writel(uint32_t addr, uint32_t val, void *priv)
xga_write_test(addr + 2, val >> 16, svga);
xga_write_test(addr + 3, val >> 24, svga);
if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA)) {
if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA) && (((svga->gdcreg[6] >> 2) & 0x03) != 0x01)) {
svga_writel(addr, val, svga);
return;
}
@@ -2914,7 +2916,7 @@ gd54xx_read(uint32_t addr, void *priv)
svga_t *svga = (svga_t *) priv;
gd54xx_t *gd54xx = (gd54xx_t *) svga->local;
if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA))
if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA) && (((svga->gdcreg[6] >> 2) & 0x03) != 0x01))
return svga_read(addr, svga);
if (gd54xx->countminusone && gd54xx->blt.ms_is_dest &&
@@ -2935,7 +2937,7 @@ gd54xx_readw(uint32_t addr, void *priv)
gd54xx_t *gd54xx = (gd54xx_t *) svga->local;
uint16_t ret;
if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA))
if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA) && (((svga->gdcreg[6] >> 2) & 0x03) != 0x01))
return svga_readw(addr, svga);
if (gd54xx->countminusone && gd54xx->blt.ms_is_dest &&
@@ -2960,7 +2962,7 @@ gd54xx_readl(uint32_t addr, void *priv)
gd54xx_t *gd54xx = (gd54xx_t *) svga->local;
uint32_t ret;
if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA))
if (!(svga->seqregs[0x07] & CIRRUS_SR7_BPP_SVGA) && (((svga->gdcreg[6] >> 2) & 0x03) != 0x01))
return svga_readl(addr, svga);
if (gd54xx->countminusone && gd54xx->blt.ms_is_dest &&
@@ -4421,6 +4423,7 @@ gd54xx_init(const device_t *info)
vram = 1024;
else
vram = device_get_config_int("memory");
gd54xx->vram_size = vram << 10;
} else {
if (id <= CIRRUS_ID_CLGD5428) {
@@ -4432,6 +4435,7 @@ gd54xx_init(const device_t *info)
vram = 512;
else
vram = device_get_config_int("memory");
gd54xx->vram_size = vram << 10;
} else {
vram = device_get_config_int("memory");