diff options
Diffstat (limited to 'main/busybox/0005-fbsplash-support-console-switching.patch')
| -rw-r--r-- | main/busybox/0005-fbsplash-support-console-switching.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/main/busybox/0005-fbsplash-support-console-switching.patch b/main/busybox/0005-fbsplash-support-console-switching.patch index 7ffa5da1cd9..0d9b87861ce 100644 --- a/main/busybox/0005-fbsplash-support-console-switching.patch +++ b/main/busybox/0005-fbsplash-support-console-switching.patch @@ -1,7 +1,7 @@ -From 44be65aa1de3ad093cd754574734175884048285 Mon Sep 17 00:00:00 2001 +From f5660f60455d2a86fd78d5a8949a31864233faf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> Date: Mon, 24 Sep 2012 07:58:29 +0300 -Subject: [PATCH 05/15] fbsplash: support console switching +Subject: [PATCH 05/12] fbsplash: support console switching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,11 +12,11 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi> 1 file changed, 76 insertions(+), 7 deletions(-) diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c -index 3ddf8a2..aaaca39 100644 +index fc6c9b953..ec5947314 100644 --- a/miscutils/fbsplash.c +++ b/miscutils/fbsplash.c -@@ -22,7 +22,7 @@ - */ +@@ -47,7 +47,7 @@ + //kbuild:lib-$(CONFIG_FBSPLASH) += fbsplash.o //usage:#define fbsplash_trivial_usage -//usage: "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]" @@ -24,7 +24,7 @@ index 3ddf8a2..aaaca39 100644 //usage:#define fbsplash_full_usage "\n\n" //usage: " -s Image" //usage: "\n -c Hide cursor" -@@ -32,11 +32,17 @@ +@@ -57,11 +57,17 @@ //usage: "\n BAR_R,BAR_G,BAR_B" //usage: "\n -f Control pipe (else exit after drawing image)" //usage: "\n commands: 'NN' (% for progress bar) or 'exit'" @@ -42,7 +42,7 @@ index 3ddf8a2..aaaca39 100644 /* If you want logging messages on /tmp/fbsplash.log... */ #define DEBUG 0 -@@ -48,6 +54,8 @@ struct globals { +@@ -73,6 +79,8 @@ struct globals { unsigned char *addr; // pointer to framebuffer memory unsigned ns[7]; // n-parameters const char *image_filename; @@ -51,7 +51,7 @@ index 3ddf8a2..aaaca39 100644 struct fb_var_screeninfo scr_var; struct fb_fix_screeninfo scr_fix; unsigned bytes_per_pixel; -@@ -458,6 +466,11 @@ static void init(const char *cfg_filename) +@@ -483,6 +491,11 @@ static void init(const char *cfg_filename) config_close(parser); } @@ -63,7 +63,7 @@ index 3ddf8a2..aaaca39 100644 int fbsplash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int fbsplash_main(int argc UNUSED_PARAM, char **argv) -@@ -467,6 +480,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -492,6 +505,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) char *num_buf; unsigned num; bool bCursorOff; @@ -73,7 +73,7 @@ index 3ddf8a2..aaaca39 100644 INIT_G(); -@@ -474,8 +490,10 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -499,8 +515,10 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) fb_device = "/dev/fb0"; cfg_filename = NULL; fifo_filename = NULL; @@ -86,7 +86,7 @@ index 3ddf8a2..aaaca39 100644 // parse configuration file if (cfg_filename) -@@ -485,11 +503,43 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -510,11 +528,43 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) if (!G.image_filename) bb_show_usage(); @@ -131,7 +131,7 @@ index 3ddf8a2..aaaca39 100644 } fb_drawimage(); -@@ -497,6 +547,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -522,6 +572,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) if (!fifo_filename) return EXIT_SUCCESS; @@ -139,7 +139,7 @@ index 3ddf8a2..aaaca39 100644 fp = xfopen_stdin(fifo_filename); if (fp != stdin) { // For named pipes, we want to support this: -@@ -512,8 +563,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -537,8 +588,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) // and become an additional writer :) open(fifo_filename, O_WRONLY); // errors are ignored } @@ -150,7 +150,7 @@ index 3ddf8a2..aaaca39 100644 // Block on read, waiting for some input. // Use of <stdio.h> style I/O allows to correctly // handle a case when we have many buffered lines -@@ -528,12 +580,29 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -553,12 +605,29 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) #if DEBUG DEBUG_MESSAGE(itoa(num)); #endif @@ -183,5 +183,5 @@ index 3ddf8a2..aaaca39 100644 return EXIT_SUCCESS; -- -2.9.1 +2.11.0 |