diff options
author | Lajos Molnar <molnar@ti.com> | 2011-04-07 08:41:41 +0100 |
---|---|---|
committer | Andy Green <andy.green@linaro.org> | 2011-04-07 08:41:41 +0100 |
commit | 33cccd7849331dcf927120cd3de1ea34e185bfb6 (patch) | |
tree | 3bde0ce90bb920c1e1deabe593da33a478a107a7 /drivers/media/video/tiler | |
parent | caffc47daba167c0b44ff8d83106f30776569286 (diff) |
TILER: Update file-headers and includes
Moved tiler_def.h into _tiler.h
Updated file headers to include correct file name and copyright
notice.
Since _tiler.h includes <mach/tiler.h> and "tcm.h", removed these
includes from source files.
Signed-off-by: Lajos Molnar <molnar@ti.com>
Signed-off-by: David Sin <davidsin@ti.com>
Diffstat (limited to 'drivers/media/video/tiler')
-rw-r--r-- | drivers/media/video/tiler/_tiler.h | 26 | ||||
-rw-r--r-- | drivers/media/video/tiler/tcm/tcm-sita.c | 2 | ||||
-rw-r--r-- | drivers/media/video/tiler/tiler-def.h | 25 | ||||
-rw-r--r-- | drivers/media/video/tiler/tiler-geom.c | 32 | ||||
-rw-r--r-- | drivers/media/video/tiler/tiler-iface.c | 18 | ||||
-rw-r--r-- | drivers/media/video/tiler/tiler-main.c | 7 | ||||
-rw-r--r-- | drivers/media/video/tiler/tiler-reserve.c | 6 | ||||
-rw-r--r-- | drivers/media/video/tiler/tmm-pat.c | 2 |
8 files changed, 60 insertions, 58 deletions
diff --git a/drivers/media/video/tiler/_tiler.h b/drivers/media/video/tiler/_tiler.h index a14d7ae0265..4227fa172f7 100644 --- a/drivers/media/video/tiler/_tiler.h +++ b/drivers/media/video/tiler/_tiler.h @@ -1,9 +1,31 @@ -#ifndef __TILER_PACK_H__ -#define __TILER_PACK_H__ +/* + * _tiler.h + * + * TILER driver internal shared definitions for TI OMAP processors. + * + * Copyright (C) 2009-2010 Texas Instruments, Inc. + * + * This package is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + */ + +#ifndef _TILER_H +#define _TILER_H #include <linux/kernel.h> +#include <mach/tiler.h> #include "tcm.h" +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) + +#define TILER_FORMATS (TILFMT_MAX - TILFMT_MIN + 1) + /* per process (thread group) info */ struct process_info { struct list_head list; /* other processes */ diff --git a/drivers/media/video/tiler/tcm/tcm-sita.c b/drivers/media/video/tiler/tcm/tcm-sita.c index 5aba3be461a..ba1ff5f57d0 100644 --- a/drivers/media/video/tiler/tcm/tcm-sita.c +++ b/drivers/media/video/tiler/tcm/tcm-sita.c @@ -1,5 +1,5 @@ /* - * tcm_sita.c + * tcm-sita.c * * Author: Ravi Ramachandra <r.ramachandra@ti.com> * diff --git a/drivers/media/video/tiler/tiler-def.h b/drivers/media/video/tiler/tiler-def.h deleted file mode 100644 index 99b7a1f53bb..00000000000 --- a/drivers/media/video/tiler/tiler-def.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * tiler_def.h - * - * TILER driver support functions for TI OMAP processors. - * - * Copyright (C) 2009-2010 Texas Instruments, Inc. - * - * This package is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -#ifndef TILER_DEF_H -#define TILER_DEF_H - -#define MIN(a, b) ((a) < (b) ? (a) : (b)) -#define MAX(a, b) ((a) > (b) ? (a) : (b)) - -#define TILER_FORMATS (TILFMT_MAX - TILFMT_MIN + 1) - -#endif diff --git a/drivers/media/video/tiler/tiler-geom.c b/drivers/media/video/tiler/tiler-geom.c index b4b5a1e979f..ca9dd735e16 100644 --- a/drivers/media/video/tiler/tiler-geom.c +++ b/drivers/media/video/tiler/tiler-geom.c @@ -1,25 +1,21 @@ /* -* tiler_rot.c -* -* TILER driver support functions for TI OMAP processors. -* -* Copyright (C) 2009-2010 Texas Instruments, Inc. -* -* This package is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR -* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. -*/ + * tiler-geom.c + * + * TILER driver support functions for TI OMAP processors. + * + * Copyright (C) 2009-2010 Texas Instruments, Inc. + * + * This package is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + */ #include <linux/init.h> #include <linux/module.h> -#include <mach/tiler.h> -#include "tiler-def.h" -#include <mach/dmm.h> /* TEMP */ -#include "tcm.h" #include "_tiler.h" #define SLOT_WIDTH_BITS 6 diff --git a/drivers/media/video/tiler/tiler-iface.c b/drivers/media/video/tiler/tiler-iface.c index 79514e3c20c..55ae1d6c2ba 100644 --- a/drivers/media/video/tiler/tiler-iface.c +++ b/drivers/media/video/tiler/tiler-iface.c @@ -1,3 +1,19 @@ +/* + * tiler-iface.c + * + * TILER driver interace functions for TI OMAP processors. + * + * Copyright (C) 2009-2010 Texas Instruments, Inc. + * + * This package is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + */ + #include <linux/module.h> #include <linux/mutex.h> #include <linux/fs.h> /* fops */ @@ -8,8 +24,6 @@ #include <linux/mm_types.h> #include <asm/mach/map.h> /* for ioremap_page */ -#include <mach/tiler.h> -#include <mach/dmm.h> /* TEMP */ #include "_tiler.h" static bool security = CONFIG_TILER_SECURITY; diff --git a/drivers/media/video/tiler/tiler-main.c b/drivers/media/video/tiler/tiler-main.c index eef958a3881..603e347df43 100644 --- a/drivers/media/video/tiler/tiler-main.c +++ b/drivers/media/video/tiler/tiler-main.c @@ -1,5 +1,5 @@ /* - * tiler.c + * tiler-main.c * * TILER driver support functions for TI OMAP processors. * @@ -29,13 +29,10 @@ #include <linux/pagemap.h> /* page_cache_release() */ #include <linux/slab.h> -#include <mach/tiler.h> #include <mach/dmm.h> #include "tmm.h" -#include "tcm.h" -#include "tiler-def.h" -#include "tcm/tcm-sita.h" /* Algo Specific header */ #include "_tiler.h" +#include "tcm/tcm-sita.h" /* Algo Specific header */ #include <linux/syscalls.h> diff --git a/drivers/media/video/tiler/tiler-reserve.c b/drivers/media/video/tiler/tiler-reserve.c index fd3e1734f4b..3f87f5af929 100644 --- a/drivers/media/video/tiler/tiler-reserve.c +++ b/drivers/media/video/tiler/tiler-reserve.c @@ -1,7 +1,7 @@ /* - * tiler_pack.c + * tiler-reserve.c * - * TILER driver support functions for TI OMAP processors. + * TILER driver area reservation functions for TI OMAP processors. * * Copyright (C) 2009-2010 Texas Instruments, Inc. * @@ -17,8 +17,6 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/slab.h> -#include <mach/tiler.h> -#include "tiler-def.h" #include "_tiler.h" static struct tiler_ops *ops; diff --git a/drivers/media/video/tiler/tmm-pat.c b/drivers/media/video/tiler/tmm-pat.c index 5513c6800ab..c3c86e582db 100644 --- a/drivers/media/video/tiler/tmm-pat.c +++ b/drivers/media/video/tiler/tmm-pat.c @@ -1,5 +1,5 @@ /* - * tmm_pat.c + * tmm-pat.c * * DMM driver support functions for TI OMAP processors. * |