Changes, updates and fixes to fixes. Check the new warnings re timer_add(). Using stricter prototypes receiled more stuff..

This commit is contained in:
waltje
2017-06-04 02:11:19 -04:00
parent 8a57bd4bc0
commit cbfa682cb7
42 changed files with 1139 additions and 1094 deletions

View File

@@ -9,21 +9,35 @@
* Implementation of the generic device interface to handle
* all devices attached to the emulator.
*
* Version: @(#)device.h 1.0.0 2017/05/30
* Version: @(#)device.h 1.0.1 2017/06/03
*
* Author: Sarah Walker, <http://pcem-emulator.co.uk/>
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Copyright 2008-2016 Sarah Walker.
* Copyright 2016-2017 Miran Grca.
*/
#ifndef EMU_DEVICE_H
# define EMU_DEVICE_H
#define CONFIG_STRING 0
#define CONFIG_INT 1
#define CONFIG_BINARY 2
#define CONFIG_STRING 0
#define CONFIG_INT 1
#define CONFIG_BINARY 2
#define CONFIG_SELECTION 3
#define CONFIG_HEX16 4
#define CONFIG_HEX20 5
#define CONFIG_MAC 6
#define CONFIG_HEX16 4
#define CONFIG_HEX20 5
#define CONFIG_MAC 6
enum
{
DEVICE_NOT_WORKING = 1, /*Device does not currently work correctly and will be disabled in a release build*/
DEVICE_AT = 2, /*Device requires an AT-compatible system*/
DEVICE_PS2 = 4, /*Device requires a PS/1 or PS/2 system*/
DEVICE_MCA = 0x20, /*Device requires the MCA bus*/
DEVICE_PCI = 0x40 /*Device requires the PCI bus*/
};
typedef struct device_config_selection_t
{
@@ -54,33 +68,28 @@ typedef struct device_t
device_config_t *config;
} device_t;
void device_init();
void device_add(device_t *d);
void device_close_all();
int device_available(device_t *d);
void device_speed_changed();
void device_force_redraw();
char *device_add_status_info(char *s, int max_len);
int device_get_config_int(char *name);
int device_get_config_int_ex(char *s, int default_int);
int device_get_config_hex16(char *name);
int device_get_config_hex20(char *name);
int device_get_config_mac(char *name, int default_int);
void device_set_config_int(char *s, int val);
void device_set_config_hex16(char *s, int val);
void device_set_config_hex20(char *s, int val);
void device_set_config_mac(char *s, int val);
char *device_get_config_string(char *name);
extern void device_init(void);
extern void device_add(device_t *d);
extern void device_close_all(void);
extern int device_available(device_t *d);
extern void device_speed_changed(void);
extern void device_force_redraw(void);
extern char *device_add_status_info(char *s, int max_len);
enum
{
DEVICE_NOT_WORKING = 1, /*Device does not currently work correctly and will be disabled in a release build*/
DEVICE_AT = 2, /*Device requires an AT-compatible system*/
DEVICE_PS2 = 4, /*Device requires a PS/1 or PS/2 system*/
DEVICE_MCA = 0x20, /*Device requires the MCA bus*/
DEVICE_PCI = 0x40 /*Device requires the PCI bus*/
};
extern int device_get_config_int(char *name);
extern int device_get_config_int_ex(char *s, int default_int);
extern int device_get_config_hex16(char *name);
extern int device_get_config_hex20(char *name);
extern int device_get_config_mac(char *name, int default_int);
extern void device_set_config_int(char *s, int val);
extern void device_set_config_hex16(char *s, int val);
extern void device_set_config_hex20(char *s, int val);
extern void device_set_config_mac(char *s, int val);
extern char *device_get_config_string(char *name);
int model_get_config_int(char *s);
char *model_get_config_string(char *s);
extern int model_get_config_int(char *s);
extern char *model_get_config_string(char *s);
#endif /*EMU_DEVICE_H*/