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 'master' into feature/ich2

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-08-25 18:15:05 -04:00
parent 87714db816 4128bb7c93
commit bcef7f696d
6 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,9 +122,6 @@ extern int cpu, /* (C) cpu type */
cpu_use_dynarec, /* (C) cpu uses/needs Dyna */
fpu_type; /* (C) fpu type */
extern int time_sync; /* (C) enable time sync */
extern int network_type; /* (C) net provider type */
extern int network_card; /* (C) net interface num */
extern char network_host[522]; /* (C) host network intf */
extern int hdd_format_type; /* (C) hard disk file format */
extern int confirm_reset, /* (C) enable reset confirmation */
confirm_exit, /* (C) enable exit confirmation */

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

@@ -58,6 +58,7 @@
#define NET_MAX_FRAME 1518
#define NET_QUEUE_LEN 8
#define NET_CARD_MAX 4
#define NET_HOST_INTF_MAX 64
/* Supported network cards. */
enum {
@@ -141,7 +142,7 @@ extern "C" {
/* Global variables. */
extern int nic_do_log; /* config */
extern int network_ndev;
extern netdev_t network_devs[32];
extern netdev_t network_devs[NET_HOST_INTF_MAX];
/* Function prototypes. */