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

hw/ide/ahci: Move SysBus definitions to 'ahci-sysbus.h' 

Keep "hw/ide/ahci.h" AHCI-generic.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20240213081201.78951-10-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-02-13 06:15:13 +01:00
parent b0bccc6a9a
commit fbb5945e85
9 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/arm/highbank.c
View File

@ -30,7 +30,7 @@
#include "hw/boards.h"
#include "qemu/error-report.h"
#include "hw/char/pl011.h"
#include "hw/ide/ahci.h"
#include "hw/ide/ahci-sysbus.h"
#include "hw/cpu/a9mpcore.h"
#include "hw/cpu/a15mpcore.h"
#include "qemu/log.h"

1
hw/arm/sbsa-ref.c
View File

@ -38,6 +38,7 @@
#include "hw/boards.h"
#include "hw/ide/internal.h"
#include "hw/ide/ahci_internal.h"
#include "hw/ide/ahci-sysbus.h"
#include "hw/intc/arm_gicv3_common.h"
#include "hw/intc/arm_gicv3_its_common.h"
#include "hw/loader.h"

3
hw/ide/ahci-allwinner.c
View File

@ -19,9 +19,8 @@
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "sysemu/dma.h"
#include "hw/ide/internal.h"
#include "migration/vmstate.h"
#include "ahci_internal.h"
#include "hw/ide/ahci-sysbus.h"
#include "trace.h"

1
hw/ide/ahci.c
View File

@ -37,6 +37,7 @@
#include "hw/ide/internal.h"
#include "hw/ide/pci.h"
#include "hw/ide/ahci-pci.h"
#include "hw/ide/ahci-sysbus.h"
#include "ahci_internal.h"
#include "trace.h"

2
include/hw/arm/allwinner-a10.h
View File

@ -5,7 +5,7 @@
#include "hw/intc/allwinner-a10-pic.h"
#include "hw/net/allwinner_emac.h"
#include "hw/sd/allwinner-sdhost.h"
#include "hw/ide/ahci.h"
#include "hw/ide/ahci-sysbus.h"
#include "hw/usb/hcd-ohci.h"
#include "hw/usb/hcd-ehci.h"
#include "hw/rtc/allwinner-rtc.h"

2
include/hw/arm/allwinner-r40.h
View File

@ -22,7 +22,7 @@
#include "qom/object.h"
#include "hw/timer/allwinner-a10-pit.h"
#include "hw/ide/ahci.h"
#include "hw/ide/ahci-sysbus.h"
#include "hw/intc/arm_gic.h"
#include "hw/sd/allwinner-sdhost.h"
#include "hw/misc/allwinner-r40-ccu.h"

2
include/hw/arm/xlnx-zynqmp.h
View File

@ -22,7 +22,7 @@
#include "hw/net/cadence_gem.h"
#include "hw/char/cadence_uart.h"
#include "hw/net/xlnx-zynqmp-can.h"
#include "hw/ide/ahci.h"
#include "hw/ide/ahci-sysbus.h"
#include "hw/sd/sdhci.h"
#include "hw/ssi/xilinx_spips.h"
#include "hw/dma/xlnx_dpdma.h"

35
include/hw/ide/ahci-sysbus.h Normal file
View File

@ -0,0 +1,35 @@
/*
* QEMU AHCI Emulation (MMIO-mapped devices)
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef HW_IDE_AHCI_SYSBUS_H
#define HW_IDE_AHCI_SYSBUS_H
#include "qom/object.h"
#include "hw/sysbus.h"
#include "hw/ide/ahci.h"
#define TYPE_SYSBUS_AHCI "sysbus-ahci"
OBJECT_DECLARE_SIMPLE_TYPE(SysbusAHCIState, SYSBUS_AHCI)
struct SysbusAHCIState {
SysBusDevice parent_obj;
AHCIState ahci;
};
#define TYPE_ALLWINNER_AHCI "allwinner-ahci"
OBJECT_DECLARE_SIMPLE_TYPE(AllwinnerAHCIState, ALLWINNER_AHCI)
#define ALLWINNER_AHCI_MMIO_OFF 0x80
#define ALLWINNER_AHCI_MMIO_SIZE 0x80
struct AllwinnerAHCIState {
SysbusAHCIState parent_obj;
MemoryRegion mmio;
uint32_t regs[ALLWINNER_AHCI_MMIO_SIZE / 4];
};
#endif

29
include/hw/ide/ahci.h
View File

@ -24,8 +24,7 @@
#ifndef HW_IDE_AHCI_H
#define HW_IDE_AHCI_H
#include "hw/sysbus.h"
#include "qom/object.h"
#include "exec/memory.h"
typedef struct AHCIDevice AHCIDevice;
@ -54,30 +53,4 @@ typedef struct AHCIState {
void ahci_ide_create_devs(AHCIState *ahci, DriveInfo **hd);
#define TYPE_SYSBUS_AHCI "sysbus-ahci"
OBJECT_DECLARE_SIMPLE_TYPE(SysbusAHCIState, SYSBUS_AHCI)
struct SysbusAHCIState {
/*< private >*/
SysBusDevice parent_obj;
/*< public >*/
AHCIState ahci;
};
#define TYPE_ALLWINNER_AHCI "allwinner-ahci"
OBJECT_DECLARE_SIMPLE_TYPE(AllwinnerAHCIState, ALLWINNER_AHCI)
#define ALLWINNER_AHCI_MMIO_OFF 0x80
#define ALLWINNER_AHCI_MMIO_SIZE 0x80
struct AllwinnerAHCIState {
/*< private >*/
SysbusAHCIState parent_obj;
/*< public >*/
MemoryRegion mmio;
uint32_t regs[ALLWINNER_AHCI_MMIO_SIZE/4];
};
#endif /* HW_IDE_AHCI_H */