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

Yet more clang-formatting

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-02-28 23:24:58 -05:00
parent c29958af6a
commit 610401de7a
45 changed files with 1245 additions and 1230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/device/isartc.c
View File

@@ -88,7 +88,7 @@
#define ISARTC_A6PAK 3
#define ISARTC_VENDEX 4
#define ISARTC_DEBUG 0
#define ISARTC_DEBUG 0
typedef struct {
const char *name; /* board name */
@@ -572,7 +572,7 @@ isartc_init(const device_t *info)
dev->f_rd, NULL, NULL, dev->f_wr, NULL, NULL, dev);
/* Hook into the NVR backend. */
dev->nvr.fn = (char *)info->internal_name;
dev->nvr.fn = (char *) info->internal_name;
dev->nvr.irq = dev->irq;
if (!is_at)
nvr_init(&dev->nvr);

5
src/device/mouse.c
View File

@@ -40,11 +40,10 @@ int mouse_x,
mouse_buttons,
mouse_mode,
mouse_tablet_in_proximity = 0,
tablet_tool_type = 1; /* 0 = Puck/Cursor, 1 = Pen */
tablet_tool_type = 1; /* 0 = Puck/Cursor, 1 = Pen */
double mouse_x_abs,
mouse_y_abs;
mouse_y_abs;
static const device_t mouse_none_device = {
.name = "None",

2
src/device/mouse_serial.c
View File

@@ -511,7 +511,7 @@ sermouse_command_timer(void *priv)
}
static int
sermouse_poll(int x, int y, int z, int b, double abs_x, double abs_y, void *priv)
sermouse_poll(int x, int y, int z, int b, double abs_x, double abs_y, void *priv)
{
mouse_t *dev = (mouse_t *) priv;

202
src/device/mouse_wacom_tablet.c
View File

@@ -10,10 +10,9 @@
#include <86box/serial.h>
#include <86box/plat.h>
#define FLAG_3BTN 0x20 /* enable 3-button mode */
#define FLAG_3BTN 0x20 /* enable 3-button mode */
enum wacom_modes
{
enum wacom_modes {
WACOM_MODE_SUPPRESSED = 0,
WACOM_MODE_POINT = 1,
WACOM_MODE_STREAM = 2,
@@ -36,7 +35,7 @@ typedef struct {
int abs_x, abs_y,
rel_x, rel_y,
oldb, b;
int data_pos, data_rec_pos, mode, transmission_ongoing, transmission_format, interval;
int increment, suppressed_increment;
int transmission_stopped;
@@ -46,8 +45,8 @@ typedef struct {
int suppressed, measurement, always_report;
int remote_req, remote_mode;
int last_abs_x, last_abs_y; /* Suppressed/Increment Mode. */
uint32_t settings; /* Settings DWORD */
int last_abs_x, last_abs_y; /* Suppressed/Increment Mode. */
uint32_t settings; /* Settings DWORD */
double transmit_period;
double old_tsc, reset_tsc;
@@ -59,8 +58,8 @@ typedef struct {
static double
wacom_transmit_period(mouse_wacom_t *dev, int bps, int rps)
{
double dbps = (double) bps;
double temp = 0.0;
double dbps = (double) bps;
double temp = 0.0;
int word_len = 10;
if (rps == -1)
@@ -76,22 +75,22 @@ wacom_transmit_period(mouse_wacom_t *dev, int bps, int rps)
}
static void
wacom_reset(mouse_wacom_t* wacom)
wacom_reset(mouse_wacom_t *wacom)
{
wacom->transmit_period = wacom_transmit_period(wacom, 9600, -1);
wacom->mode = WACOM_MODE_POINT;
wacom->data_pos = 0;
wacom->transmit_period = wacom_transmit_period(wacom, 9600, -1);
wacom->mode = WACOM_MODE_POINT;
wacom->data_pos = 0;
wacom->transmission_ongoing = 0;
wacom->mode = 0;
wacom->mode = 0;
wacom->transmission_stopped = 0;
wacom->interval = 0;
wacom->transmit_id = 0;
wacom->format = 0; /* ASCII */
wacom->measurement = 1;
wacom->interval = 0;
wacom->transmit_id = 0;
wacom->format = 0; /* ASCII */
wacom->measurement = 1;
wacom->increment = wacom->suppressed_increment = 0;
wacom->reset_tsc = tsc;
wacom->reset_tsc = tsc;
wacom->remote_mode = wacom->remote_req = 0;
wacom->always_report = 0;
wacom->always_report = 0;
mouse_mode = 1;
}
@@ -99,7 +98,7 @@ wacom_reset(mouse_wacom_t* wacom)
static void
wacom_callback(struct serial_s *serial, void *priv)
{
mouse_wacom_t* wacom = (mouse_wacom_t*)priv;
mouse_wacom_t *wacom = (mouse_wacom_t *) priv;
wacom->transmit_period = wacom_transmit_period(wacom, 9600, -1);
timer_stop(&wacom->report_timer);
@@ -109,8 +108,8 @@ wacom_callback(struct serial_s *serial, void *priv)
static void
wacom_write(struct serial_s *serial, void *priv, uint8_t data)
{
mouse_wacom_t* wacom = (mouse_wacom_t*)priv;
static int special_command = 0;
mouse_wacom_t *wacom = (mouse_wacom_t *) priv;
static int special_command = 0;
if (data == '~') {
special_command = 1;
@@ -119,17 +118,18 @@ wacom_write(struct serial_s *serial, void *priv, uint8_t data)
if (special_command) {
switch (data) {
case '#':
{
if (!wacom->transmission_ongoing) wacom->transmit_id++;
break;
}
{
if (!wacom->transmission_ongoing)
wacom->transmit_id++;
break;
}
}
special_command = 0;
return;
}
if (data == '@') {
wacom->remote_req = 1;
wacom->remote_req = 1;
wacom->remote_mode = 1;
return;
}
@@ -144,41 +144,44 @@ wacom_write(struct serial_s *serial, void *priv, uint8_t data)
}
wacom->data_rec[wacom->data_rec_pos++] = data;
if (data == '\r' || data == '\n') {
wacom->data_rec[wacom->data_rec_pos] = 0;
wacom->data_rec_pos = 0;
wacom->data_rec[wacom->data_rec_pos] = 0;
wacom->data_rec_pos = 0;
if (data == '\n') pclog("Wacom: written %s", wacom->data_rec);
else pclog("Wacom: written %s\n", wacom->data_rec);
if (data == '\n')
pclog("Wacom: written %s", wacom->data_rec);
else
pclog("Wacom: written %s\n", wacom->data_rec);
if (!memcmp(wacom->data_rec, "AS", 2)) {
wacom->format = (wacom->data_rec[2] == '1');
wacom->format = (wacom->data_rec[2] == '1');
wacom->transmission_ongoing = 0;
} else if (!memcmp(wacom->data_rec, "SR", 2)) {
wacom->mode = WACOM_MODE_STREAM;
wacom->mode = WACOM_MODE_STREAM;
wacom->suppressed_increment = 0;
} else if (!memcmp(wacom->data_rec, "IN", 2)) {
sscanf((const char*)wacom->data_rec, "IN%d", &wacom->increment);
sscanf((const char *) wacom->data_rec, "IN%d", &wacom->increment);
} else if (!memcmp(wacom->data_rec, "RE", 2) || wacom->data_rec[0] == '$' || wacom->data_rec[0] == '#') {
wacom_reset(wacom);
} else if (!memcmp(wacom->data_rec, "IT", 2)) {
sscanf((const char*)wacom->data_rec, "IT%d", &wacom->interval);
sscanf((const char *) wacom->data_rec, "IT%d", &wacom->interval);
} else if (!memcmp(wacom->data_rec, "DE", 2)) {
sscanf((const char*)wacom->data_rec, "DE%d", &mouse_mode);
sscanf((const char *) wacom->data_rec, "DE%d", &mouse_mode);
mouse_mode = !mouse_mode;
plat_mouse_capture(0);
} else if (!memcmp(wacom->data_rec, "SU", 2)) {
sscanf((const char*)wacom->data_rec, "SU%d", &wacom->suppressed_increment);
sscanf((const char *) wacom->data_rec, "SU%d", &wacom->suppressed_increment);
} else if (!memcmp(wacom->data_rec, "PH", 2)) {
sscanf((const char*)wacom->data_rec, "PH%d", &wacom->pressure_mode);
sscanf((const char *) wacom->data_rec, "PH%d", &wacom->pressure_mode);
} else if (!memcmp(wacom->data_rec, "IC", 2)) {
sscanf((const char*)wacom->data_rec, "IC%d", &wacom->measurement);
sscanf((const char *) wacom->data_rec, "IC%d", &wacom->measurement);
} else if (!memcmp(wacom->data_rec, "AL", 2)) {
sscanf((const char*)wacom->data_rec, "AL%d", &wacom->always_report);
sscanf((const char *) wacom->data_rec, "AL%d", &wacom->always_report);
} else if (!memcmp(wacom->data_rec, "RQ", 2)) {
sscanf((const char*)wacom->data_rec, "RQ%d", &wacom->remote_mode);
if (wacom->remote_mode) wacom->remote_req = 1;
sscanf((const char *) wacom->data_rec, "RQ%d", &wacom->remote_mode);
if (wacom->remote_mode)
wacom->remote_req = 1;
} else if (!memcmp(wacom->data_rec, "SP", 2)) {
wacom->transmission_stopped = 1;
} else if (!memcmp(wacom->data_rec, "ST", 2)){
} else if (!memcmp(wacom->data_rec, "ST", 2)) {
wacom->transmission_stopped = 0;
wacom->remote_mode = wacom->remote_req = 0;
}
@@ -188,16 +191,21 @@ wacom_write(struct serial_s *serial, void *priv, uint8_t data)
static int
wacom_poll(int x, int y, int z, int b, double abs_x, double abs_y, void *priv)
{
mouse_wacom_t* wacom = (mouse_wacom_t*)priv;
wacom->abs_x = abs_x * (wacom->measurement ? 4566. : 5800.);
wacom->abs_y = abs_y * (wacom->measurement ? 2972. : 3774.);
if (wacom->abs_x > (wacom->measurement ? 4566 : 5800)) wacom->abs_x = (wacom->measurement ? 4566 : 5800);
if (wacom->abs_y > (wacom->measurement ? 2972 : 3774)) wacom->abs_x = (wacom->measurement ? 2972 : 3774);
if (wacom->abs_x < 0) wacom->abs_x = 0;
if (wacom->abs_y < 0) wacom->abs_y = 0;
mouse_wacom_t *wacom = (mouse_wacom_t *) priv;
wacom->abs_x = abs_x * (wacom->measurement ? 4566. : 5800.);
wacom->abs_y = abs_y * (wacom->measurement ? 2972. : 3774.);
if (wacom->abs_x > (wacom->measurement ? 4566 : 5800))
wacom->abs_x = (wacom->measurement ? 4566 : 5800);
if (wacom->abs_y > (wacom->measurement ? 2972 : 3774))
wacom->abs_x = (wacom->measurement ? 2972 : 3774);
if (wacom->abs_x < 0)
wacom->abs_x = 0;
if (wacom->abs_y < 0)
wacom->abs_y = 0;
wacom->rel_x = x;
wacom->rel_y = y;
if (wacom->b != b) wacom->oldb = wacom->b;
if (wacom->b != b)
wacom->oldb = wacom->b;
wacom->b = b;
return (0);
}
@@ -205,9 +213,12 @@ wacom_poll(int x, int y, int z, int b, double abs_x, double abs_y, void *priv)
static int
wacom_switch_off_to_on(int b, int oldb)
{
if (!(oldb & 0x1) && (b & 1)) return 1;
if (!(oldb & 0x2) && (b & 2)) return 1;
if (!(oldb & 0x4) && (b & 4)) return 1;
if (!(oldb & 0x1) && (b & 1))
return 1;
if (!(oldb & 0x2) && (b & 2))
return 1;
if (!(oldb & 0x4) && (b & 4))
return 1;
return 0;
}
@@ -215,33 +226,36 @@ wacom_switch_off_to_on(int b, int oldb)
static uint8_t
wacom_get_switch(int b)
{
if (b & 0x4) return 0x23;
if (b & 0x2) return 0x22;
if (b & 0x1) return 0x21;
if (b & 0x4)
return 0x23;
if (b & 0x2)
return 0x22;
if (b & 0x1)
return 0x21;
return 0x00;
}
static void
wacom_transmit_prepare(mouse_wacom_t* wacom, int x, int y)
wacom_transmit_prepare(mouse_wacom_t *wacom, int x, int y)
{
wacom->transmission_ongoing = 1;
wacom->data_pos = 0;
wacom->data_pos = 0;
memset(wacom->data, 0, sizeof(wacom->data));
if (wacom->transmit_id) {
wacom->transmission_format = 0;
snprintf((char*)wacom->data, sizeof(wacom->data), "~#SD51C V3.2.1.01\r");
snprintf((char *) wacom->data, sizeof(wacom->data), "~#SD51C V3.2.1.01\r");
return;
}
wacom->transmission_format = wacom->format;
wacom->last_abs_x = wacom->abs_x;
wacom->last_abs_y = wacom->abs_y;
wacom->remote_req = 0;
wacom->last_abs_x = wacom->abs_x;
wacom->last_abs_y = wacom->abs_y;
wacom->remote_req = 0;
wacom->oldb = wacom->b;
if (wacom->format == 1) {
wacom->data[0] = 0xC0;
wacom->data[6] = wacom->pressure_mode ? ((wacom->b & 0x1) ? (uint8_t)31 : (uint8_t)-31) : wacom_get_switch(wacom->b);
wacom->data[6] = wacom->pressure_mode ? ((wacom->b & 0x1) ? (uint8_t) 31 : (uint8_t) -31) : wacom_get_switch(wacom->b);
wacom->data[5] = (y & 0x7F);
wacom->data[4] = ((y & 0x3F80) >> 7) & 0x7F;
@@ -264,15 +278,15 @@ wacom_transmit_prepare(mouse_wacom_t* wacom, int x, int y)
if (tablet_tool_type == 1) {
wacom->data[0] |= 0x20;
}
if (!mouse_tablet_in_proximity) {
wacom->data[0] &= ~0x40;
}
} else {
wacom->data[0] = 0;
snprintf((char*)wacom->data, sizeof(wacom->data), "*,%05d,%05d,%d\r\n",
wacom->abs_x, wacom->abs_y,
wacom->pressure_mode ? ((wacom->b & 0x1) ? (uint8_t)-31 : (uint8_t)15) : ((wacom->b & 0x1) ? 21 : 00));
snprintf((char *) wacom->data, sizeof(wacom->data), "*,%05d,%05d,%d\r\n",
wacom->abs_x, wacom->abs_y,
wacom->pressure_mode ? ((wacom->b & 0x1) ? (uint8_t) -31 : (uint8_t) 15) : ((wacom->b & 0x1) ? 21 : 00));
}
}
@@ -280,17 +294,17 @@ extern double cpuclock;
static void
wacom_report_timer(void *priv)
{
mouse_wacom_t* wacom = (mouse_wacom_t*)priv;
double milisecond_diff = ((double)(tsc - wacom->old_tsc)) / cpuclock * 1000.0;
int relative_mode = (mouse_mode == 0);
int x = (relative_mode ? wacom->rel_x : wacom->abs_x);
int y = (relative_mode ? wacom->rel_y : wacom->abs_y);
int x_diff = abs(relative_mode ? wacom->rel_x : (wacom->abs_x - wacom->last_abs_x));
int y_diff = abs(relative_mode ? wacom->rel_y : (wacom->abs_y - wacom->last_abs_y));
int increment = wacom->suppressed_increment ? wacom->suppressed_increment : wacom->increment;
mouse_wacom_t *wacom = (mouse_wacom_t *) priv;
double milisecond_diff = ((double) (tsc - wacom->old_tsc)) / cpuclock * 1000.0;
int relative_mode = (mouse_mode == 0);
int x = (relative_mode ? wacom->rel_x : wacom->abs_x);
int y = (relative_mode ? wacom->rel_y : wacom->abs_y);
int x_diff = abs(relative_mode ? wacom->rel_x : (wacom->abs_x - wacom->last_abs_x));
int y_diff = abs(relative_mode ? wacom->rel_y : (wacom->abs_y - wacom->last_abs_y));
int increment = wacom->suppressed_increment ? wacom->suppressed_increment : wacom->increment;
timer_on_auto(&wacom->report_timer, wacom->transmit_period);
if ((((double)(tsc - wacom->reset_tsc)) / cpuclock * 1000.0) <= 10)
if ((((double) (tsc - wacom->reset_tsc)) / cpuclock * 1000.0) <= 10)
return;
if (wacom->transmit_id && !wacom->transmission_ongoing)
goto transmit_prepare;
@@ -309,26 +323,26 @@ wacom_report_timer(void *priv)
wacom->old_tsc = tsc;
} else
return;
switch (wacom->mode) {
case WACOM_MODE_STREAM:
default:
break;
case WACOM_MODE_POINT:
{
if (!(wacom_switch_off_to_on(wacom->b, wacom->oldb)))
return;
break;
}
{
if (!(wacom_switch_off_to_on(wacom->b, wacom->oldb)))
return;
break;
}
case WACOM_MODE_SWITCH:
{
if (!wacom->b)
return;
break;
}
{
if (!wacom->b)
return;
break;
}
}
if (increment && !(x_diff > increment || y_diff > increment)) {
@@ -348,9 +362,9 @@ transmit:
if ((wacom->transmission_format == 0 && wacom->data[wacom->data_pos] == 0)
|| (wacom->transmission_format == 1 && wacom->data_pos == 7)) {
wacom->transmission_ongoing = 0;
wacom->transmit_id = 0;
wacom->data_pos = 0;
wacom->old_tsc = tsc;
wacom->transmit_id = 0;
wacom->data_pos = 0;
wacom->old_tsc = tsc;
}
return;
}
@@ -360,7 +374,7 @@ wacom_init(const device_t *info)
{
mouse_wacom_t *dev;
dev = (mouse_wacom_t *) calloc(1, sizeof(mouse_wacom_t));
dev = (mouse_wacom_t *) calloc(1, sizeof(mouse_wacom_t));
dev->name = info->name;
dev->but = 3;

19
src/device/serial.c
View File

@@ -152,7 +152,7 @@ serial_clear_timeout(serial_t *dev)
static void
serial_receive_timer(void *priv)
{
serial_t *dev = (serial_t *) priv;
serial_t *dev = (serial_t *) priv;
// serial_log("serial_receive_timer()\n");
@@ -211,8 +211,7 @@ write_fifo(serial_t *dev, uint8_t dat)
{
serial_log("write_fifo(%08X, %02X, %i, %i)\n", dev, dat,
(dev->type >= SERIAL_16550) && dev->fifo_enabled,
((dev->type >= SERIAL_16550) && dev->fifo_enabled) ?
(dev->rcvr_fifo_pos % dev->rcvr_fifo_len) : 0);
((dev->type >= SERIAL_16550) && dev->fifo_enabled) ? (dev->rcvr_fifo_pos % dev->rcvr_fifo_len) : 0);
if ((dev->type >= SERIAL_16550) && dev->fifo_enabled) {
/* FIFO mode. */
@@ -560,7 +559,7 @@ serial_write(uint16_t addr, uint8_t val, void *p)
dev->rcvr_fifo_len = 14;
break;
}
dev->out_new = 0xffff;
dev->out_new = 0xffff;
serial_log("FIFO now %sabled, receive FIFO length = %i\n", dev->fifo_enabled ? "en" : "dis", dev->rcvr_fifo_len);
}
break;
@@ -665,7 +664,7 @@ serial_read(uint16_t addr, void *p)
if (dev->rcvr_fifo_full || (dev->rcvr_fifo_pos != dev->rcvr_fifo_end)) {
/* There is data in the FIFO. */
ret = dev->rcvr_fifo[dev->rcvr_fifo_pos];
ret = dev->rcvr_fifo[dev->rcvr_fifo_pos];
dev->rcvr_fifo_pos = (dev->rcvr_fifo_pos + 1) & 0x0f;
/* Make sure to clear the FIFO full condition. */
@@ -690,7 +689,7 @@ serial_read(uint16_t addr, void *p)
} else {
/* Non-FIFO mode. */
ret = (uint8_t) (dev->out_new & 0xffff);
ret = (uint8_t) (dev->out_new & 0xffff);
dev->out_new = 0xffff;
/* Always clear Data Ready interrupt. */
@@ -857,8 +856,8 @@ serial_reset(void *priv)
serial_reset_port(dev);
dev->dlab = 96;
dev->fcr = 0x06;
dev->dlab = 96;
dev->fcr = 0x06;
serial_transmit_period(dev);
serial_update_speed(dev);
@@ -889,8 +888,8 @@ serial_init(const device_t *info)
serial_setup(dev, COM1_ADDR, COM1_IRQ);
/* Default to 1200,N,7. */
dev->dlab = 96;
dev->fcr = 0x06;
dev->dlab = 96;
dev->fcr = 0x06;
if (info->local == SERIAL_8250_PCJR)
dev->clock_src = 1789500.0;
else