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

Merge branch 'master' of https://github.com/86Box/86Box into qt

Browse Source
This commit is contained in:
ts-korhonen
2021-12-21 00:08:18 +02:00
parent a99b556b14 df985616e0
commit 01f45ae651
21 changed files with 280 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/device/serial.c
View File

@@ -129,7 +129,7 @@ serial_update_ints(serial_t *dev)
}
if (stat && (dev->irq != 0xff) && ((dev->mctrl & 8) || (dev->type == SERIAL_8250_PCJR))) {
if (dev->type >= SERIAL_NS16450)
if (dev->type >= SERIAL_16450)
picintlevel(1 << dev->irq);
else
picint(1 << dev->irq);
@@ -151,9 +151,9 @@ serial_clear_timeout(serial_t *dev)
static void
write_fifo(serial_t *dev, uint8_t dat)
{
serial_log("write_fifo(%08X, %02X, %i, %i)\n", dev, dat, (dev->type >= SERIAL_NS16550) && dev->fifo_enabled, dev->rcvr_fifo_pos & 0x0f);
serial_log("write_fifo(%08X, %02X, %i, %i)\n", dev, dat, (dev->type >= SERIAL_16550) && dev->fifo_enabled, dev->rcvr_fifo_pos & 0x0f);
if ((dev->type >= SERIAL_NS16550) && dev->fifo_enabled) {
if ((dev->type >= SERIAL_16550) && dev->fifo_enabled) {
/* FIFO mode. */
timer_disable(&dev->timeout_timer);
/* Indicate overrun. */
@@ -189,7 +189,7 @@ write_fifo(serial_t *dev, uint8_t dat)
void
serial_write_fifo(serial_t *dev, uint8_t dat)
{
serial_log("serial_write_fifo(%08X, %02X, %i, %i)\n", dev, dat, (dev->type >= SERIAL_NS16550) && dev->fifo_enabled, dev->rcvr_fifo_pos & 0x0f);
serial_log("serial_write_fifo(%08X, %02X, %i, %i)\n", dev, dat, (dev->type >= SERIAL_16550) && dev->fifo_enabled, dev->rcvr_fifo_pos & 0x0f);
if (!(dev->mctrl & 0x10))
write_fifo(dev, dat);
@@ -371,7 +371,7 @@ serial_write(uint16_t addr, uint8_t val, void *p)
dev->int_status &= ~SERIAL_INT_TRANSMIT;
serial_update_ints(dev);
if ((dev->type >= SERIAL_NS16550) && dev->fifo_enabled && (dev->xmit_fifo_pos < 16)) {
if ((dev->type >= SERIAL_16550) && dev->fifo_enabled && (dev->xmit_fifo_pos < 16)) {
/* FIFO mode, begin transmitting. */
timer_on_auto(&dev->transmit_timer, dev->transmit_period);
dev->transmit_enabled |= 1; /* Start moving. */
@@ -396,7 +396,7 @@ serial_write(uint16_t addr, uint8_t val, void *p)
serial_update_ints(dev);
break;
case 2:
if (dev->type >= SERIAL_NS16550) {
if (dev->type >= SERIAL_16550) {
if ((val ^ dev->fcr) & 0x01)
serial_reset_fifo(dev);
dev->fcr = val & 0xf9;
@@ -500,7 +500,7 @@ serial_write(uint16_t addr, uint8_t val, void *p)
serial_update_ints(dev);
break;
case 7:
if (dev->type >= SERIAL_NS16450)
if (dev->type >= SERIAL_16450)
dev->scratch = val;
break;
}
@@ -522,7 +522,7 @@ serial_read(uint16_t addr, void *p)
break;
}
if ((dev->type >= SERIAL_NS16550) && dev->fifo_enabled) {
if ((dev->type >= SERIAL_16550) && dev->fifo_enabled) {
/* FIFO mode. */
serial_clear_timeout(dev);
@@ -718,12 +718,12 @@ serial_set_next_inst(int ni)
void
serial_standalone_init(void) {
for ( ; next_inst < 4; )
device_add_inst(&i8250_device, next_inst + 1);
device_add_inst(&ns8250_device, next_inst + 1);
};
const device_t i8250_device = {
"Intel 8250(-compatible) UART",
const device_t ns8250_device = {
"National Semiconductor 8250(-compatible) UART",
0,
SERIAL_8250,
serial_init, serial_close, NULL,
@@ -731,8 +731,8 @@ const device_t i8250_device = {
NULL
};
const device_t i8250_pcjr_device = {
"Intel 8250(-compatible) UART for PCjr",
const device_t ns8250_pcjr_device = {
"National Semiconductor 8250(-compatible) UART for PCjr",
DEVICE_PCJR,
SERIAL_8250_PCJR,
serial_init, serial_close, NULL,
@@ -743,7 +743,7 @@ const device_t i8250_pcjr_device = {
const device_t ns16450_device = {
"National Semiconductor NS16450(-compatible) UART",
0,
SERIAL_NS16450,
SERIAL_16450,
serial_init, serial_close, NULL,
{ NULL }, serial_speed_changed, NULL,
NULL
@@ -752,7 +752,43 @@ const device_t ns16450_device = {
const device_t ns16550_device = {
"National Semiconductor NS16550(-compatible) UART",
0,
SERIAL_NS16550,
SERIAL_16550,
serial_init, serial_close, NULL,
{ NULL }, serial_speed_changed, NULL,
NULL
};
const device_t ns16650_device = {
"Startech Semiconductor 16650(-compatible) UART",
0,
SERIAL_16650,
serial_init, serial_close, NULL,
{ NULL }, serial_speed_changed, NULL,
NULL
};
const device_t ns16750_device = {
"Texas Instruments 16750(-compatible) UART",
0,
SERIAL_16750,
serial_init, serial_close, NULL,
{ NULL }, serial_speed_changed, NULL,
NULL
};
const device_t ns16850_device = {
"Exar Corporation NS16850(-compatible) UART",
0,
SERIAL_16850,
serial_init, serial_close, NULL,
{ NULL }, serial_speed_changed, NULL,
NULL
};
const device_t ns16950_device = {
"Oxford Semiconductor NS16950(-compatible) UART",
0,
SERIAL_16950,
serial_init, serial_close, NULL,
{ NULL }, serial_speed_changed, NULL,
NULL

11
src/game/gameport.c
View File

@@ -446,7 +446,7 @@ const device_t gameport_device = {
};
const device_t gameport_201_device = {
"Game port (port 201h only)",
"Game port (Port 201h only)",
0, 0x010201,
gameport_init,
gameport_close,
@@ -463,6 +463,15 @@ const device_t gameport_208_device = {
NULL
};
const device_t gameport_209_device = {
"Game port (Port 209h only)",
0, 0x010209,
gameport_init,
gameport_close,
NULL, { NULL }, NULL,
NULL
};
const device_t gameport_pnp_device = {
"Game port (Plug and Play only)",
0, 0x080000,

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

@@ -109,6 +109,7 @@ extern "C" {
extern const device_t gameport_device;
extern const device_t gameport_201_device;
extern const device_t gameport_208_device;
extern const device_t gameport_209_device;
extern const device_t gameport_pnp_device;
extern const device_t gameport_pnp_6io_device;
extern const device_t gameport_sio_device;

2
src/include/86box/nvr.h
View File

@@ -67,7 +67,7 @@
typedef struct _nvr_ {
char *fn; /* pathname of image file */
uint16_t size; /* device configuration */
int8_t irq, new;
int8_t irq, is_new;
uint8_t onesec_cnt;
pc_timer_t onesec_time;

23
src/include/86box/serial.h
View File

@@ -6,7 +6,8 @@
*
* This file is part of the 86Box distribution.
*
* Definitions for the NS8250/16450/16550 UART emulation.
* Definitions for the NS8250/16450/16550/16650/16750/16850/16950
* UART emulation.
*
*
*
@@ -22,10 +23,14 @@
# define EMU_SERIAL_H
#define SERIAL_8250 0
#define SERIAL_8250 0
#define SERIAL_8250_PCJR 1
#define SERIAL_NS16450 2
#define SERIAL_NS16550 3
#define SERIAL_16450 2
#define SERIAL_16550 3
#define SERIAL_16650 4
#define SERIAL_16750 5
#define SERIAL_16850 6
#define SERIAL_16950 7
#define SERIAL_FIFO_SIZE 16
@@ -39,8 +44,6 @@
#define SERIAL4_ADDR 0x02e8
#define SERIAL4_IRQ 3
#define MAX_SERIAL 4
struct serial_device_s;
struct serial_s;
@@ -89,10 +92,14 @@ extern void serial_standalone_init(void);
extern void serial_set_clock_src(serial_t *dev, double clock_src);
extern void serial_reset_port(serial_t *dev);
extern const device_t i8250_device;
extern const device_t i8250_pcjr_device;
extern const device_t ns8250_device;
extern const device_t ns8250_pcjr_device;
extern const device_t ns16450_device;
extern const device_t ns16550_device;
extern const device_t ns16650_device;
extern const device_t ns16750_device;
extern const device_t ns16850_device;
extern const device_t ns16950_device;
#endif /*EMU_SERIAL_H*/

2
src/machine/m_at_commodore.c
View File

@@ -112,7 +112,7 @@ machine_at_cmdpc_init(const machine_t *model)
if (fdc_type == FDC_INTERNAL)
device_add(&fdc_at_device);
cmd_uart = device_add(&i8250_device);
cmd_uart = device_add(&ns8250_device);
cbm_io_init();

4
src/machine/m_pcjr.c
View File

@@ -866,8 +866,8 @@ machine_pcjr_init(const machine_t *model)
device_add(&fdc_pcjr_device);
device_add(&i8250_pcjr_device);
serial_set_next_inst(MAX_SERIAL); /* So that serial_standalone_init() won't do anything. */
device_add(&ns8250_pcjr_device);
serial_set_next_inst(SERIAL_MAX); /* So that serial_standalone_init() won't do anything. */
return ret;
}

4
src/machine/m_xt_zenith.c
View File

@@ -153,8 +153,8 @@ machine_xt_z184_init(const machine_t *model)
lpt1_remove(); /* only one parallel port */
lpt2_remove();
lpt1_init(0x278);
device_add(&i8250_device);
serial_set_next_inst(MAX_SERIAL); /* So that serial_standalone_init() won't do anything. */
device_add(&ns8250_device);
serial_set_next_inst(SERIAL_MAX); /* So that serial_standalone_init() won't do anything. */
device_add(&cga_device);

4
src/nvr.c
View File

@@ -262,7 +262,7 @@ nvr_load(void)
path = nvr_path(saved_nvr->fn);
nvr_log("NVR: loading from '%s'\n", path);
fp = plat_fopen(path, "rb");
saved_nvr->new = (fp == NULL);
saved_nvr->is_new = (fp == NULL);
if (fp != NULL) {
/* Read NVR contents from file. */
if (fread(saved_nvr->regs, 1, saved_nvr->size, fp) != saved_nvr->size)
@@ -270,7 +270,7 @@ nvr_load(void)
(void)fclose(fp);
}
} else
saved_nvr->new = 1;
saved_nvr->is_new = 1;
/* Get the local RTC running! */
if (saved_nvr->start != NULL)

22
src/nvr_at.c
View File

@@ -565,11 +565,11 @@ static void
nvr_reg_common_write(uint16_t reg, uint8_t val, nvr_t *nvr, local_t *local)
{
if ((reg == 0x2c) && (local->flags & FLAG_AMI_1994_HACK))
nvr->new = 0;
nvr->is_new = 0;
if ((reg == 0x2d) && (local->flags & FLAG_AMI_1992_HACK))
nvr->new = 0;
nvr->is_new = 0;
if ((reg == 0x52) && (local->flags & FLAG_AMI_1995_HACK))
nvr->new = 0;
nvr->is_new = 0;
if ((reg >= 0x38) && (reg <= 0x3f) && local->wp[0])
return;
if ((reg >= 0xb8) && (reg <= 0xbf) && local->wp[1])
@@ -706,14 +706,14 @@ nvr_read(uint16_t addr, void *priv)
break;
case 0x2c:
if (!nvr->new && (local->flags & FLAG_AMI_1994_HACK))
if (!nvr->is_new && (local->flags & FLAG_AMI_1994_HACK))
ret = nvr->regs[local->addr[addr_id]] & 0x7f;
else
ret = nvr->regs[local->addr[addr_id]];
break;
case 0x2d:
if (!nvr->new && (local->flags & FLAG_AMI_1992_HACK))
if (!nvr->is_new && (local->flags & FLAG_AMI_1992_HACK))
ret = nvr->regs[local->addr[addr_id]] & 0xf7;
else
ret = nvr->regs[local->addr[addr_id]];
@@ -721,7 +721,7 @@ nvr_read(uint16_t addr, void *priv)
case 0x2e:
case 0x2f:
if (!nvr->new && (local->flags & FLAG_AMI_1992_HACK)) {
if (!nvr->is_new && (local->flags & FLAG_AMI_1992_HACK)) {
for (i = 0x10; i <= 0x2d; i++) {
if (i == 0x2d)
checksum += (nvr->regs[i] & 0xf7);
@@ -732,7 +732,7 @@ nvr_read(uint16_t addr, void *priv)
ret = checksum >> 8;
else
ret = checksum & 0xff;
} else if (!nvr->new && (local->flags & FLAG_AMI_1994_HACK)) {
} else if (!nvr->is_new && (local->flags & FLAG_AMI_1994_HACK)) {
for (i = 0x10; i <= 0x2d; i++) {
if (i == 0x2c)
checksum += (nvr->regs[i] & 0x7f);
@@ -749,7 +749,7 @@ nvr_read(uint16_t addr, void *priv)
case 0x3e:
case 0x3f:
if (!nvr->new && (local->flags & FLAG_AMI_1995_HACK)) {
if (!nvr->is_new && (local->flags & FLAG_AMI_1995_HACK)) {
/* The checksum at 3E-3F is for 37-3D and 40-7F. */
for (i = 0x37; i <= 0x3d; i++)
checksum += nvr->regs[i];
@@ -763,7 +763,7 @@ nvr_read(uint16_t addr, void *priv)
ret = checksum >> 8;
else
ret = checksum & 0xff;
} else if (!nvr->new && (local->flags & FLAG_P6RP4_HACK)) {
} else if (!nvr->is_new && (local->flags & FLAG_P6RP4_HACK)) {
/* The checksum at 3E-3F is for 37-3D and 40-51. */
for (i = 0x37; i <= 0x3d; i++)
checksum += nvr->regs[i];
@@ -782,14 +782,14 @@ nvr_read(uint16_t addr, void *priv)
break;
case 0x43:
if (!nvr->new && (local->flags & FLAG_P6RP4_HACK))
if (!nvr->is_new && (local->flags & FLAG_P6RP4_HACK))
ret = nvr->regs[local->addr[addr_id]] | 0x02;
else
ret = nvr->regs[local->addr[addr_id]];
break;
case 0x52:
if (!nvr->new && (local->flags & FLAG_AMI_1995_HACK))
if (!nvr->is_new && (local->flags & FLAG_AMI_1995_HACK))
ret = nvr->regs[local->addr[addr_id]] & 0xf3;
else
ret = nvr->regs[local->addr[addr_id]];