Greg Hackmann
c042bb01df
am e25864b7: am 537f53b6: Merge "rootdir: add permissions for /dev/rtc0"
...
* commit 'e25864b752db0bc8ddc55f2c22cf1b8bcb2602bf':
rootdir: add permissions for /dev/rtc0
2013-12-18 00:26:06 +00:00
Greg Hackmann
e25864b752
am 537f53b6: Merge "rootdir: add permissions for /dev/rtc0"
...
* commit '537f53b682eb0d99e90da2a3e7389ea474bc583d':
rootdir: add permissions for /dev/rtc0
2013-12-17 16:23:31 -08:00
Greg Hackmann
537f53b682
Merge "rootdir: add permissions for /dev/rtc0"
2013-12-18 00:17:01 +00:00
Greg Hackmann
a585e662e0
rootdir: add permissions for /dev/rtc0
...
Change-Id: If9d853bdae2399b1e7434f45df375ba1fd6dbe9c
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-17 14:45:39 -08:00
Elliott Hughes
286ab6ce08
am 3278af85: am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"
...
* commit '3278af85f984a1b6df56b010a93589f6068514e0':
libdiskconfig: Use uintptr_t instead of uint32_t
2013-12-17 21:22:16 +00:00
Elliott Hughes
3278af85f9
am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"
...
* commit '30f9b5092062a0c8b61356496128feaaf8cd4237':
libdiskconfig: Use uintptr_t instead of uint32_t
2013-12-17 13:19:42 -08:00
Elliott Hughes
30f9b50920
Merge "libdiskconfig: Use uintptr_t instead of uint32_t"
2013-12-17 21:15:42 +00:00
Ashok Bhat
35539affd8
libdiskconfig: Use uintptr_t instead of uint32_t
...
Use uintptr_t instead of uint32_t when pointer is cast
to an integer type.
Change-Id: I03dd4c7ff66611661af466dfb7b393d461bb2d7d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2013-12-17 12:43:41 +00:00
Elliott Hughes
980093ca59
am 348856fa: am 532f4658: Merge "AArch64: Correction of struct surface_t"
...
* commit '348856fadb03cd0d93d0af3f78c11555a343e97f':
AArch64: Correction of struct surface_t
2013-12-16 19:59:28 +00:00
Elliott Hughes
348856fadb
am 532f4658: Merge "AArch64: Correction of struct surface_t"
...
* commit '532f46582362f6b14d5e2a19600c2930385cdc30':
AArch64: Correction of struct surface_t
2013-12-16 11:56:33 -08:00
Elliott Hughes
532f465823
Merge "AArch64: Correction of struct surface_t"
2013-12-16 19:50:17 +00:00
Elliott Hughes
410a1966df
am fd382f2e: am fd7eabe4: Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."
...
* commit 'fd382f2e2f27377e0a61f442bff196b66b188293':
Pixelflinger: Add AArch64 support to pixelflinger JIT.
2013-12-16 19:49:33 +00:00
Elliott Hughes
fd382f2e2f
am fd7eabe4: Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."
...
* commit 'fd7eabe4429ee6bbc18796b0c76033902fa63497':
Pixelflinger: Add AArch64 support to pixelflinger JIT.
2013-12-16 11:47:14 -08:00
Elliott Hughes
fd7eabe442
Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."
2013-12-16 19:42:55 +00:00
Elliott Hughes
f64b4a6a84
am 7fe10ded: am cadb10c9: Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"
...
* commit '7fe10dedfdefe952602d3507db3109eaa94d4068':
Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
2013-12-16 19:02:53 +00:00
Elliott Hughes
7fe10dedfd
am cadb10c9: Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"
...
* commit 'cadb10c9578c39e7f886a1fce11536258b2cac4e':
Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
2013-12-16 10:59:19 -08:00
Elliott Hughes
cadb10c957
Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"
2013-12-16 18:55:09 +00:00
Nick Kralevich
a24e9a8655
am 02ad8700: am e4335483: Merge "Relabel /data/misc/zoneinfo"
...
* commit '02ad8700dd22d5bf5d73c638e3a45c35d5ef3d1d':
Relabel /data/misc/zoneinfo
2013-12-16 17:07:12 +00:00
Nick Kralevich
02ad8700dd
am e4335483: Merge "Relabel /data/misc/zoneinfo"
...
* commit 'e4335483e78292800e27c7bf0a67d23bee47dc84':
Relabel /data/misc/zoneinfo
2013-12-16 09:04:04 -08:00
Nick Kralevich
e4335483e7
Merge "Relabel /data/misc/zoneinfo"
2013-12-16 16:59:19 +00:00
Elliott Hughes
41e9ee2477
am feb539b6: am e1a475c0: Merge "Force alignment of data buffer used to process netlink messages"
...
* commit 'feb539b6e3d81a7f0ab86b6b48056a531c4cb4ed':
Force alignment of data buffer used to process netlink messages
2013-12-14 00:20:11 +00:00
Elliott Hughes
feb539b6e3
am e1a475c0: Merge "Force alignment of data buffer used to process netlink messages"
...
* commit 'e1a475c0b4b73ec72fae12ea310b038d87a71b0e':
Force alignment of data buffer used to process netlink messages
2013-12-13 16:17:24 -08:00
Elliott Hughes
e1a475c0b4
Merge "Force alignment of data buffer used to process netlink messages"
2013-12-14 00:13:32 +00:00
Nick Kralevich
354e9edbd7
Relabel /data/misc/zoneinfo
...
The files in zoneinfo changed from system_data_file to
zoneinfo_data_file. Fixup pre-existing files.
Change-Id: Idddbd6c2ecf66cd16b057a9ff288cd586a109949
2013-12-13 16:03:48 -08:00
Narayan Kamath
df39ce3929
am d61266d0: am 4928d8d0: Merge "Fix ExtractEntryToFile."
...
* commit 'd61266d0167816e653141f7f3c6579f2a65944db':
Fix ExtractEntryToFile.
2013-12-13 18:19:20 +00:00
Narayan Kamath
d61266d016
am 4928d8d0: Merge "Fix ExtractEntryToFile."
...
* commit '4928d8d072b5fab695f88437987c4be10781f40c':
Fix ExtractEntryToFile.
2013-12-13 10:16:19 -08:00
Narayan Kamath
4928d8d072
Merge "Fix ExtractEntryToFile."
2013-12-13 18:13:01 +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
d2aea929bf
am f595365f: am d5f97db5: Merge "libion: Use %zu for size_t"
...
* commit 'f595365fefab6abe2a0429eb9b0b519704c8b5fc':
libion: Use %zu for size_t
2013-12-13 17:47:51 +00:00
Elliott Hughes
f595365fef
am d5f97db5: Merge "libion: Use %zu for size_t"
...
* commit 'd5f97db507f47b0db0d15c8a809ce33c46391228':
libion: Use %zu for size_t
2013-12-13 09:45:20 -08:00
Elliott Hughes
d5f97db507
Merge "libion: Use %zu for size_t"
2013-12-13 17:38:23 +00:00
Elliott Hughes
a99f0b6e38
am 5b8daae0: am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"
...
* commit '5b8daae0440330097ed9d5f7bee24eea0ac0bb31':
Pixelflinger: Fix issue of pointers being stored in ints
2013-12-12 21:28:02 +00:00
Elliott Hughes
5b8daae044
am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"
...
* commit 'a67b39cb612744764ad9cd9a78aabd6b5742a384':
Pixelflinger: Fix issue of pointers being stored in ints
2013-12-12 13:25:36 -08:00
Elliott Hughes
a67b39cb61
Merge "Pixelflinger: Fix issue of pointers being stored in ints"
2013-12-12 21:22:33 +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
bfc6dc4ca8
Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
...
GGLAssembler assumes addresses to be 32-bit and uses ARM 32-bit
instructions to load/store/manipulate addresses. To support, 64-bit
architectures, following changes has been done
1. ARMAssemblerInterface has been extended to support four new
operations ADDR_LDR, ADDR_STR, ADDR_SUB, ADDR_ADD. Base class
implements these virtual functions to use 32bit equivalent
function. This avoids existing 32-bit Assembler backend
implementations like ARMAssembler and MIPSAssembler from
mapping the new functions to existing equivalent routines.
This also allows 64-bit Architectures like AArch64 to override
the function in their assembler backend implementations.
2. GGLAssembler code (spread over GGLAssembler.cpp, GGLAssembler.h
and texturing.cpp) has been changed to use the new operations
for address operations.
Change-Id: I3d7eace4691e3e47cef737d97ac67ce6ef4fb18d
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
Narayan Kamath
de39957ba1
am 3a5ab80d: am 7d92b7cc: Merge "Get rid of some log spam."
...
* commit '3a5ab80d0f2a70b2e39ffcc6eebf876b04ff5cdd':
Get rid of some log spam.
2013-12-12 17:27:53 +00:00
Narayan Kamath
3a5ab80d0f
am 7d92b7cc: Merge "Get rid of some log spam."
...
* commit '7d92b7cc6580285ab7f8ef86be7512eafda89354':
Get rid of some log spam.
2013-12-12 09:25:29 -08:00
Narayan Kamath
7d92b7cc65
Merge "Get rid of some log spam."
2013-12-12 17:19:40 +00:00
Narayan Kamath
f6a196522a
Get rid of some log spam.
...
We don't need a warning if an entry isn't found in a zip
file. It can happen as part of normal operation.
Change-Id: I86c132a040371f36f0dd981b49c02b3173821439
2013-12-12 10:29:31 +00:00
Nick Kralevich
af9e9d97ee
am f0a68b54: am 8779c4ea: Merge "Minor cleanups."
...
* commit 'f0a68b54be5ba78466a7075a6d9a72438c25e645':
Minor cleanups.
2013-12-11 22:53:39 +00:00
Nick Kralevich
f0a68b54be
am 8779c4ea: Merge "Minor cleanups."
...
* commit '8779c4eab43956ecf626bbece3f6f3bc54970d6a':
Minor cleanups.
2013-12-11 14:50:20 -08:00
Nick Kralevich
8779c4eab4
Merge "Minor cleanups."
2013-12-11 22:46:35 +00:00
Narayan Kamath
bac8ae4d1d
am 841ef3bd: am bcf1454c: Merge "Use FileMap from libcutil instead of rolling our own."
...
* commit '841ef3bd2081a74bf95be83211e92a653df61541':
Use FileMap from libcutil instead of rolling our own.
2013-12-11 21:02:22 +00:00
Narayan Kamath
841ef3bd20
am bcf1454c: Merge "Use FileMap from libcutil instead of rolling our own."
...
* commit 'bcf1454cf6a2fadc30c5189c3756b3cb96149745':
Use FileMap from libcutil instead of rolling our own.
2013-12-11 09:40:03 -08:00
Narayan Kamath
bcf1454cf6
Merge "Use FileMap from libcutil instead of rolling our own."
2013-12-11 17:33:58 +00:00
Narayan Kamath
eaf988532b
Use FileMap from libcutil instead of rolling our own.
...
Adds windows support as a side effect.
Change-Id: I912c1f980f284d01d4f3936291999646ddf6250a
2013-12-11 15:17:06 +00:00
Todd Poynor
0af90f6f75
charger: dump pstore ram console DO NOT MERGE
...
Change-Id: I7f612d49418272e2ac867f64c10149ad616391cd
2013-12-10 21:58:34 +00:00
Nick Kralevich
a91a47c30c
am b2dfa7ec: am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client
...
* commit 'b2dfa7ece7fb69d2ce5ae517eb35492beb646385':
Fix overflow in adb_client
2013-12-10 12:42:20 -08:00