aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 59e8e196 into tools_r10. DO NOT MERGE.David 'Digit' Turner2011-02-168-20/+49
| | | | | | | | | | | | | Add hw.keyboard.lid This is used to control the lid switch virtual device. + Add support for a "version <number>" field to the skin format. This will later be used for skin format #3. + Fix a bug where string hw properties didn't work/compile Change-Id: I27ff3293b439917a51c584a25139264ddb1aff12
* Merge "Fix "avd name" bug." into tools_r10David 'Digit' Turner2011-02-162-0/+6
|\
| * Fix "avd name" bug.David 'Digit' Turner2011-02-172-0/+6
|/ | | | | | | | | | | | | The console's 'avd name' command returned "unknown" incorrectly. This was due to a missing option when invoking the core, even in the standalone case. Fixes bug 3454261 Change-Id: I7efcfc50792231f57dc76d3c11e7968faf057e12 NOTE: This is a quick fix for tools_r10. A proper fix should instead move the AVD name to auto-generated qemu-hardware.ini instead of using a core command-line option.
* Merge "Merge 593d0ea0 into tools_r10. DO NOT MERGE." into tools_r10Xavier Ducrohet2011-02-151-5/+7
|\
| * Merge 593d0ea0 into tools_r10. DO NOT MERGE.David 'Digit' Turner2011-02-151-5/+7
|/ | | | | | | | | | | | hw-sensors.c: Reduce default delay between sensor updates. This reduces the default delay used between sensor updates. This is needed to fix orientation for Honeycomb emulation since the framework's window orientation listener now discards events if they are spaced by more than 1 second (which happened to be the old default). Change-Id: I4a29bc6f905ca048aa8b753130a7a1711c3a79f3
* Merge "Rename emulator_config_xxx to user_config_xxx"David 'Digit' Turner2011-02-094-10/+10
|\
| * Rename emulator_config_xxx to user_config_xxxDavid 'Digit' Turner2011-02-094-10/+10
|/ | | | Change-Id: Icfcef72a02e388f2aa87b97f004ed43715fc9f30
* Merge "emulator: Fix -no-window flag"David 'Digit' Turner2011-02-091-0/+2
|\
| * emulator: Fix -no-window flagDavid 'Digit' Turner2011-02-091-0/+2
| | | | | | | | Change-Id: Ibb06b7d412faeafa717de6d095a9eaae84d35ab4
* | Merge "android-configure.sh: Fix --cc=<compiler> option."David 'Digit' Turner2011-02-096-8/+42
|\ \ | |/
| * android-configure.sh: Fix --cc=<compiler> option.David 'Digit' Turner2011-02-096-8/+42
| | | | | | | | | | | | | | | | + Fix LOCAL_GENERATED_SOURCES handling + Fix missing library dependencies for executables + Move generated library files to objs/libs/ (instead of objs/) Change-Id: If3ebaa7ae856efa9bd3ff9e2c199389989db7f71
* | Merge "elff: Remove un-needed qemu-common.h include."David 'Digit' Turner2011-02-096-30/+13
|\ \ | |/
| * elff: Remove un-needed qemu-common.h include.David 'Digit' Turner2011-02-096-30/+13
| | | | | | | | | | | | | | The elff library doesn't really depend on anything QEMU-specific. This will allow us to use it in other projects later. Change-Id: I662b6e864b320cd9cf2fe246d04fbba95be66c56
* | Merge "Rename qemu-android to qemu-android-$(TARGET_ARCH)"David 'Digit' Turner2011-02-091-2/+1
|\ \ | |/
| * Rename qemu-android to qemu-android-$(TARGET_ARCH)David 'Digit' Turner2011-02-091-2/+1
| | | | | | | | | | | | | | This makes it easier to distinguish between the ARM and x86 versions of the program. Change-Id: Id6991e4c4b14c560d1732da05e253c678ca392d9
* | Merge "Fixing aborts caused by compute_fb_update_rect_linear() when the ↵David Turner2011-02-092-1/+11
|\ \ | |/ |/| | | framebuffers are large. Also, added a boot parameter for the goldfish kernel to use PIT, rather than TSC."
| * Fixing aborts caused by compute_fb_update_rect_linear() when the framebuffersJun Nakajima2011-02-082-1/+11
|/ | | | | | | | are large. Also, added a boot parameter for the goldfish kernel to use PIT, rather than TSC. Change-Id: I5824c7248e0c1a4c487aeb52da112d870846ae62 Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
* Merge "Fix emulator core and UI on Windows"Vladimir Chtchetkine2011-02-076-10/+107
|\
| * Fix emulator core and UI on WindowsVladimir Chtchetkine2011-02-076-10/+107
|/ | | | | | | | There are two parts in this CL: 1. Fixing the Windows build (missing set_fd_handler) 2. Replacing read/write with socket_recv/socket_send. Change-Id: I5fa599774260257d481b738a892e1124135fc319
* Merge "Fix android-configure.sh"Vladimir Chtchetkine2011-02-071-0/+5
|\
| * Fix android-configure.shDavid 'Digit' Turner2011-02-071-0/+5
|/ | | | | | | | The latest patch broke the script because TARGET_ARCH is no longer defined as it should. Use the --arch=x86 option to force an x86 build (which currently fails though), arm being the default. Change-Id: Ie5f508b2caa972620787fc268f8dccc02df65f2b
* Merge "events: Fix no-Dpad emulation when hw.keyboard=yes"David 'Digit' Turner2011-02-061-0/+23
|\
| * events: Fix no-Dpad emulation when hw.keyboard=yesDavid 'Digit' Turner2011-02-061-0/+23
|/ | | | | | | | | | This fixes a bug where Dpad emulation was forced when hw.keyboard was set to 'yes' in hardware.ini, even if hw.dpad was set to no. The problem was that the events device set the Dpad EV_KEY bits unconditionally since they are in the 0..0xff range. Change-Id: Ice2488341170f43d3fe230d816a089da97c4d5ac
* Merge "Improve telephony emulation support."David 'Digit' Turner2011-02-041-38/+38
|\
| * Improve telephony emulation support.David 'Digit' Turner2011-02-041-38/+38
| | | | | | | | | | | | | | | | | | This patch fixes a few minor bugs in our emulated GSM modem. - Mixup between the answers for +CGDCONT=? and +CGDCONT? - Return our IP address as part of +CGDCONT=? now - Ensure the area code and cell id are no more than 4 hexadecimal digits Change-Id: I4fc0b333ed0f7df88a9874490d3b3e0b4a09a7d3
* | Merge "x86: Add x86 support. Rebase the change (20906/1) due to a minor ↵David Turner2011-02-0315-43/+235
|\ \ | |/ |/| | | conflict."
| * x86: Add x86 support. Rebase the change (20906/1) due to a minor conflict.Jun Nakajima2011-02-0215-43/+235
|/ | | | | | | Change-Id: Ic73cca0fc6c6e5cf74f63daa6080d00aa7c392bb Signed-off-by: Xiaohui Xin <xiaohui.xin@intel.com> Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com> Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
* Merge "Formatting / Code styling."David 'Digit' Turner2011-02-024-85/+91
|\
| * Formatting / Code styling.David 'Digit' Turner2011-02-024-85/+91
|/ | | | | | | Rename implFb_xxx to fbUpdatesImpl_xxx for consistency Avoid redundant global variable access Change-Id: I783b52ade3ff3e9f04f34162684eeb9c4c4addac
* Merge "Remove QEMU-ism from UI code."David 'Digit' Turner2011-02-026-895/+31
|\
| * Remove QEMU-ism from UI code.David 'Digit' Turner2011-02-026-895/+31
|/ | | | | | | | | This gets rid of qemu_set_fd_handler() users in the UI program. We can remove its implementation from vl-android-ui.c + Really remove qemu-timer-ui.c :-) Change-Id: I490df8ad5d5eea36b332bf54e2b156f6b5872bf4
* Merge changes Icd076267,I6d5ad6ecDavid 'Digit' Turner2011-02-0218-1358/+241
|\ | | | | | | | | | | * changes: Simplify UI-only sources. Simplify core framebuffer management.
| * Simplify UI-only sources.David 'Digit' Turner2011-02-0211-1152/+108
| | | | | | | | | | | | | | | | | | | | Get rid of console-ui.c, qemu-timer-ui.c and modify vl-android-ui.c to use a generic Looper object instead of a crummy event loop. We still need to implement qemu_set_fd_handler for two sources under android/protocol/ but this will be cleaned up later. Change-Id: Icd0762675ca2f54e720a9cec40f96caea500b52f
| * Simplify core framebuffer management.David 'Digit' Turner2011-02-027-206/+133
|/ | | | | | | | | | | | | | | | | | | | | | | Remove one layer of indirection between the core's DisplayState and a ProxyFramebuffer object. The main ideas behind this patch are that: - We don't need a QFrameBuffer object when in the core process, each proxy can receive display updates directly from QEMU. - The DisplayChangeListener is really lame: its can't dissociate between several listeners that use the same callback pointers, so introduce DisplayUpdateListener in console.h to work around this. This is preferably to modifying DisplayChangeListener which is going to introduce conflicts with upstream. - Simplify a lot the console code and display-core. Note that we can have several framebuffer clients at the same time now. Note that QFrameBuffer is still used by both the UI program and the standalone emulator. Change-Id: I6d5ad6ecd9b34b9d9d1a30ea5000e875c285e84e
* Merge "Move framebuffer.h to android/"David 'Digit' Turner2011-02-0211-16/+15
|\
| * Move framebuffer.h to android/David 'Digit' Turner2011-02-0211-16/+15
| | | | | | | | | | | | | | The QFrameBuffer is no used by QEMU-specific code anymore so it's more logical to move it here. Change-Id: Id49ff53dd49648000e7543652d66f7c03881a8cb
* | Merge "Move core-connection.c from to android/protocol/"David 'Digit' Turner2011-02-0211-9/+9
|\ \ | |/
| * Move core-connection.c from to android/protocol/David 'Digit' Turner2011-02-0211-9/+9
| | | | | | | | Change-Id: I1f04ed1f00fccdea043f4a4fbf5ba745b36bbcc7
* | Merge "Separate init_skinned_ui() into two functions."David 'Digit' Turner2011-02-026-214/+227
|\ \ | |/
| * Separate init_skinned_ui() into two functions.David 'Digit' Turner2011-02-026-214/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes init_skinned_ui() and adds parse_skin_files() and init_sdl_ui(). The first function only parses skin files and options, and doesn't do anything related to the UI. The second function does setup the SDL UI after all options/skin processing has been performed. We also modify main.c and main-ui.c to move the call to init_sdl_ui() as far as possible after the options parsing. + Move core attachment code to the end of qemu_main() in main-ui.c Change-Id: I2bf5f0a096d827ae1fee070a8fa45cbd4629d54f
* | Merge "Move common main routines from into android-common.[hc]"David 'Digit' Turner2011-02-025-938/+582
|\ \ | |/
| * Move common main routines from into android-common.[hc]David 'Digit' Turner2011-02-025-938/+582
|/ | | | | | This is a first step towards cleaning-up our initialization/startup code. Change-Id: I2d4fbc5c2cd0181fb39a1a97a15650945038c3b9
* Merge "Create user data image using the initial user data image"David Turner2011-02-011-1/+0
|\
| * Create user data image using the initial user data imageOrjan Percy2011-01-281-1/+0
| | | | | | | | | | | | | | | | | | | | Starting the emulator with a new AVD should create a new user data image (userdata-qemu.img) as a copy of existing user data image (userdata.img). This is not done since the flag IMAGE_EMPTY_IF_MISSING will cause the user data image to be reset. By not setting the flag the user data is initialized in the way documented in code and on-line help. Change-Id: I787bcbc904f79edf241fbacb7446f459fc5f2ad0
* | Merge "Add cache-util.c to built sources for PPC"David Turner2011-02-011-1/+2
|\ \
| * | Add cache-util.c to built sources for PPCMarcus Comstedt2011-02-011-1/+2
| | | | | | | | | | | | | | | | | | | | | The file cache-utils.c contains code that is referenced in a build for a PowerPC host. Change-Id: I284481d4015de8d7fc230014faf9a1ead61c222c
* | | Merge "Generate temporary hardware.ini from configuration settings."David 'Digit' Turner2011-02-017-41/+213
|\ \ \ | |/ / |/| |
| * | Generate temporary hardware.ini from configuration settings.David 'Digit' Turner2011-02-017-41/+213
|/ / | | | | | | | | | | | | | | | | This patch generates a temporary hardware.ini from the hardware configuration. The idea is to move as much hw config info as possible to a single file that the core can read. Other patches will change how various config info is passed to the core, from command-line options to the generated hardware.ini.
* | Merge "Refactor attach-UI service"Vladimir Chtchetkine2011-02-0115-137/+385
|\ \
| * | Refactor attach-UI serviceVladimir Chtchetkine2011-01-3115-137/+385
|/ / | | | | | | Change-Id: Ia68ceb57ee5b5a66fa76b837fe3b990eb12e7188
generated by cgit v1.1 at 2024-06-26 09:57:17 +0000