aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Merge "Serialise GSM call status to snapshot"David Turner2011-01-171-0/+58
|\ \ \ | |/ / |/| |
| * | Serialise GSM call status to snapshotTim Baverstock2011-01-171-0/+58
|/ / | | | | | | Change-Id: I54491e3e9910591aedcd700a9a350dc7a6fa7127
* | Merge "Hook up framebuffer changes with UI window"Vladimir Chtchetkine2011-01-137-40/+75
|\ \
| * | Hook up framebuffer changes with UI windowVladimir Chtchetkine2011-01-137-40/+75
| | | | | | | | | | | | Change-Id: Ib2dff72c808614cd6ded096d62717afc1c41e667
* | | Merge "Add dereference for snapshot block device handling"David Turner2011-01-131-2/+2
|\ \ \ | |/ / |/| |
| * | Add dereference for snapshot block device handlingTim Baverstock2011-01-101-2/+2
|/ / | | | | | | Change-Id: I20c83aab5fbd0c87b319ac84d7911eb09b69632b
* | Merge "Make the emulator find the skins in their new location."Xavier Ducrohet2011-01-071-1/+1
|\ \
| * | Make the emulator find the skins in their new location.Xavier Ducrohet2011-01-071-1/+1
|/ / | | | | | | Change-Id: Ib5c43306376e51a2a0866868f990ca8c8899ae7a
* | Merge "Fix Darwin build."Xavier Ducrohet2011-01-062-3/+3
|\ \
| * | Fix Darwin build.David 'Digit' Turner2011-01-062-3/+3
|/ / | | | | | | | | | | | | The reason for the build breakage is still mysterious though. Were the system headers updated during the last system update ?!? Change-Id: Ib0ea2b54bf7ffad907752c3a82fb4bbe686425a5
* | Merge "Fix tracing segfault due to improper upstream integrate."David 'Digit' Turner2011-01-061-29/+9
|\ \
| * | Fix tracing segfault due to improper upstream integrate.David 'Digit' Turner2011-01-061-29/+9
|/ / | | | | | | | | | | | | | | | | The integration failed to update some tcg files resulting in a crash when trying to trace stuff, and properly a few other problems. Undo it. We will re-integrate tcg changes later. Change-Id: I6fd3f7f442ce3bc70cb6995c04684cb1acfaa378
* | Merge "Fix tracing bug when built as 64-bit program."David 'Digit' Turner2011-01-061-1/+1
|\ \
| * | Fix tracing bug when built as 64-bit program.David 'Digit' Turner2011-01-061-1/+1
|/ / | | | | | | Change-Id: I523f4464cfbbd02aff93031660d2ee2f80d54921
* | Merge "upstream: integrate block changes"David 'Digit' Turner2011-01-0634-1754/+5284
|\ \
| * | upstream: integrate block changesDavid 'Digit' Turner2011-01-0234-1754/+5284
| | | | | | | | | | | | | | | | | | | | | | | | This large patch upgrades the block support code to the upstream version available in ba5e7f82169f32ab8163c707d97c799ca09f8924 dated 2010-08-08 Change-Id: I8b24df0c287e72f6620650a4d6a62e1bb315453e
* | | Merge "Fix buffer overwrite caused by typo."David 'Digit' Turner2011-01-061-1/+1
|\ \ \
| * | | Fix buffer overwrite caused by typo.David 'Digit' Turner2011-01-061-1/+1
|/ / / | | | | | | | | | Change-Id: I1101b4e97400698c59a28c2d5c0dc9d8cfb9c21b
* | | Merge "fix OS X build: missing comma"David 'Digit' Turner2011-01-031-1/+1
|\ \ \
| * | | fix OS X build: missing commaDavid 'Digit' Turner2011-01-031-1/+1
|/ / / | | | | | | | | | Change-Id: Ie70bde0bb8786d0e2c1b253217a47e3c9808abb8
* | | Merge changes ↵David 'Digit' Turner2011-01-0240-1544/+2464
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I30b39053,If7896d65,I364390a7,Ibd4321ed,Ifc00b124,I805c1a24,Ie9442676,Ia9496943,Ic3e35ac0,I060300b4,Id6c6c93f,I71c837e4,I37c21672 * changes: qemu-sockets-android.c: Add inet_dgram_opts qemu-sockets-android.c: Add support for socket=<number> option. monitor.h: cleanup upstream: Move bottom-half handlers to async.c sockets.h: Add SOCKET_LIST_DGRAM upstream: qemu-io.c upstream: update hxtool upstream: minor json-lexer.c integration. upstream: minor integration Add -audio-test-out option to the core. Fix upstream audio bug: can't play with two soft voices. Remove obsolete -audio-in and -audio-out options. upstream: audio sub-system improvements.
| * | qemu-sockets-android.c: Add inet_dgram_optsDavid 'Digit' Turner2011-01-021-0/+112
| | | | | | | | | | | | Change-Id: I30b3905332925d369481612a571342e21a5a7ed9
| * | qemu-sockets-android.c: Add support for socket=<number> option.David 'Digit' Turner2011-01-022-0/+77
| | | | | | | | | | | | Change-Id: If7896d653b36fde05c24d3170ff5b0beb27fff5f
| * | monitor.h: cleanupDavid 'Digit' Turner2011-01-021-3/+0
| | | | | | | | | | | | Change-Id: I364390a724cd01d7b6e127750c330654b78ac229