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

Conflict resolution.

Browse Source
This commit is contained in:
BurnedPinguin
2024-01-18 11:45:21 +01:00
parent e12ed7272c 115a0b1c55
commit 5e59cb17cf
717 changed files with 72500 additions and 41900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sio/sio_fdc37c6xx.c
View File

@@ -11,10 +11,8 @@
*
*
*
* Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Authors: Miran Grca, <mgrca8@gmail.com>
*
* Copyright 2008-2020 Sarah Walker.
* Copyright 2016-2020 Miran Grca.
*/
#include <stdio.h>
@@ -230,8 +228,8 @@ fdc37c6xx_write(uint16_t port, uint8_t val, void *priv)
static uint8_t
fdc37c6xx_read(uint16_t port, void *priv)
{
fdc37c6xx_t *dev = (fdc37c6xx_t *) priv;
uint8_t ret = 0xff;
const fdc37c6xx_t *dev = (fdc37c6xx_t *) priv;
uint8_t ret = 0xff;
if (dev->tries == 2) {
if (port == 0x3f1)