Changes between Version 2 and Version 3 of jazz/jfbterm


Ignore:
Timestamp:
Jan 13, 2009, 7:01:11 PM (16 years ago)
Author:
jazz
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • jazz/jfbterm

    v2 v3  
    276276$3 = 0
    277277}}}
     278 * 避開 mmap 回傳零的修正
     279{{{
     280#!diff
     281diff -Naur jfbterm-0.4.7/fbcommon.c jfbterm-0.4.7-dev/fbcommon.c
     282--- jfbterm-0.4.7/fbcommon.c    2009-01-13 18:56:35.000000000 +0800
     283+++ jfbterm-0.4.7-dev/fbcommon.c        2008-11-18 04:19:25.000000000 +0800
     284@@ -563,8 +563,13 @@
     285
     286        p->moff = (u_long)(fb_fix.mmio_start) & (~PAGE_MASK);
     287        p->mlen = (fb_fix.mmio_len + p->moff + ~PAGE_MASK) & PAGE_MASK;
     288-       p->mmio = (u_char*)mmap(NULL, p->mlen, PROT_READ|PROT_WRITE,
     289+       if(p->mlen == 0)
     290+       {
     291+         p->mmio = 0;
     292+       } else {
     293+         p->mmio = (u_char*)mmap(NULL, p->mlen, PROT_READ|PROT_WRITE,
     294                                MAP_SHARED, p->fh, p->slen);
     295+       }
     296        if ((long)p->mmio == -1) {
     297 #ifdef JFB_MMIO_CHECK
     298                die("cannot mmap(mmio)");
     299}}}