80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

src/device

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-03-13 09:28:28 -04:00
parent a52f0cca79
commit a7edaf0608
21 changed files with 1047 additions and 781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/device/bugger.c
View File

@@ -354,13 +354,16 @@ bug_close(UNUSED(void *priv))
bug_read, NULL, NULL, bug_write, NULL, NULL, NULL);
}
const device_t bugger_device = {
"ISA/PCI Bus Bugger",
"bugger",
DEVICE_ISA | DEVICE_AT,
0,
bug_init, bug_close, NULL,
{ NULL }, NULL, NULL,
NULL
.name = "ISA/PCI Bus Bugger",
.internal_name = "bugger",
.flags = DEVICE_ISA | DEVICE_AT,
.local = 0,
.init = bug_init,
.close = bug_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

18
src/device/cassette.c
View File

@@ -714,11 +714,15 @@ cassette_init(const device_t *info)
const device_t cassette_device = {
"IBM PC/PCjr Cassette Device",
"cassette",
0,
0,
cassette_init, cassette_close, NULL,
{ NULL }, NULL, NULL,
NULL
.name = "IBM PC/PCjr Cassette Device",
.internal_name = "cassette",
.flags = 0,
.local = 0,
.init = cassette_init,
.close = cassette_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

37
src/device/hwm_gl518sm.c
View File

@@ -296,25 +296,32 @@ gl518sm_init(const device_t *info)
return dev;
}
/* GL518SM on SMBus address 2Ch */
const device_t gl518sm_2c_device = {
"Genesys Logic GL518SM Hardware Monitor",
"gl518sm_2c",
DEVICE_ISA,
0x2c,
gl518sm_init, gl518sm_close, NULL,
{ NULL }, NULL, NULL,
NULL
.name = "Genesys Logic GL518SM Hardware Monitor",
.internal_name = "gl518sm_2c",
.flags = DEVICE_ISA,
.local = 0x2c,
.init = gl518sm_init,
.close = gl518sm_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
/* GL518SM on SMBus address 2Dh */
const device_t gl518sm_2d_device = {
"Genesys Logic GL518SM Hardware Monitor",
"gl518sm_2d",
DEVICE_ISA,
0x2d,
gl518sm_init, gl518sm_close, NULL,
{ NULL }, NULL, NULL,
NULL
.name = "Genesys Logic GL518SM Hardware Monitor",
.internal_name = "gl518sm_2d",
.flags = DEVICE_ISA,
.local = 0x2d,
.init = gl518sm_init,
.close = gl518sm_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

36
src/device/hwm_lm75.c
View File

@@ -243,24 +243,32 @@ lm75_init(const device_t *info)
/* LM75 on SMBus address 4Ah, reporting temperatures[1]. */
const device_t lm75_1_4a_device = {
"National Semiconductor LM75 Temperature Sensor",
"lm75_1_4a",
DEVICE_ISA,
0x14a,
lm75_init, lm75_close, NULL,
{ NULL }, NULL, NULL,
NULL
.name = "National Semiconductor LM75 Temperature Sensor",
.internal_name = "lm75_1_4a",
.flags = DEVICE_ISA,
.local = 0x14a,
.init = lm75_init,
.close = lm75_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
/* LM75 secondary/tertiary temperature sensors built into
the Winbond W83781D family. Not to be used stand-alone. */
const device_t lm75_w83781d_device = {
"Winbond W83781D Secondary Temperature Sensor",
"lm75_w83781d",
DEVICE_ISA,
0,
lm75_init, lm75_close, NULL,
{ NULL }, NULL, NULL,
NULL
.name = "Winbond W83781D Secondary Temperature Sensor",
.internal_name = "lm75_w83781d",
.flags = DEVICE_ISA,
.local = 0,
.init = lm75_init,
.close = lm75_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

114
src/device/hwm_lm78.c
View File

@@ -783,75 +783,93 @@ lm78_init(const device_t *info)
return dev;
}
/* National Semiconductor LM78 on ISA and SMBus. */
const device_t lm78_device = {
"National Semiconductor LM78 Hardware Monitor",
"lm78",
DEVICE_ISA,
0x290 | LM78_I2C,
lm78_init, lm78_close, lm78_reset,
{ NULL }, NULL, NULL,
NULL
.name = "National Semiconductor LM78 Hardware Monitor",
.internal_name = "lm78",
.flags = DEVICE_ISA,
.local = 0x290 | LM78_I2C,
.init = lm78_init,
.close = lm78_close,
.reset = lm78_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
/* Winbond W83781D on ISA and SMBus. */
const device_t w83781d_device = {
"Winbond W83781D Hardware Monitor",
"w83781d",
DEVICE_ISA,
0x290 | LM78_I2C | LM78_W83781D,
lm78_init, lm78_close, lm78_reset,
{ NULL }, NULL, NULL,
NULL
.name = "Winbond W83781D Hardware Monitor",
.internal_name = "w83781d",
.flags = DEVICE_ISA,
.local = 0x290 | LM78_I2C | LM78_W83781D,
.init = lm78_init,
.close = lm78_close,
.reset = lm78_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
/* Winbond W83781D on ISA and SMBus. */
const device_t w83781d_p5a_device = {
"Winbond W83781D Hardware Monitor (ASUS P5A)",
"w83781d_p5a",
DEVICE_ISA,
0x290 | LM78_I2C | LM78_W83781D | LM78_P5A,
lm78_init, lm78_close, lm78_reset,
{ NULL }, NULL, NULL,
NULL
.name = "Winbond W83781D Hardware Monitor (ASUS P5A)",
.internal_name = "w83781d_p5a",
.flags = DEVICE_ISA,
.local = 0x290 | LM78_I2C | LM78_W83781D | LM78_P5A,
.init = lm78_init,
.close = lm78_close,
.reset = lm78_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
/* The AS99127F is an ASIC manufactured by Holtek for ASUS, containing an
I2C-only W83781D clone with additional voltages, GPIOs and fan control. */
const device_t as99127f_device = {
"ASUS AS99127F Rev. 1 Hardware Monitor",
"as99137f",
DEVICE_ISA,
LM78_I2C | LM78_AS99127F_REV1,
lm78_init, lm78_close, lm78_reset,
{ NULL }, NULL, NULL,
NULL
.name = "ASUS AS99127F Rev. 1 Hardware Monitor",
.internal_name = "as99137f",
.flags = DEVICE_ISA,
.local = LM78_I2C | LM78_AS99127F_REV1,
.init = lm78_init,
.close = lm78_close,
.reset = lm78_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
/* Rev. 2 is manufactured by Winbond and differs only in GPI registers. */
const device_t as99127f_rev2_device = {
"ASUS AS99127F Rev. 2 Hardware Monitor",
"as99127f_rev2",
DEVICE_ISA,
LM78_I2C | LM78_AS99127F_REV2,
lm78_init, lm78_close, lm78_reset,
{ NULL }, NULL, NULL,
NULL
.name = "ASUS AS99127F Rev. 2 Hardware Monitor",
.internal_name = "as99127f_rev2",
.flags = DEVICE_ISA,
.local = LM78_I2C | LM78_AS99127F_REV2,
.init = lm78_init,
.close = lm78_close,
.reset = lm78_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
/* Winbond W83782D on ISA and SMBus. */
const device_t w83782d_device = {
"Winbond W83782D Hardware Monitor",
"w83783d",
DEVICE_ISA,
0x290 | LM78_I2C | LM78_W83782D,
lm78_init, lm78_close, lm78_reset,
{ NULL }, NULL, NULL,
NULL
.name = "Winbond W83782D Hardware Monitor",
.internal_name = "w83783d",
.flags = DEVICE_ISA,
.local = 0x290 | LM78_I2C | LM78_W83782D,
.init = lm78_init,
.close = lm78_close,
.reset = lm78_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

19
src/device/hwm_vt82c686.c
View File

@@ -204,13 +204,16 @@ vt82c686_init(const device_t *info)
return dev;
}
const device_t via_vt82c686_hwm_device = {
"VIA VT82C686 Integrated Hardware Monitor",
"via_vt82c686_hwm",
DEVICE_ISA,
0,
vt82c686_init, vt82c686_close, NULL,
{ NULL }, NULL, NULL,
NULL
.name = "VIA VT82C686 Integrated Hardware Monitor",
.internal_name = "via_vt82c686_hwm",
.flags = DEVICE_ISA,
.local = 0,
.init = vt82c686_init,
.close = vt82c686_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

26
src/device/ibm_5161.c
View File

@@ -111,18 +111,16 @@ ibm_5161_init(const device_t *info)
return dev;
}
const device_t ibm_5161_device =
{
"IBM Expansion Unit (5161)",
"ibm_5161",
DEVICE_ISA,
0,
ibm_5161_init,
ibm_5161_close,
NULL,
{ NULL },
NULL,
NULL,
NULL
const device_t ibm_5161_device = {
.name = "IBM Expansion Unit (5161)",
.internal_name = "ibm_5161",
.flags = DEVICE_ISA,
.local = 0,
.init = ibm_5161_init,
.close = ibm_5161_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

220
src/device/isamem.c
View File

@@ -693,13 +693,17 @@ static const device_config_t ibmxt_config[] = {
};
static const device_t ibmxt_device = {
"IBM PC/XT Memory Expansion",
"ibmxt",
DEVICE_ISA,
ISAMEM_IBMXT_CARD,
isamem_init, isamem_close, NULL,
{ NULL }, NULL, NULL,
ibmxt_config
.name = "IBM PC/XT Memory Expansion",
.internal_name = "ibmxt",
.flags = DEVICE_ISA,
.local = ISAMEM_IBMXT_CARD,
.init = isamem_init,
.close = isamem_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = ibmxt_config
};
static const device_config_t genericxt_config[] = {
@@ -719,16 +723,19 @@ static const device_config_t genericxt_config[] = {
};
static const device_t genericxt_device = {
"Generic PC/XT Memory Expansion",
"genericxt",
DEVICE_ISA,
ISAMEM_GENXT_CARD,
isamem_init, isamem_close, NULL,
{ NULL }, NULL, NULL,
genericxt_config
.name = "Generic PC/XT Memory Expansion",
.internal_name = "genericxt",
.flags = DEVICE_ISA,
.local = ISAMEM_GENXT_CARD,
.init = isamem_init,
.close = isamem_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = genericxt_config
};
static const device_config_t ibmat_config[] = {
// clang-format off
{
@@ -746,16 +753,19 @@ static const device_config_t ibmat_config[] = {
};
static const device_t ibmat_device = {
"IBM PC/AT Memory Expansion",
"ibmat",
DEVICE_ISA,
ISAMEM_IBMAT_CARD,
isamem_init, isamem_close, NULL,
{ NULL }, NULL, NULL,
ibmat_config
.name = "IBM PC/AT Memory Expansion",
.internal_name = "ibmat",
.flags = DEVICE_ISA,
.local = ISAMEM_IBMAT_CARD,
.init = isamem_init,
.close = isamem_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = ibmat_config
};
static const device_config_t genericat_config[] = {
// clang-format off
{
@@ -773,16 +783,19 @@ static const device_config_t genericat_config[] = {
};
static const device_t genericat_device = {
"Generic PC/AT Memory Expansion",
"genericat",
DEVICE_ISA,
ISAMEM_GENAT_CARD,
isamem_init, isamem_close, NULL,
{ NULL }, NULL, NULL,
genericat_config
.name = "Generic PC/AT Memory Expansion",
.internal_name = "genericat",
.flags = DEVICE_ISA,
.local = ISAMEM_GENAT_CARD,
.init = isamem_init,
.close = isamem_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = genericat_config
};
static const device_config_t p5pak_config[] = {
// clang-format off
{
@@ -800,13 +813,17 @@ static const device_config_t p5pak_config[] = {
};
static const device_t p5pak_device = {
"Paradise Systems 5-PAK",
"p5pak",
DEVICE_ISA,
ISAMEM_P5PAK_CARD,
isamem_init, isamem_close, NULL,
{ NULL }, NULL, NULL,
p5pak_config
.name = "Paradise Systems 5-PAK",
.internal_name = "p5pak",
.flags = DEVICE_ISA,
.local = ISAMEM_P5PAK_CARD,
.init = isamem_init,
.close = isamem_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = p5pak_config
};
@@ -827,16 +844,19 @@ static const device_config_t a6pak_config[] = {
};
static const device_t a6pak_device = {
"AST SixPakPlus",
"a6pak",
DEVICE_ISA,
ISAMEM_A6PAK_CARD,
isamem_init, isamem_close, NULL,
{ NULL }, NULL, NULL,
a6pak_config
.name = "AST SixPakPlus",
.internal_name = "a6pak",
.flags = DEVICE_ISA,
.local = ISAMEM_A6PAK_CARD,
.init = isamem_init,
.close = isamem_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = a6pak_config
};
static const device_config_t ems5150_config[] = {
// clang-format off
{
@@ -860,13 +880,17 @@ static const device_config_t ems5150_config[] = {
};
static const device_t ems5150_device = {
"Micro Mainframe EMS-5150(T)",
"ems5150",
DEVICE_ISA,
ISAMEM_EMS5150_CARD,
isamem_init, isamem_close, NULL,
{ NULL }, NULL, NULL,
ems5150_config
.name = "Micro Mainframe EMS-5150(T)",
.internal_name = "ems5150",
.flags = DEVICE_ISA,
.local = ISAMEM_EMS5150_CARD,
.init = isamem_init,
.close = isamem_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = ems5150_config
};
static const device_config_t ev159_config[] = {
@@ -928,13 +952,17 @@ static const device_config_t ev159_config[] = {
};
static const device_t ev159_device = {
"Everex EV-159 RAM 3000 Deluxe",
"ev159",
DEVICE_ISA,
ISAMEM_EV159_CARD,
isamem_init, isamem_close, NULL,
{ NULL }, NULL, NULL,
ev159_config
.name = "Everex EV-159 RAM 3000 Deluxe",
.internal_name = "ev159",
.flags = DEVICE_ISA,
.local = ISAMEM_EV159_CARD,
.init = isamem_init,
.close = isamem_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = ev159_config
};
#if defined(DEV_BRANCH) && defined(USE_ISAMEM_BRAT)
@@ -986,13 +1014,17 @@ static const device_config_t brat_config[] = {
};
static const device_t brat_device = {
"BocaRAM/AT",
"brat",
DEVICE_ISA,
ISAMEM_BRAT_CARD,
isamem_init, isamem_close, NULL,
{ NULL }, NULL, NULL,
brat_config
.name = "BocaRAM/AT",
.internal_name = "brat",
.flags = DEVICE_ISA,
.local = ISAMEM_BRAT_CARD,
.init = isamem_init,
.close = isamem_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = brat_config
};
#endif
@@ -1048,17 +1080,20 @@ static const device_config_t rampage_config[] = {
};
static const device_t rampage_device = {
"AST RAMpage/XT",
"rampage",
DEVICE_ISA,
ISAMEM_RAMPAGEXT_CARD,
isamem_init, isamem_close, NULL,
{ NULL }, NULL, NULL,
rampage_config
.name = "AST RAMpage/XT",
.internal_name = "rampage",
.flags = DEVICE_ISA,
.local = ISAMEM_RAMPAGEXT_CARD,
.init = isamem_init,
.close = isamem_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = rampage_config
};
#endif
#if defined(DEV_BRANCH) && defined(USE_ISAMEM_IAB)
static const device_config_t iab_config[] = {
// clang-format off
@@ -1111,23 +1146,32 @@ static const device_config_t iab_config[] = {
};
static const device_t iab_device = {
"Intel AboveBoard",
"iab",
DEVICE_ISA,
ISAMEM_ABOVEBOARD_CARD,
isamem_init, isamem_close, NULL,
{ NULL }, NULL, NULL,
iab_config
.name = "Intel AboveBoard",
.internal_name = "iab",
.flags = DEVICE_ISA,
.local = ISAMEM_ABOVEBOARD_CARD,
.init = isamem_init,
.close = isamem_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = iab_config
};
#endif
static const device_t isa_none_device = {
"None",
"none",
0, 0,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
NULL
.name = "None",
.internal_name = "none",
.flags = 0,
.local = 0,
.init = NULL,
.close = NULL,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
static const struct {

93
src/device/isartc.c
View File

@@ -592,7 +592,6 @@ isartc_close(void *priv)
free(dev);
}
static const device_config_t ev170_config[] = {
// clang-format off
{
@@ -618,16 +617,19 @@ static const device_config_t ev170_config[] = {
};
static const device_t ev170_device = {
"Everex EV-170 Magic I/O",
"ev170",
DEVICE_ISA,
ISARTC_EV170,
isartc_init, isartc_close, NULL,
{ NULL }, NULL, NULL,
ev170_config
.name = "Everex EV-170 Magic I/O",
.internal_name = "ev170",
.flags = DEVICE_ISA,
.local = ISARTC_EV170,
.init = isartc_init,
.close = isartc_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = ev170_config
};
static const device_config_t pii147_config[] = {
// clang-format off
{
@@ -643,16 +645,19 @@ static const device_config_t pii147_config[] = {
};
static const device_t pii147_device = {
"DTK PII-147 Hexa I/O Plus",
"pii147",
DEVICE_ISA,
ISARTC_DTK,
isartc_init, isartc_close, NULL,
{ NULL }, NULL, NULL,
pii147_config
.name = "DTK PII-147 Hexa I/O Plus",
.internal_name = "pii147",
.flags = DEVICE_ISA,
.local = ISARTC_DTK,
.init = isartc_init,
.close = isartc_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = pii147_config
};
static const device_config_t p5pak_config[] = {
// clang-format off
{
@@ -670,16 +675,19 @@ static const device_config_t p5pak_config[] = {
};
static const device_t p5pak_device = {
"Paradise Systems 5-PAK",
"p5pak",
DEVICE_ISA,
ISARTC_P5PAK,
isartc_init, isartc_close, NULL,
{ NULL }, NULL, NULL,
p5pak_config
.name = "Paradise Systems 5-PAK",
.internal_name = "p5pak",
.flags = DEVICE_ISA,
.local = ISARTC_P5PAK,
.init = isartc_init,
.close = isartc_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = p5pak_config
};
static const device_config_t a6pak_config[] = {
// clang-format off
{
@@ -697,22 +705,31 @@ static const device_config_t a6pak_config[] = {
};
static const device_t a6pak_device = {
"AST SixPakPlus",
"a6pak",
DEVICE_ISA,
ISARTC_A6PAK,
isartc_init, isartc_close, NULL,
{ NULL }, NULL, NULL,
a6pak_config
.name = "AST SixPakPlus",
.internal_name = "a6pak",
.flags = DEVICE_ISA,
.local = ISARTC_A6PAK,
.init = isartc_init,
.close = isartc_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = a6pak_config
};
static const device_t isartc_none_device = {
"None",
"none",
0, 0,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
NULL
.name = "None",
.internal_name = "none",
.flags = 0,
.local = 0,
.init = NULL,
.close = NULL,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
static const struct {

382
src/device/keyboard_at.c
View File

@@ -2340,228 +2340,286 @@ kbd_init(const device_t *info)
return(dev);
}
const device_t keyboard_at_device = {
"PC/AT Keyboard",
"keyboard_at",
0,
KBC_TYPE_ISA | KBC_VEN_GENERIC,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PC/AT Keyboard",
.internal_name = "keyboard_at",
.flags = 0,
.local = KBC_TYPE_ISA | KBC_VEN_GENERIC,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_at_ami_device = {
"PC/AT Keyboard (AMI)",
"keyboard_at_ami",
0,
KBC_TYPE_ISA | KBC_VEN_AMI,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PC/AT Keyboard (AMI)",
.internal_name = "keyboard_at_ami",
.flags = 0,
.local = KBC_TYPE_ISA | KBC_VEN_AMI,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_at_samsung_device = {
"PC/AT Keyboard (Samsung)",
"keyboard_at_samsung",
0,
KBC_TYPE_ISA | KBC_VEN_SAMSUNG,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PC/AT Keyboard (Samsung)",
.internal_name = "keyboard_at_samsung",
.flags = 0,
.local = KBC_TYPE_ISA | KBC_VEN_SAMSUNG,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_at_toshiba_device = {
"PC/AT Keyboard (Toshiba)",
"keyboard_at_toshiba",
0,
KBC_TYPE_ISA | KBC_VEN_TOSHIBA,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PC/AT Keyboard (Toshiba)",
.internal_name = "keyboard_at_toshiba",
.flags = 0,
.local = KBC_TYPE_ISA | KBC_VEN_TOSHIBA,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_at_olivetti_device = {
"PC/AT Keyboard (Olivetti)",
"keyboard_at_olivetti",
0,
KBC_TYPE_ISA | KBC_VEN_OLIVETTI,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PC/AT Keyboard (Olivetti)",
.internal_name = "keyboard_at_olivetti",
.flags = 0,
.local = KBC_TYPE_ISA | KBC_VEN_OLIVETTI,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_at_ncr_device = {
"PC/AT Keyboard (NCR)",
"keyboard_at_ncr",
0,
KBC_TYPE_ISA | KBC_VEN_NCR,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PC/AT Keyboard (NCR)",
.internal_name = "keyboard_at_ncr",
.flags = 0,
.local = KBC_TYPE_ISA | KBC_VEN_NCR,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_ps2_device = {
"PS/2 Keyboard",
"keyboard_ps2",
0,
KBC_TYPE_PS2_NOREF | KBC_VEN_GENERIC,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PS/2 Keyboard",
.internal_name = "keyboard_ps2",
.flags = 0,
.local = KBC_TYPE_PS2_NOREF | KBC_VEN_GENERIC,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_ps2_ps2_device = {
"PS/2 Keyboard",
"keyboard_ps2_ps2",
0,
KBC_TYPE_PS2_1 | KBC_VEN_GENERIC,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PS/2 Keyboard",
.internal_name = "keyboard_ps2_ps2",
.flags = 0,
.local = KBC_TYPE_PS2_1 | KBC_VEN_GENERIC,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_ps2_ps1_device = {
"PS/2 Keyboard (IBM PS/1)",
"keyboard_ps2_ps1",
0,
KBC_TYPE_PS2_NOREF | KBC_VEN_IBM_PS1,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PS/2 Keyboard (IBM PS/1)",
.internal_name = "keyboard_ps2_ps1",
.flags = 0,
.local = KBC_TYPE_PS2_NOREF | KBC_VEN_IBM_PS1,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_ps2_ps1_pci_device = {
"PS/2 Keyboard (IBM PS/1)",
"keyboard_ps2_ps1_pci",
DEVICE_PCI,
KBC_TYPE_PS2_NOREF | KBC_VEN_IBM_PS1,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PS/2 Keyboard (IBM PS/1)",
.internal_name = "keyboard_ps2_ps1_pci",
.flags = DEVICE_PCI,
.local = KBC_TYPE_PS2_NOREF | KBC_VEN_IBM_PS1,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_ps2_xi8088_device = {
"PS/2 Keyboard (Xi8088)",
"keyboard_ps2_xi8088",
0,
KBC_TYPE_PS2_1 | KBC_VEN_XI8088,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PS/2 Keyboard (Xi8088)",
.internal_name = "keyboard_ps2_xi8088",
.flags = 0,
.local = KBC_TYPE_PS2_1 | KBC_VEN_XI8088,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_ps2_ami_device = {
"PS/2 Keyboard (AMI)",
"keyboard_ps2_ami",
0,
KBC_TYPE_PS2_NOREF | KBC_VEN_AMI,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PS/2 Keyboard (AMI)",
.internal_name = "keyboard_ps2_ami",
.flags = 0,
.local = KBC_TYPE_PS2_NOREF | KBC_VEN_AMI,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_ps2_olivetti_device = {
"PS/2 Keyboard (Olivetti)",
"keyboard_ps2_olivetti",
0,
KBC_TYPE_PS2_NOREF | KBC_VEN_OLIVETTI,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PS/2 Keyboard (Olivetti)",
.internal_name = "keyboard_ps2_olivetti",
.flags = 0,
.local = KBC_TYPE_PS2_NOREF | KBC_VEN_OLIVETTI,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_ps2_mca_device = {
"PS/2 Keyboard",
"keyboard_ps2_mca",
0,
KBC_TYPE_PS2_1 | KBC_VEN_IBM_MCA,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PS/2 Keyboard",
.internal_name = "keyboard_ps2_mca",
.flags = 0,
.local = KBC_TYPE_PS2_1 | KBC_VEN_IBM_MCA,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_ps2_mca_2_device = {
"PS/2 Keyboard",
"keyboard_ps2_mca_2",
0,
KBC_TYPE_PS2_2 | KBC_VEN_IBM_MCA,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PS/2 Keyboard",
.internal_name = "keyboard_ps2_mca_2",
.flags = 0,
.local = KBC_TYPE_PS2_2 | KBC_VEN_IBM_MCA,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_ps2_quadtel_device = {
"PS/2 Keyboard (Quadtel/MegaPC)",
"keyboard_ps2_quadtel",
0,
KBC_TYPE_PS2_NOREF | KBC_VEN_QUADTEL,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PS/2 Keyboard (Quadtel/MegaPC)",
.internal_name = "keyboard_ps2_quadtel",
.flags = 0,
.local = KBC_TYPE_PS2_NOREF | KBC_VEN_QUADTEL,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_ps2_pci_device = {
"PS/2 Keyboard",
"keyboard_ps2_pci",
DEVICE_PCI,
KBC_TYPE_PS2_NOREF | KBC_VEN_GENERIC,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PS/2 Keyboard",
.internal_name = "keyboard_ps2_pci",
.flags = DEVICE_PCI,
.local = KBC_TYPE_PS2_NOREF | KBC_VEN_GENERIC,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_ps2_ami_pci_device = {
"PS/2 Keyboard (AMI)",
"keyboard_ps2_ami_pci",
DEVICE_PCI,
KBC_TYPE_PS2_NOREF | KBC_VEN_AMI,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PS/2 Keyboard (AMI)",
.internal_name = "keyboard_ps2_ami_pci",
.flags = DEVICE_PCI,
.local = KBC_TYPE_PS2_NOREF | KBC_VEN_AMI,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_ps2_intel_ami_pci_device = {
"PS/2 Keyboard (AMI)",
"keyboard_ps2_intel_ami_pci",
DEVICE_PCI,
KBC_TYPE_PS2_NOREF | KBC_VEN_INTEL_AMI,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PS/2 Keyboard (AMI)",
.internal_name = "keyboard_ps2_intel_ami_pci",
.flags = DEVICE_PCI,
.local = KBC_TYPE_PS2_NOREF | KBC_VEN_INTEL_AMI,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_ps2_acer_pci_device = {
"PS/2 Keyboard (Acer 90M002A)",
"keyboard_ps2_acer_pci",
DEVICE_PCI,
KBC_TYPE_PS2_NOREF | KBC_VEN_ACER,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL, NULL
.name = "PS/2 Keyboard (Acer 90M002A)",
.internal_name = "keyboard_ps2_acer_pci",
.flags = DEVICE_PCI,
.local = KBC_TYPE_PS2_NOREF | KBC_VEN_ACER,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
void
keyboard_at_set_mouse(void (*func)(uint8_t val, void *priv), void *priv)
{

191
src/device/keyboard_xt.c
View File

@@ -871,115 +871,144 @@ kbd_close(void *priv)
free(kbd);
}
const device_t keyboard_pc_device = {
"IBM PC Keyboard (1981)",
"keyboard_pc",
0,
KBD_TYPE_PC81,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL
.name = "IBM PC Keyboard (1981)",
.internal_name = "keyboard_pc",
.flags = 0,
.local = KBD_TYPE_PC81,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_pc82_device = {
"IBM PC Keyboard (1982)",
"keyboard_pc82",
0,
KBD_TYPE_PC82,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL
.name = "IBM PC Keyboard (1982)",
.internal_name = "keyboard_pc82",
.flags = 0,
.local = KBD_TYPE_PC82,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_xt_device = {
"XT (1982) Keyboard",
"keyboard_xt",
0,
KBD_TYPE_XT82,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL
.name = "XT (1982) Keyboard",
.internal_name = "keyboard_xt",
.flags = 0,
.local = KBD_TYPE_XT82,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_xt86_device = {
"XT (1986) Keyboard",
"keyboard_xt86",
0,
KBD_TYPE_XT86,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL
.name = "XT (1986) Keyboard",
.internal_name = "keyboard_xt86",
.flags = 0,
.local = KBD_TYPE_XT86,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_xt_compaq_device = {
"Compaq Portable Keyboard",
"keyboard_xt_compaq",
0,
KBD_TYPE_COMPAQ,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL
.name = "Compaq Portable Keyboard",
.internal_name = "keyboard_xt_compaq",
.flags = 0,
.local = KBD_TYPE_COMPAQ,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_tandy_device = {
"Tandy 1000 Keyboard",
"keyboard_tandy",
0,
KBD_TYPE_TANDY,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL
.name = "Tandy 1000 Keyboard",
.internal_name = "keyboard_tandy",
.flags = 0,
.local = KBD_TYPE_TANDY,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_xt_t1x00_device = {
"Toshiba T1x00 Keyboard",
"keyboard_xt_t1x00",
0,
KBD_TYPE_TOSHIBA,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL
.name = "Toshiba T1x00 Keyboard",
.internal_name = "keyboard_xt_t1x00",
.flags = 0,
.local = KBD_TYPE_TOSHIBA,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
#if defined(DEV_BRANCH) && defined(USE_LASERXT)
const device_t keyboard_xt_lxt3_device = {
"VTech Laser XT3 Keyboard",
"keyboard_xt_lxt3",
0,
KBD_TYPE_VTECH,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL
.name = "VTech Laser XT3 Keyboard",
.internal_name = "keyboard_xt_lxt3",
.flags = 0,
.local = KBD_TYPE_VTECH,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
#endif
const device_t keyboard_xt_olivetti_device = {
"Olivetti XT Keyboard",
"keyboard_xt_olivetti",
0,
KBD_TYPE_OLIVETTI,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL
.name = "Olivetti XT Keyboard",
.internal_name = "keyboard_xt_olivetti",
.flags = 0,
.local = KBD_TYPE_OLIVETTI,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_xt_zenith_device = {
"Zenith XT Keyboard",
"keyboard_xt_zenith",
0,
KBD_TYPE_ZENITH,
kbd_init,
kbd_close,
kbd_reset,
{ NULL }, NULL, NULL
.name = "Zenith XT Keyboard",
.internal_name = "keyboard_xt_zenith",
.flags = 0,
.local = KBD_TYPE_ZENITH,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

39
src/device/mouse.c
View File

@@ -41,24 +41,33 @@ int mouse_x,
mouse_z,
mouse_buttons;
static const device_t mouse_none_device = {
"None",
"none",
0, MOUSE_TYPE_NONE,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
NULL
};
static const device_t mouse_internal_device = {
"Internal",
"internal",
0, MOUSE_TYPE_INTERNAL,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
NULL
.name = "None",
.internal_name = "none",
.flags = 0,
.local = MOUSE_TYPE_NONE,
.init = NULL,
.close = NULL,
.reset = NULL,
{ .poll = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
static const device_t mouse_internal_device = {
.name = "Internal",
.internal_name = "internal",
.flags = 0,
.local = MOUSE_TYPE_INTERNAL,
.init = NULL,
.close = NULL,
.reset = NULL,
{ .poll = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
static mouse_t mouse_devices[] = {
// clang-format off

53
src/device/mouse_bus.c
View File

@@ -765,30 +765,43 @@ static const device_config_t ms_config[] = {
};
const device_t mouse_logibus_device = {
"Logitech/Microsoft Bus Mouse",
"logibus",
DEVICE_ISA,
MOUSE_TYPE_LOGIBUS,
bm_init, bm_close, NULL,
{ .poll = bm_poll }, NULL, NULL,
lt_config
.name = "Logitech/Microsoft Bus Mouse",
.internal_name = "logibus",
.flags = DEVICE_ISA,
.local = MOUSE_TYPE_LOGIBUS,
.init = bm_init,
.close = bm_close,
.reset = NULL,
{ .poll = bm_poll },
.speed_changed = NULL,
.force_redraw = NULL,
.config = lt_config
};
const device_t mouse_logibus_onboard_device = {
"Logitech Bus Mouse (On-Board)",
"logibus_onboard",
DEVICE_ISA,
MOUSE_TYPE_LOGIBUS | MOUSE_TYPE_ONBOARD,
bm_init, bm_close, NULL,
{ .poll = bm_poll }, NULL, NULL
.name = "Logitech Bus Mouse (On-Board)",
.internal_name = "logibus_onboard",
.flags = DEVICE_ISA,
.local = MOUSE_TYPE_LOGIBUS | MOUSE_TYPE_ONBOARD,
.init = bm_init,
.close = bm_close,
.reset = NULL,
{ .poll = bm_poll },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t mouse_msinport_device = {
"Microsoft Bus Mouse (InPort)",
"msbus",
DEVICE_ISA,
MOUSE_TYPE_INPORT,
bm_init, bm_close, NULL,
{ .poll = bm_poll }, NULL, NULL,
ms_config
.name = "Microsoft Bus Mouse (InPort)",
.internal_name = "msbus",
.flags = DEVICE_ISA,
.local = MOUSE_TYPE_INPORT,
.init = bm_init,
.close = bm_close,
.reset = NULL,
{ .poll = bm_poll },
.speed_changed = NULL,
.force_redraw = NULL,
.config = ms_config
};

19
src/device/mouse_ps2.c
View File

@@ -329,7 +329,6 @@ ps2_close(void *priv)
free(dev);
}
static const device_config_t ps2_config[] = {
// clang-format off
{
@@ -347,11 +346,15 @@ static const device_config_t ps2_config[] = {
};
const device_t mouse_ps2_device = {
"Standard PS/2 Mouse",
"ps2",
DEVICE_PS2,
MOUSE_TYPE_PS2,
mouse_ps2_init, ps2_close, NULL,
{ .poll = ps2_poll }, NULL, NULL,
ps2_config
.name = "Standard PS/2 Mouse",
.internal_name = "ps2",
.flags = DEVICE_PS2,
.local = MOUSE_TYPE_PS2,
.init = mouse_ps2_init,
.close = ps2_close,
.reset = NULL,
{ .poll = ps2_poll },
.speed_changed = NULL,
.force_redraw = NULL,
.config = ps2_config
};

54
src/device/mouse_serial.c
View File

@@ -876,31 +876,43 @@ static const device_config_t ltsermouse_config[] = {
};
const device_t mouse_mssystems_device = {
"Mouse Systems Serial Mouse",
"mssystems",
0,
MOUSE_TYPE_MSYSTEMS,
sermouse_init, sermouse_close, NULL,
{ .poll = sermouse_poll }, sermouse_speed_changed, NULL,
mssermouse_config
.name = "Mouse Systems Serial Mouse",
.internal_name = "mssystems",
.flags = DEVICE_COM,
.local = MOUSE_TYPE_MSYSTEMS,
.init = sermouse_init,
.close = sermouse_close,
.reset = NULL,
{ .poll = sermouse_poll },
.speed_changed = sermouse_speed_changed,
.force_redraw = NULL,
.config = mssermouse_config
};
const device_t mouse_msserial_device = {
"Microsoft Serial Mouse",
"msserial",
0,
0,
sermouse_init, sermouse_close, NULL,
{ .poll = sermouse_poll }, sermouse_speed_changed, NULL,
mssermouse_config
.name = "Microsoft Serial Mouse",
.internal_name = "msserial",
.flags = DEVICE_COM,
.local = 0,
.init = sermouse_init,
.close = sermouse_close,
.reset = NULL,
{ .poll = sermouse_poll },
.speed_changed = sermouse_speed_changed,
.force_redraw = NULL,
.config = mssermouse_config
};
const device_t mouse_ltserial_device = {
"Logitech Serial Mouse",
"ltserial",
0,
1,
sermouse_init, sermouse_close, NULL,
{ .poll = sermouse_poll }, sermouse_speed_changed, NULL,
ltsermouse_config
.name = "Logitech Serial Mouse",
.internal_name = "ltserial",
.flags = DEVICE_COM,
.local = 1,
.init = sermouse_init,
.close = sermouse_close,
.reset = NULL,
{ .poll = sermouse_poll },
.speed_changed = sermouse_speed_changed,
.force_redraw = NULL,
.config = ltsermouse_config
};

251
src/device/pci_bridge.c
View File

@@ -497,156 +497,145 @@ pci_bridge_init(const device_t *info)
return dev;
}
/* PCI bridges */
const device_t dec21150_device =
{
"DEC 21150 PCI Bridge",
"dec21150",
DEVICE_PCI,
PCI_BRIDGE_DEC_21150,
pci_bridge_init,
NULL,
pci_bridge_reset,
{ NULL },
NULL,
NULL,
NULL
const device_t dec21150_device = {
.name = "DEC 21150 PCI Bridge",
.internal_name = "dec21150",
.flags = DEVICE_PCI,
.local = PCI_BRIDGE_DEC_21150,
.init = pci_bridge_init,
.close = NULL,
.reset = pci_bridge_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
/* AGP bridges */
const device_t ali5243_agp_device =
{
"ALi M5243 AGP Bridge",
"ali5243_agp",
DEVICE_PCI,
AGP_BRIDGE_ALI_M5243,
pci_bridge_init,
NULL,
pci_bridge_reset,
{ NULL },
NULL,
NULL,
NULL
const device_t ali5243_agp_device = {
.name = "ALi M5243 AGP Bridge",
.internal_name = "ali5243_agp",
.flags = DEVICE_PCI,
.local = AGP_BRIDGE_ALI_M5243,
.init = pci_bridge_init,
.close = NULL,
.reset = pci_bridge_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
/* AGP bridges */
const device_t ali5247_agp_device =
{
"ALi M5247 AGP Bridge",
"ali5247_agp",
DEVICE_PCI,
AGP_BRIDGE_ALI_M5247,
pci_bridge_init,
NULL,
pci_bridge_reset,
{ NULL },
NULL,
NULL,
NULL
const device_t ali5247_agp_device = {
.name = "ALi M5247 AGP Bridge",
.internal_name = "ali5247_agp",
.flags = DEVICE_PCI,
.local = AGP_BRIDGE_ALI_M5247,
.init = pci_bridge_init,
.close = NULL,
.reset = pci_bridge_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t i440lx_agp_device =
{
"Intel 82443LX/EX AGP Bridge",
"i440lx_agp",
DEVICE_PCI,
AGP_BRIDGE_INTEL_440LX,
pci_bridge_init,
NULL,
pci_bridge_reset,
{ NULL },
NULL,
NULL,
NULL
const device_t i440lx_agp_device = {
.name = "Intel 82443LX/EX AGP Bridge",
.internal_name = "i440lx_agp",
.flags = DEVICE_PCI,
.local = AGP_BRIDGE_INTEL_440LX,
.init = pci_bridge_init,
.close = NULL,
.reset = pci_bridge_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t i440bx_agp_device =
{
"Intel 82443BX/ZX AGP Bridge",
"i440bx_agp",
DEVICE_PCI,
AGP_BRIDGE_INTEL_440BX,
pci_bridge_init,
NULL,
pci_bridge_reset,
{ NULL },
NULL,
NULL,
NULL
const device_t i440bx_agp_device = {
.name = "Intel 82443BX/ZX AGP Bridge",
.internal_name = "i440bx_agp",
.flags = DEVICE_PCI,
.local = AGP_BRIDGE_INTEL_440BX,
.init = pci_bridge_init,
.close = NULL,
.reset = pci_bridge_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t i440gx_agp_device =
{
"Intel 82443GX AGP Bridge",
"i440gx_agp",
DEVICE_PCI,
AGP_BRIDGE_INTEL_440GX,
pci_bridge_init,
NULL,
pci_bridge_reset,
{ NULL },
NULL,
NULL,
NULL
const device_t i440gx_agp_device = {
.name = "Intel 82443GX AGP Bridge",
.internal_name = "i440gx_agp",
.flags = DEVICE_PCI,
.local = AGP_BRIDGE_INTEL_440GX,
.init = pci_bridge_init,
.close = NULL,
.reset = pci_bridge_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t via_vp3_agp_device =
{
"VIA Apollo VP3 AGP Bridge",
"via_vp3_agp",
DEVICE_PCI,
AGP_BRIDGE_VIA_597,
pci_bridge_init,
NULL,
pci_bridge_reset,
{ NULL },
NULL,
NULL,
NULL
const device_t via_vp3_agp_device = {
.name = "VIA Apollo VP3 AGP Bridge",
.internal_name = "via_vp3_agp",
.flags = DEVICE_PCI,
.local = AGP_BRIDGE_VIA_597,
.init = pci_bridge_init,
.close = NULL,
.reset = pci_bridge_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t via_mvp3_agp_device =
{
"VIA Apollo MVP3 AGP Bridge",
"via_mvp3_agp",
DEVICE_PCI,
AGP_BRIDGE_VIA_598,
pci_bridge_init,
NULL,
pci_bridge_reset,
{ NULL },
NULL,
NULL,
NULL
const device_t via_mvp3_agp_device = {
.name = "VIA Apollo MVP3 AGP Bridge",
.internal_name = "via_mvp3_agp",
.flags = DEVICE_PCI,
.local = AGP_BRIDGE_VIA_598,
.init = pci_bridge_init,
.close = NULL,
.reset = pci_bridge_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t via_apro_agp_device =
{
"VIA Apollo Pro AGP Bridge",
"via_apro_agp",
DEVICE_PCI,
AGP_BRIDGE_VIA_691,
pci_bridge_init,
NULL,
pci_bridge_reset,
{ NULL },
NULL,
NULL,
NULL
const device_t via_apro_agp_device = {
.name = "VIA Apollo Pro AGP Bridge",
.internal_name = "via_apro_agp",
.flags = DEVICE_PCI,
.local = AGP_BRIDGE_VIA_691,
.init = pci_bridge_init,
.close = NULL,
.reset = pci_bridge_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t via_vt8601_agp_device =
{
"VIA Apollo ProMedia AGP Bridge",
"via_vt8601_agp",
DEVICE_PCI,
AGP_BRIDGE_VIA_8601,
pci_bridge_init,
NULL,
pci_bridge_reset,
{ NULL },
NULL,
NULL,
NULL
const device_t via_vt8601_agp_device = {
.name = "VIA Apollo ProMedia AGP Bridge",
.internal_name = "via_vt8601_agp",
.flags = DEVICE_PCI,
.local = AGP_BRIDGE_VIA_8601,
.init = pci_bridge_init,
.close = NULL,
.reset = pci_bridge_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

38
src/device/phoenix_486_jumper.c
View File

@@ -123,24 +123,30 @@ phoenix_486_jumper_init(const device_t *info)
return dev;
}
const device_t phoenix_486_jumper_device = {
"Phoenix 486 Jumper Readout",
"phoenix_486_jumper",
0,
0,
phoenix_486_jumper_init, phoenix_486_jumper_close, phoenix_486_jumper_reset,
{ NULL }, NULL, NULL,
NULL
.name = "Phoenix 486 Jumper Readout",
.internal_name = "phoenix_486_jumper",
.flags = 0,
.local = 0,
.init = phoenix_486_jumper_init,
.close = phoenix_486_jumper_close,
.reset = phoenix_486_jumper_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t phoenix_486_jumper_pci_device = {
"Phoenix 486 Jumper Readout (PCI machines)",
"phoenix_486_jumper_pci",
0,
1,
phoenix_486_jumper_init, phoenix_486_jumper_close, phoenix_486_jumper_reset,
{ NULL }, NULL, NULL,
NULL
.name = "Phoenix 486 Jumper Readout (PCI machines)",
.internal_name = "phoenix_486_jumper_pci",
.flags = 0,
.local = 1,
.init = phoenix_486_jumper_init,
.close = phoenix_486_jumper_close,
.reset = phoenix_486_jumper_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

18
src/device/postcard.c
View File

@@ -141,11 +141,15 @@ postcard_close(UNUSED(void *priv))
const device_t postcard_device = {
"POST Card",
"postcard",
DEVICE_ISA,
0,
postcard_init, postcard_close, NULL,
{ NULL }, NULL, NULL,
NULL
.name = "POST Card",
.internal_name = "postcard",
.flags = DEVICE_ISA,
.local = 0,
.init = postcard_init,
.close = postcard_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

145
src/device/serial.c
View File

@@ -721,83 +721,114 @@ serial_standalone_init(void) {
device_add_inst(&ns8250_device, next_inst + 1);
};
const device_t ns8250_device = {
"National Semiconductor 8250(-compatible) UART",
"ns8250",
0,
SERIAL_8250,
serial_init, serial_close, NULL,
{ NULL }, serial_speed_changed, NULL,
NULL
.name = "National Semiconductor 8250(-compatible) UART",
.internal_name = "ns8250",
.flags = 0,
.local = SERIAL_8250,
.init = serial_init,
.close = serial_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = serial_speed_changed,
.force_redraw = NULL,
.config = NULL
};
const device_t ns8250_pcjr_device = {
"National Semiconductor 8250(-compatible) UART for PCjr",
"ns8250_pcjr",
DEVICE_PCJR,
SERIAL_8250_PCJR,
serial_init, serial_close, NULL,
{ NULL }, serial_speed_changed, NULL,
NULL
.name = "National Semiconductor 8250(-compatible) UART for PCjr",
.internal_name = "ns8250_pcjr",
.flags = DEVICE_PCJR,
.local = SERIAL_8250_PCJR,
.init = serial_init,
.close = serial_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = serial_speed_changed,
.force_redraw = NULL,
.config = NULL
};
const device_t ns16450_device = {
"National Semiconductor NS16450(-compatible) UART",
"ns16450",
0,
SERIAL_16450,
serial_init, serial_close, NULL,
{ NULL }, serial_speed_changed, NULL,
NULL
.name = "National Semiconductor NS16450(-compatible) UART",
.internal_name = "ns16450",
.flags = 0,
.local = SERIAL_16450,
.init = serial_init,
.close = serial_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = serial_speed_changed,
.force_redraw = NULL,
.config = NULL
};
const device_t ns16550_device = {
"National Semiconductor NS16550(-compatible) UART",
"ns16550",
0,
SERIAL_16550,
serial_init, serial_close, NULL,
{ NULL }, serial_speed_changed, NULL,
NULL
.name = "National Semiconductor NS16550(-compatible) UART",
.internal_name = "ns16550",
.flags = 0,
.local = SERIAL_16550,
.init = serial_init,
.close = serial_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = serial_speed_changed,
.force_redraw = NULL,
.config = NULL
};
const device_t ns16650_device = {
"Startech Semiconductor 16650(-compatible) UART",
"ns16650",
0,
SERIAL_16650,
serial_init, serial_close, NULL,
{ NULL }, serial_speed_changed, NULL,
NULL
.name = "Startech Semiconductor 16650(-compatible) UART",
.internal_name = "ns16650",
.flags = 0,
.local = SERIAL_16650,
.init = serial_init,
.close = serial_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = serial_speed_changed,
.force_redraw = NULL,
.config = NULL
};
const device_t ns16750_device = {
"Texas Instruments 16750(-compatible) UART",
"ns16750",
0,
SERIAL_16750,
serial_init, serial_close, NULL,
{ NULL }, serial_speed_changed, NULL,
NULL
.name = "Texas Instruments 16750(-compatible) UART",
.internal_name = "ns16750",
.flags = 0,
.local = SERIAL_16750,
.init = serial_init,
.close = serial_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = serial_speed_changed,
.force_redraw = NULL,
.config = NULL
};
const device_t ns16850_device = {
"Exar Corporation NS16850(-compatible) UART",
"ns16850",
0,
SERIAL_16850,
serial_init, serial_close, NULL,
{ NULL }, serial_speed_changed, NULL,
NULL
.name = "Exar Corporation NS16850(-compatible) UART",
.internal_name = "ns16850",
.flags = 0,
.local = SERIAL_16850,
.init = serial_init,
.close = serial_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = serial_speed_changed,
.force_redraw = NULL,
.config = NULL
};
const device_t ns16950_device = {
"Oxford Semiconductor NS16950(-compatible) UART",
"ns16950",
0,
SERIAL_16950,
serial_init, serial_close, NULL,
{ NULL }, serial_speed_changed, NULL,
NULL
.name = "Oxford Semiconductor NS16950(-compatible) UART",
.internal_name = "ns16950",
.flags = 0,
.local = SERIAL_16950,
.init = serial_init,
.close = serial_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = serial_speed_changed,
.force_redraw = NULL,
.config = NULL
};

19
src/device/smbus_ali7101.c
View File

@@ -299,13 +299,16 @@ smbus_ali7101_close(void *priv)
free(dev);
}
const device_t ali7101_smbus_device = {
"ALi M7101-compatible SMBus Host Controller",
"ali7101_smbus",
DEVICE_AT,
0,
smbus_ali7101_init, smbus_ali7101_close, smbus_ali7101_reset,
{ NULL }, NULL, NULL,
NULL
.name = "ALi M7101-compatible SMBus Host Controller",
.internal_name = "ali7101_smbus",
.flags = DEVICE_AT,
.local = 0,
.init = smbus_ali7101_init,
.close = smbus_ali7101_close,
.reset = smbus_ali7101_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};

37
src/device/smbus_piix4.c
View File

@@ -384,23 +384,30 @@ smbus_piix4_close(void *priv)
free(dev);
}
const device_t piix4_smbus_device = {
"PIIX4-compatible SMBus Host Controller",
"piix4_smbus",
DEVICE_AT,
SMBUS_PIIX4,
smbus_piix4_init, smbus_piix4_close, NULL,
{ NULL }, NULL, NULL,
NULL
.name = "PIIX4-compatible SMBus Host Controller",
.internal_name = "piix4_smbus",
.flags = DEVICE_AT,
.local = SMBUS_PIIX4,
.init = smbus_piix4_init,
.close = smbus_piix4_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t via_smbus_device = {
"VIA VT82C686B SMBus Host Controller",
"via_smbus",
DEVICE_AT,
SMBUS_VIA,
smbus_piix4_init, smbus_piix4_close, NULL,
{ NULL }, NULL, NULL,
NULL
.name = "VIA VT82C686B SMBus Host Controller",
.internal_name = "via_smbus",
.flags = DEVICE_AT,
.local = SMBUS_VIA,
.init = smbus_piix4_init,
.close = smbus_piix4_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};