Merge branch 'master' into feature/ich2

This commit is contained in:
Jasmine Iwanek
2022-08-02 23:50:02 -04:00
61 changed files with 2394 additions and 1357 deletions

View File

@@ -322,6 +322,9 @@ extern int machine_get_machine_from_internal_name(char *s);
extern void machine_init(void);
#ifdef EMU_DEVICE_H
extern const device_t *machine_getdevice(int m);
extern const device_t *machine_getviddevice(int m);
extern const device_t *machine_getsnddevice(int m);
extern const device_t *machine_getnetdevice(int m);
#endif
extern char *machine_get_internal_name_ex(int m);
extern int machine_get_nvrmask(int m);