Skip to content

Commit

Permalink
merge cm10.1 into eos4.0 for more device support
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit f9f985d6ba644a11458d6051bb3af2e1babb14af
Author: Andrew Dodd <[email protected]>
Date:   Tue Dec 18 17:11:01 2012 -0500

    gralloc: Add missing GRALLOC_USAGE_HW_FIMC1 logic

    This caused the ION pointer to get clobbered with a UMP
    pointer when FIMC1 memory was requested.

    After a while, camera would be unable to allocate buffers
    due to ION memory not being freed properly.

    Change-Id: I1ba1d27da924a0bb81631548e83c7f3e5789f319

commit 1c3297ae966e719a25354027cfb071d716e0b082
Author: R. Andrew Ohana <[email protected]>
Date:   Sun Dec 16 22:47:37 2012 -0800

    include ril for exynos4210

    Building libsecril-client from source works perfectly well
    on the i815. It will probably work well with the gsm devices
    as well.

    Change-Id: I4f394555d82fb48a86ea52212d9fb56ca0e8acd3

commit 84f8d1d325333f9d904ec3311763d4169a8145e8
Author: codeworkx <[email protected]>
Date:   Thu Dec 13 17:23:45 2012 +0100

    macloader: add new murata value

    Change-Id: I1bc1aa88ec58f406fcf46a7c118ef577d6b0fb78

commit d052b701d224b3b6cbd0a2e4a3a7a17d98c2fd06
Merge: 04470b7 e6a23d7
Author: Daniel Hillenbrand <[email protected]>
Date:   Tue Dec 11 04:57:03 2012 -0800

    Merge "hwc: Pull in updates from exynos3 hwc" into mr1-staging

commit e6a23d7713f657f9aadf8339fd37f8e1c20e45b4
Author: Andrew Dodd <[email protected]>
Date:   Sun Dec 2 21:50:58 2012 -0500

    hwc: Pull in updates from exynos3 hwc

    Change-Id: I61e1556da3e2d1e9a8b9c22163f4f11982bda7dc

commit 04470b7fa8fa658417a7b40f904a978c59dc84f1
Merge: 6ab6c16 19e59a7
Author: Daniel Hillenbrand <[email protected]>
Date:   Mon Dec 10 22:41:07 2012 -0800

    Merge "gralloc: Back out hacks now that Mali-derping is fixed" into mr1-staging

commit 6ab6c16999e51e67561f1b25e35bb0436916cd73
Author: codeworkx <[email protected]>
Date:   Sun Dec 9 09:51:22 2012 +0100

    exynos4: libhwcomposer: disable debugging

    Change-Id: Iead8beee1c2c40b3c7ce1277c84dc180fb96ecb8

commit 19e59a77d90d963d8a2b3e91daefe59fdeebe3e0
Author: Andrew Dodd <[email protected]>
Date:   Sat Dec 8 12:27:01 2012 -0500

    gralloc: Back out hacks now that Mali-derping is fixed

    Two reverts squashed, due to Mali-derping being fixed
    in frameworks/native:

    Revert "gralloc: avoid using framebuffer"

    This reverts commit 5125ccc5b6d9a4bf1256a4a57f6d5f7d0ebe26c9.

    Revert "gralloc:  Send first 2 FB buffers to carveout and next to UMP"

    This reverts commit d288deb284f205c6b0eae04b27377c902afaf24e.

    Change-Id: I530dc255b7543e03d0e8277d3ad12ed11d6649ab

commit 6aab55a059d81151596ac2feff8ee5192aa55930
Author: codeworkx <[email protected]>
Date:   Fri Dec 7 20:51:05 2012 +0100

    exynos4: gralloc: fix fimc1/ion logic

    Change-Id: I0d125275e4d9ec3b6368572b9c0aa1033969c98d

commit 3e73708c2e79e38420e686a9dd139f5325a927ed
Author: Andrew Dodd <[email protected]>
Date:   Thu Dec 6 01:12:38 2012 -0500

    exynos4: gralloc: Do FIMC1 memory allocations from ION instead of FIMC1

    Mobile's blobs behave this way, except they don't do the
    4k alignment done by the FIMC1 allocs.

    The 4k alignment should fix issues such as NHK World Live TV,
    but fails to do so.

    Change-Id: I1ee4cd13e23f9f2f6c6616ee9eed1096b571a82c

commit 2f662dd093a0ea58e0a8683aad20e56de6277b20
Author: Andrew Dodd <[email protected]>
Date:   Thu Dec 6 00:16:18 2012 -0500

    gralloc_priv: Remove unused yaddr member

    Mobile's blobs don't appear to have been compiled with this
    present in their headers, and none of the Insignal sources
    actually use this.

    Change-Id: Ib8611f6da90ea78aa8eec451c76f56ddb32b45a4

commit 3fc2ca9f38b75a67b1543c84cce91964c268adc7
Author: Andrew Dodd <[email protected]>
Date:   Wed Dec 5 00:47:48 2012 -0500

    gralloc: Let } rejoin its people

    This is the story of poor }.  It is a painful saga.

    Samsung left } floating inside the galaxy of framebuffer_alloc,
    unable to join its brethren on the planet of STANDARD_LINUX_SCREEN
    when they were shifted out of the #ifdef dimension.

    codeworkx brutally eliminated poor } from the galaxy, it was
    nowhere to be seen.  codeworkx then took pity on the } and
    placed it back on the planet of STANDARD_LINUX_SCREEN, but
    placed it on a continent where it was all alone, unable to
    ever see its mate {

    Take pity on poor }, let it rejoin its people on the correct
    continent of the planet STANDARD_LINUX_SCREEN, so they may
    all shift out of the #ifdef dimension together.

    Change-Id: I7a700b73ccd2c91f91d9af3704930759f46978c7

commit 1400c151aa81bc5cfcb55334406d76f1740f6335
Author: codeworkx <[email protected]>
Date:   Mon Dec 3 22:21:46 2012 +0100

    gralloc: add HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED for video

    Change-Id: I340b2bc065490797889aa17c5396cf40e0e7d6ff

commit 5125ccc5b6d9a4bf1256a4a57f6d5f7d0ebe26c9
Author: codeworkx <[email protected]>
Date:   Mon Dec 3 21:22:06 2012 +0100

    gralloc: avoid using framebuffer

    Change-Id: I216b4b67f09729d00d337512ab17ff378f218a33

commit 00b0625388d05ded0b7ae14358355a86ebb2da64
Author: codeworkx <[email protected]>
Date:   Mon Dec 3 18:15:06 2012 +0100

    gralloc: do it the android way

    Change-Id: I54d7cfcbf39a97a340cf5b807537c39584c0e50a

commit c5b109bede1e83e7b2b2327670c2037f26fcfb7a
Author: codeworkx <[email protected]>
Date:   Mon Dec 3 18:11:28 2012 +0100

    gralloc: hello }, welcome back at your new home

    Change-Id: I86f80b78325f37f2d46b0c3b08818ab1274242e9

commit 0a4bdb5f50d970d86637f1aae453305dbdc3328c
Author: codeworkx <[email protected]>
Date:   Mon Dec 3 18:05:53 2012 +0100

    gralloc: hello }, what are you doing there?

    Change-Id: Idf59890cb41e97004039a71e4b32f3d263b89482

commit d288deb284f205c6b0eae04b27377c902afaf24e
Author: Espen Fjellvær Olsen <[email protected]>
Date:   Sun Dec 2 21:05:31 2012 +0100

    gralloc:  Send first 2 FB buffers to carveout and next to UMP

    Taken from QCOM gralloc:

    commit d80a52cbf961d737f6f3beef47b868a581b98591
    Author: Saurabh Shah <[email protected]>
    Date:   Tue Oct 2 14:32:40 2012 -0700

    gralloc:  Send first 2 FB buffers to carveout and next to IOMMU

    Gralloc uses the GRALLOC_USAGE_HW_FB flag to allocate memory from carveout.
    This is fine for primary framebuffer, but for external framebuffer we need IOMMU
    heap buffers, since the ioctls for external work with those.

    Ideally, the primary buffers also need to come from IOMMU heap, which is ongoing
    work. This patch allocates the first 2 FB buffer requests (assuming they are for
        primary) from carveout and allocates all subsequent buffers from IOMMU heap.

    Bug: 7124159
    Change-Id: Ie53b2e1e7fcac136acd2d251f39cefe367fc7125
    Signed-off-by: Iliyan Malchev <[email protected]>

commit 4b20a95b20a00abbfe5ac456725257650d6f9b7d
Author: codeworkx <[email protected]>
Date:   Mon Dec 3 17:43:43 2012 +0100

    Revert "exynos4: gralloc: higher number of buffers for page flipping"

    This reverts commit 8b9deaf74eba92bac8725666c2f99e51412a5b6f.

commit 39aefd0fc48ae60b7db526887ce216e82c8f3ce2
Author: codeworkx <[email protected]>
Date:   Sun Dec 2 19:39:25 2012 +0100

    libhwcomposer: keep window 2 open

    Window 2 is used to query global info about the LCD.

    Kanged from patch for aries by Greg Hackmann <[email protected]>

    Change-Id: Idf754d4536337d6c06652c1d0c744dc7c0936b15

commit 8b9deaf74eba92bac8725666c2f99e51412a5b6f
Author: codeworkx <[email protected]>
Date:   Sat Dec 1 23:54:58 2012 +0100

    exynos4: gralloc: higher number of buffers for page flipping

commit abfed77d4612fa4812327221373213d04ce65974
Author: codeworkx <[email protected]>
Date:   Sat Dec 1 19:37:39 2012 +0100

    exynos4: hwcomposer: add uevent vsync handling

commit 34f9d5d69265777b8bb27f98cfa9855494e1266a
Author: espenfjo <[email protected]>
Date:   Sat Dec 1 18:52:36 2012 +0100

    exynos4: libhwcomposer: update for new api version

commit 1030fe0ae8322353c0e376c7ecfbd0db32636668
Author: codeworkx <[email protected]>
Date:   Sat Dec 1 18:45:44 2012 +0100

    exynos4: update gralloc from insignal, modify it to work with libsecion

commit d573d9b5a18cb47ed2b091099872790ae59bfffa
Author: codeworkx <[email protected]>
Date:   Tue Nov 27 12:34:52 2012 +0100

    exynos4: add missing pixel format definitions

    Change-Id: I0386e8a9209d4f6633f67aa028c512e749c2c857

commit 1503aad3780ec95fe8865314998b9b63e790b818
Merge: 2c81822 b9ae8e0
Author: Daniel Hillenbrand <[email protected]>
Date:   Fri Nov 23 04:49:15 2012 -0800

    Merge "s5pc110: hwcomposer: update to hwcomposer HAL v1 api" into mr1-staging

commit 2c818225252c98681de70109d8f4d6657c486f09
Author: Chirayu Desai <[email protected]>
Date:   Fri Nov 16 14:32:19 2012 +0530

    exynos5: remove sources

    - upstream has them at hardware/samsung_slsi

    Change-Id: I6721098016ea7d760b553d533613ffc450eefd86

commit b9ae8e0e0d6d35121650fb0b926038bc00d2883c
Author: Pawit Pornkitprasan <[email protected]>
Date:   Fri Nov 23 14:24:32 2012 +0700

    s5pc110: hwcomposer: update to hwcomposer HAL v1 api

    Change-Id: I2dc71cca002a1c36898831c54e2bea281ac98744

commit c9288149a35eef64908085d9799f2ba908bfabd2
Author: Petr Havlena <[email protected]>
Date:   Thu Nov 15 14:07:10 2012 +0530

    exynos3: libhdmi: initial commit

    Change-Id: Iee23cf3b6e746c3a20adf7b90ab930a3cba50d5c

commit 1386f44a87281ecfb0309fc7b6ba00209cd7c05f
Author: Petr Havlena <[email protected]>
Date:   Fri Oct 26 17:52:00 2012 +0530

    exynos3: hwc: add hdmi support

    Change-Id: I9def46f17fc2b3042af776b253ac3441fd6d3405

commit 41b00c3b143ef1dfdd4704fa2154ad5fd0385fbf
Author: Petr Havlena <[email protected]>
Date:   Thu Nov 15 14:23:02 2012 +0530

    exynos3: fimc: fix

    - remove conflicting prototypes from s5p_fimc.h,
      libhdmi needs another version of fimc.

    Change-Id: I22a6b016c7a9a701bf9b70d63db84b0c8258495b

commit 5b604fa3f40a6ae2e36d99301612f8e33133d153
Author: codeworkx <[email protected]>
Date:   Sun Nov 11 11:38:03 2012 +0100

    exynos4x12: add nfc package

    Change-Id: Ife5522ad65d68d5ed0ca3a79a50ca86fedfb88e6

commit 79e21ef09bc2f0156ca6c40b6ce640138d878c37
Author: Chirayu Desai <[email protected]>
Date:   Tue Oct 16 15:50:18 2012 +0530

    exynos3: omx: moar love for p1

    - bump up mfc memsize
    - use H/W decoding for TV-Out

    Change-Id: I9425a371c29671e4ba9f82207f79d236ff6731e1

commit 88fda93e7365a7f61c612acdb31237e732b24a38
Author: jt1134 <[email protected]>
Date:   Fri Oct 19 23:17:48 2012 -0500

    exynos3: power HAL: add support for interactive governor

    completely kanged from d2 power HAL

    Change-Id: I4f6c32165251ae76c97afb715dde1fee9544430b

commit 81c2e053c0c94849860692ea48e89e09828c5231
Author: R. Andrew Ohana <[email protected]>
Date:   Wed Oct 3 19:52:52 2012 -0700

    Move macloader to hardware/samsung

    There are quite a few different Samsung devices which require
    macloader (many of which are just using binary blobs), so we
    should move it out of the device trees.

    Change-Id: I9e23fca0ba4c17da328cace801a92fa57df9a862

commit 76a153a66c8122fe13a84f8eac5392dae13c2dc0
Author: Pawit Pornkitprasan <[email protected]>
Date:   Sun Sep 30 18:24:57 2012 +0700

    Power HAL: Remove sampling rate change

    Sampling rate change causes stutter while playing music.
    Stutter appears randomly, but has a higher chance of appearing
    when the screen goes from off to on.

    Change-Id: I9b23212165203c7ff7ef65021be09fd366e55770

commit 5bff9aca163c0602f4f4a47001bc40c6d4f887ba
Author: Pawit Pornkitprasan <[email protected]>
Date:   Tue Sep 25 21:17:58 2012 +0700

    s5pc110: Add Power HAL (userspace CPU boosting)

    The majority of this commit is by Steve Kondik for the D2, modified
    by Daniel Bateman and me.

    Change-Id: Id6c1a1f0c6b39d5d20a765545526c07ad0fc64f6

commit 3c938a7e18ab2e06b3d925fdc99e157ad125f6bb
Author: Michael Brehm <[email protected]>
Date:   Sat Sep 15 02:03:39 2012 -0500

    exynos3: Implement custom VSYNC IOCTL

    * Replace crespo-based VSYNC uevent mechanism in hwcomposer
      with a custom IOCTL mechanism instead (required kernel
      modifications.

    * The VSYNC uevents were spamming the Android UEventObserver
      and causing about 7% of constant CPU load

      c86856efabfa0b2981ceb47898dc5873a4998707

    Improve custom VSYNC handler in hwcomposer

    * only poll when necessary
    * solves suspend/resume instability?

      45bf1dae7fa9057a3415151f7559e7bd2a162ead

    Change-Id: Icdb5c60059e71688479d390b7b3a1f09a0315a5f

commit 317dcfa0f0ed518a7bb5577ea36559713c3f6698
Author: Pawit Pornkitprasan <[email protected]>
Date:   Sat Aug 18 22:02:03 2012 +0700

    exynos3: Add V4L2_CID_CAMERA_GPS_PROCESSINGMETHOD to camera header

    Used by aries

    Change-Id: I9cb4bb8c03a257468addb88ea18f7ff3473230ef

commit 0a336cc1f20ec04f5af90cc455a769b8cc3138ea
Author: Chirayu Desai <[email protected]>
Date:   Thu Jul 12 14:37:05 2012 +0530

    exynos3: initial commit

    Patch Set 2: removed unused files,
    as audio, camera and sensors are device specific

    Patch Set 3: aries OMX

    Patch Set 5: liblight patch for epic

    Patch Set 9: liblight(s) is device specific, rmed it from here.

    Change-Id: I57a3d5714037836bab441ee5a3e772c260fb21d4

commit f1587a360fb72dffce67917f3dbc8144165014da
Author: codeworkx <[email protected]>
Date:   Fri Aug 3 23:32:29 2012 +0200

    exynos4: added secril-client and secril-client-sap sources

    taken from i9100 update7 and i9300 update4

    Change-Id: I1188c8c43c07ff179bc592a22345e4db9d8a56bf

commit 134c1fe2e2f7ec5a2ac508a83638c665b4d5c25a
Author: Daniel Hillenbrand <[email protected]>
Date:   Thu Aug 2 22:49:27 2012 +0200

    lights: use a hardcoded value for led brightness

    Change-Id: I2badc13aeb1871898ba001940ccabbb5ddfa53cb

commit 1784ceccd6dd69a532153b8b67e90b9c4aaa81d4
Author: Daniel Hillenbrand <[email protected]>
Date:   Sun Jul 22 17:32:42 2012 +0200

    fix libcamera and fimc conflict

commit 353fecb128199378439a3e8da8200f654551a526
Author: Daniel Hillenbrand <[email protected]>
Date:   Sun Jul 22 16:14:08 2012 +0200

    underp logging

commit 0fdadcaf08c588469ad9905b0136c894bb062fdf
Author: Daniel Hillenbrand <[email protected]>
Date:   Sun Jul 22 15:45:33 2012 +0200

    exynos hal: jellybean compat

commit 29deaa07a920f242d8b2766fba3c8ffa374b1eaf
Author: Daniel Hillenbrand <[email protected]>
Date:   Sun Jul 22 15:34:24 2012 +0200

    exynos4210 lights: jellybean compat

commit 75ae0a2bc5d5a44eee72c3f5deaad54aaacfc573
Author: Daniel Hillenbrand <[email protected]>
Date:   Sun Jul 22 15:32:08 2012 +0200

    exynos4x12 lights: jellybean compat

commit 313840440fc50d20127047a55dbacb0bfcb57fac
Author: codeworkx <[email protected]>
Date:   Sat Jul 7 17:34:03 2012 +0200

    exynos4x12: calibrate led colors, lights cleanup, disable debugging

    blue and green leds are much stronger than the red one,
    dim them down to get true colors (especially yellow).

    Change-Id: I61c5f39e90e6392752a0e80a96e5e317427ea4a2

commit cb3fc72d3519ab1d96d626dea10080875992ece7
Author: codeworkx <[email protected]>
Date:   Wed Jul 11 16:14:28 2012 +0200

    exynos4210: moved libsensors to galaxys2 device tree

    Change-Id: Ie479fbbf1a4d2fd879dc4fe63d97f9efac1ebfc0

commit cbf1cb2a7fd2ac5b80b26626fec0b48c54b82f65
Author: Andrew Dodd <[email protected]>
Date:   Tue Jul 10 22:44:59 2012 -0400

    sensors: Fix conversion values

    Our kernel sets the gyro to 500 DPS and not 2000 DPS.
    In addition, X and Y are swapped and Y is not inverted.

    Also change the orientation sensor conversion factors to
    match that found in aries-common since the orientation
    sensor seemed overly sensitive.  However, the orientation
    sensor might not actually do anything...  Android may
    be performing sensor fusion of other data to determine
    orientation.

    Change-Id: I03df5d7bac9d58881e360546af4cf77878802807

commit 827f2f953c875767aae004d08f5659224752d14b
Author: Sam Mortimer <[email protected]>
Date:   Sun Jul 1 23:33:50 2012 -0700

    exynos4212 liblights: remove unused BUTTON_POWER define

    Change-Id: I1e911e234ed45924c263d85741f395ecf54414f1

commit 8ada6ea604a1d76b9d9f392147727b4a173a39b2
Merge: 86d0895 4c88bee
Author: Daniel Hillenbrand <[email protected]>
Date:   Mon Jul 9 14:14:28 2012 +0400

    Merge "exynos4212 liblights: fix keypad lighting up when screen backlight auto-adjusts" into ics

commit 86d0895f82ca01b07da6e0d1e5e37d26f5114333
Author: XpLoDWilD <[email protected]>
Date:   Sat Jul 7 22:58:23 2012 +0200

    liblights: Fix reading of previous brightness value

    Change-Id: Ie175521033b3a8d96197794cff1a2dce89e516c3

commit 23280fc439163a1971956167217283c4ae70bce3
Author: codeworkx <[email protected]>
Date:   Tue Jul 3 19:22:20 2012 +0200

    exynos4: added missing gralloc defines for hdmi

    Change-Id: Ie489452003c30e05f3fdf36a0643963ce4ae0c2e

commit 4c88bee69d0ccca502c6de8c0c536fa096e597c0
Author: Sam Mortimer <[email protected]>
Date:   Sun Jul 1 22:46:59 2012 -0700

    exynos4212 liblights: fix keypad lighting up when screen backlight auto-adjusts

    clone of http://review.cyanogenmod.com/#/c/18372/

    becomes relevant when these are applied:
    smdk4210 kernel: cypress touchkey led_timeout functionality (1/2)
    http://review.cyanogenmod.com/#/c/18357/
    galaxys2/i777: configurable touchkey backlight timeout (2/2)
    http://review.cyanogenmod.com/#/c/18431/

    Change-Id: I3d4df6574cdd3c6317199a884ef7ac72cb4c71a3

commit b20c5367514dc976afbc7f074ad5b8a49bbc592b
Author: codeworkx <[email protected]>
Date:   Sun Jul 1 16:15:52 2012 +0200

    fix for fix keypad lighting up when screen backlight auto-adjusts

    Change-Id: I61e987b4fcae277ab4a1ec6585b25255a445b238

commit 679d203f63c9c6c64825b2df0b0f005e4aaaeee4
Author: Gary D <[email protected]>
Date:   Thu Jun 28 05:05:36 2012 -0400

    fix keypad lighting up when screen backlight auto-adjusts

    If the screen backlight was already lit and is just changing brightness,
    don't blindly illuminate the keypad

    Change-Id: If7473eb57aa4d48bc98a4bb42b9becc80764b1f8
    Signed-off-by: Gary D <[email protected]>

commit f2d31f2429158e5d7e62264e302a28cea327a5f1
Author: XpLoDWilD <[email protected]>
Date:   Tue Jun 26 13:23:55 2012 +0200

    liblights: Store LED battery status and restore it after a notification LED blinking

    Change-Id: Ifd01e3dea28ecc0dac94f2ff44b94e81493ba2a4

commit 48421e2da2538026a6e249e3b8a588d0fd40a860
Author: codeworkx <[email protected]>
Date:   Sun Jun 24 19:21:40 2012 +0200

    lights: lower battery led brightness

    Change-Id: I9cd680a760f81d0b131dc3e9d37e5f8f19171c00

commit 3c04c0d0a83982b4b05cdbe628b28d10c496e47d
Author: codeworkx <[email protected]>
Date:   Fri Jun 22 17:13:18 2012 +0200

    exynos4x12: lower brightness on battery light

    Change-Id: Ic3cd8f9bac985e09d7f7df0521cbaadfc9640f11

commit 61bb8c4defa2cf570796d2840fca8ffcd573202d
Author: codeworkx <[email protected]>
Date:   Thu Jun 21 05:40:51 2012 +0200

    smdk4x12: lights: battery led support

    Change-Id: Ida4e7bd998251ec07a9874f695d1fef9f97a1b0c

commit 15b850d507ab3aa1fe284a97a700ac4640a4fdc0
Merge: 64dd846 9375b16
Author: codeworkx <[email protected]>
Date:   Sat Jun 16 17:00:32 2012 +0400

    Merge "omx: build shared instead of static libs for exynos4x12" into ics

commit 64dd846ab4ff2eb8a56cb00bcc91c05565167673
Author: XpLoDWilD <[email protected]>
Date:   Thu Jun 14 19:48:19 2012 +0200

    Fix blue light sticking and fixed delays

    Change-Id: I1a9a92eaaf09f6a5524e0d08b4fdefa2b7ba000d

commit beeef87d0be24f99d1e15ddf431d24284135f723
Author: codeworkx <[email protected]>
Date:   Mon Jun 11 17:47:21 2012 +0200

    exynos4x12: add lights module

    Change-Id: Ib37f0b7cc94a5b9607817e3b3bee4814074517a4

commit 9375b16344e6744c0cf8f6bd5b8765f2d45d60a2
Author: codeworkx <[email protected]>
Date:   Sun Jun 10 16:38:12 2012 +0200

    omx: build shared instead of static libs for exynos4x12

    Change-Id: Idac85baf743ea26a5953538f8f931908c15ad754

commit 952954aafaf69b626aa71e05d1c75b9742843f1c
Author: codeworkx <[email protected]>
Date:   Fri Jun 8 11:01:47 2012 +0200

    exynos4: hdmi: fix invalid conversion from void* to unsigned int

    Change-Id: Ib81076f7f85719cd7bc318d45a0b176211b0ee89

commit 05804b14193b917e6acd9275fa29d0108a9945e6
Author: codeworkx <[email protected]>
Date:   Tue Jun 5 01:54:17 2012 +0200

    codecs: build shared mfcapi lib on exynos4x12

    Change-Id: I8a09f8e6e86191197f0382e5c40e6acd16f33cda

commit cf27f2a25b5492650b85be1b9459979aeba8e4a4
Author: codeworkx <[email protected]>
Date:   Tue Jun 5 01:39:35 2012 +0200

    codecs: mfcapi compatibility patch for exynos4x12

    Change-Id: I2fe0d481506d374e8fa6a71b56d4dddee3f132b1

commit 5e44bae46772acc5dbfa3160118cf3a2807e4738
Author: sbrissen <[email protected]>
Date:   Fri May 25 09:40:54 2012 -0400

    Add Red/Blue LED notification support

    This will allow the use of the red/blue led's on the sph-d710
    Uses BOARD_HAS_LED_NOTIF in boardconfig.

    Change-Id: Ic217ed5b0ec673d03bb596fbde0ac725a5ca0887

commit 9eb34160302dbf64076da9397a25e047c22e062f
Author: codeworkx <[email protected]>
Date:   Wed May 23 20:22:25 2012 +0200

    liblights: adjust file location for smdk4210 kernel

    Change-Id: Ib66a360729d25619b4270f081659b18e18437be3

commit 759cb25d9c3006a476263d76cca5adcbf4979751
Author: athurh <[email protected]>
Date:   Mon May 21 21:55:40 2012 +0200

    exynos: Improve H264 encode quality

    Change-Id: I0c184daecffe644445c759deeeb8895f69c1755b

commit 3e03dba1c04889f7ff1fcc45bb3721184c8e11b4
Author: R. Andrew Ohana <[email protected]>
Date:   Mon May 21 01:47:01 2012 -0700

    Android.mk: only include directory for exynos devices

    we should play nice with other devices that have there own libraries with the same name

    Change-Id: Icf208e38094e4317d3546578176ab149a4e4b5b9

commit 62f02ba4f4b7b561aa15408ebd9951600bdd71aa
Author: codeworkx <[email protected]>
Date:   Sun May 20 12:00:36 2012 +0200

    exynos: reorganized and updated from insignal

    Changes needed on exynos4210 devices:

    libcsc -> libseccscapi
    libswconverter -> remove

    TARGET_HAL_PATH := hardware/samsung/exynos4/hal
    TARGET_OMX_PATH := hardware/samsung/exynos/multimedia/openmax
    $(call inherit-product, hardware/samsung/exynos4210.mk)

    Change-Id: Ic59ef95b85ef37b3f38fb36cf6a364a5414685ee

commit e54debb12ecdf92d12acab00a261c0c5a6ef1d64
Author: Phil Tunstall <[email protected]>
Date:   Thu May 17 16:25:38 2012 +0100

    liblights: Fix touch key lights coming on when screen brightness is adjusted

    Only tested on GT-I9100

    Change-Id: I2be3c5ce74799bea310a65bc75dd90985b9d17d6

commit 7bfa58c3766f9ad88bf458fbf68deab5a2dd718b
Author: athurh <[email protected]>
Date:   Sun May 6 05:18:28 2012 +0200

    OMX: Improve H264 encode quality

    Change-Id: I874d393e9f1f357b3125cad4a04526aa7336c6ca

commit 8537e27d601a73708e26b912d8cd3190af28aae6
Author: Espen Fjellvær Olsen <[email protected]>
Date:   Thu Apr 19 10:05:35 2012 +0200

    Update AkmSensor to manually set poll interval

    Change-Id: I84fc5c3fc1cb552874129512ea6dfc19b1f9a60a

commit ec03b1b0c86814ce62e57f5afd97201a119951e9
Author: R. Andrew Ohana <[email protected]>
Date:   Sun Apr 1 00:30:55 2012 -0700

    added tablet support to liblights

    Change-Id: I778167e6fc10a8162a20771b9b4953af28fc1a97

commit 9a5f75abbf436284b78dceb2825c7f3fce706c31
Author: Espen Fjellvær Olsen <[email protected]>
Date:   Thu Mar 29 22:02:35 2012 +0200

    Remove in_output_mode missing from the kernel part. Thanks to Zlodo from XDA

    Change-Id: I07106e2af67a1565827bd71954868b7132473a5d

commit 47c6ea990552b20c24ede4bcf8e8978dae619c7b
Author: codeworkx <[email protected]>
Date:   Sat Mar 24 19:21:30 2012 +0100

    libump: include fixes

    Change-Id: Ib1a815d443c9efa9ef25579a470b6df1fdf023b2

commit bb7076f6eaaea8340c198714314b83bda3b62f42
Author: codeworkx <[email protected]>
Date:   Sat Mar 24 17:55:51 2012 +0100

    removed unneeded filters on makefiles

commit f1be2fe3cd7c04704e166f5303c5c41a7be146c1
Author: codeworkx <[email protected]>
Date:   Sat Mar 24 17:38:29 2012 +0100

    initial commit, taken and modified from linaro/insignal

Change-Id: I6e223bc5620cdbbfa2276f333961b80319194b0c
  • Loading branch information
bigrushdog committed Jan 13, 2013
1 parent 75b62f8 commit 3a78979
Show file tree
Hide file tree
Showing 393 changed files with 128,561 additions and 0 deletions.
34 changes: 34 additions & 0 deletions Android.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Copyright (C) 2012 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

SAM_ROOT := $(call my-dir)

ifeq ($(TARGET_BOARD_PLATFORM),exynos4)
ifeq ($(TARGET_SOC),exynos4210)
include $(SAM_ROOT)/exynos4210.mk
endif
ifeq ($(TARGET_SOC),exynos4x12)
include $(SAM_ROOT)/exynos4x12.mk
endif
endif

ifeq ($(TARGET_BOARD_PLATFORM),s5pc110)
ifneq ($(TARGET_BOOTLOADER_BOARD_NAME),herring)
include $(SAM_ROOT)/s5pc110.mk
endif
endif

ifeq ($(BOARD_HAVE_SAMSUNG_WIFI),true)
include $(SAM_ROOT)/macloader/Android.mk
endif
1 change: 1 addition & 0 deletions exynos/multimedia/Android.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include $(all-subdir-makefiles)
1 change: 1 addition & 0 deletions exynos/multimedia/codecs/Android.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include $(all-subdir-makefiles)
7 changes: 7 additions & 0 deletions exynos/multimedia/codecs/audio/Android.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

ifeq ($(filter-out exynos4,$(TARGET_BOARD_PLATFORM)),)
include $(LOCAL_PATH)/exynos4/Android.mk
endif
14 changes: 14 additions & 0 deletions exynos/multimedia/codecs/audio/exynos4/Android.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_AUDIO_PATH :=$(LOCAL_PATH)

ifeq ($(BOARD_USE_ALP_AUDIO), true)
include $(LOCAL_AUDIO_PATH)/srp/alp/Android.mk
else
ifeq ($(USE_ULP_AUDIO), true)
include $(LOCAL_AUDIO_PATH)/srp/ulp/Android.mk
include $(LOCAL_AUDIO_PATH)/srp/libsa_jni/Android.mk
endif
endif
26 changes: 26 additions & 0 deletions exynos/multimedia/codecs/audio/exynos4/srp/alp/Android.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

LOCAL_COPY_HEADERS_TO := libsecmm
LOCAL_COPY_HEADERS := \
include/srp_api.h \
include/srp_ioctl.h \
include/srp_error.h

LOCAL_SRC_FILES := \
src/srp_api.c

LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include

LOCAL_MODULE := libsrpapi

LOCAL_MODULE_TAGS := optional

LOCAL_ARM_MODE := arm

LOCAL_STATIC_LIBRARIES :=

LOCAL_SHARED_LIBRARIES :=

include $(BUILD_STATIC_LIBRARY)
52 changes: 52 additions & 0 deletions exynos/multimedia/codecs/audio/exynos4/srp/alp/include/srp_api.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#ifndef __SRP_API_H__
#define __SRP_API_H__

#include "srp_ioctl.h"
#include "srp_error.h"

#define SRP_DEV_NAME "dev/srp"

#define SRP_INIT_BLOCK_MODE 0
#define SRP_INIT_NONBLOCK_MODE 1

#define SRP_PENDING_STATE_RUNNING 0
#define SRP_PENDING_STATE_PENDING 1

struct srp_buf_info {
void *mmapped_addr;
void *addr;
unsigned int mmapped_size;
unsigned int size;
int num;
};

struct srp_dec_info {
unsigned int sample_rate;
unsigned int channels;
};

#ifdef __cplusplus
extern "C" {
#endif

int SRP_Create(int block_mode);
int SRP_Init();
int SRP_Decode(void *buff, int size_byte);
int SRP_Send_EOS(void);
int SRP_SetParams(int id, unsigned long val);
int SRP_GetParams(int id, unsigned long *pval);
int SRP_Deinit(void);
int SRP_Terminate(void);
int SRP_IsOpen(void);

int SRP_Get_Ibuf_Info(void **addr, unsigned int *size, unsigned int *num);
int SRP_Get_Obuf_Info(void **addr, unsigned int *size, unsigned int *num);
int SRP_Get_Dec_Info(struct srp_dec_info *dec_info);
int SRP_Get_PCM(void **addr, unsigned int *size);
int SRP_Flush(void);

#ifdef __cplusplus
}
#endif

#endif /*__SRP_API_H__ */
22 changes: 22 additions & 0 deletions exynos/multimedia/codecs/audio/exynos4/srp/alp/include/srp_error.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#ifndef _SRP_ERROR_H_
#define _SRP_ERROR_H_

typedef enum {
SRP_RETURN_OK = 0,

SRP_ERROR_OPEN_FAIL = -1000,
SRP_ERROR_ALREADY_OPEN = -1001,
SRP_ERROR_NOT_READY = -1002,

SRP_ERROR_IBUF_OVERFLOW = -2000,
SRP_ERROR_IBUF_INFO = -2001,

SRP_ERROR_OBUF_READ = -3000,
SRP_ERROR_OBUF_INFO = -3001,
SRP_ERROR_OBUF_MMAP = -3002,

SRP_ERROR_INVALID_SETTING = -4000,
SRP_ERROR_GETINFO_FAIL = -4001
} SRP_ERRORTYPE;

#endif /* _SRP_ERROR_H_ */
23 changes: 23 additions & 0 deletions exynos/multimedia/codecs/audio/exynos4/srp/alp/include/srp_ioctl.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#ifndef __SRP_IOCTL_H__
#define __SRP_IOCTL_H__

#ifdef __cplusplus
extern "C" {
#endif

#define SRP_INIT (0x10000)
#define SRP_DEINIT (0x10001)
#define SRP_GET_MMAP_SIZE (0x10002)
#define SRP_FLUSH (0x20002)
#define SRP_SEND_EOS (0x20005)
#define SRP_GET_IBUF_INFO (0x20007)
#define SRP_GET_OBUF_INFO (0x20008)
#define SRP_STOP_EOS_STATE (0x30007)
#define SRP_GET_DEC_INFO (0x30008)

#ifdef __cplusplus
}
#endif

#endif /* __SRP_IOCTL_H__ */

Loading

0 comments on commit 3a78979

Please sign in to comment.