Commit Graph

204 Commits

Author SHA1 Message Date
Jean-Baptiste Queru 34961b2667 am 6713a2e0: Merge "Fix USB endianness bugs on Linux."
Merge commit '6713a2e0c659be9d992e75ab420da5680f522658' into gingerbread-plus-aosp

* commit '6713a2e0c659be9d992e75ab420da5680f522658':
  Fix USB endianness bugs on Linux.
2010-10-20 15:33:57 -07:00
Jean-Baptiste Queru 89463984f5 am 81347d27: Merge "adb: Improved detection of big endian architecture"
Merge commit '81347d2764b32ec7224d4e2ab3348103816400b2' into gingerbread-plus-aosp

* commit '81347d2764b32ec7224d4e2ab3348103816400b2':
  adb: Improved detection of big endian architecture
2010-10-20 13:34:01 -07:00
Marcus Comstedt 6f703a2e85 Fix USB endianness bugs on Linux.
The fields device->idVendor and device->idProduct should not be
converted from little endian to native byteorder, because the
kernel has in fact done so already!

On the other hand, the descriptors read using raw ioctl:s in
register_device() do need to be converted.

Change-Id: I5fe08b626b14ead56a592b68d026690e343c2656
2010-10-16 14:35:34 +02:00
Marcus Comstedt d340d2f57d adb: Improved detection of big endian architecture
Instead of testing for the (compiler specific) define
__ppc__ explicitly, use the define HAVE_BIG_ENDIAN provided by
AndroidConfig.h.  That way, it should work on all big endian
systems.

Change-Id: Ic4d62afcefce4c8ad5716178ebfcb2b055ac73ce
2010-10-16 14:35:28 +02:00
Mike Lockwood a8b8c0e21a am d02e521d: adb: Add support for Philips\'s USB vendor ID
Merge commit 'd02e521d79a49471b3f1dc3717e842948df64789' into gingerbread-plus-aosp

* commit 'd02e521d79a49471b3f1dc3717e842948df64789':
  adb: Add support for Philips's USB vendor ID
2010-10-15 18:25:27 -07:00
Mike Lockwood d02e521d79 adb: Add support for Philips's USB vendor ID
Change-Id: Iaf2e3f6f111198740703b5c3581d95756f797224
Signed-off-by: Mike Lockwood <lockwood@google.com>
2010-10-15 18:14:22 -04:00
Xavier Ducrohet fa5c690d93 am 89aff1d2: Add Asus USB vendor ID to adb.
Merge commit '89aff1d22662c64cc2de384e7e2c699e4d1d5d47' into gingerbread-plus-aosp

* commit '89aff1d22662c64cc2de384e7e2c699e4d1d5d47':
  Add Asus USB vendor ID to adb.
2010-10-15 11:57:14 -07:00
Xavier Ducrohet 89aff1d226 Add Asus USB vendor ID to adb.
Bug: 3099385

Change-Id: Ic068fbf58abd23f4bddfe13ae33854a8b4053cf8
2010-10-15 10:26:50 -07:00
Xavier Ducrohet 1693c32f42 am 6c263694: Fix KT Tech\'s usb vendor ID.
Merge commit '6c2636947c43c2950488d8d82bfc691cb907518d' into gingerbread-plus-aosp

* commit '6c2636947c43c2950488d8d82bfc691cb907518d':
  Fix KT Tech's usb vendor ID.
2010-10-14 11:35:01 -07:00
Xavier Ducrohet 6c2636947c Fix KT Tech's usb vendor ID.
Change-Id: I77a6de8c11d490e2427f704ff64e7c09874a5d14
2010-10-14 10:06:13 -07:00
Xavier Ducrohet 1e3f8f2769 am f62b23f2: Add new USB vendor IDs.
Merge commit 'f62b23f2c1540221621024c850fdf615dda0c903' into gingerbread-plus-aosp

* commit 'f62b23f2c1540221621024c850fdf615dda0c903':
  Add new USB vendor IDs.
2010-09-28 10:44:12 -07:00
Xavier Ducrohet f62b23f2c1 Add new USB vendor IDs.
Change-Id: Ie3b1ee09c67c4c8fdb294cfc99fa28e4ebe8dfae
2010-09-28 09:54:07 -07:00
Nick Kralevich 4692599cf7 am 44db990d: Fix bug 2950316. Check return values.
Merge commit '44db990d3a4ce0edbdd16fa7ac20693ef601b723' into gingerbread-plus-aosp

* commit '44db990d3a4ce0edbdd16fa7ac20693ef601b723':
  Fix bug 2950316.  Check return values.
2010-08-27 15:28:24 -07:00
Nick Kralevich 44db990d3a Fix bug 2950316. Check return values.
Change-Id: I687bb5fb8195d4c1fc863e32a5e233a8b9e74196
2010-08-27 14:37:11 -07:00
Takeshi Kishimoto 91c3853911 Added Toshiba's USB VID (0x0930) upon their request.
Change-Id: I9f7fca6b98b0664ef9af4f7b86f0f5863e91e4c1
2010-07-21 10:21:05 -07:00
Takeshi Kishimoto 81fbbc2d0b Added NEC and PMC's USB VIDs upon their request.
Change-Id: I332ee1e68ff960d41a365aeb96d012253056edd2
2010-07-21 10:20:54 -07:00
Xavier Ducrohet deafd15f2c am 4309d602: Merge "Added Toshiba\'s USB VID (0x0930) upon their request." into gingerbread
Merge commit '4309d602b562eb9f181b0314837e6096577c6c18' into gingerbread-plus-aosp

* commit '4309d602b562eb9f181b0314837e6096577c6c18':
  Added Toshiba's USB VID (0x0930) upon their request.
2010-07-20 23:55:42 -07:00
The Android Open Source Project 3c5581da1d merge from open-source master
Change-Id: I90bd618ff8c6bcbe1071468e0d75574feee58d27
2010-07-20 10:11:46 -07:00
The Android Open Source Project 02565fec82 merge from open-source master
Change-Id: Ice679e12b8393621b21a8dafe640dd880a09d35e
2010-07-20 10:11:20 -07:00
Takeshi Kishimoto 29837f94b5 Added Toshiba's USB VID (0x0930) upon their request.
Change-Id: I9f7fca6b98b0664ef9af4f7b86f0f5863e91e4c1
2010-07-20 17:08:09 +08:00
Viral Mehta 899913f816 print msg.command in human-readable format
to print msg.command as some odd decimal number is just not helping in debugging;
instead print msg.command as a string

Change-Id: Id1ec770c20c86b8bdae40a0262bf4b63c0213b0a
2010-07-19 15:28:22 -07:00
Jean-Baptiste Queru fdb13f7937 Merge "Fix ADB daemon file descriptor leak" 2010-07-19 15:23:44 -07:00
The Android Open Source Project 67e6fcd195 merge from froyo-plus-aosp
Change-Id: Ie231effb4d9dfd63aa98ec08b269c31ce32aa1c0
2010-06-21 11:50:42 -07:00
Teddie Stenvi 8f5daadcc1 Fix ADB daemon file descriptor leak
The ADB (Android Debug Bridge) daemon suffers from a file descriptor leak.
When transfering file descriptors, opened by the adbd daemon, to a JDWP
process for debugging through sendmsg, the file descriptor is duplicated
by the kernel and a copy is transfered to the JDWP process.
Adbd neglects to close it's copy of the descriptor after the sendmsg call
which causes a file descriptor leak in the process.
Eventually this causes the daemon to hit its maximum roof of opened file
descriptors thus making it impossible for the process to serve any new
commands from the adb server.
Jdwp_service.c has been modified to close the file descriptor after the
send message call has succeded.
Also, the socket used for transfering the file descriptor is set to blocking
mode before the sendmsg call since the adbd processes needs to know when the
duplication has been completed by the kernel.
The flags are reset to its original state after the sendmsg call.

Change-Id: I76b15460301ac01e432f5ce8678ff58c658c16f2
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
2010-06-18 08:11:04 +00:00
Takeshi Kishimoto 2124afeee1 Added NEC and PMC's USB VIDs upon their request.
Change-Id: I332ee1e68ff960d41a365aeb96d012253056edd2
2010-06-18 09:37:35 +08:00
The Android Open Source Project 2ef569417d merge from open-source master
Change-Id: Ia99df155e4abf0585ed46943b75a2a1569d0534f
2010-06-15 11:31:57 -07:00
The Android Open Source Project ee0306b933 merge from open-source master
Change-Id: I183a933e96222f8c01516210cfa4be5f18e35b70
2010-06-15 11:29:05 -07:00
The Android Open Source Project d9a1904d3f merge from open-source master
Change-Id: I14853c1f8a1d392d7ee9dfae3914d9ee3107794c
2010-06-15 11:27:36 -07:00
The Android Open Source Project 6f29e5a27b merge from open-source master
Change-Id: I2dacf7f8895debd0452c3601424e32a3b9e19059
2010-06-15 11:26:20 -07:00
The Android Open Source Project 07a804b83a merge from open-source master
Change-Id: Ia8d41f96f3885bd7159571182d09c1da079e5bc9
2010-06-15 11:24:47 -07:00
Michael Richardson 83cb93b401 added vendor ID for http://www.onthegovideo.com/
Change-Id: I38e3a6f252728d93177745778147e6f6ed45d5c5
2010-06-15 09:33:59 -07:00
Jean-Baptiste Queru feff3a8b8d Merge "eliminate a compiler warning: signed/unsigned length" 2010-06-15 09:31:40 -07:00
Michael Richardson eb558b9240 eliminate a compiler warning: signed/unsigned length
Change-Id: I6139a1b3f9caa8fe3492e4850dcc58d8d5ff0cfb
2010-06-14 14:49:08 -07:00
André Goddard Rosa 8182829ccb adb: optimize socket-list-walking code
Change-Id: I8bbb8b671c1ce7a2ce736b60b0cdb7b21ccdc372
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
2010-06-14 09:59:34 -07:00
André Goddard Rosa 8e78dc64d2 adb: remove unneeded assignment of id to zero
... as memory was already obtained zero'ed by calloc().

Change-Id: Ic73bad09b54cb778fd40bdf86bb40888ea504c5f
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
2010-06-14 09:56:14 -07:00
André Goddard Rosa c419e2a210 adb: clean up 0 --> NULL for pointers
Change-Id: I9216fdf534d807a55dfbc6800b5c3ef5f8c83368
2010-06-14 09:55:42 -07:00
The Android Open Source Project f7e148c1bc merge from open-source master
Change-Id: I9b051ebd6e785e4d68e148a005a0485e79aa55ea
2010-06-03 09:09:17 -07:00
Mike Lockwood cbbe79add1 adb connect and disconnect improvements:
Port number is now optional.  Will use default port 5555 if not specified.
"adb disconnect" with no additional arguments will disconnect all TCP devices.

Change-Id: I7fc26528ed85e66a73b8f6254cea7bf83d98109f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-02 11:31:26 -04: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 5dc0f5db71 merge from open-source master
Change-Id: I9e7ebc99f0de12ed3ae38a3882481485a96f9680
2010-06-02 08:13:29 -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 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 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
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
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
The Android Open Source Project e57d89186d merge from open-source master
Change-Id: Ibc1c58aa757910f2b00acf6883127dd027f01d73
2010-05-03 16:32:46 -07:00
Tim cd64315f72 Add documentation for some adb environmental variables.
The ADB_TRACE one is particularly important.

Change-Id: I125a5930c43065c8cf505eea40d20e3f209bc858
2010-04-29 07:41:50 -07:00