Update of /cvsroot/vesautils/vesautils/libvbe
In directory mail:/var2/tmp/cvs-serv8024
Modified Files:
vbe.c
Log Message:
100l fix, original patch by Tomas Janousek
Index: vbe.c
===================================================================
RCS file: /cvsroot/vesautils/vesautils/libvbe/vbe.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vbe.c 4 Dec 2005 14:07:37 -0000 1.4
+++ vbe.c 4 Dec 2005 14:13:36 -0000 1.5
@@ -61,7 +61,7 @@
}
#endif
-#define HAVE_VERBOSE_VAR 1
+//#define HAVE_VERBOSE_VAR 1
#ifdef HAVE_VERBOSE_VAR
extern int verbose;
@@ -96,7 +96,7 @@
return retval;
}
#else
-#define VBE_LRMI_int(int_no,regs) (VBE_LRMI_int(int_no,regs))
+#define VBE_LRMI_int(int_no,regs) (LRMI_int(int_no,regs))
#endif
/**
@@ -372,7 +372,9 @@
for (i=0;((mode_table[i]!=(vesa_mode&0x3FF))&&(i<NR_MODES));i++) ;
if (i==NR_MODES) return 0;
+#ifdef HAVE_VERBOSE_VAR
if(verbose > 1) printf("vbelib: Trying to set TV mode %x\n",tv_table[TV_mode][i]);
+#endif
r.eax = 0x4f14;
r.ebx = 0x20;
r.edx = 0;
@@ -766,7 +768,9 @@
{
void *lfb;
if(fd_mem == -1) return NULL;
+#ifdef HAVE_VERBOSE_VAR
if(verbose > 1) printf("vbelib: vbeMapVideoBuffer(%08lX,%08lX)\n",phys_addr,size);
+#endif
/* Here we don't need with MAP_FIXED and prefered address (first argument) */
lfb = mmap((void *)0,size,PROT_READ | PROT_WRITE,MAP_SHARED,fd_mem,phys_addr);
return lfb == (void *)-1 ? 0 : lfb;
@@ -774,6 +778,8 @@
void vbeUnmapVideoBuffer(unsigned long linear_addr,unsigned long size)
{
+#ifdef HAVE_VERBOSE_VAR
if(verbose > 1) printf("vbelib: vbeUnmapVideoBuffer(%08lX,%08lX)\n",linear_addr,size);
+#endif
munmap((void *)linear_addr,size);
}
