mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'kraxel/testdev.2' into staging

Browse Source 
* kraxel/testdev.2:
  pc-testdev: use typedefs

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2013-01-14 10:26:57 -06:00
commit a69f221ef8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/pc-testdev.c
View File

@ -58,13 +58,13 @@ typedef struct PCTestdev {
#define TYPE_TESTDEV "pc-testdev" #define TYPE_TESTDEV "pc-testdev"
#define TESTDEV(obj) \ #define TESTDEV(obj) \
OBJECT_CHECK(struct PCTestdev, (obj), TYPE_TESTDEV) OBJECT_CHECK(PCTestdev, (obj), TYPE_TESTDEV)
static void test_irq_line(void *opaque, hwaddr addr, uint64_t data, static void test_irq_line(void *opaque, hwaddr addr, uint64_t data,
unsigned len) unsigned len)
{ {
struct PCTestdev *dev = opaque; PCTestdev *dev = opaque;
struct ISADevice *isa = ISA_DEVICE(dev); ISADevice *isa = ISA_DEVICE(dev);
qemu_set_irq(isa_get_irq(isa, addr), !!data); qemu_set_irq(isa_get_irq(isa, addr), !!data);
} }
@ -79,13 +79,13 @@ static const MemoryRegionOps test_irq_ops = {
static void test_ioport_write(void *opaque, hwaddr addr, uint64_t data, static void test_ioport_write(void *opaque, hwaddr addr, uint64_t data,
unsigned len) unsigned len)
{ {
struct PCTestdev *dev = opaque; PCTestdev *dev = opaque;
dev->ioport_data = data; dev->ioport_data = data;
} }
static uint64_t test_ioport_read(void *opaque, hwaddr addr, unsigned len) static uint64_t test_ioport_read(void *opaque, hwaddr addr, unsigned len)
{ {
struct PCTestdev *dev = opaque; PCTestdev *dev = opaque;
return dev->ioport_data; return dev->ioport_data;
} }
@ -119,7 +119,7 @@ static const MemoryRegionOps test_flush_ops = {
static uint64_t test_iomem_read(void *opaque, hwaddr addr, unsigned len) static uint64_t test_iomem_read(void *opaque, hwaddr addr, unsigned len)
{ {
struct PCTestdev *dev = opaque; PCTestdev *dev = opaque;
uint64_t ret = 0; uint64_t ret = 0;
memcpy(&ret, &dev->iomem_buf[addr], len); memcpy(&ret, &dev->iomem_buf[addr], len);
ret = le64_to_cpu(ret); ret = le64_to_cpu(ret);
@ -130,7 +130,7 @@ static uint64_t test_iomem_read(void *opaque, hwaddr addr, unsigned len)
static void test_iomem_write(void *opaque, hwaddr addr, uint64_t val, static void test_iomem_write(void *opaque, hwaddr addr, uint64_t val,
unsigned len) unsigned len)
{ {
struct PCTestdev *dev = opaque; PCTestdev *dev = opaque;
val = cpu_to_le64(val); val = cpu_to_le64(val);
memcpy(&dev->iomem_buf[addr], &val, len); memcpy(&dev->iomem_buf[addr], &val, len);
dev->iomem_buf[addr] = val; dev->iomem_buf[addr] = val;
@ -144,7 +144,7 @@ static const MemoryRegionOps test_iomem_ops = {
static int init_test_device(ISADevice *isa) static int init_test_device(ISADevice *isa)
{ {
struct PCTestdev *dev = TESTDEV(isa); PCTestdev *dev = TESTDEV(isa);
MemoryRegion *mem = isa_address_space(isa); MemoryRegion *mem = isa_address_space(isa);
MemoryRegion *io = isa_address_space_io(isa); MemoryRegion *io = isa_address_space_io(isa);
@ -175,7 +175,7 @@ static void testdev_class_init(ObjectClass *klass, void *data)
static const TypeInfo testdev_info = { static const TypeInfo testdev_info = {
.name = TYPE_TESTDEV, .name = TYPE_TESTDEV,
.parent = TYPE_ISA_DEVICE, .parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(struct PCTestdev), .instance_size = sizeof(PCTestdev),
.class_init = testdev_class_init, .class_init = testdev_class_init,
}; };