aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| * | upstream: Move bottom-half handlers to async.cDavid 'Digit' Turner2011-01-024-212/+221
| | | | | | | | | | | | Change-Id: Ibd4321edb2abe349d32483a60fdb94a282f22240
| * | sockets.h: Add SOCKET_LIST_DGRAMDavid 'Digit' Turner2011-01-022-1/+5
| | | | | | | | | | | | Change-Id: Ifc00b12403a105307fa12d14a52c6566094ba7c0
| * | upstream: qemu-io.cDavid 'Digit' Turner2011-01-021-2/+5
| | | | | | | | | | | | Change-Id: I805c1a2471269e160ec914dcdcf7c3a437c30977
| * | upstream: update hxtoolDavid 'Digit' Turner2011-01-021-2/+60
| | | | | | | | | | | | Change-Id: Ie94426766f3a59af46ddee6d3e53a56e9f8766a3
| * | upstream: minor json-lexer.c integration.David 'Digit' Turner2011-01-021-3/+7
| | | | | | | | | | | | | | | Change-Id: Ia949694386f79c763ac4f001924a9e3cca754933 Note: Keep our fix for mingw builds.
| * | upstream: minor integrationDavid 'Digit' Turner2011-01-022-31/+46
| | | | | | | | | | | | Change-Id: Ic3e35ac078b4a6e213afd8f2719b230fb0468791
| * | Add -audio-test-out option to the core.David 'Digit' Turner2011-01-026-3/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option can be used to quickly check audio output (without having to boot a full AVD and launch a sound-playing application). Usage: emulator <other-options> -qemu -audio-test-out qemu-android <other-options> -audio-test-out This simply generates an ugly saw signal, but that's enough for us. Change-Id: I060300b4000b9705d181c6262de8d4d13c749e69
| * | Fix upstream audio bug: can't play with two soft voices.David 'Digit' Turner2011-01-022-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a problem where using two SWVoiceOut at the same time would not work, unless the two voices would output sound samples at the same time. Change-Id: Id6c6c93f5fe7be29d73776f62fe03732291fcaf9
| * | Remove obsolete -audio-in and -audio-out options.David 'Digit' Turner2011-01-026-138/+0
| | | | | | | | | | | | | | | | | | Use -audio <backend> to select the audio driver. Change-Id: I71c837e4c78241711be5f38ef9b03294a69145bd
| * | upstream: audio sub-system improvements.David 'Digit' Turner2011-01-0218-1147/+1788
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the audio subsystem to match the one in upstream. Note that this gets rid of the ability to specify different audio backends for input and output, which was never really used. A future patch will remove the -audio-in and -audio-out options and related code. Change-Id: I37c21672bcb15ef1f0e928c56bf99fbecda2bce6
* | | Merge "android-configure.sh: Use 32-bit toolchain if present."David 'Digit' Turner2011-01-021-5/+14
|\ \ \ | |/ /
| * | android-configure.sh: Use 32-bit toolchain if present.David 'Digit' Turner2011-01-021-5/+14
|/ / | | | | | | | | | | | | | | This makes android-configure.sh probe for our custom 32-bit toolchain. If found, it will be used unless you have defined CC in your environment, use --try-64 or --cc=<compiler> Change-Id: I40855378eaadf52daf004dab074e53b9df0262b5
* | Merge "Pass bits per pixel tu UI when it gets attached to core framebuffer"Vladimir Chtchetkine2010-12-217-14/+76
|\ \
| * | Pass bits per pixel tu UI when it gets attached to core framebufferVladimir Chtchetkine2010-12-217-14/+76
|/ / | | | | | | | | | | | | Instead of passing bits per pixel property in each and every framebuffer notification message, do it once when UI attaches to the core's framebuffer service. Change-Id: Ic1f6d9796b64d40518f09f5a5341f8359ff817b7
* | Merge "Resubmit framebuffer service implementation"Vladimir Chtchetkine2010-12-2020-22/+850
|\ \
| * | Resubmit framebuffer service implementationVladimir Chtchetkine2010-12-2020-22/+850
|/ / | | | | | | Change-Id: I184e27a1e8d88835bc9f0502eccfa3f64a7aaf9e
* | Merge "Do not try to run the audio config tests."David 'Digit' Turner2010-12-171-1/+1
|\ \
| * | Do not try to run the audio config tests.David 'Digit' Turner2010-12-171-1/+1
|/ / | | | | | | | | | | This actually prevents the script from working when using a cross-toolchain. Change-Id: I9083cbb1fc78a9e5e3e569259ccdc7c87698ceef
* | Merge "Add 'gsm signal' command, to set rssi and ber"Tim Baverstock2010-12-173-2/+86
|\ \ | |/ |/|
| * Add 'gsm signal' command, to set rssi and berTim Baverstock2010-12-153-2/+86
| | | | | | | | Change-Id: I24d4738f6e5135437af25d22e2fa68617f5632fa
* | Merge "Implement core display deriving it from android display"Vladimir Chtchetkine2010-12-154-0/+131
|\ \ | |/ |/|
| * Implement core display deriving it from android displayVladimir Chtchetkine2010-12-144-0/+131
| | | | | | | | | | | | | | Core display is a framebuffer client that receives framebuffer updates and dispatches them to the UI attached to the core. Change-Id: Iff1e0609cbe66240031e3670934a6796a9ae3b15
* | Merge "Send unsolicited time response to first signal strength query after ↵Tim Baverstock2010-12-157-7/+67
|\ \ | |/ |/| | | loadvm"
| * Send unsolicited time response to first signal strength query after loadvmTim Baverstock2010-12-147-7/+67
|/ | | | Change-Id: I9c6260493d42564ee3aa34799313368bb2de7d4d
* Merge "Submit merged"Vladimir Chtchetkine2010-12-0610-31/+808
|\
| * Submit mergedVladimir Chtchetkine2010-12-0610-31/+808
|/ | | | | | | | | | | | | | Squashed commit of the following: commit aeefab810c6331e2f96e81f20e4408b39dd3a2ca Author: Vladimir Chtchetkine <vchtchetkine@google.com> Date: Thu Dec 2 07:40:34 2010 -0800 Implement -attach-core UI option Change-Id: I4168e2d707cab1b4873ee16d86d5126c1a316abf Change-Id: I2da1ef5d53641f3c60d83d8d5ddf3aff34b0c6c7
* Merge "Add -no-snapshot-load option to permit reboot."Tim Baverstock2010-12-034-12/+32
|\
| * Add -no-snapshot-load option to permit reboot.Tim Baverstock2010-12-024-12/+32
| | | | | | | | | | | | | | | | | | This is a workaround for the emulator not being able to detect the guest's power-down situation, and simply lingering like a zombie: on exit it's saved as a zombie, and is restored as a zombie which isn't useful. Denying autoload forces a reboot. Change-Id: I48f32600f5ce18cd5c71aa01d1b71b382102f227
* | Merge "Correct command arguments for 'geo fix', but support backward ↵Tim Baverstock2010-12-032-17/+26
|\ \ | |/ |/| | | compatible use."
| * Correct command arguments for 'geo fix', but support backward compatible use.Tim Baverstock2010-12-012-17/+26
| | | | | | | | Change-Id: Id4f427dfb918d69e3fb52725cbe88bce1666dddc
* | Merge "Augment the auto-loadvm behaviour with corresponding ↵Tim Baverstock2010-12-026-14/+49
|\ \ | | | | | | | | | auto-savevm-on-exit behaviour."
| * | Augment the auto-loadvm behaviour with corresponding auto-savevm-on-exit ↵Tim Baverstock2010-12-016-14/+49
| |/ | | | | | | | | | | | | | | | | | | | | | | behaviour. Autosave fires when loadvm would have been tried - whether it succeeded or not - in order to bootstrap from an empty snapshot file. - New autosave behaviour inhibited with -no_snapshot_save flag. - Underlying behaviour implemented with a new qemu option -savevm_on_exit Change-Id: If64d89f004565ecbb431bc7e96ecc37e27876d67
* | Merge "Implement line reading on syncsocket"Vladimir Chtchetkine2010-12-022-4/+139
|\ \
| * | Implement line reading on syncsocketVladimir Chtchetkine2010-12-022-4/+139
|/ / | | | | | | Change-Id: I1fa22c34203b163e1b0a78240be73a4a7473691e
* | Merge "Implement helper routines for syncronous socket operations"Vladimir Chtchetkine2010-12-013-0/+207
|\ \ | |/ |/|
| * Implement helper routines for syncronous socket operationsVladimir Chtchetkine2010-12-013-0/+207
|/ | | | Change-Id: I93af5f740decb1fb0f6e037a76223fa8dd5305ac
* Merge "Enable snapshot behaviour"Tim Baverstock2010-11-291-1/+1
|\
| * Enable snapshot behaviourTim Baverstock2010-11-251-1/+1
|/ | | | Change-Id: I383927c7805e840031d83ef7154c335519e1f5a4
* Merge "Replacement of padding with ftruncate."David Turner2010-11-251-33/+53
|\
| * Replacement of padding with ftruncate.Tim Baverstock2010-11-231-33/+53
| | | | | | | | | | | | | | | | Also stored some other parameters, speculatively. Guard ftruncate and lseek against EINTR Change-Id: I4237640318564db6c375a90415097c00e4fcafaa