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

Handful of function renames

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-02-07 18:06:50 -05:00
parent 3dfb553555
commit fea5ac681b
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/device.c
View File

@@ -748,7 +748,7 @@ device_is_valid(const device_t *device, int m)
int int
machine_get_config_int(char *s) 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; const device_config_t *c;
if (d == NULL) if (d == NULL)
@@ -768,7 +768,7 @@ machine_get_config_int(char *s)
char * char *
machine_get_config_string(char *s) 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; const device_config_t *c;
if (d == NULL) if (d == NULL)

8
src/include/86box/machine.h
View File

@@ -324,10 +324,10 @@ extern char *machine_get_internal_name(void);
extern int machine_get_machine_from_internal_name(char *s); extern int machine_get_machine_from_internal_name(char *s);
extern void machine_init(void); extern void machine_init(void);
#ifdef EMU_DEVICE_H #ifdef EMU_DEVICE_H
extern const device_t *machine_getdevice(int m); extern const device_t *machine_get_device(int m);
extern const device_t *machine_getviddevice(int m); extern const device_t *machine_get_vid_device(int m);
extern const device_t *machine_getsnddevice(int m); extern const device_t *machine_get_snd_device(int m);
extern const device_t *machine_getnetdevice(int m); extern const device_t *machine_get_net_device(int m);
#endif #endif
extern char *machine_get_internal_name_ex(int m); extern char *machine_get_internal_name_ex(int m);
extern int machine_get_nvrmask(int m); extern int machine_get_nvrmask(int m);

2
src/machine/machine.c
View File

@@ -138,7 +138,7 @@ int
machine_available(int m) machine_available(int m)
{ {
int ret; int ret;
device_t *d = (device_t *) machine_getdevice(m); device_t *d = (device_t *) machine_get_device(m);
bios_only = 1; bios_only = 1;

8
src/machine/machine_table.c
View File

@@ -12245,7 +12245,7 @@ machine_getname_ex(int m)
} }
const device_t * const device_t *
machine_getdevice(int m) machine_get_device(int m)
{ {
if (machines[m].device) if (machines[m].device)
return (machines[m].device); return (machines[m].device);
@@ -12254,7 +12254,7 @@ machine_getdevice(int m)
} }
const device_t * const device_t *
machine_getviddevice(int m) machine_get_vid_device(int m)
{ {
if (machines[m].vid_device) if (machines[m].vid_device)
return (machines[m].vid_device); return (machines[m].vid_device);
@@ -12263,7 +12263,7 @@ machine_getviddevice(int m)
} }
const device_t * const device_t *
machine_getsnddevice(int m) machine_get_snd_device(int m)
{ {
if (machines[m].snd_device) if (machines[m].snd_device)
return (machines[m].snd_device); return (machines[m].snd_device);
@@ -12272,7 +12272,7 @@ machine_getsnddevice(int m)
} }
const device_t * const device_t *
machine_getnetdevice(int m) machine_get_net_device(int m)
{ {
if (machines[m].net_device) if (machines[m].net_device)
return (machines[m].net_device); return (machines[m].net_device);

4
src/qt/qt_settingsmachine.cpp
View File

@@ -169,7 +169,7 @@ SettingsMachine::on_comboBoxMachine_currentIndexChanged(int index)
} }
int machineId = ui->comboBoxMachine->currentData().toInt(); int machineId = ui->comboBoxMachine->currentData().toInt();
const auto *device = machine_getdevice(machineId); const auto *device = machine_get_device(machineId);
ui->pushButtonConfigure->setEnabled((device != nullptr) && (device->config != nullptr)); ui->pushButtonConfigure->setEnabled((device != nullptr) && (device->config != nullptr));
auto *modelCpu = ui->comboBoxCPU->model(); auto *modelCpu = ui->comboBoxCPU->model();
@@ -304,6 +304,6 @@ SettingsMachine::on_pushButtonConfigure_clicked()
{ {
// deviceconfig_inst_open // deviceconfig_inst_open
int machineId = ui->comboBoxMachine->currentData().toInt(); int machineId = ui->comboBoxMachine->currentData().toInt();
const auto *device = machine_getdevice(machineId); const auto *device = machine_get_device(machineId);
DeviceConfig::ConfigureDevice(device, 0, qobject_cast<Settings *>(Settings::settings)); DeviceConfig::ConfigureDevice(device, 0, qobject_cast<Settings *>(Settings::settings));
} }

4
src/win/win_settings.c
View File

@@ -755,7 +755,7 @@ win_settings_machine_recalc_machine(HWND hdlg)
lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR)); lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
d = (device_t *) machine_getdevice(temp_machine); d = (device_t *) machine_get_device(temp_machine);
settings_enable_window(hdlg, IDC_CONFIGURE_MACHINE, d && d->config); settings_enable_window(hdlg, IDC_CONFIGURE_MACHINE, d && d->config);
settings_reset_content(hdlg, IDC_COMBO_CPU_TYPE); settings_reset_content(hdlg, IDC_COMBO_CPU_TYPE);
@@ -987,7 +987,7 @@ win_settings_machine_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
break; break;
case IDC_CONFIGURE_MACHINE: case IDC_CONFIGURE_MACHINE:
temp_machine = listtomachine[settings_get_cur_sel(hdlg, IDC_COMBO_MACHINE)]; temp_machine = listtomachine[settings_get_cur_sel(hdlg, IDC_COMBO_MACHINE)];
temp_deviceconfig |= deviceconfig_open(hdlg, (void *) machine_getdevice(temp_machine)); temp_deviceconfig |= deviceconfig_open(hdlg, (void *) machine_get_device(temp_machine));
break; break;
} }