From 49101c576d382d80475490ab1d33ffb22195f0ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 5 Aug 2010 00:37:30 +0000 Subject: [PATCH] Fix warnings and thus build. It's still unusable with QEMU for ex, which uses a different default colorspace. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37914 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/accelerants/vmware/Cursor.c | 2 ++ src/add-ons/accelerants/vmware/GetModeInfo.c | 4 +++- src/add-ons/accelerants/vmware/InitAccelerant.c | 9 +++++---- src/add-ons/accelerants/vmware/ProposeDisplayMode.c | 5 +++-- src/add-ons/accelerants/vmware/SetDisplayMode.c | 1 + 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/add-ons/accelerants/vmware/Cursor.c b/src/add-ons/accelerants/vmware/Cursor.c index 0977fff46c..cd034300cf 100644 --- a/src/add-ons/accelerants/vmware/Cursor.c +++ b/src/add-ons/accelerants/vmware/Cursor.c @@ -9,6 +9,8 @@ * Michael Pfeiffer */ + +#include #include "GlobalData.h" diff --git a/src/add-ons/accelerants/vmware/GetModeInfo.c b/src/add-ons/accelerants/vmware/GetModeInfo.c index aeda52ffd4..4facce0be2 100644 --- a/src/add-ons/accelerants/vmware/GetModeInfo.c +++ b/src/add-ons/accelerants/vmware/GetModeInfo.c @@ -8,6 +8,8 @@ * Eric Petit */ + +#include #include "GlobalData.h" @@ -30,7 +32,7 @@ GET_FRAME_BUFFER_CONFIG(frame_buffer_config *afb) afb->frame_buffer_dma = (uint8 *)gSi->fbDma + gSi->fbOffset; afb->bytes_per_row = gSi->bytesPerRow; - TRACE("fb: %p, fb_dma: %p, row: %d bytes\n", afb->frame_buffer, + TRACE("fb: %p, fb_dma: %p, row: %"B_PRIu32" bytes\n", afb->frame_buffer, afb->frame_buffer_dma, afb->bytes_per_row); return B_OK; diff --git a/src/add-ons/accelerants/vmware/InitAccelerant.c b/src/add-ons/accelerants/vmware/InitAccelerant.c index 0cf9c1e3f5..8a20284ca5 100644 --- a/src/add-ons/accelerants/vmware/InitAccelerant.c +++ b/src/add-ons/accelerants/vmware/InitAccelerant.c @@ -14,6 +14,7 @@ #include "sys/stat.h" #include "fcntl.h" #include +#include #include "GlobalData.h" @@ -30,14 +31,14 @@ status_t InitCommon(int fd) /* Contact driver and get a pointer to the registers and shared data */ if ((ret = ioctl(gFd, VMWARE_GET_PRIVATE_DATA, &gSharedArea, sizeof(area_id))) != B_OK) { - TRACE("VMWARE_GET_PRIVATE_DATA failed (%d\n", ret); + TRACE("VMWARE_GET_PRIVATE_DATA failed (%"B_PRIx32"\n", ret); return ret; } /* Clone the shared area for our use */ if ((gSharedArea = clone_area("VMware shared", (void **)&gSi, B_ANY_ADDRESS, B_READ_AREA|B_WRITE_AREA, gSharedArea)) < 0) { - TRACE("could not clone shared area (%d)\n", gSharedArea); + TRACE("could not clone shared area (%"B_PRId32")\n", gSharedArea); return gSharedArea; } @@ -68,7 +69,7 @@ INIT_ACCELERANT(int fd) INIT_BEN(gSi->fifoLock); } - TRACE("INIT_ACCELERANT: %d\n", ret); + TRACE("INIT_ACCELERANT: %"B_PRIx32"\n", ret); return ret; } @@ -118,7 +119,7 @@ CLONE_ACCELERANT(void *data) INIT_BEN(gSi->fifoLock); } - TRACE("CLONE_ACCELERANT: %d\n", ret); + TRACE("CLONE_ACCELERANT: %"B_PRIx32"\n", ret); return ret; } diff --git a/src/add-ons/accelerants/vmware/ProposeDisplayMode.c b/src/add-ons/accelerants/vmware/ProposeDisplayMode.c index 4cb9b6b06f..ca884e0730 100644 --- a/src/add-ons/accelerants/vmware/ProposeDisplayMode.c +++ b/src/add-ons/accelerants/vmware/ProposeDisplayMode.c @@ -8,8 +8,9 @@ * Eric Petit */ -#include "GlobalData.h" #include +#include +#include "GlobalData.h" #define MODE_FLAGS (B_8_BIT_DAC|B_PARALLEL_ACCESS) #define MODE_COUNT (sizeof(kModeList) / sizeof(display_mode)) @@ -60,7 +61,7 @@ PROPOSE_DISPLAY_MODE(display_mode *target, const display_mode *low, uint32 ACCELERANT_MODE_COUNT() { - TRACE("ACCELERANT_MODE_COUNT: %d\n", MODE_COUNT); + TRACE("ACCELERANT_MODE_COUNT: %"B_PRIuSIZE"\n", MODE_COUNT); return MODE_COUNT; } diff --git a/src/add-ons/accelerants/vmware/SetDisplayMode.c b/src/add-ons/accelerants/vmware/SetDisplayMode.c index e939631a68..ca3607780f 100644 --- a/src/add-ons/accelerants/vmware/SetDisplayMode.c +++ b/src/add-ons/accelerants/vmware/SetDisplayMode.c @@ -8,6 +8,7 @@ * Eric Petit */ +#include #include "GlobalData.h"