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

This commit is contained in:
Jasmine Iwanek
2022-10-23 20:49:39 -04:00
38 changed files with 3281 additions and 1332 deletions

View File

@@ -335,6 +335,7 @@ extern int machine_get_max_ram(int m);
extern int machine_get_ram_granularity(int m);
extern int machine_get_type(int m);
extern void machine_close(void);
extern int machine_has_mouse(void);
extern uint8_t machine_get_p1(void);
extern void machine_load_p1(int m);
@@ -708,6 +709,9 @@ extern int machine_at_vpc2007_init(const machine_t *);
/* m_at_t3100e.c */
extern int machine_at_t3100e_init(const machine_t *);
/* m_elt.c */
extern int machine_elt_init(const machine_t *);
/* m_europc.c */
extern int machine_europc_init(const machine_t *);
#ifdef EMU_DEVICE_H