On 10/25/2017 12:59 PM, Mark Cave-Ayland wrote:
> 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>
> ---
> hw/scsi/esp.c | 13 -------------
> include/hw/scsi/esp.h | 14 ++++++++++++++
> 2 files changed, 14 insertions(+), 13 deletions(-)
>
> diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
> index 22c2d91..ee586e7 100644
> --- a/hw/scsi/esp.c
> +++ b/hw/scsi/esp.c
> @@ -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,
> uint64_t val, unsigned int size)
> {
> diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h
> index d2c4886..3b160f8 100644
> --- a/include/hw/scsi/esp.h
> +++ b/include/hw/scsi/esp.h
> @@ -2,6 +2,7 @@
> #define QEMU_HW_ESP_H
>
> #include "hw/scsi/scsi.h"
> +#include "hw/sysbus.h"
>
> /* esp.c */
> #define ESP_MAX_DEVS 7
> @@ -52,6 +53,19 @@ struct ESPState {
> 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_TCMID 0x1
> #define ESP_FIFO 0x2
>