From c17c439a70b86b08c8d584928e94eb52096b79b6 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Mon, 23 May 2016 10:05:40 +0300
Subject: Reorganize libkms++utils header

---
 libkms++util/colorbar.cpp          |  3 +--
 libkms++util/extcpuframebuffer.cpp |  2 +-
 libkms++util/kms++util.h           | 44 ++++++++++++++++++++++++++++++++++++++
 libkms++util/kmstest.h             | 15 -------------
 libkms++util/test.h                | 32 ---------------------------
 libkms++util/testpat.cpp           |  6 +++---
 6 files changed, 49 insertions(+), 53 deletions(-)
 create mode 100644 libkms++util/kms++util.h
 delete mode 100644 libkms++util/kmstest.h
 delete mode 100644 libkms++util/test.h

(limited to 'libkms++util')

diff --git a/libkms++util/colorbar.cpp b/libkms++util/colorbar.cpp
index 9fbec28..6a5dbc4 100644
--- a/libkms++util/colorbar.cpp
+++ b/libkms++util/colorbar.cpp
@@ -1,8 +1,7 @@
 #include <cstdint>
 
 #include <kms++.h>
-
-#include "test.h"
+#include "kms++util.h"
 
 namespace kms
 {
diff --git a/libkms++util/extcpuframebuffer.cpp b/libkms++util/extcpuframebuffer.cpp
index 145168f..bd0b10c 100644
--- a/libkms++util/extcpuframebuffer.cpp
+++ b/libkms++util/extcpuframebuffer.cpp
@@ -1,6 +1,6 @@
 
 #include "extcpuframebuffer.h"
-#include "test.h"
+#include "kms++util.h"
 
 using namespace std;
 
diff --git a/libkms++util/kms++util.h b/libkms++util/kms++util.h
new file mode 100644
index 0000000..c02c12c
--- /dev/null
+++ b/libkms++util/kms++util.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include "color.h"
+#include <cstdio>
+#include <cstdlib>
+
+namespace kms
+{
+class IMappedFramebuffer;
+
+void draw_color_bar(IMappedFramebuffer& buf, int old_xpos, int xpos, int width);
+
+void draw_test_pattern(IMappedFramebuffer &fb);
+
+void draw_rect(IMappedFramebuffer &fb, uint32_t x, uint32_t y, uint32_t w, uint32_t h, RGB color);
+}
+
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+
+#define unlikely(x) __builtin_expect(!!(x), 0)
+
+#define ASSERT(x) \
+	if (unlikely(!(x))) { \
+		fprintf(stderr, "%s:%d: %s: ASSERT(%s) failed\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, __STRING(x)); \
+		abort(); \
+	}
+
+#define FAIL(fmt, ...) \
+	do { \
+		fprintf(stderr, "%s:%d: %s:\n" fmt "\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__); \
+		abort(); \
+	} while(0)
+
+#define FAIL_IF(x, fmt, ...) \
+	if (unlikely(x)) { \
+		fprintf(stderr, "%s:%d: %s:\n" fmt "\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__); \
+		abort(); \
+	}
+
+#define EXIT(fmt, ...) \
+	do { \
+		fprintf(stderr, fmt "\n", ##__VA_ARGS__); \
+		exit(-1); \
+	} while(0)
diff --git a/libkms++util/kmstest.h b/libkms++util/kmstest.h
deleted file mode 100644
index aed40fe..0000000
--- a/libkms++util/kmstest.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "color.h"
-#include "framebuffer.h"
-
-namespace kms
-{
-class IMappedFramebuffer;
-
-void draw_color_bar(IMappedFramebuffer& buf, int old_xpos, int xpos, int width);
-
-void draw_test_pattern(IMappedFramebuffer &fb);
-
-void draw_rect(IMappedFramebuffer &fb, uint32_t x, uint32_t y, uint32_t w, uint32_t h, RGB color);
-}
diff --git a/libkms++util/test.h b/libkms++util/test.h
deleted file mode 100644
index 3631f2c..0000000
--- a/libkms++util/test.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "color.h"
-#include "kmstest.h"
-
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-
-#define unlikely(x) __builtin_expect(!!(x), 0)
-
-#define ASSERT(x) \
-	if (unlikely(!(x))) { \
-		fprintf(stderr, "%s:%d: %s: ASSERT(%s) failed\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, __STRING(x)); \
-		abort(); \
-	}
-
-#define FAIL(fmt, ...) \
-	do { \
-		fprintf(stderr, "%s:%d: %s:\n" fmt "\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__); \
-		abort(); \
-	} while(0)
-
-#define FAIL_IF(x, fmt, ...) \
-	if (unlikely(x)) { \
-		fprintf(stderr, "%s:%d: %s:\n" fmt "\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__); \
-		abort(); \
-	}
-
-#define EXIT(fmt, ...) \
-	do { \
-		fprintf(stderr, fmt "\n", ##__VA_ARGS__); \
-		exit(-1); \
-	} while(0)
diff --git a/libkms++util/testpat.cpp b/libkms++util/testpat.cpp
index 68f4385..cee6e85 100644
--- a/libkms++util/testpat.cpp
+++ b/libkms++util/testpat.cpp
@@ -5,9 +5,9 @@
 #include <cstring>
 #include <cassert>
 
-#include "kms++.h"
-#include "test.h"
-#include "cpuframebuffer.h"
+#include <kms++.h>
+#include <kms++util.h>
+#include <cpuframebuffer.h>
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
-- 
cgit v1.2.3