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/omap_mmc.c | |
| parent | 99a0949b720a0936da2052cb9a46db04ffc6db29 (diff) | |
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/omap_mmc.c')
| -rw-r--r-- | hw/omap_mmc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/hw/omap_mmc.c b/hw/omap_mmc.c index 7edfba5cb1..15cbf06c87 100644 --- a/hw/omap_mmc.c +++ b/hw/omap_mmc.c @@ -104,10 +104,10 @@ typedef enum { sd_r3, /* OCR register */ sd_r6 = 6, /* Published RCA response */ sd_r1b = -1, -} e_sd_rsp_type; +} sd_rsp_type_t; static void omap_mmc_command(struct omap_mmc_s *host, int cmd, int dir, - e_sd_cmd_type type, int busy, e_sd_rsp_type resptype, int init) + sd_cmd_type_t type, int busy, sd_rsp_type_t resptype, int init) { uint32_t rspstatus, mask; int rsplen, timeout; @@ -305,7 +305,7 @@ void omap_mmc_reset(struct omap_mmc_s *host) host->clkdiv = 0; } -static uint32_t omap_mmc_read(void *opaque, a_target_phys_addr offset) +static uint32_t omap_mmc_read(void *opaque, target_phys_addr_t offset) { uint16_t i; struct omap_mmc_s *s = (struct omap_mmc_s *) opaque; @@ -394,7 +394,7 @@ static uint32_t omap_mmc_read(void *opaque, a_target_phys_addr offset) return 0; } -static void omap_mmc_write(void *opaque, a_target_phys_addr offset, +static void omap_mmc_write(void *opaque, target_phys_addr_t offset, uint32_t value) { int i; @@ -410,9 +410,9 @@ static void omap_mmc_write(void *opaque, a_target_phys_addr offset, for (i = 0; i < 8; i ++) s->rsp[i] = 0x0000; omap_mmc_command(s, value & 63, (value >> 15) & 1, - (e_sd_cmd_type) ((value >> 12) & 3), + (sd_cmd_type_t) ((value >> 12) & 3), (value >> 11) & 1, - (e_sd_rsp_type) ((value >> 8) & 7), + (sd_rsp_type_t) ((value >> 8) & 7), (value >> 7) & 1); omap_mmc_update(s); break; @@ -569,7 +569,7 @@ static void omap_mmc_cover_cb(void *opaque, int line, int level) } } -struct omap_mmc_s *omap_mmc_init(a_target_phys_addr base, +struct omap_mmc_s *omap_mmc_init(target_phys_addr_t base, BlockDriverState *bd, qemu_irq irq, qemu_irq dma[], omap_clk clk) { |