diff options
Diffstat (limited to 'main/busybox/0007-fbsplash-support-console-switching.patch')
| -rw-r--r-- | main/busybox/0007-fbsplash-support-console-switching.patch | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/main/busybox/0007-fbsplash-support-console-switching.patch b/main/busybox/0007-fbsplash-support-console-switching.patch index 7d76d4f1f45..8d1950587e1 100644 --- a/main/busybox/0007-fbsplash-support-console-switching.patch +++ b/main/busybox/0007-fbsplash-support-console-switching.patch @@ -1,14 +1,14 @@ -From 377e2f20c1034de1195fd900fc637821952cfa49 Mon Sep 17 00:00:00 2001 +From 8fb815ec846d9ac64c89ac21cededc17f0b804c3 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 07/16] fbsplash: support console switching +Subject: [PATCH] fbsplash: support console switching --- - miscutils/fbsplash.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++----- + miscutils/fbsplash.c | 82 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 75 insertions(+), 7 deletions(-) diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c -index 5b2e5ac56..bc80f728c 100644 +index bc3c61055..1c206ef53 100644 --- a/miscutils/fbsplash.c +++ b/miscutils/fbsplash.c @@ -47,7 +47,7 @@ @@ -21,7 +21,7 @@ index 5b2e5ac56..bc80f728c 100644 //usage: " -s Image" //usage: "\n -c Hide cursor" @@ -57,11 +57,17 @@ - //usage: "\n BAR_R,BAR_G,BAR_B" + //usage: "\n BAR_R,BAR_G,BAR_B,IMG_LEFT,IMG_TOP" //usage: "\n -f Control pipe (else exit after drawing image)" //usage: "\n commands: 'NN' (% for progress bar) or 'exit'" +//usage: "\n -T Switch to TTY to hide all console messages" @@ -40,14 +40,14 @@ index 5b2e5ac56..bc80f728c 100644 @@ -75,6 +81,8 @@ struct globals { unsigned char *addr; // pointer to framebuffer memory - unsigned ns[7]; // n-parameters + unsigned ns[9]; // n-parameters const char *image_filename; + int silent_tty, fd_tty_s; + bool do_not_draw; struct fb_var_screeninfo scr_var; struct fb_fix_screeninfo scr_fix; unsigned bytes_per_pixel; -@@ -485,6 +493,11 @@ static void init(const char *cfg_filename) +@@ -488,6 +496,11 @@ static void init(const char *cfg_filename) config_close(parser); } @@ -59,7 +59,7 @@ index 5b2e5ac56..bc80f728c 100644 int fbsplash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int fbsplash_main(int argc UNUSED_PARAM, char **argv) -@@ -494,6 +507,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -497,6 +510,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) char *num_buf; unsigned num; bool bCursorOff; @@ -69,7 +69,7 @@ index 5b2e5ac56..bc80f728c 100644 INIT_G(); -@@ -501,8 +517,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -504,8 +520,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) fb_device = "/dev/fb0"; cfg_filename = NULL; fifo_filename = NULL; @@ -81,7 +81,7 @@ index 5b2e5ac56..bc80f728c 100644 // parse configuration file if (cfg_filename) -@@ -512,11 +529,43 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -515,11 +532,43 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) if (!G.image_filename) bb_show_usage(); @@ -126,7 +126,7 @@ index 5b2e5ac56..bc80f728c 100644 } fb_drawimage(); -@@ -524,6 +573,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -527,6 +576,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) if (!fifo_filename) return EXIT_SUCCESS; @@ -134,7 +134,7 @@ index 5b2e5ac56..bc80f728c 100644 fp = xfopen_stdin(fifo_filename); if (fp != stdin) { // For named pipes, we want to support this: -@@ -539,8 +589,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -542,8 +592,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) // and become an additional writer :) open(fifo_filename, O_WRONLY); // errors are ignored } @@ -145,7 +145,7 @@ index 5b2e5ac56..bc80f728c 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 -@@ -555,12 +606,29 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) +@@ -558,12 +609,29 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) #if DEBUG DEBUG_MESSAGE(itoa(num)); #endif @@ -177,6 +177,3 @@ index 5b2e5ac56..bc80f728c 100644 full_write(STDOUT_FILENO, ESC"[?25h", 6); return EXIT_SUCCESS; --- -2.16.2 - |