diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-01 16:12:16 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-01 16:12:16 -0500 |
| commit | c227f0995e1722a1abccc28cadf0664266bd8043 (patch) | |
| tree | 39e92c2f818e3e8144978740b914731613af0e40 /hw/ide/mmio.c | |
| parent | 99a0949b720a0936da2052cb9a46db04ffc6db29 (diff) | |
| download | qemu-c227f0995e1722a1abccc28cadf0664266bd8043.zip qemu-c227f0995e1722a1abccc28cadf0664266bd8043.tar.gz qemu-c227f0995e1722a1abccc28cadf0664266bd8043.tar.bz2 | |
Revert "Get rid of _t suffix"
In the very least, a change like this requires discussion on the list.
The naming convention is goofy and it causes a massive merge problem. Something
like this _must_ be presented on the list first so people can provide input
and cope with it.
This reverts commit 99a0949b720a0936da2052cb9a46db04ffc6db29.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/ide/mmio.c')
| -rw-r--r-- | hw/ide/mmio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index a1a7606..acaa900 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -41,7 +41,7 @@ typedef struct { int shift; } MMIOState; -static uint32_t mmio_ide_read (void *opaque, a_target_phys_addr addr) +static uint32_t mmio_ide_read (void *opaque, target_phys_addr_t addr) { MMIOState *s = (MMIOState*)opaque; IDEBus *bus = s->bus; @@ -52,7 +52,7 @@ static uint32_t mmio_ide_read (void *opaque, a_target_phys_addr addr) return ide_data_readw(bus, 0); } -static void mmio_ide_write (void *opaque, a_target_phys_addr addr, +static void mmio_ide_write (void *opaque, target_phys_addr_t addr, uint32_t val) { MMIOState *s = (MMIOState*)opaque; @@ -76,14 +76,14 @@ static CPUWriteMemoryFunc * const mmio_ide_writes[] = { mmio_ide_write, }; -static uint32_t mmio_ide_status_read (void *opaque, a_target_phys_addr addr) +static uint32_t mmio_ide_status_read (void *opaque, target_phys_addr_t addr) { MMIOState *s= (MMIOState*)opaque; IDEBus *bus = s->bus; return ide_status_read(bus, 0); } -static void mmio_ide_cmd_write (void *opaque, a_target_phys_addr addr, +static void mmio_ide_cmd_write (void *opaque, target_phys_addr_t addr, uint32_t val) { MMIOState *s = (MMIOState*)opaque; @@ -122,7 +122,7 @@ static int mmio_ide_load(QEMUFile* f, void *opaque, int version_id) return 0; } -void mmio_ide_init (a_target_phys_addr membase, a_target_phys_addr membase2, +void mmio_ide_init (target_phys_addr_t membase, target_phys_addr_t membase2, qemu_irq irq, int shift, DriveInfo *hd0, DriveInfo *hd1) { |