From alex at mplayerhq.hu Sun Dec 4 15:04:28 2005 From: alex at mplayerhq.hu (Alex Beregszaszi) Date: Sun, 4 Dec 2005 15:04:28 +0100 (CET) Subject: [Vesautils-devel] CVS: vesautils/libvbe Makefile,1.1,1.2 Message-ID: <20051204140428.0575F8A8EF@mail.mplayerhq.hu> Update of /cvsroot/vesautils/vesautils/libvbe In directory mail:/var2/tmp/cvs-serv3052 Modified Files: Makefile Log Message: symlinking 10l fix by Tomas Janousek Index: Makefile =================================================================== RCS file: /cvsroot/vesautils/vesautils/libvbe/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 12 Aug 2005 17:49:53 -0000 1.1 +++ Makefile 4 Dec 2005 14:04:26 -0000 1.2 @@ -27,8 +27,8 @@ libvbe.so: $(pic_objects) # $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -shared -o $@ $^ $(CC) $(CPPFLAGS) $(CFLAGS) -Wl,-soname,$(LIBNAME).so.$(MAJOR) -fPIC -shared -o $(LIBNAME).so.$(VERSION) $^ - ln -s $(LIBNAME).so.$(VERSION) $(LIBNAME).so.$(MAJOR) - ln -s $(LIBNAME).so.$(MAJOR) $(LIBNAME).so + ln -sf $(LIBNAME).so.$(VERSION) $(LIBNAME).so.$(MAJOR) + ln -sf $(LIBNAME).so.$(MAJOR) $(LIBNAME).so install: mkdir -p $(LIBDIR) From alex at mplayerhq.hu Sun Dec 4 15:07:40 2005 From: alex at mplayerhq.hu (Alex Beregszaszi) Date: Sun, 4 Dec 2005 15:07:40 +0100 (CET) Subject: [Vesautils-devel] CVS: vesautils/libvbe vbe.c,1.3,1.4 Message-ID: <20051204140740.1DC208A903@mail.mplayerhq.hu> Update of /cvsroot/vesautils/vesautils/libvbe In directory mail:/var2/tmp/cvs-serv17030 Modified Files: vbe.c Log Message: Fixing asm inline code which crashed when used as a shared library. Patch by Tomas Janousek Index: vbe.c =================================================================== RCS file: /cvsroot/vesautils/vesautils/libvbe/vbe.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vbe.c 12 Aug 2005 17:53:54 -0000 1.3 +++ vbe.c 4 Dec 2005 14:07:37 -0000 1.4 @@ -525,9 +525,10 @@ __asm __volatile( "pushl %%ebx\n" "movl %1, %%ebx\n" - ::"a"(0x4f05),"S"(win_num & 0x0f),"d"(win_gran):"memory"); - (*vbe_pm_info.SetWindowCall)(); - __asm __volatile("popl %%ebx":::"memory"); + "call *%2\n" + "popl %%ebx" + ::"a"(0x4f05),"S"(win_num & 0x0f),"D"(vbe_pm_info.SetWindowCall), + "d"(win_gran):"memory"); retval = VBE_OK; } else @@ -637,10 +638,10 @@ __asm __volatile( "pushl %%ebx\n" "movl %1, %%ebx\n" - ::"a"(0x4f07),"S"(vsync ? 0x80 : 0), + "call *%2\n" + "popl %%ebx\n" + ::"a"(0x4f07),"S"(vsync ? 0x80 : 0),"D"(vbe_pm_info.SetDisplayStart), "c"((offset>>2) & 0xffff),"d"((offset>>18)&0xffff):"memory"); - (*vbe_pm_info.SetDisplayStart)(); - __asm __volatile("popl %%ebx":::"memory"); retval = VBE_OK; } else From alex at mplayerhq.hu Sun Dec 4 15:13:38 2005 From: alex at mplayerhq.hu (Alex Beregszaszi) Date: Sun, 4 Dec 2005 15:13:38 +0100 (CET) Subject: [Vesautils-devel] CVS: vesautils/libvbe vbe.c,1.4,1.5 Message-ID: <20051204141338.669538A902@mail.mplayerhq.hu> 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 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); }