[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/9] ide/ioport: move ide_portio_list[] and ide_portio_list2[] def
From: |
Kevin Wolf |
Subject: |
[PULL 6/9] ide/ioport: move ide_portio_list[] and ide_portio_list2[] definitions to IDE core |
Date: |
Tue, 21 Nov 2023 12:52:59 +0100 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
These definitions are present in ioport.c which is currently only available when
CONFIG_IDE_ISA is enabled. Move them to the IDE core so that they can be made
available to PCI IDE controllers that support switching to legacy mode.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-ID: <20231116103355.588580-2-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/hw/ide/internal.h | 3 +++
hw/ide/core.c | 12 ++++++++++++
hw/ide/ioport.c | 12 ------------
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h
index 2bfa7533d6..3bdcc75597 100644
--- a/include/hw/ide/internal.h
+++ b/include/hw/ide/internal.h
@@ -354,6 +354,9 @@ enum ide_dma_cmd {
extern const char *IDE_DMA_CMD_lookup[IDE_DMA__COUNT];
+extern const MemoryRegionPortio ide_portio_list[];
+extern const MemoryRegionPortio ide_portio2_list[];
+
#define ide_cmd_is_read(s) \
((s)->dma_cmd == IDE_DMA_READ)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 63ba665f3d..8a0579bff4 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -81,6 +81,18 @@ static const char *IDE_DMA_CMD_str(enum ide_dma_cmd enval)
static void ide_dummy_transfer_stop(IDEState *s);
+const MemoryRegionPortio ide_portio_list[] = {
+ { 0, 8, 1, .read = ide_ioport_read, .write = ide_ioport_write },
+ { 0, 1, 2, .read = ide_data_readw, .write = ide_data_writew },
+ { 0, 1, 4, .read = ide_data_readl, .write = ide_data_writel },
+ PORTIO_END_OF_LIST(),
+};
+
+const MemoryRegionPortio ide_portio2_list[] = {
+ { 0, 1, 1, .read = ide_status_read, .write = ide_ctrl_write },
+ PORTIO_END_OF_LIST(),
+};
+
static void padstr(char *str, const char *src, int len)
{
int i, v;
diff --git a/hw/ide/ioport.c b/hw/ide/ioport.c
index e2ecc6230c..0b283ac783 100644
--- a/hw/ide/ioport.c
+++ b/hw/ide/ioport.c
@@ -28,18 +28,6 @@
#include "hw/ide/internal.h"
#include "trace.h"
-static const MemoryRegionPortio ide_portio_list[] = {
- { 0, 8, 1, .read = ide_ioport_read, .write = ide_ioport_write },
- { 0, 1, 2, .read = ide_data_readw, .write = ide_data_writew },
- { 0, 1, 4, .read = ide_data_readl, .write = ide_data_writel },
- PORTIO_END_OF_LIST(),
-};
-
-static const MemoryRegionPortio ide_portio2_list[] = {
- { 0, 1, 1, .read = ide_status_read, .write = ide_ctrl_write },
- PORTIO_END_OF_LIST(),
-};
-
int ide_init_ioport(IDEBus *bus, ISADevice *dev, int iobase, int iobase2)
{
int ret;
--
2.42.0
- [PULL 0/9] Block layer fixes for 8.2.0-rc1, Kevin Wolf, 2023/11/21
- [PULL 2/9] block: Fix bdrv_graph_wrlock() call in blk_remove_bs(), Kevin Wolf, 2023/11/21
- [PULL 4/9] stream: Fix AioContext locking during bdrv_graph_wrlock(), Kevin Wolf, 2023/11/21
- [PULL 1/9] hw/ide/ahci: fix legacy software reset, Kevin Wolf, 2023/11/21
- [PULL 5/9] iotests: Test two stream jobs in a single iothread, Kevin Wolf, 2023/11/21
- [PULL 6/9] ide/ioport: move ide_portio_list[] and ide_portio_list2[] definitions to IDE core,
Kevin Wolf <=
- [PULL 3/9] block: Fix deadlocks in bdrv_graph_wrunlock(), Kevin Wolf, 2023/11/21
- [PULL 7/9] ide/pci: introduce pci_ide_update_mode() function, Kevin Wolf, 2023/11/21
- [PULL 9/9] hw/ide/via: implement legacy/native mode switching, Kevin Wolf, 2023/11/21
- [PULL 8/9] ide/via: don't attempt to set default BAR addresses, Kevin Wolf, 2023/11/21
- Re: [PULL 0/9] Block layer fixes for 8.2.0-rc1, Stefan Hajnoczi, 2023/11/21