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

Merge remote-tracking branch 'upstream/master' into feature/machine_z150

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-11-08 03:20:16 -05:00
parent 47505ff4e7 6848dfc48c
commit eebe9dc760
67 changed files with 2561 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ extern void ini_section_set_double(ini_section_t section, char *name, double
extern void ini_section_set_hex16(ini_section_t section, char *name, int val);
extern void ini_section_set_hex20(ini_section_t section, char *name, int val);
extern void ini_section_set_mac(ini_section_t section, char *name, int val);
extern void ini_section_set_string(ini_section_t section, char *name, char *val);
extern void ini_section_set_string(ini_section_t section, const char *name, const char *val);
extern void ini_section_set_wstring(ini_section_t section, char *name, wchar_t *val);
#define ini_delete_var(ini, head, name) ini_section_delete_var(ini_find_section(ini, head), name)

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

@@ -89,14 +89,14 @@ enum {
};
typedef struct {
int device_num;
uint16_t device_num;
int net_type;
char host_dev_name[128];
uint32_t link_state;
} netcard_conf_t;
extern netcard_conf_t net_cards_conf[NET_CARD_MAX];
extern int net_card_current;
extern uint16_t net_card_current;
typedef int (*NETRXCB)(void *, uint8_t *, int);
typedef int (*NETSETLINKSTATE)(void *, uint32_t link_state);
@@ -135,7 +135,7 @@ struct _netcard_t {
mutex_t *tx_mutex;
mutex_t *rx_mutex;
pc_timer_t timer;
int card_num;
uint16_t card_num;
double byte_period;
uint32_t led_timer;
uint32_t led_state;

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

@@ -320,6 +320,8 @@ typedef struct voodoo_t {
uint32_t cmdfifo_amin, cmdfifo_amax;
int cmdfifo_holecount;
atomic_uint cmd_status;
uint32_t sSetupMode;
vert_t verts[4];
unsigned int vertex_ages[3];