summaryrefslogtreecommitdiff
path: root/hw/xfree86/vbe
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/vbe')
-rw-r--r--hw/xfree86/vbe/vbe.c17
-rw-r--r--hw/xfree86/vbe/vbe.h16
-rw-r--r--hw/xfree86/vbe/vbeModes.c12
3 files changed, 25 insertions, 20 deletions
diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
index 18e8032e1..07659d943 100644
--- a/hw/xfree86/vbe/vbe.c
+++ b/hw/xfree86/vbe/vbe.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.1 2003/02/17 17:06:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.3 2003/11/03 05:11:53 tsi Exp $ */
/*
* XFree86 vbe module
@@ -106,11 +106,13 @@ VBEExtendedInit(xf86Int10InfoPtr pInt, int entityIndex, int Flags)
}
xf86DrvMsgVerb(screen, X_INFO, 4,
- "VbeVersion is %d, OemStringPtr is 0x%08x,\n"
- "\tOemVendorNamePtr is 0x%08x, OemProductNamePtr is 0x%08x,\n"
- "\tOemProductRevPtr is 0x%08x\n",
- vbe->VbeVersion, vbe->OemStringPtr, vbe->OemVendorNamePtr,
- vbe->OemProductNamePtr, vbe->OemProductRevPtr);
+ "VbeVersion is %d, OemStringPtr is 0x%08lx,\n"
+ "\tOemVendorNamePtr is 0x%08lx, OemProductNamePtr is 0x%08lx,\n"
+ "\tOemProductRevPtr is 0x%08lx\n",
+ vbe->VbeVersion, (unsigned long)vbe->OemStringPtr,
+ (unsigned long)vbe->OemVendorNamePtr,
+ (unsigned long)vbe->OemProductNamePtr,
+ (unsigned long)vbe->OemProductRevPtr);
xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE Version %i.%i\n",
VERSION(vbe->VbeVersion));
@@ -341,7 +343,7 @@ VBEGetVBEInfo(vbeInfoPtr pVbe)
VbeInfoBlock *block = NULL;
int i, pStr, pModes;
char *str;
- CARD16 major, minor, *modes;
+ CARD16 major, *modes;
bzero(pVbe->memory, sizeof(VbeInfoBlock));
@@ -378,7 +380,6 @@ VBEGetVBEInfo(vbeInfoPtr pVbe)
block->VESAVersion = *(CARD16*)(((char*)pVbe->memory) + 4);
major = (unsigned)block->VESAVersion >> 8;
- minor = block->VESAVersion & 0xff;
pStr = *(CARD32*)(((char*)pVbe->memory) + 6);
str = xf86int10Addr(pVbe->pInt10, FARP(pStr));
diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h
index 5bca184f5..30756119d 100644
--- a/hw/xfree86/vbe/vbe.h
+++ b/hw/xfree86/vbe/vbe.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.1 2003/02/17 17:06:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.3 2003/11/14 14:58:45 tsi Exp $ */
/*
* XFree86 vbe module
@@ -60,7 +60,11 @@ typedef struct vbeControllerInfoBlock {
CARD8 OemData[256];
} vbeControllerInfoRec, *vbeControllerInfoPtr;
-#pragma pack()
+#ifdef __GNUC__
+#pragma pack() /* All GCC versions recognise this syntax */
+#else
+#pragma pack(0)
+#endif
#ifndef __GNUC__
#define __attribute__(a)
@@ -237,8 +241,8 @@ typedef enum {
} vbeScanwidthCommand;
#define VBESetLogicalScanline(pVbe, width) \
- VBESetGetLogicalScanlineLength(pVbe, SCANWID_SET, \
- width, NULL, NULL, NULL)
+ VBESetGetLogicalScanlineLength(pVbe, SCANWID_SET, width, \
+ NULL, NULL, NULL)
#define VBESetLogicalScanlineBytes(pVbe, width) \
VBESetGetLogicalScanlineLength(pVbe, SCANWID_SET_BYTES, width, \
NULL, NULL, NULL)
@@ -246,8 +250,8 @@ typedef enum {
VBESetGetLogicalScanlineLength(pVbe, SCANWID_GET, 0, \
pixels, bytes, max)
#define VBEGetMaxLogicalScanline(pVbe, pixels, bytes, max) \
- VBESetGetLogicalScanlineLength(pVbe, SCANWID_GET_MAX, \
- NULL, pixels, bytes, max)
+ VBESetGetLogicalScanlineLength(pVbe, SCANWID_GET_MAX, 0, \
+ pixels, bytes, max)
Bool VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe,
vbeScanwidthCommand command, int width,
int *pixels, int *bytes, int *max);
diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c
index 4d4f1bfac..ae16d7b75 100644
--- a/hw/xfree86/vbe/vbeModes.c
+++ b/hw/xfree86/vbe/vbeModes.c
@@ -27,7 +27,7 @@
*
* Authors: David Dawes <dawes@xfree86.org>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.1 2003/02/17 17:06:45 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.4 2003/11/06 18:38:14 tsi Exp $
*/
#include "xf86.h"
@@ -120,7 +120,7 @@ static DisplayModePtr
CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe, int id,
int flags)
{
- CARD16 major, minor;
+ CARD16 major;
VbeModeInfoBlock *mode;
DisplayModePtr pMode, p;
VbeModeInfoData *data;
@@ -128,7 +128,6 @@ CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe, int id,
ModeStatus status = MODE_OK;
major = (unsigned)(vbe->VESAVersion >> 8);
- minor = vbe->VESAVersion & 0xff;
if ((mode = VBEGetModeInfo(pVbe, id)) == NULL)
return NULL;
@@ -193,7 +192,7 @@ CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe, int id,
xf86ErrorFVerb(DEBUG_VERB,
" WinBSegment: 0x%x\n", mode->WinBSegment);
xf86ErrorFVerb(DEBUG_VERB,
- " WinFuncPtr: 0x%x\n", mode->WinFuncPtr);
+ " WinFuncPtr: 0x%lx\n", (unsigned long)mode->WinFuncPtr);
xf86ErrorFVerb(DEBUG_VERB,
" BytesPerScanline: %d\n", mode->BytesPerScanline);
xf86ErrorFVerb(DEBUG_VERB,
@@ -236,7 +235,8 @@ CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe, int id,
" DirectColorModeInfo: %d\n", mode->DirectColorModeInfo);
if (major >= 2) {
xf86ErrorFVerb(DEBUG_VERB,
- " PhysBasePtr: 0x%x\n", mode->PhysBasePtr);
+ " PhysBasePtr: 0x%lx\n",
+ (unsigned long)mode->PhysBasePtr);
if (major >= 3) {
xf86ErrorFVerb(DEBUG_VERB,
" LinBytesPerScanLine: %d\n", mode->LinBytesPerScanLine);
@@ -261,7 +261,7 @@ CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe, int id,
xf86ErrorFVerb(DEBUG_VERB,
" LinRsvdFieldPosition: %d\n", mode->LinRsvdFieldPosition);
xf86ErrorFVerb(DEBUG_VERB,
- " MaxPixelClock: %d\n", mode->MaxPixelClock);
+ " MaxPixelClock: %ld\n", (unsigned long)mode->MaxPixelClock);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 14:16:11 +0000