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

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

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-05-01 04:14:16 -04:00
parent 5f65a206aa 2684befe7b
commit af0d1b29ea
61 changed files with 17152 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,7 +129,8 @@ extern uint32_t mem_size; /* (C) memory size (Installed on system board)
extern uint32_t isa_mem_size; /* (C) memory size (ISA Memory Cards) */
extern int cpu, /* (C) cpu type */
cpu_use_dynarec, /* (C) cpu uses/needs Dyna */
fpu_type; /* (C) fpu type */
fpu_type, /* (C) fpu type */
fpu_softfloat; /* (C) fpu uses softfloat */
extern int time_sync; /* (C) enable time sync */
extern int hdd_format_type; /* (C) hard disk file format */
extern int confirm_reset, /* (C) enable reset confirmation */

13
src/include/86box/usb.h
View File

@@ -22,14 +22,25 @@
extern "C" {
#endif
/* USB Host Controller device struct */
typedef struct usb_t usb_t;
/* USB device creation parameters struct */
typedef struct
{
void (*raise_interrupt)(usb_t*, void*);
void* parent_priv;
} usb_params_t;
/* USB Host Controller device struct */
typedef struct usb_t
{
uint8_t uhci_io[32], ohci_mmio[4096];
uint16_t uhci_io_base;
int uhci_enable, ohci_enable;
uint32_t ohci_mem_base;
mem_mapping_t ohci_mmio_mapping;
usb_params_t* usb_params;
} usb_t;
/* USB endpoint device struct. Incomplete and unused. */