summaryrefslogblamecommitdiff
path: root/japanese/kon2-16dot/files/patch-ah
blob: e410e32bf9d9d23d831eeba2fafd6aab9129460a (plain) (tree)
1
                                                        
















                                                







                                                                     
                    










                                                             
--- src/display/vga.c.orig	Sun Jan 26 18:05:00 1997
+++ src/display/vga.c	Wed Jan 24 00:05:00 2001
@@ -47,7 +47,13 @@
 #elif defined(__FreeBSD__)
 #include      <vm/vm_param.h>
 #include      <sys/ioctl.h>
-#include      <machine/console.h>
+#include      <osreldate.h>
+#if __FreeBSD_version >= 410000
+#  include    <sys/consio.h>
+#  include    <sys/kbio.h>
+#else
+#  include    <machine/console.h>
+#endif
 vm_size_t page_size;
 #endif
 #undef free
@@ -382,7 +388,7 @@
 /*    if (!code) return;*/
     VgaSetColor(fc);
     if (bc & 0x8) *(vcls - dInfo.glineByte) = 0;
-    for (x = 0;x < sbFReg->high;x ++, code ++, fm >>= 1) {
+    if (code) for (x = 0;x < sbFReg->high;x ++, code ++, fm >>= 1) {
 	if (*code) {
 	    VgaOutByte(*code);
 	    *gram = *gram;
@@ -620,7 +626,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;
     }