ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

esp: convert to memory API 

[benoit: fix]

Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-11-13 13:07:04 +02:00
parent 897fa7cff2
commit 67bb53149f
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hw/esp.c
View File

@ -45,6 +45,7 @@ typedef struct ESPState ESPState;
struct ESPState { struct ESPState {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion iomem;
uint8_t rregs[ESP_REGS]; uint8_t rregs[ESP_REGS];
uint8_t wregs[ESP_REGS]; uint8_t wregs[ESP_REGS];
qemu_irq irq; qemu_irq irq;
@ -504,7 +505,8 @@ static void esp_gpio_demux(void *opaque, int irq, int level)
} }
} }
static uint32_t esp_mem_readb(void *opaque, target_phys_addr_t addr) static uint64_t esp_mem_read(void *opaque, target_phys_addr_t addr,
unsigned size)
{ {
ESPState *s = opaque; ESPState *s = opaque;
uint32_t saddr, old_val; uint32_t saddr, old_val;
@ -545,7 +547,8 @@ static uint32_t esp_mem_readb(void *opaque, target_phys_addr_t addr)
return s->rregs[saddr]; return s->rregs[saddr];
} }
static void esp_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) static void esp_mem_write(void *opaque, target_phys_addr_t addr,
uint64_t val, unsigned size)
{ {
ESPState *s = opaque; ESPState *s = opaque;
uint32_t saddr; uint32_t saddr;
@ -641,7 +644,7 @@ static void esp_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
s->rregs[ESP_RINTR] = 0; s->rregs[ESP_RINTR] = 0;
break; break;
default: default:
ESP_ERROR("Unhandled ESP command (%2.2x)\n", val); ESP_ERROR("Unhandled ESP command (%2.2x)\n", (unsigned)val);
break; break;
} }
break; break;
@ -656,22 +659,23 @@ static void esp_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
s->rregs[saddr] = val; s->rregs[saddr] = val;
break; break;
default: default:
ESP_ERROR("invalid write of 0x%02x at [0x%x]\n", val, saddr); ESP_ERROR("invalid write of 0x%02x at [0x%x]\n", (unsigned)val, saddr);
return; return;
} }
s->wregs[saddr] = val; s->wregs[saddr] = val;
} }
static CPUReadMemoryFunc * const esp_mem_read[3] = { static bool esp_mem_accepts(void *opaque, target_phys_addr_t addr,
esp_mem_readb, unsigned size, bool is_write)
NULL, {
NULL, return (size == 1) || (is_write && size == 4);
}; }
static CPUWriteMemoryFunc * const esp_mem_write[3] = { static const MemoryRegionOps esp_mem_ops = {
esp_mem_writeb, .read = esp_mem_read,
NULL, .write = esp_mem_write,
esp_mem_writeb, .endianness = DEVICE_NATIVE_ENDIAN,
.valid.accepts = esp_mem_accepts,
}; };
static const VMStateDescription vmstate_esp = { static const VMStateDescription vmstate_esp = {
@ -735,14 +739,13 @@ static const struct SCSIBusInfo esp_scsi_info = {
static int esp_init1(SysBusDevice *dev) static int esp_init1(SysBusDevice *dev)
{ {
ESPState *s = FROM_SYSBUS(ESPState, dev); ESPState *s = FROM_SYSBUS(ESPState, dev);
int esp_io_memory;
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
assert(s->it_shift != -1); assert(s->it_shift != -1);
esp_io_memory = cpu_register_io_memory(esp_mem_read, esp_mem_write, s, memory_region_init_io(&s->iomem, &esp_mem_ops, s,
DEVICE_NATIVE_ENDIAN); "esp", ESP_REGS << s->it_shift);
sysbus_init_mmio(dev, ESP_REGS << s->it_shift, esp_io_memory); sysbus_init_mmio_region(dev, &s->iomem);
qdev_init_gpio_in(&dev->qdev, esp_gpio_demux, 2); qdev_init_gpio_in(&dev->qdev, esp_gpio_demux, 2);