From: Vicente Bergas <vicencb@gmail.com>
To: barebox@lists.infradead.org
Cc: Vicente Bergas <vicencb@gmail.com>
Subject: [PATCH] OMAP4_USBboot: Change output text formatting
Date: Sat, 22 Mar 2014 17:39:04 +0000 [thread overview]
Message-ID: <1395509944-1512-1-git-send-email-vicencb@gmail.com> (raw)
The basic console used for USBboot has two different formattings,
one for text coming from the host and another for text coming from
the target.
This change makes both formattings readable regardless of the
console background color.
Signed-off-by: Vicente Bergas <vicencb@gmail.com>
---
scripts/omap4_usbboot/omap4_usbboot.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/scripts/omap4_usbboot/omap4_usbboot.c b/scripts/omap4_usbboot/omap4_usbboot.c
index e521086..0e5abcb 100644
--- a/scripts/omap4_usbboot/omap4_usbboot.c
+++ b/scripts/omap4_usbboot/omap4_usbboot.c
@@ -35,16 +35,17 @@
#define WHITE 8
#define RED 1
#define BLACK 0
-#define FORMAT "%c[%d;%d;%dm"
-#define TARGET_FORMAT 0x1B, BRIGHT, RED+30, BLACK+40
-#define HOST_FORMAT 0x1B, RESET, WHITE+30, BLACK+40
-#define host_print(fmt, arg...) printf(FORMAT fmt FORMAT, \
+#define TFORMAT "%c[%d;%dm"
+#define HFORMAT "%c[%dm"
+#define TARGET_FORMAT 0x1B, BRIGHT, RED+30
+#define HOST_FORMAT 0x1B, RESET
+#define host_print(fmt, arg...) printf(HFORMAT fmt TFORMAT, \
HOST_FORMAT, ##arg, TARGET_FORMAT)
void panic(struct termios *t_restore)
{
tcsetattr(STDIN_FILENO, TCSANOW, t_restore);
- printf(FORMAT, HOST_FORMAT);
+ printf(HFORMAT, HOST_FORMAT);
exit(1);
}
@@ -354,7 +355,7 @@ int usb_boot(
tcgetattr(STDIN_FILENO, &vars.t_restore);
tn = vars.t_restore;
tn.c_lflag &= ~(ICANON | ECHO);
- printf(FORMAT, TARGET_FORMAT);
+ printf(TFORMAT, TARGET_FORMAT);
tcsetattr(STDIN_FILENO, TCSANOW, &tn);
if (pthread_create(&thread, NULL, listenerTask, &vars))
host_print("listenerTask failed\n");
@@ -375,7 +376,7 @@ int usb_boot(
usb_close(usb);
pthread_mutex_destroy(&vars.usb_mutex);
tcsetattr(STDIN_FILENO, TCSANOW, &vars.t_restore);
- printf(FORMAT, HOST_FORMAT);
+ printf(HFORMAT, HOST_FORMAT);
return 0;
}
@@ -415,7 +416,7 @@ int main(int argc, char **argv)
sz = s.st_size;
close(fd);
argv++;
- printf(FORMAT, HOST_FORMAT);
+ printf(HFORMAT, HOST_FORMAT);
for (once = 1;;) {
usb = usb_open(match_omap4_bootloader);
if (usb)
--
1.9.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2014-03-22 17:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-22 17:39 Vicente Bergas [this message]
2014-03-24 6:59 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395509944-1512-1-git-send-email-vicencb@gmail.com \
--to=vicencb@gmail.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox