diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/blizzard_template.h | 2 | ||||
| -rw-r--r-- | hw/bt-hci.c | 2 | ||||
| -rw-r--r-- | hw/gus.c | 2 | ||||
| -rw-r--r-- | hw/omap_lcd_template.h | 2 | ||||
| -rw-r--r-- | hw/pl110_template.h | 6 | ||||
| -rw-r--r-- | hw/pxa2xx_template.h | 2 | ||||
| -rw-r--r-- | hw/vga.c | 14 | ||||
| -rw-r--r-- | hw/vga_template.h | 6 |
8 files changed, 18 insertions, 18 deletions
diff --git a/hw/blizzard_template.h b/hw/blizzard_template.h index 0ef27d1c4d..42f4e90b04 100644 --- a/hw/blizzard_template.h +++ b/hw/blizzard_template.h @@ -41,7 +41,7 @@ # error unknown bit depth #endif -#ifdef WORDS_BIGENDIAN +#ifdef HOST_WORDS_BIGENDIAN # define SWAP_WORDS 1 #endif diff --git a/hw/bt-hci.c b/hw/bt-hci.c index 6a7909406c..d510d81180 100644 --- a/hw/bt-hci.c +++ b/hw/bt-hci.c @@ -419,7 +419,7 @@ static void bt_submit_raw_acl(struct bt_piconet_s *net, int length, uint8_t *dat * be continuously allocated. We do it though, to preserve similar * behaviour between hosts. Some things, like the BD_ADDR cannot be * preserved though (for example if a real hci is used). */ -#ifdef WORDS_BIGENDIAN +#ifdef HOST_WORDS_BIGENDIAN # define HNDL(raw) bswap16(raw) #else # define HNDL(raw) (raw) @@ -35,7 +35,7 @@ #define ldebug(...) #endif -#ifdef WORDS_BIGENDIAN +#ifdef HOST_WORDS_BIGENDIAN #define GUS_ENDIANNESS 1 #else #define GUS_ENDIANNESS 0 diff --git a/hw/omap_lcd_template.h b/hw/omap_lcd_template.h index 0590e45010..2fb96f83ae 100644 --- a/hw/omap_lcd_template.h +++ b/hw/omap_lcd_template.h @@ -152,7 +152,7 @@ static void glue(draw_line12_, DEPTH)(void *opaque, static void glue(draw_line16_, DEPTH)(void *opaque, uint8_t *d, const uint8_t *s, int width, int deststep) { -#if DEPTH == 16 && defined(WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) +#if DEPTH == 16 && defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) memcpy(d, s, width * 2); #else uint16_t v; diff --git a/hw/pl110_template.h b/hw/pl110_template.h index d7ff8bc61c..b3c9077dcc 100644 --- a/hw/pl110_template.h +++ b/hw/pl110_template.h @@ -95,18 +95,18 @@ static drawfn glue(pl110_draw_fn_,BITS)[36] = #if ORDER == 0 #define NAME glue(glue(lblp_, BORDER), BITS) -#ifdef WORDS_BIGENDIAN +#ifdef HOST_WORDS_BIGENDIAN #define SWAP_WORDS 1 #endif #elif ORDER == 1 #define NAME glue(glue(bbbp_, BORDER), BITS) -#ifndef WORDS_BIGENDIAN +#ifndef HOST_WORDS_BIGENDIAN #define SWAP_WORDS 1 #endif #else #define SWAP_PIXELS 1 #define NAME glue(glue(lbbp_, BORDER), BITS) -#ifdef WORDS_BIGENDIAN +#ifdef HOST_WORDS_BIGENDIAN #define SWAP_WORDS 1 #endif #endif diff --git a/hw/pxa2xx_template.h b/hw/pxa2xx_template.h index 35312ec296..40f4e4d219 100644 --- a/hw/pxa2xx_template.h +++ b/hw/pxa2xx_template.h @@ -23,7 +23,7 @@ # error unknown bit depth #endif -#ifdef WORDS_BIGENDIAN +#ifdef HOST_WORDS_BIGENDIAN # define SWAP_WORDS 1 #endif @@ -74,19 +74,19 @@ const uint8_t gr_mask[16] = { (((uint32_t)(__x) & (uint32_t)0x00ff0000UL) >> 8) | \ (((uint32_t)(__x) & (uint32_t)0xff000000UL) >> 24) )) -#ifdef WORDS_BIGENDIAN +#ifdef HOST_WORDS_BIGENDIAN #define PAT(x) cbswap_32(x) #else #define PAT(x) (x) #endif -#ifdef WORDS_BIGENDIAN +#ifdef HOST_WORDS_BIGENDIAN #define BIG 1 #else #define BIG 0 #endif -#ifdef WORDS_BIGENDIAN +#ifdef HOST_WORDS_BIGENDIAN #define GET_PLANE(data, p) (((data) >> (24 - (p) * 8)) & 0xff) #else #define GET_PLANE(data, p) (((data) >> ((p) * 8)) & 0xff) @@ -113,7 +113,7 @@ static const uint32_t mask16[16] = { #undef PAT -#ifdef WORDS_BIGENDIAN +#ifdef HOST_WORDS_BIGENDIAN #define PAT(x) (x) #else #define PAT(x) cbswap_32(x) @@ -1369,7 +1369,7 @@ static void vga_draw_text(VGAState *s, int full_update) if (cx > cx_max) cx_max = cx; *ch_attr_ptr = ch_attr; -#ifdef WORDS_BIGENDIAN +#ifdef HOST_WORDS_BIGENDIAN ch = ch_attr >> 8; cattr = ch_attr & 0xff; #else @@ -1632,7 +1632,7 @@ static void vga_draw_graphic(VGAState *s, int full_update) disp_width != s->last_width || height != s->last_height || s->last_depth != depth) { -#if defined(WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) +#if defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) if (depth == 16 || depth == 32) { #else if (depth == 32) { @@ -1641,7 +1641,7 @@ static void vga_draw_graphic(VGAState *s, int full_update) s->ds->surface = qemu_create_displaysurface_from(disp_width, height, depth, s->line_offset, s->vram_ptr + (s->start_addr * 4)); -#if defined(WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN) +#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN) s->ds->surface->pf = qemu_different_endianness_pixelformat(depth); #endif dpy_resize(s->ds); diff --git a/hw/vga_template.h b/hw/vga_template.h index 0bc2e8020c..8f32a77b6a 100644 --- a/hw/vga_template.h +++ b/hw/vga_template.h @@ -417,7 +417,7 @@ void glue(vga_draw_cursor_line_, DEPTH)(uint8_t *d1, static void glue(vga_draw_line15_, PIXEL_NAME)(VGAState *s1, uint8_t *d, const uint8_t *s, int width) { -#if DEPTH == 15 && defined(WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) +#if DEPTH == 15 && defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) memcpy(d, s, width * 2); #else int w; @@ -442,7 +442,7 @@ static void glue(vga_draw_line15_, PIXEL_NAME)(VGAState *s1, uint8_t *d, static void glue(vga_draw_line16_, PIXEL_NAME)(VGAState *s1, uint8_t *d, const uint8_t *s, int width) { -#if DEPTH == 16 && defined(WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) +#if DEPTH == 16 && defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) memcpy(d, s, width * 2); #else int w; @@ -493,7 +493,7 @@ static void glue(vga_draw_line24_, PIXEL_NAME)(VGAState *s1, uint8_t *d, static void glue(vga_draw_line32_, PIXEL_NAME)(VGAState *s1, uint8_t *d, const uint8_t *s, int width) { -#if DEPTH == 32 && defined(WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) && !defined(BGR_FORMAT) +#if DEPTH == 32 && defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) && !defined(BGR_FORMAT) memcpy(d, s, width * 4); #else int w; |