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

More sonarlint work

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-06-09 23:46:54 -04:00
parent 0d1d069af4
commit ee695e71f9
218 changed files with 6282 additions and 3845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/network/net_wd8003.c
View File

@@ -64,6 +64,7 @@
#include <86box/net_dp8390.h>
#include <86box/net_wd8003.h>
#include <86box/bswap.h>
#include <86box/plat_unused.h>
#include "cpu.h"
@@ -98,12 +99,14 @@
#define WE_ID_EXTRA_RAM 0x40
#define WE_ID_BUS_MCA 0x80
typedef struct {
typedef struct wd_t {
dp8390_t *dp8390;
mem_mapping_t ram_mapping;
uint32_t ram_addr, ram_size;
uint32_t ram_addr;
uint32_t ram_size;
uint8_t maclocal[6]; /* configured MAC (local) address */
uint8_t bit16, pad;
uint8_t bit16;
uint8_t pad;
int board;
const char *name;
uint32_t base_address;
@@ -113,11 +116,12 @@ typedef struct {
uint8_t pos_regs[8];
/* Memory for WD cards*/
uint8_t msr, /* Memory Select Register (MSR) */
icr, /* Interface Configuration Register (ICR) */
irr, /* Interrupt Request Register (IRR) */
laar, /* LA Address Register (read by Windows 98!) */
if_chip, board_chip;
uint8_t msr; /* Memory Select Register (MSR) */
uint8_t icr; /* Interface Configuration Register (ICR) */
uint8_t irr; /* Interrupt Request Register (IRR) */
uint8_t laar; /* LA Address Register (read by Windows 98!) */
uint8_t if_chip;
uint8_t board_chip;
} wd_t;
#ifdef ENABLE_WD_LOG
@@ -280,6 +284,9 @@ wd_smc_read(wd_t *dev, uint32_t off)
retval = 0xff - (checksum & 0xff);
break;
default:
break;
}
wdlog("%s: ASIC read addr=0x%02x, value=0x%04x\n",
@@ -602,6 +609,9 @@ wd_8013epa_mca_write(int port, uint8_t val, void *priv)
case 0x0c:
dev->irq = 14;
break;
default:
break;
}
if (dev->pos_regs[3] & 0x10)
@@ -629,7 +639,7 @@ wd_8013epa_mca_write(int port, uint8_t val, void *priv)
}
static uint8_t
wd_mca_feedb(void *priv)
wd_mca_feedb(UNUSED(void *priv))
{
return 1;
}
@@ -724,6 +734,7 @@ wd_init(const device_t *info)
/* Ethernet, MCA, 5x3 interface chip, RAM 16k */
case WD8003EA:
dev->board_chip = WE_ID_SOFT_CONFIG;
[[fallthrough]];
/* Ethernet, MCA, no interface chip, RAM 16k */
case WD8003ETA:
dev->board_chip |= WE_TYPE_WD8013EBT | WE_ID_BUS_MCA;
@@ -740,6 +751,9 @@ wd_init(const device_t *info)
dev->pos_regs[1] = 0x61;
dev->bit16 = 3;
break;
default:
break;
}
dev->irr |= WE_IRR_ENABLE_IRQ;