projects
/
eightysix
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
foo
[eightysix]
/
kern
/
src
/
vid.c
diff --git
a/kern/src/vid.c
b/kern/src/vid.c
index
f4eb723
..
25c7cf1
100644
(file)
--- a/
kern/src/vid.c
+++ b/
kern/src/vid.c
@@
-45,6
+45,7
@@
static void detect_video(void)
{
mono = 0;
vid_type = VID_UNK;
{
mono = 0;
vid_type = VID_UNK;
+ return; /* XXX */
if(detect_vgainfo() == 0) {
return;
if(detect_vgainfo() == 0) {
return;
@@
-211,7
+212,7
@@
void vid_bgcolor(int color)
void vid_glyph(int x, int y, int c, int attr)
{
uint16_t __far *ptr;
void vid_glyph(int x, int y, int c, int attr)
{
uint16_t __far *ptr;
- uint16_t val = (c & 0xff) | attr;
+ uint16_t val = c | (attr << 8);
y += cur_scroll;
y += cur_scroll;
@@
-234,7
+235,7
@@
void vid_text(int x, int y, const char *s, int attr)
ptr = vmem + y * 80 + x;
while(*s) {
ptr = vmem + y * 80 + x;
while(*s) {
- *ptr++ = (*s++ & 0xff) | attr;
+ *ptr++ = *s++ | (attr << 8);
len++;
}
len++;
}
@@
-243,7
+244,7
@@
void vid_text(int x, int y, const char *s, int attr)
ptr -= 80 * 32 + len;
s -= len;
while(*s) {
ptr -= 80 * 32 + len;
s -= len;
while(*s) {
- *ptr++ = (*s++ & 0xff) | attr;
+ *ptr++ = *s++ | (attr << 8);
}
}
}
}
}
}