mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-03-02 18:58:22 -07:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'upstream/master' into feature/machine_z150

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-11-19 13:48:10 -05:00
parent fd8c5cf1af 38b9d4e9fa
commit 960bb3614b
394 changed files with 78773 additions and 75725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/machine/machine_table.c
View File

@@ -2098,7 +2098,7 @@ const machine_t machines[] = {
.max_multi = 0
},
.bus_flags = MACHINE_PC,
.flags = MACHINE_VIDEO | MACHINE_MOUSE,
.flags = MACHINE_VIDEO | MACHINE_MOUSE | MACHINE_MFM,
.ram = {
.min = 128,
.max = 640,
@@ -12003,8 +12003,8 @@ const machine_t machines[] = {
/* Saved copies - jumpers get applied to these.
We use also machine_gpio to store IBM PC/XT jumpers as they need more than one byte. */
static uint16_t machine_p1;
static uint32_t machine_gpio;
static uint16_t machine_p1;
static uint32_t machine_gpio;
uint8_t
machine_get_p1(void)
@@ -12039,97 +12039,97 @@ machine_set_gpio(uint32_t gpio)
int
machine_count(void)
{
return((sizeof(machines) / sizeof(machine_t)) - 1);
return ((sizeof(machines) / sizeof(machine_t)) - 1);
}
char *
machine_getname(void)
{
return((char *)machines[machine].name);
return ((char *) machines[machine].name);
}
char *
machine_getname_ex(int m)
{
return((char *)machines[m].name);
return ((char *) machines[m].name);
}
const device_t *
machine_getdevice(int m)
{
if (machines[m].device)
return(machines[m].device);
return (machines[m].device);
return(NULL);
return (NULL);
}
const device_t *
machine_getviddevice(int m)
{
if (machines[m].vid_device)
return(machines[m].vid_device);
return (machines[m].vid_device);
return(NULL);
return (NULL);
}
const device_t *
machine_getsnddevice(int m)
{
if (machines[m].snd_device)
return(machines[m].snd_device);
return (machines[m].snd_device);
return(NULL);
return (NULL);
}
const device_t *
machine_getnetdevice(int m)
{
if (machines[m].net_device)
return(machines[m].net_device);
return (machines[m].net_device);
return(NULL);
return (NULL);
}
char *
machine_get_internal_name(void)
{
return((char *)machines[machine].internal_name);
return ((char *) machines[machine].internal_name);
}
char *
machine_get_internal_name_ex(int m)
{
return((char *)machines[m].internal_name);
return ((char *) machines[m].internal_name);
}
int
machine_get_nvrmask(int m)
{
return(machines[m].nvrmask);
return (machines[m].nvrmask);
}
int
machine_has_flags(int m, int flags)
{
return(machines[m].flags & flags);
return (machines[m].flags & flags);
}
int
machine_has_bus(int m, int bus_flags)
{
return(machines[m].bus_flags & bus_flags);
return (machines[m].bus_flags & bus_flags);
}
int
machine_has_cartridge(int m)
{
return(machine_has_bus(m, MACHINE_CARTRIDGE) ? 1 : 0);
return (machine_has_bus(m, MACHINE_CARTRIDGE) ? 1 : 0);
}
int
machine_get_min_ram(int m)
{
return(machines[m].ram.min);
return (machines[m].ram.min);
}
int
@@ -12145,13 +12145,13 @@ machine_get_max_ram(int m)
int
machine_get_ram_granularity(int m)
{
return(machines[m].ram.step);
return (machines[m].ram.step);
}
int
machine_get_type(int m)
{
return(machines[m].type);
return (machines[m].type);
}
int
@@ -12160,16 +12160,16 @@ machine_get_machine_from_internal_name(char *s)
int c = 0;
while (machines[c].init != NULL) {
if (!strcmp(machines[c].internal_name, (const char *)s))
return(c);
if (!strcmp(machines[c].internal_name, (const char *) s))
return (c);
c++;
}
return(0);
return (0);
}
int
machine_has_mouse(void)
{
return(machines[machine].flags & MACHINE_MOUSE);
return (machines[machine].flags & MACHINE_MOUSE);
}