dp8393x: checkpatch fixes
Also fix a simple comment typo of "constrainst" to "constraints". Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Tested-by: Finn Thain <fthain@linux-m68k.org> Message-Id: <20210625065401.30170-2-mark.cave-ayland@ilande.co.uk> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Mark Cave-Ayland
Philippe Mathieu-Daudé
parent
8660df5ea2
commit
1ca82a8db0
231
hw/net/dp8393x.c
231
hw/net/dp8393x.c
|
|
@ -29,14 +29,14 @@
|
|||
#include <zlib.h>
|
||||
#include "qom/object.h"
|
||||
|
||||
//#define DEBUG_SONIC
|
||||
/* #define DEBUG_SONIC */
|
||||
|
||||
#define SONIC_PROM_SIZE 0x1000
|
||||
|
||||
#ifdef DEBUG_SONIC
|
||||
#define DPRINTF(fmt, ...) \
|
||||
do { printf("sonic: " fmt , ## __VA_ARGS__); } while (0)
|
||||
static const char* reg_names[] = {
|
||||
static const char *reg_names[] = {
|
||||
"CR", "DCR", "RCR", "TCR", "IMR", "ISR", "UTDA", "CTDA",
|
||||
"TPS", "TFC", "TSA0", "TSA1", "TFS", "URDA", "CRDA", "CRBA0",
|
||||
"CRBA1", "RBWC0", "RBWC1", "EOBC", "URRA", "RSA", "REA", "RRP",
|
||||
|
|
@ -185,7 +185,8 @@ struct dp8393xState {
|
|||
AddressSpace as;
|
||||
};
|
||||
|
||||
/* Accessor functions for values which are formed by
|
||||
/*
|
||||
* Accessor functions for values which are formed by
|
||||
* concatenating two 16 bit device registers. By putting these
|
||||
* in their own functions with a uint32_t return type we avoid the
|
||||
* pitfall of implicit sign extension where ((x << 16) | y) is a
|
||||
|
|
@ -350,8 +351,7 @@ static void dp8393x_do_read_rra(dp8393xState *s)
|
|||
}
|
||||
|
||||
/* Warn the host if CRBA now has the last available resource */
|
||||
if (s->regs[SONIC_RRP] == s->regs[SONIC_RWP])
|
||||
{
|
||||
if (s->regs[SONIC_RRP] == s->regs[SONIC_RWP]) {
|
||||
s->regs[SONIC_ISR] |= SONIC_ISR_RBE;
|
||||
dp8393x_update_irq(s);
|
||||
}
|
||||
|
|
@ -364,7 +364,8 @@ static void dp8393x_do_software_reset(dp8393xState *s)
|
|||
{
|
||||
timer_del(s->watchdog);
|
||||
|
||||
s->regs[SONIC_CR] &= ~(SONIC_CR_LCAM | SONIC_CR_RRRA | SONIC_CR_TXP | SONIC_CR_HTX);
|
||||
s->regs[SONIC_CR] &= ~(SONIC_CR_LCAM | SONIC_CR_RRRA | SONIC_CR_TXP |
|
||||
SONIC_CR_HTX);
|
||||
s->regs[SONIC_CR] |= SONIC_CR_RST | SONIC_CR_RXDIS;
|
||||
}
|
||||
|
||||
|
|
@ -490,8 +491,10 @@ static void dp8393x_do_transmit_packets(dp8393xState *s)
|
|||
|
||||
/* Handle Ethernet checksum */
|
||||
if (!(s->regs[SONIC_TCR] & SONIC_TCR_CRCI)) {
|
||||
/* Don't append FCS there, to look like slirp packets
|
||||
* which don't have one */
|
||||
/*
|
||||
* Don't append FCS there, to look like slirp packets
|
||||
* which don't have one
|
||||
*/
|
||||
} else {
|
||||
/* Remove existing FCS */
|
||||
tx_len -= 4;
|
||||
|
|
@ -558,26 +561,34 @@ static void dp8393x_do_command(dp8393xState *s, uint16_t command)
|
|||
|
||||
s->regs[SONIC_CR] |= (command & SONIC_CR_MASK);
|
||||
|
||||
if (command & SONIC_CR_HTX)
|
||||
if (command & SONIC_CR_HTX) {
|
||||
dp8393x_do_halt_transmission(s);
|
||||
if (command & SONIC_CR_TXP)
|
||||
}
|
||||
if (command & SONIC_CR_TXP) {
|
||||
dp8393x_do_transmit_packets(s);
|
||||
if (command & SONIC_CR_RXDIS)
|
||||
}
|
||||
if (command & SONIC_CR_RXDIS) {
|
||||
dp8393x_do_receiver_disable(s);
|
||||
if (command & SONIC_CR_RXEN)
|
||||
}
|
||||
if (command & SONIC_CR_RXEN) {
|
||||
dp8393x_do_receiver_enable(s);
|
||||
if (command & SONIC_CR_STP)
|
||||
}
|
||||
if (command & SONIC_CR_STP) {
|
||||
dp8393x_do_stop_timer(s);
|
||||
if (command & SONIC_CR_ST)
|
||||
}
|
||||
if (command & SONIC_CR_ST) {
|
||||
dp8393x_do_start_timer(s);
|
||||
if (command & SONIC_CR_RST)
|
||||
}
|
||||
if (command & SONIC_CR_RST) {
|
||||
dp8393x_do_software_reset(s);
|
||||
}
|
||||
if (command & SONIC_CR_RRRA) {
|
||||
dp8393x_do_read_rra(s);
|
||||
s->regs[SONIC_CR] &= ~SONIC_CR_RRRA;
|
||||
}
|
||||
if (command & SONIC_CR_LCAM)
|
||||
if (command & SONIC_CR_LCAM) {
|
||||
dp8393x_do_load_cam(s);
|
||||
}
|
||||
}
|
||||
|
||||
static uint64_t dp8393x_read(void *opaque, hwaddr addr, unsigned int size)
|
||||
|
|
@ -587,24 +598,24 @@ static uint64_t dp8393x_read(void *opaque, hwaddr addr, unsigned int size)
|
|||
uint16_t val = 0;
|
||||
|
||||
switch (reg) {
|
||||
/* Update data before reading it */
|
||||
case SONIC_WT0:
|
||||
case SONIC_WT1:
|
||||
dp8393x_update_wt_regs(s);
|
||||
val = s->regs[reg];
|
||||
break;
|
||||
/* Accept read to some registers only when in reset mode */
|
||||
case SONIC_CAP2:
|
||||
case SONIC_CAP1:
|
||||
case SONIC_CAP0:
|
||||
if (s->regs[SONIC_CR] & SONIC_CR_RST) {
|
||||
val = s->cam[s->regs[SONIC_CEP] & 0xf][2* (SONIC_CAP0 - reg) + 1] << 8;
|
||||
val |= s->cam[s->regs[SONIC_CEP] & 0xf][2* (SONIC_CAP0 - reg)];
|
||||
}
|
||||
break;
|
||||
/* All other registers have no special contrainst */
|
||||
default:
|
||||
val = s->regs[reg];
|
||||
/* Update data before reading it */
|
||||
case SONIC_WT0:
|
||||
case SONIC_WT1:
|
||||
dp8393x_update_wt_regs(s);
|
||||
val = s->regs[reg];
|
||||
break;
|
||||
/* Accept read to some registers only when in reset mode */
|
||||
case SONIC_CAP2:
|
||||
case SONIC_CAP1:
|
||||
case SONIC_CAP0:
|
||||
if (s->regs[SONIC_CR] & SONIC_CR_RST) {
|
||||
val = s->cam[s->regs[SONIC_CEP] & 0xf][2 * (SONIC_CAP0 - reg) + 1] << 8;
|
||||
val |= s->cam[s->regs[SONIC_CEP] & 0xf][2 * (SONIC_CAP0 - reg)];
|
||||
}
|
||||
break;
|
||||
/* All other registers have no special contraints */
|
||||
default:
|
||||
val = s->regs[reg];
|
||||
}
|
||||
|
||||
DPRINTF("read 0x%04x from reg %s\n", val, reg_names[reg]);
|
||||
|
|
@ -622,75 +633,75 @@ static void dp8393x_write(void *opaque, hwaddr addr, uint64_t data,
|
|||
DPRINTF("write 0x%04x to reg %s\n", (uint16_t)val, reg_names[reg]);
|
||||
|
||||
switch (reg) {
|
||||
/* Command register */
|
||||
case SONIC_CR:
|
||||
dp8393x_do_command(s, val);
|
||||
break;
|
||||
/* Prevent write to read-only registers */
|
||||
case SONIC_CAP2:
|
||||
case SONIC_CAP1:
|
||||
case SONIC_CAP0:
|
||||
case SONIC_SR:
|
||||
case SONIC_MDT:
|
||||
DPRINTF("writing to reg %d invalid\n", reg);
|
||||
break;
|
||||
/* Accept write to some registers only when in reset mode */
|
||||
case SONIC_DCR:
|
||||
if (s->regs[SONIC_CR] & SONIC_CR_RST) {
|
||||
s->regs[reg] = val & 0xbfff;
|
||||
} else {
|
||||
DPRINTF("writing to DCR invalid\n");
|
||||
}
|
||||
break;
|
||||
case SONIC_DCR2:
|
||||
if (s->regs[SONIC_CR] & SONIC_CR_RST) {
|
||||
s->regs[reg] = val & 0xf017;
|
||||
} else {
|
||||
DPRINTF("writing to DCR2 invalid\n");
|
||||
}
|
||||
break;
|
||||
/* 12 lower bytes are Read Only */
|
||||
case SONIC_TCR:
|
||||
s->regs[reg] = val & 0xf000;
|
||||
break;
|
||||
/* 9 lower bytes are Read Only */
|
||||
case SONIC_RCR:
|
||||
s->regs[reg] = val & 0xffe0;
|
||||
break;
|
||||
/* Ignore most significant bit */
|
||||
case SONIC_IMR:
|
||||
s->regs[reg] = val & 0x7fff;
|
||||
dp8393x_update_irq(s);
|
||||
break;
|
||||
/* Clear bits by writing 1 to them */
|
||||
case SONIC_ISR:
|
||||
val &= s->regs[reg];
|
||||
s->regs[reg] &= ~val;
|
||||
if (val & SONIC_ISR_RBE) {
|
||||
dp8393x_do_read_rra(s);
|
||||
}
|
||||
dp8393x_update_irq(s);
|
||||
break;
|
||||
/* The guest is required to store aligned pointers here */
|
||||
case SONIC_RSA:
|
||||
case SONIC_REA:
|
||||
case SONIC_RRP:
|
||||
case SONIC_RWP:
|
||||
if (s->regs[SONIC_DCR] & SONIC_DCR_DW) {
|
||||
s->regs[reg] = val & 0xfffc;
|
||||
} else {
|
||||
s->regs[reg] = val & 0xfffe;
|
||||
}
|
||||
break;
|
||||
/* Invert written value for some registers */
|
||||
case SONIC_CRCT:
|
||||
case SONIC_FAET:
|
||||
case SONIC_MPT:
|
||||
s->regs[reg] = val ^ 0xffff;
|
||||
break;
|
||||
/* All other registers have no special contrainst */
|
||||
default:
|
||||
s->regs[reg] = val;
|
||||
/* Command register */
|
||||
case SONIC_CR:
|
||||
dp8393x_do_command(s, val);
|
||||
break;
|
||||
/* Prevent write to read-only registers */
|
||||
case SONIC_CAP2:
|
||||
case SONIC_CAP1:
|
||||
case SONIC_CAP0:
|
||||
case SONIC_SR:
|
||||
case SONIC_MDT:
|
||||
DPRINTF("writing to reg %d invalid\n", reg);
|
||||
break;
|
||||
/* Accept write to some registers only when in reset mode */
|
||||
case SONIC_DCR:
|
||||
if (s->regs[SONIC_CR] & SONIC_CR_RST) {
|
||||
s->regs[reg] = val & 0xbfff;
|
||||
} else {
|
||||
DPRINTF("writing to DCR invalid\n");
|
||||
}
|
||||
break;
|
||||
case SONIC_DCR2:
|
||||
if (s->regs[SONIC_CR] & SONIC_CR_RST) {
|
||||
s->regs[reg] = val & 0xf017;
|
||||
} else {
|
||||
DPRINTF("writing to DCR2 invalid\n");
|
||||
}
|
||||
break;
|
||||
/* 12 lower bytes are Read Only */
|
||||
case SONIC_TCR:
|
||||
s->regs[reg] = val & 0xf000;
|
||||
break;
|
||||
/* 9 lower bytes are Read Only */
|
||||
case SONIC_RCR:
|
||||
s->regs[reg] = val & 0xffe0;
|
||||
break;
|
||||
/* Ignore most significant bit */
|
||||
case SONIC_IMR:
|
||||
s->regs[reg] = val & 0x7fff;
|
||||
dp8393x_update_irq(s);
|
||||
break;
|
||||
/* Clear bits by writing 1 to them */
|
||||
case SONIC_ISR:
|
||||
val &= s->regs[reg];
|
||||
s->regs[reg] &= ~val;
|
||||
if (val & SONIC_ISR_RBE) {
|
||||
dp8393x_do_read_rra(s);
|
||||
}
|
||||
dp8393x_update_irq(s);
|
||||
break;
|
||||
/* The guest is required to store aligned pointers here */
|
||||
case SONIC_RSA:
|
||||
case SONIC_REA:
|
||||
case SONIC_RRP:
|
||||
case SONIC_RWP:
|
||||
if (s->regs[SONIC_DCR] & SONIC_DCR_DW) {
|
||||
s->regs[reg] = val & 0xfffc;
|
||||
} else {
|
||||
s->regs[reg] = val & 0xfffe;
|
||||
}
|
||||
break;
|
||||
/* Invert written value for some registers */
|
||||
case SONIC_CRCT:
|
||||
case SONIC_FAET:
|
||||
case SONIC_MPT:
|
||||
s->regs[reg] = val ^ 0xffff;
|
||||
break;
|
||||
/* All other registers have no special contrainst */
|
||||
default:
|
||||
s->regs[reg] = val;
|
||||
}
|
||||
|
||||
if (reg == SONIC_WT0 || reg == SONIC_WT1) {
|
||||
|
|
@ -747,17 +758,18 @@ static int dp8393x_receive_filter(dp8393xState *s, const uint8_t * buf,
|
|||
}
|
||||
|
||||
/* Check broadcast */
|
||||
if ((s->regs[SONIC_RCR] & SONIC_RCR_BRD) && !memcmp(buf, bcast, sizeof(bcast))) {
|
||||
if ((s->regs[SONIC_RCR] & SONIC_RCR_BRD) &&
|
||||
!memcmp(buf, bcast, sizeof(bcast))) {
|
||||
return SONIC_RCR_BC;
|
||||
}
|
||||
|
||||
/* Check CAM */
|
||||
for (i = 0; i < 16; i++) {
|
||||
if (s->regs[SONIC_CE] & (1 << i)) {
|
||||
/* Entry enabled */
|
||||
if (!memcmp(buf, s->cam[i], sizeof(s->cam[i]))) {
|
||||
return 0;
|
||||
}
|
||||
/* Entry enabled */
|
||||
if (!memcmp(buf, s->cam[i], sizeof(s->cam[i]))) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -938,7 +950,8 @@ static void dp8393x_reset(DeviceState *dev)
|
|||
s->regs[SONIC_SR] = 0x0004; /* only revision recognized by Linux/mips */
|
||||
s->regs[SONIC_CR] = SONIC_CR_RST | SONIC_CR_STP | SONIC_CR_RXDIS;
|
||||
s->regs[SONIC_DCR] &= ~(SONIC_DCR_EXBUS | SONIC_DCR_LBR);
|
||||
s->regs[SONIC_RCR] &= ~(SONIC_RCR_LB0 | SONIC_RCR_LB1 | SONIC_RCR_BRD | SONIC_RCR_RNT);
|
||||
s->regs[SONIC_RCR] &= ~(SONIC_RCR_LB0 | SONIC_RCR_LB1 | SONIC_RCR_BRD |
|
||||
SONIC_RCR_RNT);
|
||||
s->regs[SONIC_TCR] |= SONIC_TCR_NCRS | SONIC_TCR_PTX;
|
||||
s->regs[SONIC_TCR] &= ~SONIC_TCR_BCM;
|
||||
s->regs[SONIC_IMR] = 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue