Author: dnusinow Date: 2006-02-26 23:35:37 -0500 (Sun, 26 Feb 2006) New Revision: 1350
Added: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/04_read_rom_in_chunks.diff Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series Log: * add 04_read_rom_in_chunks.diff. This reads PCI ROM in large chunks rather than one byte at a time. This patch by Alex Williamson and forwarded to us by Dann Frazier. Thanks to both of them. (closes: #353168) Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog =================================================================== --- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog 2006-02-27 04:18:59 UTC (rev 1349) +++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/changelog 2006-02-27 04:35:37 UTC (rev 1350) @@ -6,8 +6,11 @@ * Port patches from trunk + 030_libvgahw_gcc4_volatile_fix.diff + general/026_xc_programs_manpage_overhaul.diff + * add 04_read_rom_in_chunks.diff. This reads PCI ROM in large chunks rather + than one byte at a time. This patch by Alex Williamson and forwarded to us + by Dann Frazier. Thanks to both of them. (closes: #353168) - -- David Nusinow <[EMAIL PROTECTED]> Sun, 26 Feb 2006 21:30:19 -0500 + -- David Nusinow <[EMAIL PROTECTED]> Sun, 26 Feb 2006 23:33:33 -0500 xorg-server (1:1.0.1-1) experimental; urgency=low Added: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/04_read_rom_in_chunks.diff =================================================================== --- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/04_read_rom_in_chunks.diff 2006-02-27 04:18:59 UTC (rev 1349) +++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/04_read_rom_in_chunks.diff 2006-02-27 04:35:37 UTC (rev 1350) @@ -0,0 +1,16 @@ +Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/bus/linuxPci.c +=================================================================== +--- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/os-support/bus/linuxPci.c 2006-01-04 23:07:36.000000000 -0500 ++++ xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/bus/linuxPci.c 2006-02-26 23:33:05.000000000 -0500 +@@ -742,8 +742,10 @@ + write(fd, "1", 2); + lseek(fd, 0, SEEK_SET); + ++ len = min(Len, st.st_size); ++ + /* copy the ROM until we hit Len, EOF or read error */ +- for (i = 0; i < Len && read(fd, Buf, 1) > 0; Buf++, i++) ++ for (; len && (size = read(fd, Buf, len)) > 0 ; Buf+=size, len-=size) + ; + + write(fd, "0", 2); Modified: branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series =================================================================== --- branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series 2006-02-27 04:18:59 UTC (rev 1349) +++ branches/modular/xserver/xorg-server-X11R7.0-1.0.1/debian/patches/series 2006-02-27 04:35:37 UTC (rev 1350) @@ -1,3 +1,4 @@ 001_ubuntu_add_extra_modelines_from_xorg.patch -p1 02_libvgahw_gcc4_volatile_fix.diff 03_xnest_manpage_overhaul.diff +04_read_rom_in_chunks.diff -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]