david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sparc32_dma: move type declarations from sparc32_dma.c to sparc32_dma.h

Browse Source 
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Artyom Tarasenko <atar4qemu@gmail.com>
Acked-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Mark Cave-Ayland 2017-10-14 13:22:21 +01:00
parent 52d39e5b67
commit 9db2cf3f29
2 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hw/dma/sparc32_dma.c
View File

@ -40,7 +40,6 @@
* http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/DMA2.txt * http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/DMA2.txt
*/ */
#define DMA_REGS 4
#define DMA_SIZE (4 * sizeof(uint32_t)) #define DMA_SIZE (4 * sizeof(uint32_t))
/* We need the mask, because one instance of the device is not page /* We need the mask, because one instance of the device is not page
aligned (ledma, start address 0x0010) */ aligned (ledma, start address 0x0010) */
@ -61,39 +60,6 @@
/* XXX SCSI and ethernet should have different read-only bit masks */ /* XXX SCSI and ethernet should have different read-only bit masks */
#define DMA_CSR_RO_MASK 0xfe000007 #define DMA_CSR_RO_MASK 0xfe000007
#define TYPE_SPARC32_DMA_DEVICE "sparc32-dma-device"
#define SPARC32_DMA_DEVICE(obj) OBJECT_CHECK(DMADeviceState, (obj), \
TYPE_SPARC32_DMA_DEVICE)
typedef struct DMADeviceState DMADeviceState;
struct DMADeviceState {
SysBusDevice parent_obj;
MemoryRegion iomem;
uint32_t dmaregs[DMA_REGS];
qemu_irq irq;
void *iommu;
qemu_irq gpio[2];
uint32_t is_ledma;
};
#define TYPE_SPARC32_ESPDMA_DEVICE "sparc32-espdma"
#define SPARC32_ESPDMA_DEVICE(obj) OBJECT_CHECK(ESPDMADeviceState, (obj), \
TYPE_SPARC32_ESPDMA_DEVICE)
typedef struct ESPDMADeviceState {
DMADeviceState parent_obj;
} ESPDMADeviceState;
#define TYPE_SPARC32_LEDMA_DEVICE "sparc32-ledma"
#define SPARC32_LEDMA_DEVICE(obj) OBJECT_CHECK(LEDMADeviceState, (obj), \
TYPE_SPARC32_LEDMA_DEVICE)
typedef struct LEDMADeviceState {
DMADeviceState parent_obj;
} LEDMADeviceState;
enum { enum {
GPIO_RESET = 0, GPIO_RESET = 0,
GPIO_DMA, GPIO_DMA,

37
include/hw/sparc/sparc32_dma.h
View File

@ -1,6 +1,43 @@
#ifndef SPARC32_DMA_H #ifndef SPARC32_DMA_H
#define SPARC32_DMA_H #define SPARC32_DMA_H
#include "hw/sysbus.h"
#define DMA_REGS 4
#define TYPE_SPARC32_DMA_DEVICE "sparc32-dma-device"
#define SPARC32_DMA_DEVICE(obj) OBJECT_CHECK(DMADeviceState, (obj), \
TYPE_SPARC32_DMA_DEVICE)
typedef struct DMADeviceState DMADeviceState;
struct DMADeviceState {
SysBusDevice parent_obj;
MemoryRegion iomem;
uint32_t dmaregs[DMA_REGS];
qemu_irq irq;
void *iommu;
qemu_irq gpio[2];
uint32_t is_ledma;
};
#define TYPE_SPARC32_ESPDMA_DEVICE "sparc32-espdma"
#define SPARC32_ESPDMA_DEVICE(obj) OBJECT_CHECK(ESPDMADeviceState, (obj), \
TYPE_SPARC32_ESPDMA_DEVICE)
typedef struct ESPDMADeviceState {
DMADeviceState parent_obj;
} ESPDMADeviceState;
#define TYPE_SPARC32_LEDMA_DEVICE "sparc32-ledma"
#define SPARC32_LEDMA_DEVICE(obj) OBJECT_CHECK(LEDMADeviceState, (obj), \
TYPE_SPARC32_LEDMA_DEVICE)
typedef struct LEDMADeviceState {
DMADeviceState parent_obj;
} LEDMADeviceState;
/* sparc32_dma.c */ /* sparc32_dma.c */
void ledma_memory_read(void *opaque, hwaddr addr, void ledma_memory_read(void *opaque, hwaddr addr,
uint8_t *buf, int len, int do_bswap); uint8_t *buf, int len, int do_bswap);