OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

exec/cpu-common: Move MUSB specific typedefs to 'hw/usb/hcd-musb.h' 

The CPUReadMemoryFunc/CPUWriteMemoryFunc typedefs are legacy
remnant from before the conversion to MemoryRegions.
Since they are now only used in tusb6010.c and hcd-musb.c,
move them to "hw/usb/musb.h" and rename them appropriately.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200601141536.15192-4-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-06-01 16:15:36 +02:00 committed by Paolo Bonzini
parent 2c89d91195
commit efb22b2f98
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/usb/hcd-musb.c
View File

@ -1540,13 +1540,13 @@ static void musb_writew(void *opaque, hwaddr addr, uint32_t value)
};
}
CPUReadMemoryFunc * const musb_read[] = {
MUSBReadFunc * const musb_read[] = {
musb_readb,
musb_readh,
musb_readw,
};
CPUWriteMemoryFunc * const musb_write[] = {
MUSBWriteFunc * const musb_write[] = {
musb_writeb,
musb_writeh,
musb_writew,

3
include/exec/cpu-common.h
View File

@ -43,9 +43,6 @@ extern ram_addr_t ram_size;
/* memory API */
typedef void CPUWriteMemoryFunc(void *opaque, hwaddr addr, uint32_t value);
typedef uint32_t CPUReadMemoryFunc(void *opaque, hwaddr addr);
void qemu_ram_remap(ram_addr_t addr, ram_addr_t length);
/* This should not be used by devices. */
ram_addr_t qemu_ram_addr_from_host(void *ptr);

9
include/hw/usb/hcd-musb.h
View File

@ -13,8 +13,6 @@
#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,
@ -32,8 +30,11 @@ enum musb_irq_source_e {
musb_irq_max /* total number of interrupts defined */
};
extern CPUReadMemoryFunc * const musb_read[];
extern CPUWriteMemoryFunc * const musb_write[];
/* TODO convert hcd-musb to QOM/qdev and remove MUSBReadFunc/MUSBWriteFunc */
typedef void MUSBWriteFunc(void *opaque, hwaddr addr, uint32_t value);
typedef uint32_t MUSBReadFunc(void *opaque, hwaddr addr);
extern MUSBReadFunc * const musb_read[];
extern MUSBWriteFunc * const musb_write[];
typedef struct MUSBState MUSBState;