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

Merge pull request #1539 from 86Box/master

Browse Source 
Bring the branch up to part with master.
This commit is contained in:
Miran Grča
2021-07-09 04:42:04 +02:00
committed by GitHub
parent 638dff832f ce1799c630
commit aa06cffe24
13 changed files with 482 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,10 +134,11 @@ extern const device_t via_apro133_device;
extern const device_t via_apro133a_device;
extern const device_t via_vt8601_device;
extern const device_t via_vt82c586b_device;
extern const device_t via_vt82c596_device;
extern const device_t via_vt82c596a_device;
extern const device_t via_vt82c596b_device;
extern const device_t via_vt82c686a_device;
extern const device_t via_vt82c686b_device;
extern const device_t via_vt8231_device;
/* VLSI */
extern const device_t vl82c480_device;

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

@@ -62,4 +62,6 @@ extern const lpt_device_t lpt_dac_stereo_device;
extern const lpt_device_t dss_device;
extern const lpt_device_t lpt_hasp_savquest_device;
#endif /*EMU_LPT_H*/

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

@@ -30,6 +30,8 @@ enum {
typedef struct {
uint32_t local;
uint16_t io_base;
int clock;
double bit_period;
uint8_t stat, next_stat, ctl, cmd, addr,
data0, data1,
index, data[SMBUS_PIIX4_BLOCK_DATA_SIZE];
@@ -39,6 +41,7 @@ typedef struct {
extern void smbus_piix4_remap(smbus_piix4_t *dev, uint16_t new_io_base, uint8_t enable);
extern void smbus_piix4_setclock(smbus_piix4_t *dev, int clock);
#ifdef EMU_DEVICE_H