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

Merge pull request #4 from 86Box/master

Browse Source 
rebase to master
This commit is contained in:
Akamaki
2025-02-22 22:06:01 +09:00
committed by GitHub
parent 4042fd15fb 470b0658b7
commit 23045ccf60
7 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/device/cassette.c
View File

@@ -715,7 +715,7 @@ cassette_init(UNUSED(const device_t *info))
const device_t cassette_device = {
.name = "IBM PC/PCjr Cassette Device",
.internal_name = "cassette",
.flags = 0,
.flags = DEVICE_CASETTE,
.local = 0,
.init = cassette_init,
.close = cassette_close,

2
src/device/isartc.c
View File

@@ -862,7 +862,7 @@ static const device_config_t mm58167_config[] = {
static const device_t mm58167_device = {
.name = "Generic MM58167 RTC",
.internal_name = "rtc_mm58167",
.flags = DEVICE_ISA,
.flags = DEVICE_ISA | DEVICE_SIDECAR,
.local = ISARTC_MM58167,
.init = isartc_init,
.close = isartc_close,

4
src/device/mouse_bus.c
View File

@@ -815,7 +815,7 @@ static const device_config_t ms_config[] = {
const device_t mouse_logibus_device = {
.name = "Logitech/Microsoft Bus Mouse",
.internal_name = "logibus",
.flags = DEVICE_ISA,
.flags = DEVICE_ISA | DEVICE_SIDECAR,
.local = MOUSE_TYPE_LOGIBUS,
.init = bm_init,
.close = bm_close,
@@ -843,7 +843,7 @@ const device_t mouse_logibus_onboard_device = {
const device_t mouse_msinport_device = {
.name = "Microsoft Bus Mouse (InPort)",
.internal_name = "msbus",
.flags = DEVICE_ISA,
.flags = DEVICE_ISA | DEVICE_SIDECAR,
.local = MOUSE_TYPE_INPORT,
.init = bm_init,
.close = bm_close,

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

@@ -79,6 +79,7 @@
// #define CONFIG_STANDALONE 257 /* not available on the on-board variant */
enum {
DEVICE_CASETTE = 1, /* requires a Casette Port */
DEVICE_SIDECAR = 2, /* requires an IBM PCjr */
DEVICE_ISA = 4, /* requires the ISA bus */
DEVICE_XT_KBC = 8, /* requires an XT-compatible keyboard controller */

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

@@ -48,7 +48,7 @@
#define MACHINE_BUS_AGP 0x00080000 /* sys has AGP bus */
#define MACHINE_BUS_AC97 0x00100000 /* sys has AC97 bus (ACR/AMR/CNR slot) */
/* Aliases. */
#define MACHINE_CASSETTE (MACHINE_BUS_CASSETTE) /* sys has cassette port */
#define MACHINE_CASSETTE (MACHINE_BUS_CASSETTE) /* sys has cassette port */
/* Combined flags. */
#define MACHINE_PC (MACHINE_BUS_ISA) /* sys is PC/XT-compatible (ISA) */
#define MACHINE_AT (MACHINE_BUS_ISA | MACHINE_BUS_ISA16) /* sys is AT-compatible (ISA + ISA16) */
@@ -67,18 +67,19 @@
#define MACHINE_AGP (MACHINE_BUS_AGP | MACHINE_PCI) /* sys is AT-compatible with AGP */
#define MACHINE_AGP98 (MACHINE_BUS_AGP | MACHINE_PCI98) /* sys is NEC PC-98x1 series with AGP (did that even exist?) */
#define MACHINE_PC5150 (MACHINE_PC | MACHINE_CASSETTE) /* sys is IBM PC 5150 */
#define MACHINE_PCJR (MACHINE_PC | MACHINE_CASSETTE | MACHINE_BUS_SIDECAR) /* sys is PCjr */
#define MACHINE_PS2 (MACHINE_AT | MACHINE_BUS_PS2) /* sys is PS/2 */
#define MACHINE_PS2_MCA (MACHINE_MCA | MACHINE_BUS_PS2) /* sys is MCA PS/2 */
#define MACHINE_PS2_VLB (MACHINE_VLB | MACHINE_BUS_PS2) /* sys is VLB PS/2 */
#define MACHINE_PS2_PCI (MACHINE_PCI | MACHINE_BUS_PS2) /* sys is PCI PS/2 */
#define MACHINE_PS2_PCIV (MACHINE_PCIV | MACHINE_BUS_PS2) /* sys is VLB/PCI PS/2 */
#define MACHINE_PS2_AGP (MACHINE_AGP | MACHINE_BUS_PS2) /* sys is AGP PS/2 */
#define MACHINE_PS2_A97 (MACHINE_PS2_AGP | MACHINE_BUS_AC97) /* sys is AGP/AC97 PS/2 */
#define MACHINE_PS2_NOISA (MACHINE_PS2_AGP & ~MACHINE_AT) /* sys is AGP PS/2 without ISA */
#define MACHINE_PS2_PCIONLY (MACHINE_PS2_NOISA & ~MACHINE_BUS_AGP) /* sys is PCI PS/2 without ISA */
#define MACHINE_PS2_NOI97 (MACHINE_PS2_A97 & ~MACHINE_AT) /* sys is AGP/AC97 PS/2 without ISA */
#define MACHINE_PC5150 (MACHINE_CASSETTE | MACHINE_PC) /* sys is IBM PC 5150 */
#define MACHINE_PCJR (MACHINE_CASSETTE | MACHINE_BUS_SIDECAR) /* sys is PCjr */
#define MACHINE_PS2 (MACHINE_AT | MACHINE_BUS_PS2) /* sys is PS/2 */
#define MACHINE_PS2_MCA (MACHINE_MCA | MACHINE_BUS_PS2) /* sys is MCA PS/2 */
#define MACHINE_PS2_VLB (MACHINE_VLB | MACHINE_BUS_PS2) /* sys is VLB PS/2 */
#define MACHINE_PS2_PCI (MACHINE_PCI | MACHINE_BUS_PS2) /* sys is PCI PS/2 */
#define MACHINE_PS2_PCIV (MACHINE_PCIV | MACHINE_BUS_PS2) /* sys is VLB/PCI PS/2 */
#define MACHINE_PS2_AGP (MACHINE_AGP | MACHINE_BUS_PS2) /* sys is AGP PS/2 */
#define MACHINE_PS2_A97 (MACHINE_PS2_AGP | MACHINE_BUS_AC97) /* sys is AGP/AC97 PS/2 */
#define MACHINE_PS2_NOISA (MACHINE_PS2_AGP & ~MACHINE_AT) /* sys is AGP PS/2 without ISA */
#define MACHINE_PS2_PCIONLY (MACHINE_PS2_NOISA & ~MACHINE_BUS_AGP) /* sys is PCI PS/2 without ISA */
#define MACHINE_PS2_NOI97 (MACHINE_PS2_A97 & ~MACHINE_AT) /* sys is AGP/AC97 PS/2 without ISA */
/* Feature flags for miscellaneous internal devices. */
#define MACHINE_FLAGS_NONE 0x00000000 /* sys has no int devices */
#define MACHINE_SOFTFLOAT_ONLY 0x00000001 /* sys requires SoftFloat FPU */

2
src/scsi/scsi_ncr53c400.c
View File

@@ -1024,7 +1024,7 @@ const device_t scsi_t130b_device = {
const device_t scsi_ls2000_device = {
.name = "Corel LS2000",
.internal_name = "ls2000",
.flags = DEVICE_ISA,
.flags = DEVICE_ISA | DEVICE_SIDECAR,
.local = ROM_LS2000,
.init = ncr53c400_init,
.close = ncr53c400_close,

2
src/sound/snd_adlib.c
View File

@@ -145,7 +145,7 @@ adlib_close(void *priv)
const device_t adlib_device = {
.name = "AdLib",
.internal_name = "adlib",
.flags = DEVICE_ISA,
.flags = DEVICE_ISA | DEVICE_SIDECAR,
.local = 0,
.init = adlib_init,
.close = adlib_close,