falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

esp: move TYPE_ESP and SysBusESPState from esp.c to esp.h 

This enables them to be used outside of esp.c.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-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:22 +01:00
parent f542ad0388
commit 1b13a60c1c
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/scsi/esp.c
View File

@ -592,19 +592,6 @@ const VMStateDescription vmstate_esp = {
} }
}; };
#define TYPE_ESP "esp"
#define ESP_STATE(obj) OBJECT_CHECK(SysBusESPState, (obj), TYPE_ESP)
typedef struct {
/*< private >*/
SysBusDevice parent_obj;
/*< public >*/
MemoryRegion iomem;
uint32_t it_shift;
ESPState esp;
} SysBusESPState;
static void sysbus_esp_mem_write(void *opaque, hwaddr addr, static void sysbus_esp_mem_write(void *opaque, hwaddr addr,
uint64_t val, unsigned int size) uint64_t val, unsigned int size)
{ {

14
include/hw/scsi/esp.h
View File

@ -2,6 +2,7 @@
#define QEMU_HW_ESP_H #define QEMU_HW_ESP_H
#include "hw/scsi/scsi.h" #include "hw/scsi/scsi.h"
#include "hw/sysbus.h"
/* esp.c */ /* esp.c */
#define ESP_MAX_DEVS 7 #define ESP_MAX_DEVS 7
@ -52,6 +53,19 @@ struct ESPState {
void (*dma_cb)(ESPState *s); void (*dma_cb)(ESPState *s);
}; };
#define TYPE_ESP "esp"
#define ESP_STATE(obj) OBJECT_CHECK(SysBusESPState, (obj), TYPE_ESP)
typedef struct {
/*< private >*/
SysBusDevice parent_obj;
/*< public >*/
MemoryRegion iomem;
uint32_t it_shift;
ESPState esp;
} SysBusESPState;
#define ESP_TCLO 0x0 #define ESP_TCLO 0x0
#define ESP_TCMID 0x1 #define ESP_TCMID 0x1
#define ESP_FIFO 0x2 #define ESP_FIFO 0x2