Commit Graph

1105 Commits

Author SHA1 Message Date
Mike Lockwood
d7321f833d am 78befc12: (-s ours) am 6139fa33: DO NOT MERGE: linux/usb/f_accessory.h: Update USB accessory kernel header
* commit '78befc121181a17a1a537575274a35f75267902b':
  DO NOT MERGE: linux/usb/f_accessory.h: Update USB accessory kernel header
2011-03-14 18:24:55 -07:00
Mike Lockwood
a7e9442270 am 2bb79ad9: Update USB accessory kernel header to include serial number support
* commit '2bb79ad9b5941ad11b7ccaa8147577cef69524b2':
  Update USB accessory kernel header to include serial number support
2011-03-14 17:43:39 -07:00
Mike Lockwood
2bb79ad9b5 Update USB accessory kernel header to include serial number support
Change-Id: Ic94e3f5ad278df43777fc4ea97f1fc67f6ccab0e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-14 17:50:44 -04:00
Mike Lockwood
78befc1211 am 6139fa33: DO NOT MERGE: linux/usb/f_accessory.h: Update USB accessory kernel header
* commit '6139fa33ab823e935471fa71bba4c6f715ad6c56':
  DO NOT MERGE: linux/usb/f_accessory.h: Update USB accessory kernel header
2011-03-14 13:35:03 -07:00
Brad Fitzpatrick
f9316d37b4 am 08a4ce98: am 0c398985: Merge "[ENDIAN] Build md5 code correctly for bigendian targets"
* commit '08a4ce983ba14cef394e5198c9561349ec7fef44':
  [ENDIAN] Build md5 code correctly for bigendian targets
2011-03-14 11:50:56 -07:00
David 'Digit' Turner
8d1f2e6ffc am 638608b1: am da8ea213: Merge "libc: <stdint.h>: Don\'t make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined."
* commit '638608b11afbd255ddbd15e739f0f638791a4305':
  libc: <stdint.h>: Don't make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined.
2011-03-14 10:53:11 -07:00
David 'Digit' Turner
448a1b9f18 am b299039d: am e6e2ba1d: Merge "libc: <pthread.h>: Replace \'#if __cplusplus\' by \'#ifdef __cplusplus\'"
* commit 'b299039d060eb5f523c05e4f9b6934a6b897a54f':
  libc: <pthread.h>: Replace '#if __cplusplus' by '#ifdef __cplusplus'
2011-03-14 10:53:09 -07:00
Brad Fitzpatrick
08a4ce983b am 0c398985: Merge "[ENDIAN] Build md5 code correctly for bigendian targets"
* commit '0c3989854fa3ea3ffb4152c013f68f2a21a52dc1':
  [ENDIAN] Build md5 code correctly for bigendian targets
2011-03-14 10:52:05 -07:00
Brad Fitzpatrick
0c3989854f Merge "[ENDIAN] Build md5 code correctly for bigendian targets" 2011-03-14 10:39:10 -07:00
Mike Lockwood
6139fa33ab DO NOT MERGE: linux/usb/f_accessory.h: Update USB accessory kernel header
For bugs b/4079236, b/4073248 and b/4080288

Change-Id: Id9cdbe95d7dd892bf38e16e7da505ee0eae26b99
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 19:02:16 -05:00
David 'Digit' Turner
3134b56bb0 am 0d6bbc7a: am dfe6eda5: Merge "libc: <stdint.h>: fix typo in INTMAX_C()/UINTMAX_C() definition"
* commit '0d6bbc7af091ee05dd032492ae594c263404e4aa':
  libc: <stdint.h>: fix typo in INTMAX_C()/UINTMAX_C() definition
2011-03-11 15:40:21 -08:00
David 'Digit' Turner
b868a32df6 am 0b73dac8: am d6722bdd: Merge "libc: <stdint.h>: Proper C++"
* commit '0b73dac8aa9546c0f532c7ea5e0bf72dd029f271':
  libc: <stdint.h>: Proper C++
2011-03-11 15:40:16 -08:00
David 'Digit' Turner
638608b11a am da8ea213: Merge "libc: <stdint.h>: Don\'t make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined."
* commit 'da8ea213abb8bec08da37622179061630bd8e2f8':
  libc: <stdint.h>: Don't make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined.
2011-03-11 11:13:45 -08:00
David 'Digit' Turner
b299039d06 am e6e2ba1d: Merge "libc: <pthread.h>: Replace \'#if __cplusplus\' by \'#ifdef __cplusplus\'"
* commit 'e6e2ba1d40241c85de16d75cbd397cc3670d7535':
  libc: <pthread.h>: Replace '#if __cplusplus' by '#ifdef __cplusplus'
2011-03-11 11:12:11 -08:00
David 'Digit' Turner
da8ea213ab Merge "libc: <stdint.h>: Don't make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined." 2011-03-11 09:32:33 -08:00
David 'Digit' Turner
e6e2ba1d40 Merge "libc: <pthread.h>: Replace '#if __cplusplus' by '#ifdef __cplusplus'" 2011-03-11 09:31:57 -08:00
David 'Digit' Turner
847b183f63 libc: <pthread.h>: Replace '#if __cplusplus' by '#ifdef __cplusplus'
See http://code.google.com/p/android/issues/detail?id=15221

Change-Id: Ia7b6668c28737810d6c4941604c6adf232a27c61
2011-03-11 14:51:19 +01:00
David 'Digit' Turner
8b3cea6732 libc: <stdint.h>: Don't make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined.
Change-Id: I8b0ea266eab9c6f75d8407b704953ecaef948221
2011-03-11 14:39:05 +01:00
David 'Digit' Turner
0d6bbc7af0 am dfe6eda5: Merge "libc: <stdint.h>: fix typo in INTMAX_C()/UINTMAX_C() definition"
* commit 'dfe6eda57e1e463427f941d5d71f8ccb5297d6d2':
  libc: <stdint.h>: fix typo in INTMAX_C()/UINTMAX_C() definition
2011-03-10 12:14:51 -08:00
David 'Digit' Turner
0b73dac8aa am d6722bdd: Merge "libc: <stdint.h>: Proper C++"
* commit 'd6722bdd201e2747c55ec7255db7f1d5864ccdd3':
  libc: <stdint.h>: Proper C++
2011-03-10 12:11:41 -08:00
David 'Digit' Turner
dfe6eda57e Merge "libc: <stdint.h>: fix typo in INTMAX_C()/UINTMAX_C() definition" 2011-03-10 11:35:58 -08:00
David 'Digit' Turner
0e5411b4ba libc: <stdint.h>: fix typo in INTMAX_C()/UINTMAX_C() definition
Change-Id: I3c74269901a288c448734dd7eb442a62b9348db8
2011-03-10 20:35:17 +01:00
Paul Lind
865e3789dd [ENDIAN] Build md5 code correctly for bigendian targets
Signed-off-by: Raghu Gandham <raghu@mips.com>
2011-03-10 11:13:50 -08:00
David 'Digit' Turner
d6722bdd20 Merge "libc: <stdint.h>: Proper C++" 2011-03-10 11:01:24 -08:00
David 'Digit' Turner
08ff1a6474 libc: <stdint.h>: Proper C++
This patch prevents the definition of various macros when <stdint.h> is
included from C++. The ISO C99 standard mentions that when this header
is included from a C++ source file, limit and constant related macros
should only be defined when asked explicitely by defining
__STDC_LIMIT_MACROS and __STD_CONSTANT_MACROS, respectively.

The <stdint.h> lacked the proper #ifdef .. #endif blocks for the
following macros:

    INTPTR_MIN, INTPTR_MAX, UINTPTR_MAX, PTRDIFF_MIN, PTRDIFF_MAX
    INTMAX_MIN, INTMAX_MAX, UINTMAX_MAX,
    INPTR_C, UINTPR_C, PTRDIFF_C, INTMAX_C, UINTMAX_C

This is intended to fix http://code.google.com/p/android/issues/detail?id=14380
after we copy this file to development/ndk/platforms/android-3/include/

Change-Id: Ia77e0822edfaaf568ea599d7de673b310eeeaa4a
2011-03-10 18:02:01 +01:00
Mike Lockwood
1a0775f1ca am c0fc678e: linux/usb/f_accessory.h: Update USB accessory kernel header
* commit 'c0fc678e969885cf95d2dacaad647cdc3f704f6e':
  linux/usb/f_accessory.h: Update USB accessory kernel header
2011-03-10 07:52:33 -08:00
David 'Digit' Turner
81d79f9fb3 am 962dcb22: am fed58049: Merge "libc: Fix PTHREAD_RWLOCK_INITIALIZER"
* commit '962dcb22218a1a6d4ebd05e4fc4a69875d037234':
  libc: Fix PTHREAD_RWLOCK_INITIALIZER
  Proxy getnameinfo through netd
  Updated gcc 4.4.3 IA toolchain doesn't require the .ctors list
  Convert cname lenght before use
2011-03-10 01:55:35 -08:00
David 'Digit' Turner
962dcb2221 am fed58049: Merge "libc: Fix PTHREAD_RWLOCK_INITIALIZER"
* commit 'fed58049d50083e4c960d89f4bbd516a181c2d18':
  libc: Fix PTHREAD_RWLOCK_INITIALIZER
  Proxy getnameinfo through netd
  Updated gcc 4.4.3 IA toolchain doesn't require the .ctors list
  Convert cname lenght before use
2011-03-10 01:51:19 -08:00
David 'Digit' Turner
fed58049d5 Merge "libc: Fix PTHREAD_RWLOCK_INITIALIZER" 2011-03-10 01:26:26 -08:00
David 'Digit' Turner
ca4462d76c libc: Fix PTHREAD_RWLOCK_INITIALIZER
The macro definition was incorrect and resulted in a compile error
when used.

Fixes http://code.google.com/p/android/issues/detail?id=15306

Change-Id: I8fa6047b63e7f56b53653774327099822c469cd1
2011-03-10 10:23:44 +01:00
Mike Lockwood
c0fc678e96 linux/usb/f_accessory.h: Update USB accessory kernel header
For bugs b/4079236, b/4073248 and b/4080288

Change-Id: I641a0fa93492c7059900f0193c722356d13eeab5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 21:57:00 -05:00
Mike Lockwood
b6a562e389 am 2703b704: (-s ours) am 6bd73ed4: Add linux/usb/f_accessory.h header for USB accessory driver DO NOT MERGE
* commit '2703b7046cebfadee325500d957501afbba11ebc':
  Add linux/usb/f_accessory.h header for USB accessory driver DO NOT MERGE
2011-03-09 14:05:42 -08:00
Mike Lockwood
2703b7046c am 6bd73ed4: Add linux/usb/f_accessory.h header for USB accessory driver DO NOT MERGE
* commit '6bd73ed417c52ed57d5f62ea9988b6071a1efbeb':
  Add linux/usb/f_accessory.h header for USB accessory driver DO NOT MERGE
2011-03-09 13:31:58 -08:00
Jason Chen
a08eb1df00 am 0ca21df5: (-s ours) am 6519756b: Merge "DO NOT MERGE Cherry-pick of 0ee092fb2 from master" into honeycomb
* commit '0ca21df5c6fbb22498cfde93b4fd4cac3235901b':
  DO NOT MERGE Cherry-pick of 0ee092fb2 from master
2011-03-02 15:32:53 -08:00
Jason Chen
0ca21df5c6 am 6519756b: Merge "DO NOT MERGE Cherry-pick of 0ee092fb2 from master" into honeycomb
* commit '6519756b23a8b18d06dae53cc3ece32c87146972':
  DO NOT MERGE Cherry-pick of 0ee092fb2 from master
2011-03-01 17:51:49 -08:00
Jason Chen
6519756b23 Merge "DO NOT MERGE Cherry-pick of 0ee092fb2 from master" into honeycomb 2011-03-01 17:48:25 -08:00
Mattias Falk
4489244058 DO NOT MERGE Cherry-pick of 0ee092fb2 from master
Convert cname lenght before use

The length of the cname is sent in big-endian
order. Thus, it has to be converted before used
in android_getaddrinfo_proxy

Change-Id: I78552d427ef6500d9121fc83423f0744ea0c3087
2011-03-01 17:22:04 -08:00
Erik Gilling
da14b0e1dd add linux/nvhdcp.h header
Change-Id: I74a1cf90bc9807002869aa9c7b5eddb065638db2
2011-03-01 14:46:11 -08:00
Mattias Falk
0ee092fb23 Convert cname lenght before use
The length of the cname is sent in big-endian
order. Thus, it has to be converted before used
in android_getaddrinfo_proxy

Change-Id: I1a0cc12780c47f7493fcf06f690515829f88c01e
2011-03-01 12:52:10 -08:00
Brad Fitzpatrick
1ed86fa491 Merge "Proxy getnameinfo through netd" 2011-02-22 07:18:56 -08:00
David Turner
5d90cb30f4 Merge "Updated gcc 4.4.3 IA toolchain doesn't require the .ctors list" 2011-02-22 07:05:32 -08:00
Mattias Falk
149f7dfe04 Proxy getnameinfo through netd
Proxy the parts of getnameinfo that utilize
the dns cache through netd.

Change-Id: I1d57c451ea6b179c34828cf57a4182b262674003
2011-02-22 08:22:16 +01:00
Mike Lockwood
6bd73ed417 Add linux/usb/f_accessory.h header for USB accessory driver DO NOT MERGE
Change-Id: I972d28065ee7e77e93699512310fcd6d5742ed0d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-21 12:35:22 -05:00
David Turner
3224c08bd7 Merge changes I8c481c89,I791406f8,I5f09cef8
* changes:
  libc: ARM: update syscalls with new script
  libc: ARM: add size info to gensyscalls
  Add function marks and size indications
2011-02-18 15:22:27 -08:00
David Turner
0999f8dcf2 Merge "Move the zoneinfo generation tool into bionic." 2011-02-18 14:53:03 -08:00
Elliott Hughes
d40e63ee47 Move the zoneinfo generation tool into bionic.
This also incorporates a bunch of changes to the previous script; this one
requires no setup, can be run from anywhere, and leaves no droppings.

Change-Id: I38f299f03e33950d2a64e9336f4ba7cb3c5cf6f0
2011-02-17 16:20:28 -08:00
Kenny Root
fb723c8749 libc: ARM: update syscalls with new script
Used the new gensyscalls.py script to update the ARM syscalls with the
BEGIN(x) and END(x) macros to give size information for the code of the
syscall. Useful for valgrind.

Change-Id: I8c481c8928401ac110fd19b087f7d67e4db39326
2011-02-17 10:47:47 -08:00
Kenny Root
f540c03bff libc: ARM: add size info to gensyscalls
Add size information to gensyscalls output for ARM syscalls with new
BEGIN(x) and END(x) macros in arch-arm/include/machine/asm.h

Change-Id: I791406f8b17abcb83b70a6d15a65a527de15d3f5
2011-02-17 10:47:20 -08:00
Kenny Root
420878c690 Add function marks and size indications
Add a macro to annotate function end and start using both ENTRY and END
for each function. This allows valgrind (and presumably other debugging
tools) to use the debug symbols to trace the functions.

Change-Id: I5f09cef8e22fb356eb6f5cee952b031e567599b6
2011-02-17 09:07:25 -08:00
Kenny Root
0233509c16 Amend previous commit with needed include
Change-Id: Idae8daaf095d90513820e05f423144ffed4ba913
2011-02-17 07:50:36 -08:00