Commit graph

1078 commits

Author SHA1 Message Date
Mark Salyzyn
24239a99ff Merge "liblog: deprecate export of LOGGER_LOG_* defines" 2014-01-16 21:51:03 +00:00
Glenn Kasten
1c3e16fb40 Miscellaneous updates to <system/audio.h>
Add single-precision floating-point PCM format:
    - AUDIO_FORMAT_PCM_SUB_FLOAT
    - AUDIO_FORMAT_PCM_FLOAT

Add symbols to replace hard-coded constants in code:
    - AUDIO_IO_HANDLE_NONE
    - AUDIO_IN_ACOUSTICS_NONE
    - AUDIO_INTERLEAVE_*
    - AUDIO_STREAM_MIN

Update comments.

Fix whitespace in switch statement.

Change-Id: I61862c188ebac06657b5d9887164edc24b8ab8f5
2014-01-15 14:11:27 -08:00
Glenn Kasten
765aef9c13 Merge "Add AUDIO_SESSION_ALLOCATE" 2014-01-15 00:15:37 +00:00
Glenn Kasten
b4f2b4eac4 Add AUDIO_SESSION_ALLOCATE
Change-Id: I045f2f04520bc474666c43a0ff1568f0fab3567c
2014-01-14 16:14:18 -08:00
Elliott Hughes
49cf122d25 am 7b80c138: am 7c7d76f4: am ab3d5036: am d47ffb88: Merge "AArch64: Add atomic functions"
* commit '7b80c1381581bd3c0c28440236e043888c49087d':
  AArch64: Add atomic functions
2014-01-14 23:43:47 +00:00
Elliott Hughes
d47ffb8890 Merge "AArch64: Add atomic functions" 2014-01-14 23:32:22 +00:00
Ashok Bhat
c15d2ce5fc AArch64: Add atomic functions
This patch adds atomic functions for AArch64. The functions
will be revisited later for potential optimizations using
assembly or otherwise.

This patch also introduces new 64-bit atomic functions for
LP64 platforms.

Change-Id: Id2127dd01cea65025f939e955d73d27e95d8687e
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-01-14 12:45:58 -08:00
Mark Salyzyn
73459a5c87 liblog: deprecate export of LOGGER_LOG_* defines
Change-Id: I263af8e889f8f2ad91b91757caf90a4d17823dab
2014-01-14 07:51:14 -08:00
Christopher Ferris
4167d7e5c2 resolved conflicts for merge of 8791ee5c to master
Change-Id: I107bb055941809331c451c1d903f231f07a86ece
2014-01-13 18:14:11 -08:00
Christopher Ferris
20303f856f Next phase of the move, reformat use C++ features.
Use the libbacktrace C++ interface instead of the C interface in debuggerd.

Reformat the debuggerd code to be closer to Google C++ style.

Fix all debuggerd casts to be C++ casts.

Add a frame number to the frame data structure for ease of formatting and
add another FormatFrameData function.

Change the format_test to use the new FormatFrameData function.

Modify all of the backtrace_test to use the C++ interface.

Change-Id: I10e1610861acf7f4a3ad53276b74971cfbfda464
2014-01-13 14:21:52 -08:00
Christopher Ferris
bc12d6329e Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.
Use a bit better name for this. The other name was a bit confusing.

Change-Id: I1261f2ee3854a9c8b82133ad0bfbbbe48b43c9ac

(cherry picked from commit 242b1a8c7a)

Conflicts:
	libbacktrace/Backtrace.cpp
2014-01-09 15:49:39 -08:00
Christopher Ferris
038ac694b3 Move CallStack to libbacktrace.
Fix a small bug in the Printer for strings that didn't properly
prepend the prefix.

(cherry picked from commit 9b0e074c6d)

Change-Id: I78bfa3f76864c34f33fb439bf20dfc85616f1077
2014-01-09 15:09:13 -08:00
Mark Salyzyn
153b370624 liblog: resolve build warning messages
Change-Id: Icc6f1f2c926a008efc4df71022cfde8d0e285880
2014-01-09 10:42:20 -08:00
Christopher Ferris
a74ead0fd6 resolved conflicts for merge of 72f204de to master
Change-Id: I7345014d00c669aea5e27ea50b2ac658145b068b
2014-01-08 16:20:50 -08:00
Christopher Ferris
9846497f79 Refactor to share map_info amongst threads.
Allow the use of the same map info to be shared when getting information on
multiple threads from the same pid.

Change-Id: I2e460e20154a10f4894ae563331fb32179e4551f
2014-01-08 15:32:28 -08:00
Mark Salyzyn
c96a44888a liblog: drop use of sys/cdefs.h
Change-Id: I44ea5d6b572e3712c301e6ebf4b34e6225d7e18b
2014-01-03 17:40:20 -08:00
Mark Salyzyn
105a83e854 Merge "Revert "liblog: Add liblog test suite"" 2014-01-04 01:01:33 +00:00
Mark Salyzyn
20727babc7 Revert "liblog: Add liblog test suite"
This reverts commit 46abc52296.

Change-Id: Iced83fdfa7de061c0495920ea28a9468023706d3
2014-01-04 00:41:16 +00:00
Mark Salyzyn
7cc2336316 Merge changes Ia6d6821e,I1e1a55d1,Ic26e9dba,Iedc55c13
* changes:
  liblog: Add liblog test suite
  logcat: Incorporate liblog reading API
  debuggerd: Incorporate liblog reading API
  liblog: Interface to support abstracting log read
2014-01-03 22:49:35 +00:00
Rom Lemarchand
e3f0c079b3 am 79b6b7f0: am 1892fe66: am c8d7d2d6: am 5234147c: Merge "move sync headers from include to libsync"
* commit '79b6b7f0fdb14fcd8c336ed8f1c0a5b481bb8697':
  move sync headers from include to libsync
2014-01-03 21:42:21 +00:00
Rom Lemarchand
ddc20de148 move sync headers from include to libsync
Make sw_sync.h private

Change-Id: I0b120ebe81fd4a191b7aa4b6a8de4f64d16e2b3e
2014-01-03 21:27:05 +00:00
Mark Salyzyn
46abc52296 liblog: Add liblog test suite
Change-Id: Ia6d6821e8546e0eccacab812d39d529ea0372c6a
2014-01-02 12:54:07 -08:00
Mark Salyzyn
6c1b07fbbd liblog: Interface to support abstracting log read
Change-Id: Iedc55c1316029b4bb72f51cc656b53b0e3f90aee
2014-01-02 12:53:53 -08:00
Colin Cross
d809eace0c am 9f34b141: am 85d5d611: am c4f4e5e2: am cd8b953e: Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd
* commit '9f34b141b301f15111de2ff0efb3d76379b46f1c':
  libion: update to latest uapi header
  libion: return -errno from ion_close
  libion: add include for size_t
  libion: add NULL checks
  libion: clean up whitespace
  libion: move ion.h into local include directory
2013-12-19 22:12:51 +00:00
Colin Cross
cd8b953ede Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd
* changes:
  libion: update to latest uapi header
  libion: return -errno from ion_close
  libion: add include for size_t
  libion: add NULL checks
  libion: clean up whitespace
  libion: move ion.h into local include directory
2013-12-19 21:49:48 +00:00
Colin Cross
dfe747ada3 Merge "ion: update struct and type definitions to match kernel header" 2013-12-19 21:18:51 +00:00
Brian Carlstrom
0e90bb97cb am 137ab19a: am b37b53bf: am 87942c9a: am b3bfe881: Merge "Make libutils Looper independent of frameworks/native"
* commit '137ab19a0a196a419636b078f94aef23b1172335':
  Make libutils Looper independent of frameworks/native
2013-12-19 07:58:21 +00:00
Brian Carlstrom
1693d7e48f Make libutils Looper independent of frameworks/native
Change-Id: I1dacca10a3cd7601abc3451b69ed761bf71c38fe
2013-12-18 22:32:13 -08:00
Rom Lemarchand
969eac8161 ion: update struct and type definitions to match kernel header
- Replacing struct ion_handle * with ion_user_handle_t
- Replacing heap_mask field name with heap_id_mask

Change-Id: Iaba1ccc62b9398a7b37c5a734bc21a9ecbbc8277
2013-12-18 18:24:50 -08:00
Colin Cross
03c932dffa libion: move ion.h into local include directory
Export it to users of libion with LOCAL_C_EXPORT_INCLUDE_DIRS

Change-Id: I4d00a9dd2e99953723994d0304ca77e0ad50a3a9
2013-12-18 18:24:50 -08:00
Elliott Hughes
fed76f8515 am 63824e92: am 980093ca: am 348856fa: am 532f4658: Merge "AArch64: Correction of struct surface_t"
* commit '63824e923aca6fe15942beee00b258ea6119e459':
  AArch64: Correction of struct surface_t
2013-12-16 20:03:17 +00:00
Elliott Hughes
c29664284b am 49a88c3c: am 410a1966: am fd382f2e: am fd7eabe4: Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."
* commit '49a88c3cf38e9c17a756434880fb01971018a9c6':
  Pixelflinger: Add AArch64 support to pixelflinger JIT.
2013-12-16 19:55:21 +00:00
Elliott Hughes
532f465823 Merge "AArch64: Correction of struct surface_t" 2013-12-16 19:50:17 +00:00
Elliott Hughes
fd7eabe442 Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT." 2013-12-16 19:42:55 +00:00
Elliott Hughes
f73c009a3d am aa8dc146: am 41e9ee24: am feb539b6: am e1a475c0: Merge "Force alignment of data buffer used to process netlink messages"
* commit 'aa8dc14665003abbbeebed3b113c3083b3f342c7':
  Force alignment of data buffer used to process netlink messages
2013-12-14 00:27:09 +00:00
Elliott Hughes
e1a475c0b4 Merge "Force alignment of data buffer used to process netlink messages" 2013-12-14 00:13:32 +00:00
Narayan Kamath
cec7e7e3ea am 153c03ac: am df39ce39: am d61266d0: am 4928d8d0: Merge "Fix ExtractEntryToFile."
* commit '153c03acc247ef283ed27d83e9286425b651a816':
  Fix ExtractEntryToFile.
2013-12-13 22:19:37 +00:00
Narayan Kamath
00a258cec7 Fix ExtractEntryToFile.
We would always write uncompressed data at offset 0 instead
of the current filedescriptor offset.

Also adds a unit-test & a clarifying comment on the API.

Change-Id: If44757e96dde504ce63d81b4dec7115fc6f6d5fb
2013-12-13 17:56:57 +00:00
Elliott Hughes
260854c0b0 am ed20fef0: am a99f0b6e: am 5b8daae0: am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"
* commit 'ed20fef0630d02395abab6a073a5717ddfbfaa8d':
  Pixelflinger: Fix issue of pointers being stored in ints
2013-12-12 21:33:04 +00:00
Ashok Bhat
658f89dc5c Pixelflinger: Add AArch64 support to pixelflinger JIT.
See the comment-block at the top of Aarch64Assembler.cpp
for overview on how AArch64 support has been implemented

In addition, this commit contains
[x] AArch64 inline asm versions of gglmul series of
    functions and a new unit test bench to test the
    functions

[x] Assembly implementations of scanline_col32cb16blend
    and scanline_t32cb16blend for AArch64, with unit
    test bench

Change-Id: I915cded9e1d39d9a2a70bf8a0394b8a0064d1eb4
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2013-12-12 17:30:13 +00:00
Ashok Bhat
d10afb1748 Pixelflinger: Fix issue of pointers being stored in ints
Pixelflinger's code makes assumptions, at certain places,
that pointers can be stored as ints. This patch makes use
of uintptr_t wherever pointers are stored as int or cast
to int.

Change-Id: Ie76f425cbc82ac038a747f77a95bd31774f4a8e8
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2013-12-12 17:30:13 +00:00
Marcus Oakland
6053564160 AArch64: Correction of struct surface_t
The struct in the union with GGLSurface in struct surface_t assumed
that the reserved field, which corresponds to the GGLsizei version
field in the GGLSurface structure (where GGLsizei is define as being
ssize_t in the system/core/include/pixelflinger/pixelflinger.h header
file) is uint32_t. That is appropriate to the 32-bit system but is
not appropriate to the 64-bit system, where ssize_t is 64-bits rather
than 32-bits.

The 32-bit system has also been tested and has no regression
because of this change.

Change-Id: I5cd84fd4a18fa0e63e27975f7b3d3e95b99cea58
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2013-12-10 18:13:26 +00:00
Mark Salyzyn
9880128af2 Merge changes I7d9db1e2,I48b0942a,I0572555a
* changes:
  liblog: whitespace cleanup
  libsysutils: Get rid of warnings
  libcutils: Move list.c to inlines on list.h
2013-12-06 19:12:28 +00:00
Narayan Kamath
fe4d0a1065 am cb7092d9: am 48a6d3de: am ac3ab308: Merge "Fix Mac OS build for libziparchive."
* commit 'cb7092d9f602dcbe8c8c7b2eeec5858e1c35cc39':
  Fix Mac OS build for libziparchive.
2013-12-06 18:37:12 +00:00
Narayan Kamath
48a6d3de59 am ac3ab308: Merge "Fix Mac OS build for libziparchive."
* commit 'ac3ab308f657f70e2747734d5ff2158aa943b25e':
  Fix Mac OS build for libziparchive.
2013-12-06 10:32:07 -08:00
Narayan Kamath
574c3b35df Fix Mac OS build for libziparchive.
BSD off_t are implicitly 64 bit so the platform
doesn't define off64_t.

Change-Id: I51cbe94ead01d2d6bc7c5010d9472487bee7c2d3
2013-12-06 18:27:53 +00:00
Narayan Kamath
52d07d2056 am f591bbc2: am 51a1d4e3: am a2125077: Merge "Unify zipfile implementations : Step 1."
* commit 'f591bbc247cf3535c8b5e162058769db4aa3d4af':
  Unify zipfile implementations : Step 1.
2013-12-06 16:08:40 +00:00
Narayan Kamath
51a1d4e3f6 am a2125077: Merge "Unify zipfile implementations : Step 1."
* commit 'a2125077e104941f797f93fbe6bfad22ef60a1d8':
  Unify zipfile implementations : Step 1.
2013-12-06 05:37:39 -08:00
The Android Open Source Project
7fc7a07b23 Merge commit '252d9030cd4b2e3e6cf13fa33f328eccedb5e26c' into HEAD 2013-12-05 12:38:34 -08:00
Mark Salyzyn
0ea3624b3e libcutils: Move list.c to inlines on list.h
Change-Id: I0572555a194d2560e74dfbf07abcec05e9a276a2
2013-12-05 07:33:21 -08:00