summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn van Drongelen <tinctorius@gmail.com>2009-05-05 16:37:06 +0200
committerJulien Cristau <jcristau@debian.org>2009-05-05 16:38:59 +0200
commit8d27247829fe4f55691ce68f9f4b14810fb34b32 (patch)
treede9d5160c709b556e3c8cb2291f924a323ceebc4
parenta8a771a853478e5f45f71d0eff3c4d55bf24d0ad (diff)
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@debian.org>
-rw-r--r--src/bios_reader/bios_reader.c4
-rw-r--r--src/i830_bios.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bios_reader/bios_reader.c b/src/bios_reader/bios_reader.c
index fc518214..328cacf2 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 7c51f384..73c097ad 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 *