diff options
author | Shigeyuki Fukushima <shige@FreeBSD.org> | 2000-01-31 05:47:45 +0000 |
---|---|---|
committer | Shigeyuki Fukushima <shige@FreeBSD.org> | 2000-01-31 05:47:45 +0000 |
commit | 0def7c196ef73f0758237585dec7f1dce06c75d8 (patch) | |
tree | af0f92cae8455967900c080d9791039a6739519b /japanese | |
parent | Fix for NEWGCC (diff) |
Fix kon's vga/mmap code for 4-current or later with new sysncos ans vga/mmap.
# But 3.x-stable or former uses old code.
Thanks, yokota-san!
Submitted by: Kazutaka YOKOTA <yokota@FreeBSD.org>
Notes
Notes:
svn path=/head/; revision=25349
Diffstat (limited to 'japanese')
-rw-r--r-- | japanese/kon2-16dot/files/patch-ah | 16 | ||||
-rw-r--r-- | japanese/kon2-16dot/files/patch-am | 15 |
2 files changed, 29 insertions, 2 deletions
diff --git a/japanese/kon2-16dot/files/patch-ah b/japanese/kon2-16dot/files/patch-ah index 7a4e6d355b37..ab1220edde4a 100644 --- a/japanese/kon2-16dot/files/patch-ah +++ b/japanese/kon2-16dot/files/patch-ah @@ -1,5 +1,5 @@ ---- src/display/vga.c Sun Jan 26 18:05:00 1997 -+++ src/display/vga.c Mon Apr 7 10:37:35 1997 +--- src/display/vga.c.orig Sun Jan 26 18:05:00 1997 ++++ src/display/vga.c Mon Jan 31 14:09:55 2000 @@ -382,7 +382,7 @@ /* if (!code) return;*/ VgaSetColor(fc); @@ -9,3 +9,15 @@ if (*code) { VgaOutByte(*code); *gram = *gram; +@@ -620,7 +620,11 @@ + Perror("ioctl CONSOLE_IO_ENABLE"); + return FAILURE; + } ++#if (__FreeBSD__ <= 3) + if ((devMem = open("/dev/vga", O_RDWR|O_NDELAY) ) < 0) { ++#else ++ if ((devMem = open("/dev/mem", O_RDWR|O_NDELAY) ) < 0) { ++#endif + Perror("/dev/mem"); + return FAILURE; + } diff --git a/japanese/kon2-16dot/files/patch-am b/japanese/kon2-16dot/files/patch-am new file mode 100644 index 000000000000..89c19f5d9b1c --- /dev/null +++ b/japanese/kon2-16dot/files/patch-am @@ -0,0 +1,15 @@ +--- include/vga.h.orig Fri Jan 24 16:08:01 1997 ++++ include/vga.h Mon Jan 31 14:13:08 2000 +@@ -59,7 +59,11 @@ + #if defined(linux) + #define GRAPH_BASE 0xA0000 + #elif defined(__FreeBSD__) +-#define GRAPH_BASE 0x0 ++# if (__FreeBSD__ <= 3) ++# define GRAPH_BASE 0x0 ++# else ++# define GRAPH_BASE 0xA0000 ++# endif + #endif + #define FONT_SIZE 0x2000 + |