aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "hw-sensors.c: Reduce default delay between sensor updates."Xavier Ducrohet2011-02-151-5/+7
|\
| * hw-sensors.c: Reduce default delay between sensor updates.David 'Digit' Turner2011-02-151-5/+7
|/ | | | | | | | | | 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: I9194d93ab445302df1d887473b6ff5c446e13f98
* Merge "Add hw.keyboard.lid"David 'Digit' Turner2011-02-108-20/+49
|\
| * Add hw.keyboard.lidDavid 'Digit' Turner2011-02-108-20/+49
| | | | | | | | | | | | | | | | | | | | | | 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: I678a0988d2cd24169dd0c2ece96e7ab0b2822104
* | Merge "Correct auto-detection of default VM heap size."David 'Digit' Turner2011-02-108-58/+69
|\ \ | |/
| * Correct auto-detection of default VM heap size.David 'Digit' Turner2011-02-108-58/+69
| | | | | | | | | | | | | | | | | | | | | | | | This patch removes the need for the -m <memory> core option. Instead, the RAM size is taken by default from qemu-hardware.ini. Also, the default value of vm.heapSize is no longer 16MB, it is now adjusted based on the RAM size (16/32/48 values) + Get rid of core -lcd-density option (use .ini file instead) Change-Id: I93919926b61a132c7943a1bb2c41f7a3ab7f2d2f
* | Merge "Get rid of -android-gui core option."David 'Digit' Turner2011-02-108-82/+118
|\ \ | |/
| * Get rid of -android-gui core option.David 'Digit' Turner2011-02-108-82/+118
| | | | | | | | | | | | | | | | | | Instead, pass all LCD configuration in qemu-hardware.ini. + Make the latter file mandatory to launch a core. You can easily generate one by launching "emulator <options>" though. Change-Id: I81a1938217562517e4c2bbb828aef934033c29a5
* | Merge "Write the core hardware configuration file to AVD's content directory."David 'Digit' Turner2011-02-104-39/+64
|\ \ | |/
| * Write the core hardware configuration file to AVD's content directory.David 'Digit' Turner2011-02-104-39/+64
|/ | | | | | | | | | | | | Do not write the core's hardware configuration file to a temporary file. Instead, stored it under the AVD's content directory with the name qemu-hardware.ini. For platform builds, use $ANDROID_PRODUCT_OUT/qemu-hardware.ini The purpose of this auto-generated file is to contain all hardware configuration required to properly launch a core from the UI. Further patches will get rid of special core command-line options (e.g. -android-gui) and rely on the content of this file, by adding new hw properties. Change-Id: Id761151c8c8990f1cfa7380779b720080f49469f
* Merge "Revert "Build arm and x86 binaries at the same time.""Xavier Ducrohet2011-02-0931-1134/+1321
|\
| * Revert "Build arm and x86 binaries at the same time."Xavier Ducrohet2011-02-0931-1134/+1321
|/ | | | | | This fails to build on MacOS X This reverts commit a39b10bd2574825a815d6ad854499dd127cfa9cb.
* Merge "Build arm and x86 binaries at the same time."David 'Digit' Turner2011-02-0931-1321/+1134
|\
| * Build arm and x86 binaries at the same time.David 'Digit' Turner2011-02-1031-1321/+1134
| | | | | | | | Change-Id: I105c5a097c988cb964b47b40b71c7a08af0d9210
* | Merge ""Negative" DNS IP address fix"David Turner2011-02-091-1/+1
|\ \ | |/ |/|
| * "Negative" DNS IP address fixrich cannings2011-02-091-1/+1
|/ | | | | | | | | | The DNS server IP is stored in a 32-bit signed int. Thus, no IP address beyond 128.0.0.0 was allowed to be set as DNS server. This change allows for DNS servers to have any IP addresses, except 255.255.255.255 (equivalent to -1 in a 32-bit signed int). Change-Id: I367f46a1de578b0cd123f14f564685c4564aab4e
* 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
|\ \ | |/