Commit 2c89d911 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

hw/usb: Move device-specific declarations to new 'hcd-musb.h' header 



Move the declarations for the MUSB-HDRC USB2.0 OTG compliant core
into a separate header.

Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-Id: <20200601141536.15192-3-f4bug@amsat.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e1bc6198

hw/usb/hcd-musb.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "qemu/osdep.h"

#include "qemu/timer.h"

#include "hw/usb.h"

#include "hw/usb/hcd-musb.h"

#include "hw/irq.h"

#include "hw/hw.h"

hw/usb/tusb6010.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "qemu/module.h"

#include "qemu/timer.h"

#include "hw/usb.h"

#include "hw/usb/hcd-musb.h"

#include "hw/arm/omap.h"

#include "hw/hw.h"

#include "hw/irq.h"

include/hw/usb.h

+0 −30
Original line number Diff line number Diff line
@@ -474,36 +474,6 @@ bool usb_host_dev_is_scsi_storage(USBDevice *usbdev); 


#define VM_USB_HUB_SIZE 8



/* hw/usb/hdc-musb.c */



enum musb_irq_source_e {

    musb_irq_suspend = 0,

    musb_irq_resume,

    musb_irq_rst_babble,

    musb_irq_sof,

    musb_irq_connect,

    musb_irq_disconnect,

    musb_irq_vbus_request,

    musb_irq_vbus_error,

    musb_irq_rx,

    musb_irq_tx,

    musb_set_vbus,

    musb_set_session,

    /* Add new interrupts here */

    musb_irq_max, /* total number of interrupts defined */

};



typedef struct MUSBState MUSBState;



extern CPUReadMemoryFunc * const musb_read[];

extern CPUWriteMemoryFunc * const musb_write[];



MUSBState *musb_init(DeviceState *parent_device, int gpio_base);

void musb_reset(MUSBState *s);

uint32_t musb_core_intr_get(MUSBState *s);

void musb_core_intr_clear(MUSBState *s, uint32_t mask);

void musb_set_size(MUSBState *s, int epnum, int size, int is_tx);



/* usb-bus.c */



#define TYPE_USB_BUS "usb-bus"

include/hw/usb/hcd-musb.h

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/*

 * "Inventra" High-speed Dual-Role Controller (MUSB-HDRC), Mentor Graphics,

 * USB2.0 OTG compliant core used in various chips.

 *

 * Only host-mode and non-DMA accesses are currently supported.

 *

 * Copyright (C) 2008 Nokia Corporation

 * Written by Andrzej Zaborowski <balrog@zabor.org>

 *

 * SPDX-License-Identifier: GPL-2.0-or-later

 */



#ifndef HW_USB_MUSB_H

#define HW_USB_MUSB_H



#include "exec/cpu-common.h"



enum musb_irq_source_e {

    musb_irq_suspend = 0,

    musb_irq_resume,

    musb_irq_rst_babble,

    musb_irq_sof,

    musb_irq_connect,

    musb_irq_disconnect,

    musb_irq_vbus_request,

    musb_irq_vbus_error,

    musb_irq_rx,

    musb_irq_tx,

    musb_set_vbus,

    musb_set_session,

    /* Add new interrupts here */

    musb_irq_max /* total number of interrupts defined */

};



extern CPUReadMemoryFunc * const musb_read[];

extern CPUWriteMemoryFunc * const musb_write[];



typedef struct MUSBState MUSBState;



MUSBState *musb_init(DeviceState *parent_device, int gpio_base);

void musb_reset(MUSBState *s);

uint32_t musb_core_intr_get(MUSBState *s);

void musb_core_intr_clear(MUSBState *s, uint32_t mask);

void musb_set_size(MUSBState *s, int epnum, int size, int is_tx);



#endif