aboutsummaryrefslogtreecommitdiffstats
path: root/console.c
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2011-01-13 11:24:07 -0800
committerVladimir Chtchetkine <vchtchetkine@google.com>2011-01-13 11:24:07 -0800
commit90c6235ce7bdc6f7afbcfe56ea6f2c3d2b128447 (patch)
tree18ca241d0b2b91acbc5b9a0ee1c8b7c79ace2988 /console.c
parent3bf6efc0928555529c3df28d291117390b840c16 (diff)
downloadexternal_qemu-90c6235ce7bdc6f7afbcfe56ea6f2c3d2b128447.zip
external_qemu-90c6235ce7bdc6f7afbcfe56ea6f2c3d2b128447.tar.gz
external_qemu-90c6235ce7bdc6f7afbcfe56ea6f2c3d2b128447.tar.bz2
Refining main-ui.c to better separate UI and core related initialization
The main reason for this is to clarify initialization for UI that starts core, and UI that attaches to an existing core. In this CL I did: - Removed -initdata option that seems obsolete (doesn't affect anything in the code) - Passed through -timezone option that doesn't affect anything in the UI, and is needed only in the core. - Removed dependency on AVD info from the core (core needed only virtual device name) Change-Id: Ie631249848a1b5b8d837c0c7b201a40ee7e4a367
Diffstat (limited to 'console.c')
-rw-r--r--console.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/console.c b/console.c
index 6125894..6cadb73 100644
--- a/console.c
+++ b/console.c
@@ -312,10 +312,10 @@ static void vga_bitblt(DisplayState *ds, int xs, int ys, int xd, int yd, int w,
#define cbswap_32(__x) \
((uint32_t)( \
- (((uint32_t)(__x) & (uint32_t)0x000000ffUL) << 24) | \
- (((uint32_t)(__x) & (uint32_t)0x0000ff00UL) << 8) | \
- (((uint32_t)(__x) & (uint32_t)0x00ff0000UL) >> 8) | \
- (((uint32_t)(__x) & (uint32_t)0xff000000UL) >> 24) ))
+ (((uint32_t)(__x) & (uint32_t)0x000000ffUL) << 24) | \
+ (((uint32_t)(__x) & (uint32_t)0x0000ff00UL) << 8) | \
+ (((uint32_t)(__x) & (uint32_t)0x00ff0000UL) >> 8) | \
+ (((uint32_t)(__x) & (uint32_t)0xff000000UL) >> 24) ))
#ifdef HOST_WORDS_BIGENDIAN
#define PAT(x) x
@@ -1395,7 +1395,7 @@ DisplayState *graphic_console_init(vga_hw_update_ptr update,
DisplayState *ds;
ds = (DisplayState *) qemu_mallocz(sizeof(DisplayState));
- ds->allocator = &default_allocator;
+ ds->allocator = &default_allocator;
#ifdef CONFIG_ANDROID
ds->surface = qemu_create_displaysurface(ds, android_display_width, android_display_height);
#else