Commit Graph

1655 Commits

Author SHA1 Message Date
Dima Zavin f1c03de74e adb: Add Qualcomm USB id
Change-Id: I044a77f14d7a90e9dff191919e4aeb39723ea429
Signed-off-by: Dima Zavin <dima@android.com>
2010-05-24 11:02:17 -04:00
Jeff Brown f6e83f7eb8 am dc594284: Merge "Fix kernel panics in fastboot on OS X." into kraken 2010-05-21 14:08:41 -07:00
Jeff Brown dc5942840e Merge "Fix kernel panics in fastboot on OS X." into kraken 2010-05-21 14:06:04 -07:00
Jeff Brown b64063737e Fix kernel panics in fastboot on OS X.
The kernel panic seems to be related to the driver trying to allocate
too many pages from the IO mapper.  That may be caused by the fact
that we try to perform a 100+ MiB transfer in a single IO operation.
This change breaks the transfer down into 1 MiB chunks.

So far after a day of testing, no kernel panics have occurred compared
to 5 in the previous 24 hours!

Change-Id: I8d27a546e0c0bf4fe2f0fc7fcad65a88d3e6bee0
2010-05-21 13:24:25 -07:00
Andy McFadden 62af8f2583 Atomic/SMP update. [manual merge to dalvik-dev]
Added atomic-inline.h.  Added a platform-specific memory barrier call
there.

Added android_atomic_acquire_cmpxchg() and android_atomic_release_store().
Not tested on Mac OS X or SH.

Added memory barrier calls to linux-x86 atomics.  Mac OS X has barrier
functions already.  sh isn't really SMP-ready.  linux-arm needs work
(to be done in a separate change).

Updated the makefile to make the SMP state visible to the code here.
Note that host binaries are NOT built with SMP enabled; while our hosts
are very likely SMP, it's not worth figuring out e.g. whether it's okay
to use the SSE2 mfence instruction or have to use something else.  We
haven't had barriers enabled in host tools before, so there's probably
no need to stat now.

Removed quasiatomic 64-bit calls (now part of Dalvik).

Change-Id: I42ae05f5db2cc9a5b64ad87f15481e2838371f1d
2010-05-21 12:53:51 -07:00
Andy McFadden 0bc248f983 am ac322da6: Atomic/SMP update. 2010-05-21 12:08:03 -07:00
Andy McFadden ac322da69e Atomic/SMP update.
Added atomic-inline.h.  Added a platform-specific memory barrier call
there.

Added android_atomic_acquire_cmpxchg() and android_atomic_release_store().
Not tested on Mac OS X or SH.

Added memory barrier calls to linux-x86 atomics.  Mac OS X has barrier
functions already.  sh isn't really SMP-ready.  linux-arm needs work
(to be done in a separate change).

Updated the makefile to make the SMP state visible to the code here.
Note that host binaries are NOT built with SMP enabled; while our hosts
are very likely SMP, it's not worth figuring out e.g. whether it's okay
to use the SSE2 mfence instruction or have to use something else.  We
haven't had barriers enabled in host tools before, so there's probably
no need to stat now.

Removed quasiatomic 64-bit calls (now part of Dalvik).

Change-Id: I49e5e6c8abe70f304cdedb9d7b8e6e65f8925815
2010-05-20 21:40:33 -07:00
Dima Zavin 2bdcf63c4c Merge "Don't define __linux__ if it is already defined by the toolchain. This change does not affect existing behavior at all and makes the file compatible with new toolchain." 2010-05-20 00:31:18 -07:00
The Android Open Source Project a92be64809 am 53a79a84: am 49337b27: merge from open-source master 2010-05-19 11:35:48 -07:00
The Android Open Source Project 53a79a841b am 49337b27: merge from open-source master
Merge commit '49337b27d9a90d7c3f703f618e7c6bfaffc2a96d' into kraken

* commit '49337b27d9a90d7c3f703f618e7c6bfaffc2a96d':
  Fix "route add default dev <iface>" behaviour
2010-05-19 11:33:56 -07:00
The Android Open Source Project 49337b27d9 merge from open-source master
Change-Id: I77e33ce567b9682f51785cc574e37dc2cd15028f
2010-05-19 11:28:01 -07:00
Jean-Baptiste Queru 5099d3447d Merge "Fix "route add default dev <iface>" behaviour" 2010-05-19 11:24:50 -07:00
Jing Yu 165db2a198 Don't define __linux__ if it is already defined by the toolchain.
This change does not affect existing behavior at all and makes
the file compatible with new toolchain.

Change-Id: Ia33bb9372d1705ec538b414bf69773f093e4543c
2010-05-18 10:55:52 -07:00
Mike Lockwood d864257938 am c0d8fb58: (-s ours) DO NOT MERGE resolved conflicts for merge of e95aad61 to kraken 2010-05-17 11:31:54 -07:00
Mike Lockwood c0d8fb5842 DO NOT MERGE resolved conflicts for merge of e95aad61 to kraken
this change is already in master

Change-Id: Ica43eae28b50d89d50217851aff7e62978abfa27
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-17 14:24:36 -04:00
The Android Open Source Project e95aad61d8 merge from open-source master
Change-Id: I414c9479f4f913c777ef18b7ff27e410f49d35b9
2010-05-17 08:54:31 -07:00
Mike Lockwood 93ac1559b8 init: Add support for /dev/bus/usb/ file system and add new unix group AID_USB.
init now creates files in /dev/bus/usb/ for user access to USB devices.
Files are chmod 660 with group AID_USB.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-16 16:04:51 -04:00
Dima Zavin c09b7cf1c9 am 509f7399: fastboot: Add more vendor usb ids 2010-05-14 14:52:40 -07:00
Dima Zavin 509f7399b8 fastboot: Add more vendor usb ids
Change-Id: Ied48302b50412f27dcf49d40913e4b900f3bd153
Signed-off-by: Dima Zavin <dima@android.com>
2010-05-14 14:48:39 -07:00
Jean-Baptiste Queru 80bdda4235 Merge "Added a move flag for init's mount command that maps to MS_MOVE." 2010-05-14 14:18:43 -07:00
The Android Open Source Project 855ddb6231 am 156b9f3d: am 538e5778: merge from open-source master 2010-05-14 13:43:54 -07:00
The Android Open Source Project 156b9f3d12 am 538e5778: merge from open-source master
Merge commit '538e5778be15382669b0058de5bafa9f4961247e' into kraken

* commit '538e5778be15382669b0058de5bafa9f4961247e':
  sys_signame[] was added to libc, remove conflicting definition
2010-05-14 13:40:11 -07:00
The Android Open Source Project 538e5778be merge from open-source master
Change-Id: Ia81df7e22e563b01091778043bba65dee1699e83
2010-05-14 13:38:07 -07:00
Jean-Baptiste Queru 34ed47a378 Merge "sys_signame[] was added to libc, remove conflicting definition" 2010-05-14 12:34:51 -07:00
Nick Kralevich fcb44c4e2f am a523b5b2: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken 2010-05-14 10:11:24 -07:00
Nick Kralevich a523b5b2ca Merge "Get rid of warnings when compiled with -Wformat-security" into kraken 2010-05-14 10:08:29 -07:00
Nick Kralevich 40754cfbb0 am 4f55adc3: Get rid of warnings when compiled with -Wformat-security 2010-05-13 16:23:34 -07:00
Nick Kralevich 4f55adc323 Get rid of warnings when compiled with -Wformat-security
Change-Id: Ib38b2c152474ed83be1a5716457d0b374c0e5c68
2010-05-13 16:10:23 -07:00
Nick Kralevich dd26bb3a00 Get rid of warnings when compiled with -Wformat-security
Change-Id: I2bfc6582a8198b22af08e4b8d58f532dc138cc02
2010-05-13 15:38:49 -07:00
Jesse Wilson 98c9784d29 Moving junit out of core.jar and into core-junit.jar.
Patched from master.
https://android-git.corp.google.com/g/50609

Change-Id: Idbcebbd3ba3599234cf9615b4cf3d38e99d2983f
2010-05-13 15:31:30 -07:00
Brian Carlstrom bc3a04df02 Merge commit '86b121523d7d3634bf5ac07b6e238b36b3e75f0a' into mm 2010-05-13 09:15:11 -07:00
Jesse Wilson 4a8becbf16 Merge "Moving junit out of core.jar and into core-junit.jar." 2010-05-12 22:03:32 -07:00
The Android Open Source Project 01e11a1a30 am 0253ffde: am d00eba45: merge from open-source master 2010-05-12 10:57:39 -07:00
The Android Open Source Project 0253ffdee4 am d00eba45: merge from open-source master
Merge commit 'd00eba458706a38f6c072ed90c5da35f3e3f1bba' into kraken

* commit 'd00eba458706a38f6c072ed90c5da35f3e3f1bba':
  Add a printf format.
2010-05-12 10:54:09 -07:00
The Android Open Source Project d00eba4587 merge from open-source master
Change-Id: I8e7903bcd3fe7ddf88b63462dc9123f12b779c64
2010-05-12 09:32:54 -07:00
Mike Lockwood 9e3a6d176a Merge changes Ibe4ce055,I3bcba4c9
* changes:
  libusbhost: add usb_endpoint_get_device()
  adb: remove unnecessary include
2010-05-12 05:56:23 -07:00
Mike Lockwood 5e567cb34b libusbhost: add usb_endpoint_get_device()
Change-Id: Ibe4ce0551faca5d2d8bec0fbd21315a393b9f208
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-12 08:53:49 -04:00
Mike Lockwood e380c27e9f adb: remove unnecessary include
Change-Id: I3bcba4c93834d0ac08bded0f2e3c74984f1f3f54
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-12 08:53:27 -04:00
Jesse Wilson 9811671e02 Moving junit out of core.jar and into core-junit.jar.
Change-Id: I603cba084c06ddbec21fc88bbaab7cde96952cb1
2010-05-11 20:21:18 -07:00
Ying Wang 758582c916 Fix sim build.
Change-Id: I6d2af129c2584ef2ea99d038c9cf394de800108b
2010-05-11 14:21:39 -07:00
Anthony Newnam 70b262ad3e Spell system correctly
Change-Id: I3a7b0b8c5c0a3dac23192a32abe88d60ce1f00c0
2010-05-11 13:55:17 -05:00
christian.bejram 28a8dab590 Add a printf format.
This makes sure that data sent through logwrapper
is interpreted as strings

Change-Id: Ifafa7c3a39433743250aeb76da3c4d9cce05a13f
2010-05-10 14:47:56 -07:00
Brian Carlstrom 3db6050d51 Merge commit '253e27acb6c9e3e0b03c59f25cdf9ecbd64bcdad' into mm 2010-05-10 13:03:30 -07:00
Mike Lockwood e717020da0 Merge "adb: Use new libusbhost library for USB support on Linux host." 2010-05-10 10:37:58 -07:00
Nick Kralevich 8a154aee8d am 42d38127: Merge "Allow pixelflinger to work when NX (No Execute) is enabled." into kraken 2010-05-10 10:32:22 -07:00
Nick Kralevich 42d38127d2 Merge "Allow pixelflinger to work when NX (No Execute) is enabled." into kraken 2010-05-10 10:28:56 -07:00
Brad Fitzpatrick cb6d5c1e54 am b20e9851: am 25ffaff6: am 86b12152: fix windows SDK build 2010-05-10 09:53:49 -07:00
Brad Fitzpatrick b4b7477dfc am c279d3c5: am 218faa30: am e43c2483: More fixes to Binder perf regression from Eclair 2010-05-10 09:53:46 -07:00
Brad Fitzpatrick b20e98511d am 25ffaff6: am 86b12152: fix windows SDK build
Merge commit '25ffaff6b1eb8706a893cf255db123d0644b4a7d' into kraken

* commit '25ffaff6b1eb8706a893cf255db123d0644b4a7d':
  fix windows SDK build
2010-05-10 09:49:48 -07:00
Brad Fitzpatrick c279d3c542 am 218faa30: am e43c2483: More fixes to Binder perf regression from Eclair
Merge commit '218faa30d547e549c1efbf9bacf23cc56c8bf481' into kraken

* commit '218faa30d547e549c1efbf9bacf23cc56c8bf481':
  More fixes to Binder perf regression from Eclair
2010-05-10 09:49:46 -07:00