Major changes to NVR, system initialization (pc.c), and what goes on in the Windows startup (win.c.) Not fully done yet, but good enough for a first commit.

This commit is contained in:
waltje
2017-10-07 00:46:54 -04:00
parent 95fe21b651
commit 2b37b7fbfb
108 changed files with 5628 additions and 5912 deletions

View File

@@ -9,12 +9,14 @@
* Implementation of the generic device interface to handle
* all devices attached to the emulator.
*
* Version: @(#)device.h 1.0.2 2017/08/23
* Version: @(#)device.h 1.0.3 2017/10/04
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
* Copyright 2008-2016 Sarah Walker.
* Copyright 2016,2017 Miran Grca.
* Copyright 2017 Fred N. van Kempen.
*/
#ifndef EMU_DEVICE_H
# define EMU_DEVICE_H
@@ -32,69 +34,68 @@
#define CONFIG_MAC 9
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*/
enum {
DEVICE_NOT_WORKING = 1, /* does not currently work correctly and will be disabled in a release build*/
DEVICE_AT = 2, /* requires an AT-compatible system */
DEVICE_PS2 = 4, /* requires a PS/1 or PS/2 system */
DEVICE_MCA = 0x20, /* requires the MCA bus */
DEVICE_PCI = 0x40 /* requires the PCI bus */
};
typedef struct device_config_selection_t
{
char description[256];
int value;
typedef struct {
char description[256];
int value;
} device_config_selection_t;
typedef struct device_config_file_filter_t
{
char description[256];
char extensions[25][25];
typedef struct {
char description[256];
char extensions[25][25];
} device_config_file_filter_t;
typedef struct device_config_spinner_t
{
int min;
int max;
int step;
typedef struct {
int min;
int max;
int step;
} device_config_spinner_t;
typedef struct device_config_t
{
char name[256];
char description[256];
int type;
char default_string[256];
int default_int;
device_config_selection_t selection[16];
device_config_file_filter_t file_filter[16];
device_config_spinner_t spinner;
typedef struct {
char name[256];
char description[256];
int type;
char default_string[256];
int default_int;
device_config_selection_t selection[16];
device_config_file_filter_t file_filter[16];
device_config_spinner_t spinner;
} device_config_t;
typedef struct device_t
{
char name[50];
uint32_t flags;
void *(*init)();
void (*close)(void *p);
int (*available)();
void (*speed_changed)(void *p);
void (*force_redraw)(void *p);
void (*add_status_info)(char *s, int max_len, void *p);
device_config_t *config;
typedef struct _device_ {
char name[50];
uint32_t flags; /* system flags */
uint32_t local; /* flags local to device */
void *(*init)(struct _device_ *);
void (*close)(void *p);
void (*reset)(void *p);
int (*available)(void);
void (*speed_changed)(void *p);
void (*force_redraw)(void *p);
void (*add_status_info)(char *s, int max_len, void *p);
device_config_t *config;
} device_t;
extern void device_init(void);
extern void device_add(device_t *d);
extern void device_close_all(void);
extern void device_reset_all(void);
extern void *device_get_priv(device_t *d);
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);
extern void device_add_status_info(char *s, int max_len);
extern int device_get_config_int(char *name);
extern int device_get_config_int_ex(char *s, int default_int);