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

fix Clang/WinSDK warnings

Browse Source
This commit is contained in:
David Hrdlička
2021-03-21 01:59:46 +01:00
parent c54c4c842c
commit 10cc122925
18 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sio/sio_pc87311.c
View File

@@ -161,7 +161,7 @@ void pc87311_uart_handler(uint8_t num, pc87311_t *dev)
{
serial_remove(dev->uart[num & 1]);
switch ((!num & 1) ? UART1_BA : UART2_BA)
switch (!(num & 1) ? UART1_BA : UART2_BA)
{
case 0:
dev->base = 0x03f8;

20
src/sio/sio_w83877f.c
View File

@@ -190,20 +190,12 @@ w83877f_serial_handler(w83877f_t *dev, int uart)
if (!(dev->regs[4] & reg_mask) && (dev->regs[reg_id] & 0xc0))
serial_setup(dev->uart[uart], make_port(dev, reg_id), (dev->regs[0x28] & irq_mask) >> irq_shift);
switch (!!(dev->regs[0x19] & (0x02 >> uart))) {
case 0:
switch (!!(dev->regs[0x03] & (0x02 >> uart))) {
case 0:
clock_src = 24000000.0 / 13.0;
break;
case 1:
clock_src = 24000000.0 / 12.0;
break;
}
break;
case 1:
clock_src = 14769000.0;
break;
if (dev->regs[0x19] & (0x02 >> uart)) {
clock_src = 14769000.0;
} else if (dev->regs[0x03] & (0x02 >> uart)) {
clock_src = 24000000.0 / 12.0;
} else {
clock_src = 24000000.0 / 13.0;
}
serial_set_clock_src(dev->uart[uart], clock_src);