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

Merge pull request #996 from richardg867/master

Browse Source 
ALi M6117 SoC implementation
This commit is contained in:
Miran Grča
2020-09-11 01:56:54 +02:00
committed by GitHub
parent 97f7682e6f 5b016edb2a
commit 92ff0d7d39
9 changed files with 549 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,9 @@ extern const device_t ali1429_device;
#if defined(DEV_BRANCH) && defined(USE_M1489)
extern const device_t ali1489_device;
#endif
#if defined(DEV_BRANCH) && defined(USE_M6117)
extern const device_t ali6117d_device;
#endif
/* AMD */
extern const device_t amd640_device;

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

@@ -241,7 +241,11 @@ extern int machine_at_adi386sx_init(const machine_t *);
extern int machine_at_commodore_sl386sx_init(const machine_t *);
extern int machine_at_wd76c10_init(const machine_t *);
extern int machine_at_awardsx_init(const machine_t *);
extern int machine_at_awardsx_init(const machine_t *);
#if defined(DEV_BRANCH) && defined(USE_M6117)
extern int machine_at_arb1375_init(const machine_t *);
extern int machine_at_pja511m_init(const machine_t *);
#endif
#ifdef EMU_DEVICE_H
extern const device_t *at_ama932j_get_device(void);