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

clang-format in src/machine/

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-09-18 17:17:57 -04:00
parent a225c9433b
commit 3fddf4d488
6 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/machine/m_at_socket7_3v.c
View File

@@ -506,7 +506,6 @@ machine_at_ap5s_init(const machine_t *model)
return ret; return ret;
} }
int int
machine_at_ms5124_init(const machine_t *model) machine_at_ms5124_init(const machine_t *model)
{ {
@@ -536,7 +535,6 @@ machine_at_ms5124_init(const machine_t *model)
return ret; return ret;
} }
int int
machine_at_vectra54_init(const machine_t *model) machine_at_vectra54_init(const machine_t *model)
{ {

2
src/machine/m_xt_t1000_vid.c
View File

@@ -723,7 +723,7 @@ static const device_config_t t1000_config[] = {
.default_int = 0 .default_int = 0
}, },
{ .name = "", .description = "", .type = CONFIG_END } { .name = "", .description = "", .type = CONFIG_END }
// clang-format on // clang-format on
}; };
const device_t t1000_video_device = { const device_t t1000_video_device = {

2
src/machine/m_xt_xi8088.c
View File

@@ -156,7 +156,7 @@ static const device_config_t xi8088_config[] = {
.default_int = 0 .default_int = 0
}, },
{ .name = "", .description = "", .type = CONFIG_END } { .name = "", .description = "", .type = CONFIG_END }
// clang-format on // clang-format on
}; };
const device_t xi8088_device = { const device_t xi8088_device = {

12
src/machine/machine.c
View File

@@ -42,33 +42,28 @@
#include <86box/machine.h> #include <86box/machine.h>
#include <86box/isamem.h> #include <86box/isamem.h>
int bios_only = 0; int bios_only = 0;
int machine; int machine;
// int AT, PCI; // int AT, PCI;
#ifdef ENABLE_MACHINE_LOG #ifdef ENABLE_MACHINE_LOG
int machine_do_log = ENABLE_MACHINE_LOG; int machine_do_log = ENABLE_MACHINE_LOG;
static void static void
machine_log(const char *fmt, ...) machine_log(const char *fmt, ...)
{ {
va_list ap; va_list ap;
if (machine_do_log) if (machine_do_log) {
{
va_start(ap, fmt); va_start(ap, fmt);
pclog_ex(fmt, ap); pclog_ex(fmt, ap);
va_end(ap); va_end(ap);
} }
} }
#else #else
#define machine_log(fmt, ...) # define machine_log(fmt, ...)
#endif #endif
static int static int
machine_init_ex(int m) machine_init_ex(int m)
{ {
@@ -132,7 +127,6 @@ machine_init_ex(int m)
return ret; return ret;
} }
void void
machine_init(void) machine_init(void)
{ {
@@ -140,7 +134,6 @@ machine_init(void)
(void) machine_init_ex(machine); (void) machine_init_ex(machine);
} }
int int
machine_available(int m) machine_available(int m)
{ {
@@ -160,7 +153,6 @@ machine_available(int m)
return !!ret; return !!ret;
} }
void void
pit_irq0_timer(int new_out, int old_out) pit_irq0_timer(int new_out, int old_out)
{ {

2
src/machine/machine_table.c
View File

@@ -201,6 +201,7 @@ const machine_filter_t machine_chipsets[] = {
const machine_t machines[] = { const machine_t machines[] = {
// clang-format off
/* 8088 Machines */ /* 8088 Machines */
{ {
.name = "[8088] IBM PC (1981)", .name = "[8088] IBM PC (1981)",
@@ -11784,6 +11785,7 @@ const machine_t machines[] = {
.snd_device = NULL, .snd_device = NULL,
.net_device = NULL .net_device = NULL
} }
// clang-format on
}; };
/* Saved copies - jumpers get applied to these. /* Saved copies - jumpers get applied to these.