From: Thomas Huth <huth@tuxfamily.org>
To: qemu-devel@nongnu.org, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Laurent Vivier <laurent@vivier.eu>
Subject: [PATCH 4/5] hw/m68k/next-cube: Remove unused NEXTDMA_EN code
Date: Sat, 30 Sep 2023 15:23:50 +0200 [thread overview]
Message-ID: <20230930132351.30282-5-huth@tuxfamily.org> (raw)
In-Reply-To: <20230930132351.30282-1-huth@tuxfamily.org>
The network code should reside in a separate file, so remove the
related handlers from next-cube.c.
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
---
hw/m68k/next-cube.c | 42 ------------------------------------------
1 file changed, 42 deletions(-)
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index 50f2cd0c61..d9a0dca07f 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -589,8 +589,6 @@ static const MemoryRegionOps scr_ops = {
#define NEXTDMA_SCSI(x) (0x10 + x)
#define NEXTDMA_FD(x) (0x10 + x)
-#define NEXTDMA_ENTX(x) (0x110 + x)
-#define NEXTDMA_ENRX(x) (0x150 + x)
#define NEXTDMA_CSR 0x0
#define NEXTDMA_NEXT 0x4000
#define NEXTDMA_LIMIT 0x4004
@@ -605,37 +603,6 @@ static void dma_writel(void *opaque, hwaddr addr, uint64_t value,
NeXTState *next_state = NEXT_MACHINE(opaque);
switch (addr) {
- case NEXTDMA_ENRX(NEXTDMA_CSR):
- if (value & DMA_DEV2M) {
- next_state->dma[NEXTDMA_ENRX].csr |= DMA_DEV2M;
- }
-
- if (value & DMA_SETENABLE) {
- /* DPRINTF("SCSI DMA ENABLE\n"); */
- next_state->dma[NEXTDMA_ENRX].csr |= DMA_ENABLE;
- }
- if (value & DMA_SETSUPDATE) {
- next_state->dma[NEXTDMA_ENRX].csr |= DMA_SUPDATE;
- }
- if (value & DMA_CLRCOMPLETE) {
- next_state->dma[NEXTDMA_ENRX].csr &= ~DMA_COMPLETE;
- }
-
- if (value & DMA_RESET) {
- next_state->dma[NEXTDMA_ENRX].csr &= ~(DMA_COMPLETE | DMA_SUPDATE |
- DMA_ENABLE | DMA_DEV2M);
- }
- /* DPRINTF("RXCSR \tWrite: %x\n",value); */
- break;
- case NEXTDMA_ENRX(NEXTDMA_NEXT_INIT):
- next_state->dma[NEXTDMA_ENRX].next_initbuf = value;
- break;
- case NEXTDMA_ENRX(NEXTDMA_NEXT):
- next_state->dma[NEXTDMA_ENRX].next = value;
- break;
- case NEXTDMA_ENRX(NEXTDMA_LIMIT):
- next_state->dma[NEXTDMA_ENRX].limit = value;
- break;
case NEXTDMA_SCSI(NEXTDMA_CSR):
if (value & DMA_DEV2M) {
next_state->dma[NEXTDMA_SCSI].csr |= DMA_DEV2M;
@@ -692,15 +659,6 @@ static uint64_t dma_readl(void *opaque, hwaddr addr, unsigned int size)
case NEXTDMA_SCSI(NEXTDMA_CSR):
DPRINTF("SCSI DMA CSR READ\n");
return next_state->dma[NEXTDMA_SCSI].csr;
- case NEXTDMA_ENRX(NEXTDMA_CSR):
- return next_state->dma[NEXTDMA_ENRX].csr;
- case NEXTDMA_ENRX(NEXTDMA_NEXT_INIT):
- return next_state->dma[NEXTDMA_ENRX].next_initbuf;
- case NEXTDMA_ENRX(NEXTDMA_NEXT):
- return next_state->dma[NEXTDMA_ENRX].next;
- case NEXTDMA_ENRX(NEXTDMA_LIMIT):
- return next_state->dma[NEXTDMA_ENRX].limit;
-
case NEXTDMA_SCSI(NEXTDMA_NEXT):
return next_state->dma[NEXTDMA_SCSI].next;
case NEXTDMA_SCSI(NEXTDMA_NEXT_INIT):
--
2.41.0
next prev parent reply other threads:[~2023-09-30 13:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-30 13:23 [PATCH 0/5] m68k: Instantiate ESP and next-net in the next-cube machine Thomas Huth
2023-09-30 13:23 ` [PATCH 1/5] hw/m68k/next-cube: Mirror BIOS to address 0 Thomas Huth
2023-09-30 13:23 ` [PATCH 2/5] hw/scsi/esp: Work around problem with PIO data read for the NeXT-Cube machine Thomas Huth
2023-09-30 13:23 ` [PATCH 3/5] m68k: Instantiate the ESP SCSI controller for the NeXTcube machine Thomas Huth
2023-09-30 13:23 ` Thomas Huth [this message]
2023-09-30 13:23 ` [PATCH 5/5] m68k: Add NeXTcube network controller Thomas Huth
2023-10-04 9:11 ` [PATCH 0/5] m68k: Instantiate ESP and next-net in the next-cube machine Mark Cave-Ayland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230930132351.30282-5-huth@tuxfamily.org \
--to=huth@tuxfamily.org \
--cc=laurent@vivier.eu \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).