Page MenuHomeFreeBSD
Files F165140512

D34531.id103767.diff
No OneTemporary
Actions

D34531.id103767.diff
View Options

Index: stand/efi/libefi/efi_console.c
===================================================================
--- stand/efi/libefi/efi_console.c
+++ stand/efi/libefi/efi_console.c
@@ -458,7 +458,7 @@
return (true);
}
if (strcasecmp(name, "yellow") == 0 || strcasecmp(name, "brown") == 0) {
- *val = TC_BROWN | light;
+ *val = TC_YELLOW | light;
return (true);
}
if (strcasecmp(name, "blue") == 0) {
Index: stand/i386/libi386/vidconsole.c
===================================================================
--- stand/i386/libi386/vidconsole.c
+++ stand/i386/libi386/vidconsole.c
@@ -545,7 +545,7 @@
return (true);
}
if (strcasecmp(name, "yellow") == 0 || strcasecmp(name, "brown") == 0) {
- *val = TC_BROWN | light;
+ *val = TC_YELLOW | light;
return (true);
}
if (strcasecmp(name, "blue") == 0) {
Index: sys/dev/syscons/scterm-teken.c
===================================================================
--- sys/dev/syscons/scterm-teken.c
+++ sys/dev/syscons/scterm-teken.c
@@ -317,7 +317,7 @@
static const teken_color_t sc_to_te_color[] = {
TC_BLACK, TC_BLUE, TC_GREEN, TC_CYAN,
- TC_RED, TC_MAGENTA, TC_BROWN, TC_WHITE,
+ TC_RED, TC_MAGENTA, TC_YELLOW, TC_WHITE,
};
static const unsigned char te_to_sc_color[] = {
Index: sys/sys/terminal.h
===================================================================
--- sys/sys/terminal.h
+++ sys/sys/terminal.h
@@ -94,7 +94,7 @@
#define FG_CYAN TCOLOR_FG(TC_CYAN)
#define FG_RED TCOLOR_FG(TC_RED)
#define FG_MAGENTA TCOLOR_FG(TC_MAGENTA)
-#define FG_BROWN TCOLOR_FG(TC_BROWN)
+#define FG_BROWN TCOLOR_FG(TC_YELLOW)
#define FG_LIGHTGREY TCOLOR_FG(TC_WHITE)
#define FG_DARKGREY (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_BLACK))
#define FG_LIGHTBLUE (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_BLUE))
@@ -102,7 +102,7 @@
#define FG_LIGHTCYAN (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_CYAN))
#define FG_LIGHTRED (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_RED))
#define FG_LIGHTMAGENTA (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_MAGENTA))
-#define FG_YELLOW (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_BROWN))
+#define FG_YELLOW (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_YELLOW))
#define FG_WHITE (TFORMAT(TF_BOLD) | TCOLOR_FG(TC_WHITE))
#define FG_BLINK TFORMAT(TF_BLINK)
@@ -113,7 +113,7 @@
#define BG_CYAN TCOLOR_BG(TC_CYAN)
#define BG_RED TCOLOR_BG(TC_RED)
#define BG_MAGENTA TCOLOR_BG(TC_MAGENTA)
-#define BG_BROWN TCOLOR_BG(TC_BROWN)
+#define BG_BROWN TCOLOR_BG(TC_YELLOW)
#define BG_LIGHTGREY TCOLOR_BG(TC_WHITE)
#define BG_DARKGREY (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_BLACK))
#define BG_LIGHTBLUE (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_BLUE))
@@ -121,7 +121,7 @@
#define BG_LIGHTCYAN (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_CYAN))
#define BG_LIGHTRED (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_RED))
#define BG_LIGHTMAGENTA (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_MAGENTA))
-#define BG_YELLOW (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_BROWN))
+#define BG_YELLOW (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_YELLOW))
#define BG_WHITE (TFORMAT(TF_BOLD) | TCOLOR_BG(TC_WHITE))
#ifndef TERMINAL_NORM_ATTR
Index: sys/teken/teken.h
===================================================================
--- sys/teken/teken.h
+++ sys/teken/teken.h
@@ -53,7 +53,7 @@
#define TC_BLACK 0
#define TC_RED 1
#define TC_GREEN 2
-#define TC_BROWN 3
+#define TC_YELLOW 3
#define TC_BLUE 4
#define TC_MAGENTA 5
#define TC_CYAN 6
Index: sys/teken/teken.c
===================================================================
--- sys/teken/teken.c
+++ sys/teken/teken.c
@@ -494,7 +494,7 @@
#define k TC_BLACK
#define b TC_BLUE
-#define y TC_BROWN
+#define y TC_YELLOW
#define c TC_CYAN
#define g TC_GREEN
#define m TC_MAGENTA
@@ -502,7 +502,7 @@
#define w TC_WHITE
#define K (TC_BLACK | TC_LIGHT)
#define B (TC_BLUE | TC_LIGHT)
-#define Y (TC_BROWN | TC_LIGHT)
+#define Y (TC_YELLOW | TC_LIGHT)
#define C (TC_CYAN | TC_LIGHT)
#define G (TC_GREEN | TC_LIGHT)
#define M (TC_MAGENTA | TC_LIGHT)
Index: sys/teken/teken_subr_compat.h
===================================================================
--- sys/teken/teken_subr_compat.h
+++ sys/teken/teken_subr_compat.h
@@ -65,7 +65,7 @@
}
static const teken_color_t cons25_colors[8] = { TC_BLACK, TC_BLUE,
- TC_GREEN, TC_CYAN, TC_RED, TC_MAGENTA, TC_BROWN, TC_WHITE };
+ TC_GREEN, TC_CYAN, TC_RED, TC_MAGENTA, TC_YELLOW, TC_WHITE };
static void
teken_subr_cons25_set_default_background(teken_t *t, unsigned int c)

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 7, 9:00 AM (6 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36158482
Default Alt Text
D34531.id103767.diff (4 KB)

Event Timeline