From c255a465f356fa92dc0296de36131ec99516e12c Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Wed, 8 Feb 2017 18:47:17 +0100
Subject: [PATCH] fb_accel_cs_hdx: remove dub includes, add includes into
 common header file

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/8fe7504007380551ae421b52b14603877da8aa85
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 src/driver/fb_accel_cs_hd1.cpp   | 21 +--------------
 src/driver/fb_accel_cs_hd2.cpp   | 21 +--------------
 src/driver/fb_accel_cs_hdx_inc.h | 45 ++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 40 deletions(-)
 create mode 100644 src/driver/fb_accel_cs_hdx_inc.h

diff --git a/src/driver/fb_accel_cs_hd1.cpp b/src/driver/fb_accel_cs_hd1.cpp
index aae21d3ed..0fc772ab9 100644
--- a/src/driver/fb_accel_cs_hd1.cpp
+++ b/src/driver/fb_accel_cs_hd1.cpp
@@ -22,26 +22,7 @@
 	along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <driver/fb_generic.h>
-#include <driver/fb_accel.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <memory.h>
-#include <limits.h>
-#include <gui/color.h>
-#include <system/debug.h>
-
-#include <cs_api.h>
-#include <cnxtfb.h>
+#include "fb_accel_cs_hdx_inc.h"
 
 /*******************************************************************************/
 #define GXA_POINT(x, y)         (((y) & 0x0FFF) << 16) | ((x) & 0x0FFF)
diff --git a/src/driver/fb_accel_cs_hd2.cpp b/src/driver/fb_accel_cs_hd2.cpp
index 6cb115dfc..393e6396c 100644
--- a/src/driver/fb_accel_cs_hd2.cpp
+++ b/src/driver/fb_accel_cs_hd2.cpp
@@ -22,26 +22,7 @@
 	along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <driver/fb_generic.h>
-#include <driver/fb_accel.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <memory.h>
-#include <limits.h>
-#include <gui/color.h>
-#include <system/debug.h>
-
-#include <cs_api.h>
-#include <cnxtfb.h>
+#include "fb_accel_cs_hdx_inc.h"
 
 #define LOGTAG "[fb_accel_cs_hd2] "
 
diff --git a/src/driver/fb_accel_cs_hdx_inc.h b/src/driver/fb_accel_cs_hdx_inc.h
new file mode 100644
index 000000000..b1d31988e
--- /dev/null
+++ b/src/driver/fb_accel_cs_hdx_inc.h
@@ -0,0 +1,45 @@
+/*
+	Framebuffer acceleration hardware abstraction functions.
+	The hardware dependent acceleration functions for coolstream hdx graphic chips
+	are represented in this class.
+
+	(C) 2017 M. Liebmann
+	(C) 2017 Thilo Graf 'dbt'
+	Derived from old neutrino-hd framebuffer code
+
+	License: GPL
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <driver/fb_generic.h>
+#include <driver/fb_accel.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <memory.h>
+#include <limits.h>
+#include <gui/color.h>
+#include <system/debug.h>
+
+#include <cs_api.h>
+#include <cnxtfb.h>