1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
|
From 2f1fe1b5233d69cf354ffb5ab182810ef74c7e3d Mon Sep 17 00:00:00 2001
From: Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com>
Date: Mon, 25 Apr 2022 10:59:44 +0300
Subject: [PATCH 05/17] Remove 'psplash-fb.h' from 'psplash.h'
psplash might not be necessary based on framebuffer, it could use DRM
in future too.
drm-backend backport from:
https://patchwork.yoctoproject.org/project/yocto/cover/20220425075954.10427-1-vasyl.vavrychuk@opensynergy.com/
Signed-off-by: Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com>
---
psplash-fb.c | 2 +-
psplash-fb.h | 3 +++
psplash.c | 1 +
psplash.h | 2 --
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/psplash-fb.c b/psplash-fb.c
index 1d2d7db..5dea82a 100644
--- a/psplash-fb.c
+++ b/psplash-fb.c
@@ -8,7 +8,7 @@
*/
#include <endian.h>
-#include "psplash.h"
+#include "psplash-fb.h"
static void
psplash_wait_for_vsync(PSplashFB *fb)
diff --git a/psplash-fb.h b/psplash-fb.h
index 6c4599c..4d5c460 100644
--- a/psplash-fb.h
+++ b/psplash-fb.h
@@ -10,6 +10,9 @@
#ifndef _HAVE_PSPLASH_FB_H
#define _HAVE_PSPLASH_FB_H
+#include <linux/fb.h>
+#include "psplash.h"
+
enum RGBMode {
RGB565,
BGR565,
diff --git a/psplash.c b/psplash.c
index 62244ba..18c012b 100644
--- a/psplash.c
+++ b/psplash.c
@@ -11,6 +11,7 @@
*/
#include "psplash.h"
+#include "psplash-fb.h"
#include "psplash-config.h"
#include "psplash-colors.h"
#include "psplash-poky-img.h"
diff --git a/psplash.h b/psplash.h
index 02d6f32..ab8e53f 100644
--- a/psplash.h
+++ b/psplash.h
@@ -15,7 +15,6 @@
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
-#include <linux/fb.h>
#include <linux/kd.h>
#include <linux/vt.h>
#include <signal.h>
@@ -78,7 +77,6 @@ typedef struct PSplashFont
PSplashFont;
-#include "psplash-fb.h"
#include "psplash-console.h"
#endif
--
2.25.1
|
