Commit Graph

1488 Commits

Author SHA1 Message Date
Christopher Tate f96e700b33 am 25e7b8fc: am b1fb3bd1: am 230cb33f: Make /proc/kmsg and /proc/sysrq-trigger system-process-readable 2010-06-02 22:23:25 -07:00
Christopher Tate 25e7b8fcc3 am b1fb3bd1: am 230cb33f: Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
Merge commit 'b1fb3bd13a4da8bc46a44ec5eef6de9cb952f163' into kraken

* commit 'b1fb3bd13a4da8bc46a44ec5eef6de9cb952f163':
  Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
2010-06-02 11:20:39 -07:00
Christopher Tate b1fb3bd13a am 230cb33f: Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
Merge commit '230cb33fd1ab335c6f808c72db891993b00110a0' into froyo-plus-aosp

* commit '230cb33fd1ab335c6f808c72db891993b00110a0':
  Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
2010-06-02 11:18:36 -07:00
The Android Open Source Project b0e270fd24 am 5458065f: am 456688bf: merge from open-source master 2010-06-02 08:19:27 -07:00
The Android Open Source Project 5458065fbb am 456688bf: merge from open-source master
Merge commit '456688bfb4fa7817031a1d704e8353e1dd5efb3c' into kraken

* commit '456688bfb4fa7817031a1d704e8353e1dd5efb3c':
  adb: remove obsolete shell history support.
2010-06-02 08:17:06 -07:00
The Android Open Source Project f296c5bc39 am 12e549b0: am 5dc0f5db: merge from open-source master 2010-06-02 08:16:59 -07:00
The Android Open Source Project f35012b093 am 7e81a617: am c57a22c8: merge from open-source master 2010-06-02 08:16:57 -07:00
The Android Open Source Project 5da46c90db am a11a001f: am 705b37b8: merge from open-source master 2010-06-02 08:15:28 -07:00
The Android Open Source Project 12e549b006 am 5dc0f5db: merge from open-source master
Merge commit '5dc0f5db7152a604377af30f7d2139a84fd7b30c' into kraken

* commit '5dc0f5db7152a604377af30f7d2139a84fd7b30c':
  Use linenoise to add simple editing and history to the Android shell.
2010-06-02 08:14:35 -07:00
The Android Open Source Project 456688bfb4 merge from open-source master
Change-Id: I99ae03ba51ee185b9cfecf4f26e94a757f3815c2
2010-06-02 08:14:33 -07:00
The Android Open Source Project 7e81a61772 am c57a22c8: merge from open-source master
Merge commit 'c57a22c8561cc571d23cd7f321103b2b4d2c7cde' into kraken

* commit 'c57a22c8561cc571d23cd7f321103b2b4d2c7cde':
  Let "adb connect" connect to emulators too
2010-06-02 08:14:32 -07:00
The Android Open Source Project 5dc0f5db71 merge from open-source master
Change-Id: I9e7ebc99f0de12ed3ae38a3882481485a96f9680
2010-06-02 08:13:29 -07:00
The Android Open Source Project a11a001fc6 am 705b37b8: merge from open-source master
Merge commit '705b37b84c0c13407963fb1cea0309b9c3081368' into kraken

* commit '705b37b84c0c13407963fb1cea0309b9c3081368':
  Fix adb remount on non-MTD devices
2010-06-02 08:13:05 -07:00
The Android Open Source Project a48c07008e am 62f30537: am c0b3ad16: merge from open-source master 2010-06-02 08:11:57 -07:00
The Android Open Source Project c57a22c856 merge from open-source master
Change-Id: I44bd527e51d102a56a1efe40cb6e634859b09461
2010-06-02 08:11:52 -07:00
The Android Open Source Project 62f305371d am c0b3ad16: merge from open-source master
Merge commit 'c0b3ad16598a0cc30cfc2fcd3fc21ce1fd2b978f' into kraken

* commit 'c0b3ad16598a0cc30cfc2fcd3fc21ce1fd2b978f':
  adb: Add Qualcomm USB id
2010-06-02 08:09:28 -07:00
The Android Open Source Project 705b37b84c merge from open-source master
Change-Id: I5f7880bec0c15ae7a42175107d8192ad44b847ca
2010-06-02 08:08:55 -07:00
The Android Open Source Project c0b3ad1659 merge from open-source master
Change-Id: I71f2e47509695ba9ec626f4a6917a645b00a4e70
2010-06-02 08:07:48 -07:00
Mike Lockwood 203f102028 libusbhost: Added usb_device_get_unique_id
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-01 22:18:04 -04:00
Christopher Tate 230cb33fd1 Make /proc/kmsg and /proc/sysrq-trigger system-process-readable
This is so that the system process can capture kernel thread stacks when the
watchdog detects a deadlock.  Previously, /proc/kmsg was root/root and mode
0400, and /proc/sysrq-trigger was root/root and mode 0200.  With this
change, /proc/kmsg becomes root/system and 0440, and /proc/sysrq-trigger
becomes root/system and 0220.

Change-Id: Iac46bd10bd11d495024afeb5d693107ce5074791
2010-06-01 17:48:30 -07:00
Andy McFadden f4dd883389 Fix build.
Missing a #define to map android_atomic_swap to its new name.  Worked
fine in the other branches, because nobody was using android_atomic_swap
in the other branches.

Change-Id: I0e730e9823ac5cd2fee5a3f856ce05d36df5d87e
2010-06-01 09:55:18 -07:00
Andy McFadden 8264358f5b am 8dfa47da: Atomic/SMP update, part 2. 2010-05-30 21:20:45 -07:00
Brian Carlstrom 0e67a03748 Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master 2010-05-27 22:38:57 -07:00
Andy McFadden 8dfa47da8c Atomic/SMP update, part 2.
Added new atomic functions, renamed some old ones.  Some #defines have
been added for backward compatibility.

Merged the pre- and post-ARMv6 implementations into a single file.

Renamed the semi-private __android_membar_full_smp to USE_SCREAMING_CAPS
since that's more appropriate for a macro.

Added lots of comments.

Note Mac OS X primitives have not been tested.

Change-Id: If827260750aeb61ad5c2b760e30658e29dbb26f2
2010-05-27 15:29:38 -07:00
Mike Lockwood 67d5358e2a adb: remove obsolete shell history support.
Change-Id: I85a7cda176ca3bb7cb9f96e18556d53daaac3023
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-25 13:40:15 -04:00
Mike Lockwood 3de417e16a Merge "adb: Adjust usb_linux.c for changes in libusbhost API." 2010-05-25 05:22:36 -07:00
Mike Lockwood cc6ff1071d Merge "libusbhost: Remove global data to allow multiple instances in the same process." 2010-05-25 05:22:26 -07:00
Mike Lockwood 36b99e4cac adb: Adjust usb_linux.c for changes in libusbhost API.
Change-Id: Ie63e4455460100b579fa87120e63c913dc5f16ad
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-25 08:20:42 -04:00
Mike Lockwood 6ac3aa1574 libusbhost: Remove global data to allow multiple instances in the same process.
Change-Id: I977145f44131ec8b588dd274e0afbc563f3aa4c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-25 08:20:32 -04:00
Jack Palevich 7fe202f160 Use linenoise to add simple editing and history to the Android shell.
The linenoise library is from http://github.com/antirez/linenoise

This patch also disables command-line editing and history from adb. The
adb implementation was shadowing the Android shell's implementation.

The adb implementation was also shadowing the editing and history
implementation in alternative shells such as BusyBox's ash.

Change-Id: I7ebd4cb391d0ce966c0ce0e707d80ecd659f9079
2010-05-25 14:49:57 +08:00
Jack Palevich c6793c5290 Include the linenoise.h header in a cleaner way.
(This was a comment to an earlier change that I
overlooked.)
2010-05-25 08:36:36 +08:00
Jack Palevich 0cf08ed5ad Move linenoise to its own static library.
This allows us to publish its license, as required
by the terms of its license.
2010-05-25 08:20:12 +08:00
Jack Palevich e7de18e445 Add simple readline-like input editing to the android shell.
Adapted from http://github.com/antirez/linenoise
2010-05-25 07:53:13 +08:00
Stefan Hilzinger d9d1ca4780 Let "adb connect" connect to emulators too
- adb can now connect to an emulator configured with an arbitrary
  pair of <console port, adb port>. These two ports do not have to be
  adjacent.
  This can be done from the commandline at any time using
  adb connect emu:<console_port>,<adb_port>
- Emulators running on ports outside the normal range
  (5554/5555-5584/5585) register themselves on startup if they follow
  the convention "console port+1==abd port".
- Emulators outside the normal port range will not be auto-detected on
  adb startup as these ports are not probed.
- The index into local_transports[] array in transport_local.c does no
  longer indicate the port number of the local transport. Use the altered
  atransport struct to get the port number.
- I have chosen not to document the adb connect emu:console_port,adb_port
  syntax on adb's help screen as this might be confusing to most readers
  and useful to very few.
- I don't expect this to introduce any (backwards) compatibility issues.

Change-Id: Iad3eccb2dcdde174b24ef0644d705ecfbff6e59d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-24 11:27:16 -04:00
Colin Cross 5762ec2905 Fix adb remount on non-MTD devices
Change-Id: If8e07502bcface53aaac81022f6183c6a147edc8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-24 11:27:16 -04:00
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