Changes between Version 2 and Version 3 of jazz/jfbterm

Timestamp:

Jan 13, 2009, 7:01:11 PM (17 years ago)

Author:

jazz

Comment:

--

jazz/jfbterm

@@ -276 +276 @@
 $3 = 0
 }}}
+ * 避開 mmap 回傳零的修正
+{{{
+#!diff
+diff -Naur jfbterm-0.4.7/fbcommon.c jfbterm-0.4.7-dev/fbcommon.c
+--- jfbterm-0.4.7/fbcommon.c    2009-01-13 18:56:35.000000000 +0800
++++ jfbterm-0.4.7-dev/fbcommon.c        2008-11-18 04:19:25.000000000 +0800
+@@ -563,8 +563,13 @@
+
+        p->moff = (u_long)(fb_fix.mmio_start) & (~PAGE_MASK);
+        p->mlen = (fb_fix.mmio_len + p->moff + ~PAGE_MASK) & PAGE_MASK;
+-       p->mmio = (u_char*)mmap(NULL, p->mlen, PROT_READ|PROT_WRITE,
++       if(p->mlen == 0)
++       {
++         p->mmio = 0;
++       } else {
++         p->mmio = (u_char*)mmap(NULL, p->mlen, PROT_READ|PROT_WRITE,
+                                MAP_SHARED, p->fh, p->slen);
++       }
+        if ((long)p->mmio == -1) {
+ #ifdef JFB_MMIO_CHECK
+                die("cannot mmap(mmio)");
+}}}