xf86-video-intel: src/bios_reader/bios_reader.c src/i830_bios.c

Julien Cristau jcristau at kemper.freedesktop.org
Tue May 5 07:41:26 PDT 2009


 src/bios_reader/bios_reader.c |    4 ++--
 src/i830_bios.c               |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8d27247829fe4f55691ce68f9f4b14810fb34b32
Author: Stijn van Drongelen <tinctorius at gmail.com>
Date:   Tue May 5 16:37:06 2009 +0200

    Fix typo in (unused) INTEL_BIOS_32 macro
    
    Debian bug#527062 <http://bugs.debian.org/527062>
    
    [jcristau: fix same typo in bios_reader.c]
    Signed-off-by: Julien Cristau <jcristau at debian.org>

diff --git a/src/bios_reader/bios_reader.c b/src/bios_reader/bios_reader.c
index fc51821..328cacf 100644
--- a/src/bios_reader/bios_reader.c
+++ b/src/bios_reader/bios_reader.c
@@ -55,8 +55,8 @@ struct _fake_i830 *pI830 = &I830;
 #define INTEL_BIOS_16(_addr)	(pI830->VBIOS[_addr] | \
 				 (pI830->VBIOS[_addr + 1] << 8))
 #define INTEL_BIOS_32(_addr)	(pI830->VBIOS[_addr] | \
-				 (pI830->VBIOS[_addr + 1] << 8) \
-				 (pI830->VBIOS[_addr + 2] << 16) \
+				 (pI830->VBIOS[_addr + 1] << 8) | \
+				 (pI830->VBIOS[_addr + 2] << 16) | \
 				 (pI830->VBIOS[_addr + 3] << 24))
 
 #define YESNO(val) ((val) ? "yes" : "no")
diff --git a/src/i830_bios.c b/src/i830_bios.c
index 7c51f38..73c097a 100644
--- a/src/i830_bios.c
+++ b/src/i830_bios.c
@@ -43,8 +43,8 @@
 #define INTEL_BIOS_16(_addr)	(bios[_addr] |			\
 				 (bios[_addr + 1] << 8))
 #define INTEL_BIOS_32(_addr)	(bios[_addr] |			\
-				 (bios[_addr + 1] << 8)		\
-				 (bios[_addr + 2] << 16)	\
+				 (bios[_addr + 1] << 8) |	\
+				 (bios[_addr + 2] << 16) |	\
 				 (bios[_addr + 3] << 24))
 
 static void *


More information about the xorg-commit mailing list