mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-24 02:18:20 -07:00
Code Issues Packages Projects Releases Activity

Merge branch '86Box:master' into broken-sensation1

Browse Source
This commit is contained in:
win2kgamer
2026-02-11 21:08:46 -06:00
committed by GitHub
parent e642504dcb d5b73357c0
commit 974e1127f7
38 changed files with 823 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -426,6 +426,7 @@ extern uint8_t machine_compaq_p1_handler(void);
extern uint8_t machine_generic_p1_handler(void);
extern uint8_t machine_ncr_p1_handler(void);
extern uint8_t machine_ps1_p1_handler(void);
extern uint8_t machine_ps2_isa_p1_handler(void);
extern uint8_t machine_t3100e_p1_handler(void);
extern uint8_t machine_get_p1_default(void);
@@ -1386,6 +1387,9 @@ extern const device_t ps1_hdc_device;
#endif
/* m_ps2_isa.c */
#ifdef EMU_DEVICE_H
extern const device_t ps2_m30_286_device;
#endif
extern int machine_ps2_m30_286_init(const machine_t *);
/* m_ps2_mca.c */

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

@@ -60,8 +60,6 @@
#define NET_QUEUE_COUNT 4
#define NET_CARD_MAX 4
#define NET_HOST_INTF_MAX 64
#define NET_SWITCH_GRP_MIN 1
#define NET_SWITCH_GRP_MAX 10
#define NET_PERIOD_10M 0.8
#define NET_PERIOD_100M 0.08
@@ -97,7 +95,7 @@ typedef struct netcard_conf_t {
int net_type;
char host_dev_name[128];
uint32_t link_state;
uint8_t switch_group;
char secret[256];
uint8_t promisc_mode;
char slirp_net[16];
char nrs_hostname[128];