diff options
| author | Tony Lofthouse <a0741364@ti.com> | 2012-11-13 09:58:01 -0600 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-11-28 21:16:26 +0200 |
| commit | ff480eddfdd5c1d89489c2e45385d32cd471cfe2 (patch) | |
| tree | c9270f34c3a2f6a3ec25a0d8fc02a4bab28d2866 /hwc | |
| parent | 9ee16905b5854efa46fd05700a77358455380af3 (diff) | |
| download | hardware_ti_omap4-ff480eddfdd5c1d89489c2e45385d32cd471cfe2.zip hardware_ti_omap4-ff480eddfdd5c1d89489c2e45385d32cd471cfe2.tar.gz hardware_ti_omap4-ff480eddfdd5c1d89489c2e45385d32cd471cfe2.tar.bz2 | |
hwc: pull in common headers to hwc_dev.h
Change-Id: I146b0b3a2aad83a97e7831218cb57c064748e0fa
Signed-off-by: Tony Lofthouse <a0741364@ti.com>
Diffstat (limited to 'hwc')
| -rw-r--r-- | hwc/hwc.c | 7 | ||||
| -rw-r--r-- | hwc/hwc_dev.h | 5 | ||||
| -rw-r--r-- | hwc/rgz_2d.c | 3 |
3 files changed, 6 insertions, 9 deletions
@@ -40,16 +40,9 @@ #include <linux/fb.h> #include <linux/omapfb.h> -#include <linux/bltsville.h> -#include <linux/ion.h> -#include <linux/omap_ion.h> #include <ion/ion.h> -#include <video/dsscomp.h> -#include <video/omap_hwc.h> -#include "hal_public.h" #include "hwc_dev.h" -#include "rgz_2d.h" #define min(a, b) ( { typeof(a) __a = (a), __b = (b); __a < __b ? __a : __b; } ) #define max(a, b) ( { typeof(a) __a = (a), __b = (b); __a > __b ? __a : __b; } ) diff --git a/hwc/hwc_dev.h b/hwc/hwc_dev.h index 3403b85..2cd1ca0 100644 --- a/hwc/hwc_dev.h +++ b/hwc/hwc_dev.h @@ -23,6 +23,11 @@ #include <hardware/hwcomposer.h> #include <ui/S3DFormat.h> +#include <linux/bltsville.h> +#include <video/dsscomp.h> +#include <video/omap_hwc.h> + +#include "hal_public.h" #include "rgz_2d.h" struct ext_transform { diff --git a/hwc/rgz_2d.c b/hwc/rgz_2d.c index 5eb3e4b..3c79796 100644 --- a/hwc/rgz_2d.c +++ b/hwc/rgz_2d.c @@ -32,7 +32,6 @@ #include <cutils/log.h> #include <cutils/properties.h> #include <hardware/hwcomposer.h> -#include "hal_public.h" #else #include "hwcomposer.h" #include "buffer_handle.h" @@ -40,7 +39,7 @@ #define HW_ALIGN 32 #endif -#include "rgz_2d.h" +#include "hwc_dev.h" #ifdef RGZ_TEST_INTEGRATION extern void BVDump(const char* prefix, const char* tab, const struct bvbltparams* parms); |