From c227f0995e1722a1abccc28cadf0664266bd8043 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Thu, 1 Oct 2009 16:12:16 -0500 Subject: 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 --- hw/jazz_led.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'hw/jazz_led.c') diff --git a/hw/jazz_led.c b/hw/jazz_led.c index 2df0e7f..18780e9 100644 --- a/hw/jazz_led.c +++ b/hw/jazz_led.c @@ -31,15 +31,15 @@ typedef enum { REDRAW_NONE = 0, REDRAW_SEGMENTS = 1, REDRAW_BACKGROUND = 2, -} e_screen_state; +} screen_state_t; typedef struct LedState { uint8_t segments; DisplayState *ds; - e_screen_state state; + screen_state_t state; } LedState; -static uint32_t led_readb(void *opaque, a_target_phys_addr addr) +static uint32_t led_readb(void *opaque, target_phys_addr_t addr) { LedState *s = opaque; uint32_t val; @@ -58,7 +58,7 @@ static uint32_t led_readb(void *opaque, a_target_phys_addr addr) return val; } -static uint32_t led_readw(void *opaque, a_target_phys_addr addr) +static uint32_t led_readw(void *opaque, target_phys_addr_t addr) { uint32_t v; #ifdef TARGET_WORDS_BIGENDIAN @@ -71,7 +71,7 @@ static uint32_t led_readw(void *opaque, a_target_phys_addr addr) return v; } -static uint32_t led_readl(void *opaque, a_target_phys_addr addr) +static uint32_t led_readl(void *opaque, target_phys_addr_t addr) { uint32_t v; #ifdef TARGET_WORDS_BIGENDIAN @@ -88,7 +88,7 @@ static uint32_t led_readl(void *opaque, a_target_phys_addr addr) return v; } -static void led_writeb(void *opaque, a_target_phys_addr addr, uint32_t val) +static void led_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) { LedState *s = opaque; @@ -105,7 +105,7 @@ static void led_writeb(void *opaque, a_target_phys_addr addr, uint32_t val) } } -static void led_writew(void *opaque, a_target_phys_addr addr, uint32_t val) +static void led_writew(void *opaque, target_phys_addr_t addr, uint32_t val) { #ifdef TARGET_WORDS_BIGENDIAN led_writeb(opaque, addr, (val >> 8) & 0xff); @@ -116,7 +116,7 @@ static void led_writew(void *opaque, a_target_phys_addr addr, uint32_t val) #endif } -static void led_writel(void *opaque, a_target_phys_addr addr, uint32_t val) +static void led_writel(void *opaque, target_phys_addr_t addr, uint32_t val) { #ifdef TARGET_WORDS_BIGENDIAN led_writeb(opaque, addr, (val >> 24) & 0xff); @@ -282,7 +282,7 @@ static void jazz_led_screen_dump(void *opaque, const char *filename) printf("jazz_led_screen_dump() not implemented\n"); } -static void jazz_led_text_update(void *opaque, a_console_ch *chardata) +static void jazz_led_text_update(void *opaque, console_ch_t *chardata) { LedState *s = opaque; char buf[2]; @@ -298,7 +298,7 @@ static void jazz_led_text_update(void *opaque, a_console_ch *chardata) dpy_update(s->ds, 0, 0, 2, 1); } -void jazz_led_init(a_target_phys_addr base) +void jazz_led_init(target_phys_addr_t base) { LedState *s; int io; -- cgit v1.1