qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Yoshinori Sato" <ysato@users.sourceforge.jp>
Subject: [PULL 06/56] hw/sh4: Remove sh7750_register_io_device() helper
Date: Wed, 11 Sep 2024 14:13:31 +0200	[thread overview]
Message-ID: <20240911121422.52585-7-philmd@linaro.org> (raw)
In-Reply-To: <20240911121422.52585-1-philmd@linaro.org>

sh7750_register_io_device() was only used by the TC58128
NAND EEPROM which has been removed in the previous commit.
Remove it as unused code.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Message-ID: <20240903153959.18392-4-philmd@linaro.org>
---
 include/hw/sh4/sh.h | 16 -------------
 hw/sh4/sh7750.c     | 57 ++-------------------------------------------
 2 files changed, 2 insertions(+), 71 deletions(-)

diff --git a/include/hw/sh4/sh.h b/include/hw/sh4/sh.h
index b726b987cc..c82feef8d0 100644
--- a/include/hw/sh4/sh.h
+++ b/include/hw/sh4/sh.h
@@ -38,22 +38,6 @@ struct SH7750State;
 
 struct SH7750State *sh7750_init(SuperHCPU *cpu, MemoryRegion *sysmem);
 
-typedef struct {
-    /* The callback will be triggered if any of the designated lines change */
-    uint16_t portamask_trigger;
-    uint16_t portbmask_trigger;
-    /* Return 0 if no action was taken */
-    int (*port_change_cb) (uint16_t porta, uint16_t portb,
-                           uint16_t *periph_pdtra,
-                           uint16_t *periph_portdira,
-                           uint16_t *periph_pdtrb,
-                           uint16_t *periph_portdirb);
-} sh7750_io_device;
-
-int sh7750_register_io_device(struct SH7750State *s,
-                              sh7750_io_device *device);
-
-/* sh_serial.c */
 #define TYPE_SH_SERIAL "sh-serial"
 #define SH_SERIAL_FEAT_SCIF (1 << 0)
 
diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index ebe0fd96d9..8041b3b651 100644
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -38,8 +38,6 @@
 #include "exec/exec-all.h"
 #include "trace.h"
 
-#define NB_DEVICES 4
-
 typedef struct SH7750State {
     MemoryRegion iomem;
     MemoryRegion iomem_1f0;
@@ -75,7 +73,6 @@ typedef struct SH7750State {
     uint16_t periph_portdira; /* Direction seen from the peripherals */
     uint16_t periph_pdtrb;    /* Imposed by the peripherals */
     uint16_t periph_portdirb; /* Direction seen from the peripherals */
-    sh7750_io_device *devices[NB_DEVICES]; /* External peripherals */
 
     /* Cache */
     uint32_t ccr;
@@ -92,19 +89,6 @@ static inline int has_bcr3_and_bcr4(SH7750State *s)
  * I/O ports
  */
 
-int sh7750_register_io_device(SH7750State *s, sh7750_io_device *device)
-{
-    int i;
-
-    for (i = 0; i < NB_DEVICES; i++) {
-        if (s->devices[i] == NULL) {
-            s->devices[i] = device;
-            return 0;
-        }
-    }
-    return -1;
-}
-
 static uint16_t portdir(uint32_t v)
 {
 #define EVENPORTMASK(n) ((v & (1 << ((n) << 1))) >> (n))
@@ -142,63 +126,26 @@ static uint16_t portb_lines(SH7750State *s)
         (~(s->portdirb | s->periph_portdirb) & s->portpullupb); /* Pullups */
 }
 
-static void gen_port_interrupts(SH7750State *s)
-{
-    /* XXXXX interrupts not generated */
-}
-
 static void porta_changed(SH7750State *s, uint16_t prev)
 {
-    uint16_t currenta, changes;
-    int i, r = 0;
+    uint16_t currenta;
 
     currenta = porta_lines(s);
     if (currenta == prev) {
         return;
     }
     trace_sh7750_porta(prev, currenta, s->pdtra, s->pctra);
-    changes = currenta ^ prev;
-
-    for (i = 0; i < NB_DEVICES; i++) {
-        if (s->devices[i] && (s->devices[i]->portamask_trigger & changes)) {
-            r |= s->devices[i]->port_change_cb(currenta, portb_lines(s),
-                                               &s->periph_pdtra,
-                                               &s->periph_portdira,
-                                               &s->periph_pdtrb,
-                                               &s->periph_portdirb);
-        }
-    }
-
-    if (r) {
-        gen_port_interrupts(s);
-    }
 }
 
 static void portb_changed(SH7750State *s, uint16_t prev)
 {
-    uint16_t currentb, changes;
-    int i, r = 0;
+    uint16_t currentb;
 
     currentb = portb_lines(s);
     if (currentb == prev) {
         return;
     }
     trace_sh7750_portb(prev, currentb, s->pdtrb, s->pctrb);
-    changes = currentb ^ prev;
-
-    for (i = 0; i < NB_DEVICES; i++) {
-        if (s->devices[i] && (s->devices[i]->portbmask_trigger & changes)) {
-            r |= s->devices[i]->port_change_cb(portb_lines(s), currentb,
-                                               &s->periph_pdtra,
-                                               &s->periph_portdira,
-                                               &s->periph_pdtrb,
-                                               &s->periph_portdirb);
-        }
-    }
-
-    if (r) {
-        gen_port_interrupts(s);
-    }
 }
 
 /*
-- 
2.45.2



  parent reply	other threads:[~2024-09-11 12:16 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-11 12:13 [PULL 00/56] Misc HW & UI patches Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 01/56] hw/pci-host/designware: Declare CPU QOM types using DEFINE_TYPES() macro Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 02/56] hw/pci-host/designware: Add 'host_mem' variable for clarity Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 03/56] hw/intc/loongson_ipi: Remove unused headers Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 04/56] hw/sh4: Remove the deprecated SHIX machine Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 05/56] hw/block: Remove TC58128 NAND EEPROM Philippe Mathieu-Daudé
2024-09-11 12:13 ` Philippe Mathieu-Daudé [this message]
2024-09-11 12:13 ` [PULL 07/56] tests/tcg: Remove CRIS libc test files Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 08/56] tests/tcg: Remove CRIS bare " Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 09/56] buildsys: Remove CRIS cross container Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 10/56] linux-user: Remove support for CRIS target Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 11/56] hw/cris: Remove the axis-dev88 machine Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 12/56] hw/cris: Remove image loader helper Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 13/56] hw/intc: Remove TYPE_ETRAX_FS_PIC device Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 14/56] hw/char: Remove TYPE_ETRAX_FS_SERIAL device Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 15/56] hw/net: Remove TYPE_ETRAX_FS_ETH device Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 16/56] hw/dma: Remove ETRAX_FS DMA device Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 17/56] hw/timer: Remove TYPE_ETRAX_FS_TIMER device Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 18/56] system: Remove support for CRIS target Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 19/56] target/cris: Remove the deprecated " Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 20/56] seccomp: Remove check for CRIS host Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 21/56] target/riscv: Remove the deprecated 'any' CPU type Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 22/56] hw/audio/virtio-sound: fix heap buffer overflow Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 23/56] hw/char/pl011: Remove unused 'readbuff' field Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 24/56] hw/char/pl011: Move pl011_put_fifo() earlier Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 25/56] hw/char/pl011: Move pl011_loopback_enabled|tx() around Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 26/56] hw/char/pl011: Split RX/TX path of pl011_reset_fifo() Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 27/56] hw/char/pl011: Extract pl011_write_txdata() from pl011_write() Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 28/56] hw/char/pl011: Extract pl011_read_rxdata() from pl011_read() Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 29/56] hw/char/pl011: Warn when using disabled transmitter Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 30/56] hw/char/pl011: Rename RX FIFO methods Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 31/56] MAINTAINERS: Add myself as a reviewer of VT-d Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 32/56] fifo8: rename fifo8_peekpop_buf() to fifo8_peekpop_bufptr() Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 33/56] fifo8: introduce head variable for fifo8_peekpop_bufptr() Philippe Mathieu-Daudé
2024-09-11 12:13 ` [PULL 34/56] fifo8: add skip parameter to fifo8_peekpop_bufptr() Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 35/56] fifo8: replace fifo8_pop_bufptr() with fifo8_peekpop_bufptr() in fifo8_pop_buf() Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 36/56] fifo8: rename fifo8_pop_buf() to fifo8_peekpop_buf() Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 37/56] fifo8: honour do_pop argument in fifo8_peekpop_buf() Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 38/56] fifo8: add fifo8_peek_buf() function Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 39/56] fifo8: introduce fifo8_peek() function Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 40/56] tests/unit: add test-fifo unit test Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 41/56] tests/unit: Strengthen FIFO8 tests Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 42/56] tests/unit: Expand test_fifo8_peek_buf_wrap() coverage Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 43/56] tests/unit: Comment FIFO8 tests Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 44/56] hw/char/escc: convert Sun mouse to use QemuInputHandler Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 45/56] hw/input/adb-mouse: convert " Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 46/56] hw/char: replace assert(0) with g_assert_not_reached() Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 47/56] hw/core: " Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 48/56] hw/watchdog: " Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 49/56] hw/gpio: remove break after g_assert_not_reached() Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 50/56] hw/misc: " Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 51/56] hw/pci-host: " Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 52/56] system: replace assert(0) with g_assert_not_reached() Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 53/56] ui/sdl2: release all modifiers Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 54/56] ui/sdl2: ignore GUI keys in SDL_TEXTINPUT handler Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 55/56] ui/sdl2: set swap interval explicitly when OpenGL is enabled Philippe Mathieu-Daudé
2024-09-11 12:14 ` [PULL 56/56] ui: remove break after g_assert_not_reached() Philippe Mathieu-Daudé
2024-09-12  6:54 ` [PULL 00/56] Misc HW & UI patches Philippe Mathieu-Daudé

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=20240911121422.52585-7-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=ysato@users.sourceforge.jp \
    /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).