Brought the ISA memory card emulation and some other things up to par with VARCem and fixed the ISA memory card configuration.

This commit is contained in:
OBattler
2018-09-06 14:38:43 +02:00
parent 9a180ed33c
commit ea5a226a97
9 changed files with 267 additions and 265 deletions

View File

@@ -8,7 +8,7 @@
*
* Definitions for the device handler.
*
* Version: @(#)device.h 1.0.6 2018/09/02
* Version: @(#)device.h 1.0.8 2018/09/06
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -53,7 +53,7 @@
enum {
DEVICE_NOT_WORKING = 1, /* does not currently work correctly and will be disabled in a release build*/
DEVICE_UNSTABLE = 1, /* unstable device, be cautious */
DEVICE_AT = 2, /* requires an AT-compatible system */
DEVICE_PS2 = 4, /* requires a PS/1 or PS/2 system */
DEVICE_ISA = 8, /* requires the ISA bus */
@@ -99,11 +99,11 @@ typedef struct _device_ {
uint32_t local; /* flags local to device */
void *(*init)(const struct _device_ *);
void (*close)(void *p);
void (*reset)(void *p);
void (*close)(void *priv);
void (*reset)(void *priv);
int (*available)(/*void*/);
void (*speed_changed)(void *p);
void (*force_redraw)(void *p);
void (*speed_changed)(void *priv);
void (*force_redraw)(void *priv);
const device_config_t *config;
} device_t;
@@ -113,29 +113,30 @@ typedef struct _device_ {
extern "C" {
#endif
extern void device_init(void);
extern void device_init(void);
extern const device_t * device_clone(const device_t *master);
extern void *device_add(const device_t *d);
extern void device_add_ex(const device_t *d, void *priv);
extern void device_close_all(void);
extern void device_reset_all(void);
extern void device_reset_all_pci(void);
extern void *device_get_priv(const device_t *d);
extern int device_available(const device_t *d);
extern void device_speed_changed(void);
extern void device_force_redraw(void);
extern void *device_add(const device_t *);
extern void device_add_ex(const device_t *d, void *priv);
extern void device_close_all(void);
extern void device_reset_all(void);
extern void device_reset_all_pci(void);
extern void *device_get_priv(const device_t *);
extern int device_available(const device_t *);
extern void device_speed_changed(void);
extern void device_force_redraw(void);
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);
extern int device_is_valid(const device_t *device, int machine_flags);
extern int device_is_valid(const device_t *, int machine_flags);
extern int device_get_config_int(const char *name);
extern int device_get_config_int_ex(const char *s, int dflt_int);
extern int device_get_config_hex16(const char *name);
extern int device_get_config_hex20(const char *name);
extern int device_get_config_mac(const char *name, int dflt_int);
extern void device_set_config_int(const char *s, int val);
extern void device_set_config_hex16(const char *s, int val);
extern void device_set_config_hex20(const char *s, int val);
extern void device_set_config_mac(const char *s, int val);
extern const char *device_get_config_string(const char *name);
extern int machine_get_config_int(char *s);
extern char *machine_get_config_string(char *s);