claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into qt-wacom-serial

Browse Source
This commit is contained in:
Cacodemon345
2023-02-15 11:12:25 +06:00
parent 64becf5d13 071ecea6a0
commit 0f36ad9f04
66 changed files with 2938 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/device.c
View File

@@ -18,6 +18,8 @@
* Copyright 2017-2019 Fred N. van Kempen.
* Copyright 2016-2019 Miran Grca.
* Copyright 2008-2019 Sarah Walker.
* Copyright 2021 Andreas J. Reichel.
* Copyright 2021-2022 Jasmine Iwanek.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -91,6 +93,7 @@ device_set_context(device_context_t *c, const device_t *d, int inst)
memset(c, 0, sizeof(device_context_t));
c->dev = d;
c->instance = inst;
if (inst) {
sprintf(c->name, "%s #%i", d->name, inst);
@@ -556,6 +559,12 @@ device_force_redraw(void)
}
}
const int
device_get_instance(void)
{
return device_current.instance;
}
const char *
device_get_config_string(const char *s)
{
@@ -748,7 +757,7 @@ device_is_valid(const device_t *device, int m)
int
machine_get_config_int(char *s)
{
const device_t *d = machine_getdevice(machine);
const device_t *d = machine_get_device(machine);
const device_config_t *c;
if (d == NULL)
@@ -768,7 +777,7 @@ machine_get_config_int(char *s)
char *
machine_get_config_string(char *s)
{
const device_t *d = machine_getdevice(machine);
const device_t *d = machine_get_device(machine);
const device_config_t *c;
if (d == NULL)