diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
| commit | adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch) | |
| tree | 23eb7becc5360b2cbe16aa8d45529880067f3989 /hw/xfree86/int10/generic.c | |
| parent | 90f1536dd315cd265bfc7ef35058761a65a01734 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'hw/xfree86/int10/generic.c')
| -rw-r--r-- | hw/xfree86/int10/generic.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c index d481f000d..845c8a177 100644 --- a/hw/xfree86/int10/generic.c +++ b/hw/xfree86/int10/generic.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.25.2.1 2003/03/20 15:14:25 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.29 2003/09/24 02:43:33 dawes Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment @@ -139,20 +139,22 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) if (bios.bus == BUS_ISA && bios.location.legacy) { xf86DrvMsg(screen, X_CONFIG, - "Overriding BIOS location: 0x%lx\n", + "Overriding BIOS location: 0x%x\n", bios.location.legacy); cs = bios.location.legacy >> 4; #define CHECK_V_SEGMENT_RANGE(x) \ - if ((x << 4) < V_BIOS) {\ + if (((x) << 4) < V_BIOS) {\ xf86DrvMsg(screen, X_ERROR, \ - "V_BIOS address 0x%x out of range\n",x << 4); \ + "V_BIOS address 0x%lx out of range\n", \ + (unsigned long)(x) << 4); \ goto error1; \ } CHECK_V_SEGMENT_RANGE(cs); vbiosMem = (unsigned char *)sysMem - V_BIOS + (cs << 4); if (!int10_check_bios(screen, cs, vbiosMem)) { xf86DrvMsg(screen, X_ERROR, - "No V_BIOS at specified address 0x%x\n",cs << 4); + "No V_BIOS at specified address 0x%lx\n", + (unsigned long)cs << 4); goto error1; } } else { @@ -182,7 +184,8 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) } } - xf86DrvMsg(screen, X_INFO, "Primary V_BIOS segment is: 0x%x\n", cs); + xf86DrvMsg(screen, X_INFO, "Primary V_BIOS segment is: 0x%lx\n", + (unsigned long)cs); set_return_trap(pInt); pInt->BIOSseg = cs; |