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

More newline and whitespace cleanups

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-02-20 02:26:27 -05:00
parent a66e392b26
commit 4674756664
401 changed files with 6985 additions and 6985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/device/bugger.c
View File

@@ -268,7 +268,7 @@ bug_reset(void)
/* Clear both 7SEG displays. */
bug_seg1 = 0x00; bug_seg2 = 0x00;
/* Reset the control register (updates UI.) */
bug_wctrl(CTRL_RESET);
}

2
src/device/cassette.c
View File

@@ -625,7 +625,7 @@ void pc_cas_advance (pc_cassette_t *cas)
if (cas->motor == 0)
return;
if (cassette_cycles == -1)
if (cassette_cycles == -1)
cassette_cycles = cycles;
if (cycles <= cassette_cycles)
ticks = (cassette_cycles - cycles);

8
src/device/clock_ics9xxx.c
View File

@@ -152,7 +152,7 @@ static const ics9xxx_model_t ics9xxx_models[] = {
ICS9xxx_MODEL_END()
ICS9xxx_MODEL(ICS9248_95)
.max_reg = 5,
.regs = {0x82, 0xff, 0xff, 0xff, 0xd5, 0xff},
.regs = {0x82, 0xff, 0xff, 0xff, 0xd5, 0xff},
.fs_regs = {{0, 4, -1, -1}, {0, 5, 4, 3}, {0, 6, -1, -1}, {0, 2, 4, 1}, {-1, -1, -1, -1}},
.hw_select = {0, 3},
.frequencies = (const ics9xxx_frequency_t[]) {
@@ -1220,7 +1220,7 @@ ics9xxx_init(const device_t *info)
dev->frequencies_ptr = (ics9xxx_frequency_t *) (dev->model->frequencies_ref ? ics9xxx_models[dev->model->frequencies_ref].frequencies : dev->model->frequencies);
if (!dev->frequencies_ptr)
fatal("ICS9xxx: NULL frequency table\n");
/* Determine which frequency bits cannot be strapped (register only). */
uint8_t register_only_bits = 0x00;
for (i = 0; i < sizeof(dev->model->fs_regs) / sizeof(dev->model->fs_regs[0]); i++) {
@@ -1229,11 +1229,11 @@ ics9xxx_init(const device_t *info)
if ((dev->model->fs_regs[i].normal_reg == 7) && (dev->model->fs_regs[i].inv_reg == 7)) /* mark as register only */
register_only_bits |= 1 << i;
}
/* Mark the hardware select bit's register as relevant, if there's one. */
if (dev->model->hw_select.normal_reg < 7)
dev->relevant_regs |= 1 << dev->model->hw_select.normal_reg;
/* Find bus speed match and set default register bits accordingly. */
dev->bus_match = ics9xxx_find_bus_match(dev, cpu_busspeed, register_only_bits, 0x00);
for (i = 0; i < sizeof(dev->model->fs_regs) / sizeof(dev->model->fs_regs[0]); i++) {

4
src/device/hwm_gl518sm.c
View File

@@ -28,7 +28,7 @@
#include <86box/i2c.h>
#include <86box/hwm.h>
#define CLAMP(a, min, max) (((a) < (min)) ? (min) : (((a) > (max)) ? (max) : (a)))
/* Formulas and factors derived from Linux's gl518sm.c driver. */
#define GL518SM_RPMDIV(r, d) (CLAMP((r), 1, 960000) * (d))
@@ -272,7 +272,7 @@ gl518sm_init(const device_t *info)
memset(dev, 0, sizeof(gl518sm_t));
dev->local = info->local;
/* Set default values. */
hwm_values_t defaults = {
{ /* fan speeds */

4
src/device/hwm_lm78.c
View File

@@ -115,7 +115,7 @@ lm78_nvram(lm78_t *dev, uint8_t save)
fread(&dev->as99127f.nvram, sizeof(dev->as99127f.nvram), 1, f);
fclose(f);
}
free(nvr_path);
}
@@ -494,7 +494,7 @@ lm78_write(lm78_t *dev, uint8_t reg, uint8_t val, uint8_t bank)
return 0;
}
}
}
}
/* regular registers */
switch (reg) {

4
src/device/isamem.c
View File

@@ -525,7 +525,7 @@ dev->frame_addr = 0xE0000;
ram_readb,
(dev->flags&FLAG_WIDE) ? ram_readw : NULL,
NULL,
ram_writeb,
ram_writeb,
(dev->flags&FLAG_WIDE) ? ram_writew : NULL,
NULL,
ptr, MEM_MAPPING_EXTERNAL, &dev->ext_ram[EXTRAM_CONVENTIONAL]);
@@ -635,7 +635,7 @@ dev->frame_addr = 0xE0000;
ems_readb,
(dev->flags&FLAG_WIDE) ? ems_readw : NULL,
NULL,
ems_writeb,
ems_writeb,
(dev->flags&FLAG_WIDE) ? ems_writew : NULL,
NULL,
ptr, MEM_MAPPING_EXTERNAL,

8
src/device/keyboard_at.c
View File

@@ -1383,7 +1383,7 @@ write64_ami(void *priv, uint8_t val)
add_data(dev, 0x28);
add_data(dev, 0x00);
break;
case 0xa1: /* get controller version */
kbd_log("ATkbc: AMI - get controller version\n");
add_data(dev, 'H');
@@ -1873,7 +1873,7 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
case 0xf3: /* set typematic rate/delay */
add_data_kbd_direct(dev, 0xfa);
break;
default:
kbd_log("ATkbd: bad keyboard 0060 write %02X command %02X\n", val, dev->key_command);
add_data_kbd_direct(dev, 0xfe);
@@ -2182,7 +2182,7 @@ kbd_read(uint16_t port, void *priv)
/* Only clear the transmit timeout flag on non-PS/2 controllers, as on
PS/2 controller, it is the keyboard/mouse output source bit. */
// dev->status &= ~STAT_RTIMEOUT;
if (((dev->flags & KBC_TYPE_MASK) > KBC_TYPE_PS2_NOREF) &&
if (((dev->flags & KBC_TYPE_MASK) > KBC_TYPE_PS2_NOREF) &&
(kbc_ven != KBC_VEN_IBM_MCA))
dev->status &= ~STAT_TTIMEOUT;
break;
@@ -2293,7 +2293,7 @@ kbd_init(const device_t *info)
io_sethandler(0x0064, 1, kbd_read, NULL, NULL, kbd_write, NULL, NULL, dev);
keyboard_send = add_data_kbd;
timer_add(&dev->send_delay_timer, kbd_poll, dev, 1);
timer_add(&dev->send_delay_timer, kbd_poll, dev, 1);
timer_add(&dev->pulse_cb, pulse_poll, dev, 0);
dev->write60_ven = NULL;

8
src/device/keyboard_xt.c
View File

@@ -68,7 +68,7 @@
#define KBD_TYPE_ZENITH 9
typedef struct {
int want_irq;
int want_irq;
int blocked;
int tandy;
@@ -371,7 +371,7 @@ static uint8_t
get_fdd_switch_settings() {
int i, fdd_count = 0;
for (i = 0; i < FDD_NUM; i++) {
if (fdd_get_flags(i))
fdd_count++;
@@ -533,7 +533,7 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
speaker_gated = val & 1;
speaker_enable = val & 2;
if (speaker_enable)
if (speaker_enable)
was_speaker_enable = 1;
pit_ctr_set_gate(&pit->counters[2], val & 1);
@@ -715,7 +715,7 @@ kbd_init(const device_t *info)
/* DIP switch readout: bit set = OFF, clear = ON. */
if (kbd->type == KBD_TYPE_OLIVETTI)
/* Olivetti M19
* Jumpers J1, J2 - monitor type.
* Jumpers J1, J2 - monitor type.
* 01 - mono (high-res)
* 10 - color (low-res, disables 640x400x2 mode)
* 00 - autoswitching

2
src/device/mouse_ps2.c
View File

@@ -212,7 +212,7 @@ mouse_reset:
}
if (dev->flags & FLAG_INTELLI) {
for (temp = 0; temp < 5; temp++)
for (temp = 0; temp < 5; temp++)
dev->last_data[temp] = dev->last_data[temp + 1];
dev->last_data[5] = val;

2
src/device/mouse_serial.c
View File

@@ -724,7 +724,7 @@ sermouse_speed_changed(void *priv)
if (dev->report_enabled) {
timer_stop(&dev->report_timer);
if (dev->report_phase == REPORT_PHASE_TRANSMIT)
if (dev->report_phase == REPORT_PHASE_TRANSMIT)
sermouse_timer_on(dev, dev->transmit_period, 1);
else
sermouse_timer_on(dev, sermouse_report_period(dev), 1);

2
src/device/serial.c
View File

@@ -556,7 +556,7 @@ serial_read(uint16_t addr, void *p)
else
ret = dev->ier;
break;
case 2:
case 2:
ret = dev->iir;
if ((ret & 0xe) == 2) {
dev->int_status &= ~SERIAL_INT_TRANSMIT;