ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nvnet: Migrate ring size shifts to GET_MASK macro

This commit is contained in:
Matt Borgerson 2025-06-18 00:59:51 -07:00 committed by mborgerson
parent f4ab3ab830
commit 04bd92df40
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xbox/mcpx/nvnet/nvnet.c
View File

@ -558,8 +558,8 @@ static void nvnet_mmio_write(void *opaque, hwaddr addr,
switch (addr) {
case NVNET_RING_SIZE:
nvnet_set_reg(s, addr, val, size);
s->rx_ring_size = ((val >> NVNET_RING_SIZE_RXSHIFT) & 0xffff) + 1;
s->tx_ring_size = ((val >> NVNET_RING_SIZE_TXSHIFT) & 0xffff) + 1;
s->rx_ring_size = GET_MASK(val, NVNET_RING_SIZE_RX) + 1;
s->tx_ring_size = GET_MASK(val, NVNET_RING_SIZE_TX) + 1;
break;
case NVNET_MII_CONTROL:

4
hw/xbox/mcpx/nvnet/nvnet_regs.h
View File

@ -121,8 +121,8 @@
#define NVNET_TX_RING_PHYS_ADDR 0x100
#define NVNET_RX_RING_PHYS_ADDR 0x104
#define NVNET_RING_SIZE 0x108
# define NVNET_RING_SIZE_TXSHIFT 0
# define NVNET_RING_SIZE_RXSHIFT 16
# define NVNET_RING_SIZE_TX 0x0000FFFF
# define NVNET_RING_SIZE_RX 0xFFFF0000
#define NVNET_UNKNOWN_TRANSMITTER_REG 0x10C
#define NVNET_LINKSPEED 0x110
# define NVNET_LINKSPEED_FORCE 0x00010000