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

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*/