claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
OBattler
2020-04-16 21:58:33 +02:00
committed by GitHub
parent ce6dc8b5a2 3452688a89
commit e2559a4897
39 changed files with 894 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/include/86box/acpi.h
View File

@@ -62,6 +62,13 @@ typedef struct
glbctl, devctl,
timer_val;
uint64_t tmr_overflow_time;
} acpi_regs_t;
typedef struct
{
acpi_regs_t regs;
uint8_t gporeg_default[4];
pc_timer_t timer;
nvr_t *nvr;
} acpi_t;

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

@@ -17,8 +17,5 @@
*/
extern const device_t intel_flash_bxt_ami_device;
#if defined(DEV_BRANCH) && defined(USE_TC430HX)
extern const device_t intel_flash_bxtw_ami_device;
#endif
extern const device_t intel_flash_bxt_device;
extern const device_t intel_flash_bxb_device;

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

@@ -285,10 +285,9 @@ extern int machine_at_acerv35n_init(const machine_t *);
extern int machine_at_ap53_init(const machine_t *);
extern int machine_at_p55t2p4_init(const machine_t *);
extern int machine_at_p55t2s_init(const machine_t *);
#if defined(DEV_BRANCH) && defined(USE_TC430HX)
extern int machine_at_tc430hx_init(const machine_t *);
extern int machine_at_equium5200_init(const machine_t *); //Toshiba branded CU430HX. Presents same issues as the TC430HX.
#endif //Other than that, works as intended(No need to set an MPU too).
extern int machine_at_equium5200_init(const machine_t *); /* Toshiba branded CU430HX.
Works as intended (No need to set an MPU too). */
extern int machine_at_p55tvp4_init(const machine_t *);
extern int machine_at_i430vx_init(const machine_t *);
@@ -301,6 +300,7 @@ extern int machine_at_tx97_init(const machine_t *);
extern int machine_at_ym430tx_init(const machine_t *);
extern int machine_at_586t2_init(const machine_t *);
extern int machine_at_807ds_init(const machine_t *);
extern int machine_at_p5mms98_init(const machine_t *);
#ifdef EMU_DEVICE_H
extern const device_t *at_pb640_get_device(void);

1
src/include/86box/nvr.h
View File

@@ -115,6 +115,7 @@ extern void nvr_time_set(struct tm *);
extern void nvr_reg_write(uint16_t reg, uint8_t val, void *priv);
extern void nvr_at_handler(int set, uint16_t base, nvr_t *nvr);
extern void nvr_at_sec_handler(int set, uint16_t base, nvr_t *nvr);
extern void nvr_read_addr_set(int set, nvr_t *nvr);
extern void nvr_wp_set(int set, int h, nvr_t *nvr);
extern void nvr_bank_set(int base, uint8_t bank, nvr_t *nvr);
extern void nvr_lock_set(int base, int size, int lock, nvr_t *nvr);

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

@@ -49,7 +49,7 @@ typedef struct PIT {
extern pit_t *pit,
*pit2;
extern double SYSCLK;
extern double SYSCLK, PCICLK;
extern uint64_t PITCONST, ISACONST,
CGACONST,

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

@@ -58,11 +58,9 @@ extern int bios_load(wchar_t *fn1, wchar_t *fn2, uint32_t addr, int sz,
int off, int flags);
extern int bios_load_linear_combined(wchar_t *fn1, wchar_t *fn2,
int sz, int off);
#if defined(DEV_BRANCH) && defined(USE_TC430HX)
extern int bios_load_linear_combined2(wchar_t *fn1, wchar_t *fn2,
wchar_t *fn3, wchar_t *fn4, wchar_t *fn5,
int sz, int off);
#endif
extern int rom_init(rom_t *rom, wchar_t *fn, uint32_t address, int size,
int mask, int file_offset, uint32_t flags);