Merge branch 'master' of https://github.com/86Box/86Box

src/include/86box/device.h

@@ -145,7 +145,7 @@ extern void		device_speed_changed(void);
 extern void		device_force_redraw(void);
 extern void		device_get_name(const device_t *d, int bus, char *name);
 
-extern int		device_is_valid(const device_t *, int machine_flags);
+extern int		device_is_valid(const device_t *, int m);
 
 extern int		device_get_config_int(const char *name);
 extern int		device_get_config_int_ex(const char *s, int dflt_int);

src/include/86box/machine.h

@@ -189,6 +189,7 @@ extern int			AT, PCI;
 extern int	machine_count(void);
 extern int	machine_available(int m);
 extern char	*machine_getname(void);
+extern char	*machine_getname_ex(int m);
 extern char	*machine_get_internal_name(void);
 extern int	machine_get_machine_from_internal_name(char *s);
 extern void	machine_init(void);
@@ -197,6 +198,13 @@ extern const device_t	*machine_getdevice(int m);
 #endif
 extern char	*machine_get_internal_name_ex(int m);
 extern int	machine_get_nvrmask(int m);
+extern int	machine_has_flags(int m, int flags);
+extern int	machine_has_bus(int m, int bus_flags);
+extern int	machine_has_cartridge(int m);
+extern int	machine_get_min_ram(int m);
+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);
 
 

src/include/86box/midi.h

@@ -95,7 +95,8 @@ extern void	midi_in_sysex(uint8_t *buffer, uint32_t len);
 #define MIDI_INPUT_INTERNAL_NAME "midi_in"
 
 #ifdef EMU_DEVICE_H
-extern const device_t system_midi_device;
+extern const device_t rtmidi_device;
+extern const device_t rtmidi_input_device;
 #ifdef USE_FLUIDSYNTH
 extern const device_t fluidsynth_device;
 #endif

src/include/86box/midi_input.h

@@ -1 +0,0 @@
-extern const device_t midi_input_device;

src/include/86box/midi_rtmidi.h

@@ -0,0 +1,13 @@
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern int	rtmidi_get_num_devs(void);
+extern void	rtmidi_get_dev_name(int num, char *s);
+extern int	rtmidi_in_get_num_devs(void);
+extern void	rtmidi_in_get_dev_name(int num, char *s);
+
+#ifdef __cplusplus
+}
+#endif

src/include/86box/midi_system.h

@@ -1 +0,0 @@
-extern const device_t system_midi_device;

src/include/86box/plat.h

@@ -170,7 +170,7 @@ typedef void event_t;
 typedef void mutex_t;
 
 extern thread_t	*thread_create(void (*thread_func)(void *param), void *param);
-extern int	thread_wait(thread_t *arg, int timeout);
+extern int	thread_wait(thread_t *arg);
 extern event_t	*thread_create_event(void);
 extern void	thread_set_event(event_t *arg);
 extern void	thread_reset_event(event_t *arg);
@@ -180,7 +180,6 @@ extern void	thread_destroy_event(event_t *arg);
 #define MUTEX_DEFAULT_SPIN_COUNT 1024
 
 extern mutex_t	*thread_create_mutex(void);
-extern mutex_t	*thread_create_mutex_with_spin_count(unsigned int spin_count);
 extern void	thread_close_mutex(mutex_t *arg);
 extern int	thread_wait_mutex(mutex_t *arg);
 extern int	thread_release_mutex(mutex_t *mutex);

src/include/86box/plat_midi.h

@@ -1,15 +0,0 @@
-extern void	plat_midi_init(void);
-extern void	plat_midi_close(void);
-
-extern void	plat_midi_play_msg(uint8_t *msg);
-extern void	plat_midi_play_sysex(uint8_t *sysex, unsigned int len);
-extern int	plat_midi_write(uint8_t val);
-
-extern int	plat_midi_get_num_devs(void);
-extern void	plat_midi_get_dev_name(int num, char *s);
-
-extern void plat_midi_input_init(void);
-extern void plat_midi_input_close(void);
-
-extern int plat_midi_in_get_num_devs(void);
-extern void plat_midi_in_get_dev_name(int num, char *s);