diff options
author | Paul Brook | 2009-05-10 02:44:56 +0200 |
---|---|---|
committer | Paul Brook | 2009-05-10 02:44:56 +0200 |
commit | bc24a225af2464dc30f88d6f930779cbf0e22b67 (patch) | |
tree | 6df682b479f89863159f836e1dc292623ab577e1 /hw/zaurus.c | |
parent | Workaround compiler warnings at -O1 (diff) | |
download | qemu-bc24a225af2464dc30f88d6f930779cbf0e22b67.tar.gz qemu-bc24a225af2464dc30f88d6f930779cbf0e22b67.tar.xz qemu-bc24a225af2464dc30f88d6f930779cbf0e22b67.zip |
Follow coding conventions
Remove explicit struct qualifiers and rename structure types.
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/zaurus.c')
-rw-r--r-- | hw/zaurus.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/hw/zaurus.c b/hw/zaurus.c index 482834fb7b..56e150d51c 100644 --- a/hw/zaurus.c +++ b/hw/zaurus.c @@ -29,7 +29,7 @@ /* SCOOP devices */ -struct scoop_info_s { +struct ScoopInfo { qemu_irq handler[16]; qemu_irq *in; uint16_t status; @@ -58,7 +58,7 @@ struct scoop_info_s { #define SCOOP_GPWR 0x24 #define SCOOP_GPRR 0x28 -static inline void scoop_gpio_handler_update(struct scoop_info_s *s) { +static inline void scoop_gpio_handler_update(ScoopInfo *s) { uint32_t level, diff; int bit; level = s->gpio_level & s->gpio_dir; @@ -73,7 +73,7 @@ static inline void scoop_gpio_handler_update(struct scoop_info_s *s) { static uint32_t scoop_readb(void *opaque, target_phys_addr_t addr) { - struct scoop_info_s *s = (struct scoop_info_s *) opaque; + ScoopInfo *s = (ScoopInfo *) opaque; switch (addr) { case SCOOP_MCR: @@ -106,7 +106,7 @@ static uint32_t scoop_readb(void *opaque, target_phys_addr_t addr) static void scoop_writeb(void *opaque, target_phys_addr_t addr, uint32_t value) { - struct scoop_info_s *s = (struct scoop_info_s *) opaque; + ScoopInfo *s = (ScoopInfo *) opaque; value &= 0xffff; switch (addr) { @@ -160,7 +160,7 @@ static CPUWriteMemoryFunc *scoop_writefn[] = { void scoop_gpio_set(void *opaque, int line, int level) { - struct scoop_info_s *s = (struct scoop_info_s *) s; + ScoopInfo *s = (ScoopInfo *) s; if (level) s->gpio_level |= (1 << line); @@ -168,12 +168,12 @@ void scoop_gpio_set(void *opaque, int line, int level) s->gpio_level &= ~(1 << line); } -qemu_irq *scoop_gpio_in_get(struct scoop_info_s *s) +qemu_irq *scoop_gpio_in_get(ScoopInfo *s) { return s->in; } -void scoop_gpio_out_set(struct scoop_info_s *s, int line, +void scoop_gpio_out_set(ScoopInfo *s, int line, qemu_irq handler) { if (line >= 16) { fprintf(stderr, "No GPIO pin %i\n", line); @@ -185,7 +185,7 @@ void scoop_gpio_out_set(struct scoop_info_s *s, int line, static void scoop_save(QEMUFile *f, void *opaque) { - struct scoop_info_s *s = (struct scoop_info_s *) opaque; + ScoopInfo *s = (ScoopInfo *) opaque; qemu_put_be16s(f, &s->status); qemu_put_be16s(f, &s->power); qemu_put_be32s(f, &s->gpio_level); @@ -202,7 +202,7 @@ static void scoop_save(QEMUFile *f, void *opaque) static int scoop_load(QEMUFile *f, void *opaque, int version_id) { uint16_t dummy; - struct scoop_info_s *s = (struct scoop_info_s *) opaque; + ScoopInfo *s = (ScoopInfo *) opaque; qemu_get_be16s(f, &s->status); qemu_get_be16s(f, &s->power); qemu_get_be32s(f, &s->gpio_level); @@ -220,15 +220,15 @@ static int scoop_load(QEMUFile *f, void *opaque, int version_id) return 0; } -struct scoop_info_s *scoop_init(struct pxa2xx_state_s *cpu, +ScoopInfo *scoop_init(PXA2xxState *cpu, int instance, target_phys_addr_t target_base) { int iomemtype; - struct scoop_info_s *s; + ScoopInfo *s; - s = (struct scoop_info_s *) - qemu_mallocz(sizeof(struct scoop_info_s)); - memset(s, 0, sizeof(struct scoop_info_s)); + s = (ScoopInfo *) + qemu_mallocz(sizeof(ScoopInfo)); + memset(s, 0, sizeof(ScoopInfo)); s->status = 0x02; s->in = qemu_allocate_irqs(scoop_gpio_set, s, 16); |