aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Refactor the framebuffer service"Vladimir Chtchetkine2011-01-3111-236/+204
|\ \
| * | Refactor the framebuffer serviceVladimir Chtchetkine2011-01-3111-236/+204
|/ / | | | | | | Change-Id: I8ac4580af65b8d58976c97b77b309dd202e75003
* | Merge "Upstream: Integrate TCG changes for remaining arches"David Turner2011-01-3110-0/+8433
|\ \
| * | Upstream: Integrate TCG changes for remaining archesMarcus Comstedt2011-01-2710-0/+8433
| |/ | | | | | | | | | | | | | | Commit b93177278 integrated upstreams TCG changes for i386 and x86_64. This commit pulls the equivalent changes for the remaining arches. Change-Id: I88a8a0e6124de841bbccba5840b19dd5612a56ed
* | Merge " New files are from the upstream QEMU (0.10.5), and the code is ↵David Turner2011-01-3128-0/+28307
|\ \ | | | | | | | | | based on the following commit (dated 2009-06-19, see CHANGES.TXT):"
| * | New files are from the upstream QEMU (0.10.5), and the code is based onJun Nakajima2011-01-2928-0/+28307
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the following commit (dated 2009-06-19, see CHANGES.TXT): d2e9fd8f703203c2eeeed120b1ef6c3a6574e0ab new file: hw/apic.c new file: hw/fdc.h new file: hw/fw_cfg.c new file: hw/fw_cfg.h new file: hw/i8254.c new file: hw/i8259.c new file: hw/ioapic.c new file: hw/mc146818rtc.c new file: hw/ne2000.c new file: hw/pc.c new file: hw/pckbd.c new file: hw/piix_pci.c new file: hw/ps2.c new file: hw/ps2.h new file: hw/smbios.c new file: target-i386/TODO new file: target-i386/cpu.h new file: target-i386/exec.h new file: target-i386/helper.c new file: target-i386/helper.h new file: target-i386/helper_template.h new file: target-i386/kvm.c new file: target-i386/machine.c new file: target-i386/op_helper.c new file: target-i386/ops_sse.h new file: target-i386/ops_sse_header.h new file: target-i386/svm.h new file: target-i386/translate.c Change-Id: I55c62ed7516f002c882705545e7c21997ece9927
* | Merge "Refactored user-events protocol"Vladimir Chtchetkine2011-01-2812-415/+474
|\ \
| * | Refactored user-events protocolVladimir Chtchetkine2011-01-2812-415/+474
|/ / | | | | | | Change-Id: I08afb96ef17a52c3795f5029acfc244a93ab57c7
* | Merge "Refactored ui-core-control and core-ui-control protocols"Vladimir Chtchetkine2011-01-2833-1818/+2026
|\ \ | |/ |/|
| * Refactored ui-core-control and core-ui-control protocolsVladimir Chtchetkine2011-01-2833-1818/+2026
|/ | | | | | | Also cleaned the code up from obsolete ui-core-protocol.* and core-ui-protocol.* Change-Id: I194bec669d25b68a10c32b2be50bc9da50c52ebb
* Merge "Remove spaces in the console service names"Vladimir Chtchetkine2011-01-267-16/+16
|\
| * Remove spaces in the console service namesVladimir Chtchetkine2011-01-267-16/+16
|/ | | | Change-Id: I339449214ab951aba40abfe2a5b3e3ebfb222311
* Merge "Implement UI control service and client"Vladimir Chtchetkine2011-01-2615-102/+1645
|\
| * Implement UI control service and clientVladimir Chtchetkine2011-01-2515-102/+1645
| | | | | | | | Change-Id: Iecc1b5bb9ddcdaf9f22c500a5195718db3f25354
* | Merge "Security fix from Tavis Ormandy"rich cannings2011-01-251-3/+5
|\ \
| * | Security fix from Tavis Ormandyrich cannings2011-01-251-3/+5
|/ / | | | | | | | | | | Perform null check before calling r->transfer_handler. Change-Id: Ide3cd7edc7bde12a0635572bfa72f3a6dd05a926
* | Merge "Use setenv when available"rich cannings2011-01-251-1/+2
|\ \
| * | Use setenv when availablerich cannings2011-01-251-1/+2
|/ / | | | | | | | | | | | | | | Even putenv("X=y") is bad because the "string becomes part of the environment; changing it later will change the environment." (http://www.kernel.org/doc/man-pages/online/pages/man3/putenv.3.html) Change-Id: I0d57204a7020649493fb005c962951407d40fa45
* | Merge "Use putenv when setenv is unavailable"rich cannings2011-01-251-2/+7
|\ \
| * | Use putenv when setenv is unavailablerich cannings2011-01-251-2/+7
|/ / | | | | | | | | | | | | Windows builds and possibly others do not have putenv. Using "#ifdef HAVE_SETENV" which is common in qemu. Change-Id: I2cd6770a77cd192440ff4dc6a624568eb27d5558
* | Merge "putenv(3) misused. Corrected with setenv(3)."rich cannings2011-01-251-3/+3
|\ \ | |/ |/|
| * putenv(3) misused. Corrected with setenv(3).rich cannings2011-01-241-3/+3
|/ | | | | | | | POS34-C. Do not call putenv() with a pointer to an automatic variable as the argument: Change-Id: I0c973edd2cc8d6c86287ec0258bca6a06f319bfb https://www.securecoding.cert.org/confluence/display/seccode/POS34-C.+Do+not+call+putenv()+with+a+pointer+to+an+automatic+variable+as+the+argument
* Merge "Remove unnecessary calls in UI <-> Core protocols."Vladimir Chtchetkine2011-01-208-28/+20
|\
| * Remove unnecessary calls in UI <-> Core protocols.Vladimir Chtchetkine2011-01-208-28/+20
|/ | | | | | | Core port related calls are no longer needed, since UI is aware of core's base port on attachment to the core Change-Id: Ic211fc9b02cb652009360f80917e90c44d941878
* Merge "Force core to send entire framebuffer on UI attachment"Vladimir Chtchetkine2011-01-207-27/+102
|\
| * Force core to send entire framebuffer on UI attachmentVladimir Chtchetkine2011-01-207-27/+102
|/ | | | Change-Id: I2feb813314163b94781ffe765eb23527b6c4a0f1
* Merge "Fix framebuffer and user events service disconnection bug."Vladimir Chtchetkine2011-01-203-0/+37
|\
| * Fix framebuffer and user events service disconnection bug.Vladimir Chtchetkine2011-01-203-0/+37
|/ | | | | | | | | | | FB and UE services overwrite the socket's read callbacks, making the console unavare of the fact that console client gets disconnected. As the result, console clients for FB and UE stays alive after UI has exited, making it impossible to attach another UI. To fix this, we add socket read callbacks to the FB and UE service that monitor the disconnection event and destroy their console clients on such events. Change-Id: I82e714f33ccc81bc04ca47eda6fbb8fab4a313f9
* Merge "Implement user event transmission between the UI and the core"Vladimir Chtchetkine2011-01-2010-25/+458
|\
| * Implement user event transmission between the UI and the coreVladimir Chtchetkine2011-01-1910-25/+458
| | | | | | | | Change-Id: I503aa691cada5250b76167a923d4a226d20ee41d
* | Merge "Fix ui/core display depth mismatch."David 'Digit' Turner2011-01-193-25/+35
|\ \ | |/ |/|
| * Fix ui/core display depth mismatch.David 'Digit' Turner2011-01-203-25/+35
|/ | | | | | | | | | | | | | | | | This patch fixes a problem where the core's framebuffer was incorrectly initialized to a pitch of width*4 by default (instead of width*2 when using a 16-bit framebuffer). The reason for this was complex, but essentially, when the machine initialization was moved before the display one in vl-android.c, this changed the way the DisplayState was initialized. Also get rid of the useless and confusing "display_state" global in vl-android.c (not the same than "display_state" in console.c) Change-Id: If8e2b8baf7ccaeedcb66da0174cc529521d67a60
* Merge "Compute default memory size from screen size."David 'Digit' Turner2011-01-196-4/+81
|\
| * Compute default memory size from screen size.David 'Digit' Turner2011-01-196-4/+81
| | | | | | | | | | | | | | | | This change is used when using a magic skin (e.g. -skin 800x600) or when using the full Android build system, in order to determine a good default for the RAM size. Change-Id: I900e28146592cdd3f0df9b3f1828b119309eea85
* | Merge "Print concatenated QEMU options with -verbose."David 'Digit' Turner2011-01-192-2/+16
|\ \ | |/
| * Print concatenated QEMU options with -verbose.David 'Digit' Turner2011-01-192-2/+16
| | | | | | | | | | | | | | This makes it easier to launch the core (qemu-android) with the same set of options than the stand-alone emulator. Change-Id: I55d0007f83280ffc5b9a26adc1300472013ff93d
* | Merge "Make "qwerty2" the default charmap."David 'Digit' Turner2011-01-195-149/+74
|\ \ | |/ |/|
| * Make "qwerty2" the default charmap.David 'Digit' Turner2011-01-195-149/+74
|/ | | | | | | | | | | | | | | This patch makes "qwerty2" the default charmap for skins that don't specifiy one explicitely. Note that the "qwerty" charmap is here for historical reasons only. All skins provided by all SDK Android platforms explicitely mention "qwerty2", so this patch will mainly impact "magic skins" like those created by an option like "-skin 1024x768". This gets rid of the obsolete "qwerty" charmap (it was never used by any of the skins provided by the SDK, and is incorrect). + Simplify android/charmap.[hc] code. + Lazy-load the charmap name in hw/goldfish_events_device.c
* Merge "Sligh speedup for pixel conversion routines with Duff's device."David 'Digit' Turner2011-01-183-48/+135
|\
| * Sligh speedup for pixel conversion routines with Duff's device.David 'Digit' Turner2011-01-183-48/+135
| | | | | | | | Change-Id: If832bc5844945f7a2027b2f8d09393586545d8d5
* | Merge "hw: framebuffer: add support for 32-bit framebuffers."David 'Digit' Turner2011-01-181-14/+21
|\ \ | |/
| * hw: framebuffer: add support for 32-bit framebuffers.David 'Digit' Turner2011-01-181-14/+21
| | | | | | | | | | | | | | This provides a new read i/o port to return the framebuffer's format to the kernel driver. Change-Id: Ifd1c4d8a4dc75fa73d5f6750e0b501c34468aec5
* | Merge "Add support for 32-bit framebuffers."David 'Digit' Turner2011-01-189-101/+238
|\ \ | |/
| * Add support for 32-bit framebuffers.David 'Digit' Turner2011-01-189-101/+238
|/ | | | | | | | | | | | | | | This modifies the emulator so support 32-bit framebuffers. You can create such a frame-buffer using one of these methods: - Add a "bpp 32" line to the "display" element of your skin - Use the new 'magic' skin option format: e.g. -skin 320x480x32 Note that the result will be hideous since the kernel driver still thinks the hardware is only 16-bits. This will be addressed in a later patch to hw/goldfish_fb.c and to the kernel driver ($KERNEL/drivers/video/goldfishfb.c) Change-Id: I0fc700c4a4cb8521076605324e15ed34e5d01136
* Merge "Adding proximity sensor simulation"David Turner2011-01-184-1/+46
|\
| * Adding proximity sensor simulationOla Albertsson2010-12-174-1/+46
| | | | | | | | | | | | | | Proximity sensor is added in emulator and avd ini file is modified to be able add a proximity seensor to a avd. Change-Id: I4d2645c0c4861511451b606e18d2fd9b9a2d27ed
* | Merge "hw: goldfish_fb: Minimize the size of the update rectangle."David 'Digit' Turner2011-01-181-92/+323
|\ \
| * | hw: goldfish_fb: Minimize the size of the update rectangle.David 'Digit' Turner2011-01-161-92/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch modifies the framebuffer's update callback to compute the minimum bounding rectangle of each framebuffer update. Before that, the code only computed the minimum and maximum Y coordinates, assuming xmin=0 and xmax=width-1. This should help reduce un-necessary traffic/churn for our core->UI framebuffer protocol. Moreover, introduce the ability to support framebuffers / display surfaces with different depths. This is a first step towards providing 32-bit framebuffers to the guest system to slightly speed-up emulated rendering on Gingerbread and above. Change-Id: I6194824ce67a3b1d6d95b5d97ddec3ef459e408e
* | | Merge "Refining main-ui.c to better separate UI and core related initialization"Vladimir Chtchetkine2011-01-189-49/+52
|\ \ \
| * | | Refining main-ui.c to better separate UI and core related initializationVladimir Chtchetkine2011-01-139-49/+52
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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