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
This commit is contained in:
@@ -9,6 +9,8 @@
|
|||||||
* Michael Pfeiffer <[email protected]>
|
* Michael Pfeiffer <[email protected]>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
#include "GlobalData.h"
|
#include "GlobalData.h"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,8 @@
|
|||||||
* Eric Petit <[email protected]>
|
* Eric Petit <[email protected]>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#include <SupportDefs.h>
|
||||||
#include "GlobalData.h"
|
#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->frame_buffer_dma = (uint8 *)gSi->fbDma + gSi->fbOffset;
|
||||||
afb->bytes_per_row = gSi->bytesPerRow;
|
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);
|
afb->frame_buffer_dma, afb->bytes_per_row);
|
||||||
|
|
||||||
return B_OK;
|
return B_OK;
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
#include "sys/stat.h"
|
#include "sys/stat.h"
|
||||||
#include "fcntl.h"
|
#include "fcntl.h"
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
|
#include <SupportDefs.h>
|
||||||
|
|
||||||
#include "GlobalData.h"
|
#include "GlobalData.h"
|
||||||
|
|
||||||
@@ -30,14 +31,14 @@ status_t InitCommon(int fd)
|
|||||||
/* Contact driver and get a pointer to the registers and shared data */
|
/* Contact driver and get a pointer to the registers and shared data */
|
||||||
if ((ret = ioctl(gFd, VMWARE_GET_PRIVATE_DATA, &gSharedArea,
|
if ((ret = ioctl(gFd, VMWARE_GET_PRIVATE_DATA, &gSharedArea,
|
||||||
sizeof(area_id))) != B_OK) {
|
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;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Clone the shared area for our use */
|
/* Clone the shared area for our use */
|
||||||
if ((gSharedArea = clone_area("VMware shared", (void **)&gSi,
|
if ((gSharedArea = clone_area("VMware shared", (void **)&gSi,
|
||||||
B_ANY_ADDRESS, B_READ_AREA|B_WRITE_AREA, gSharedArea)) < 0) {
|
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;
|
return gSharedArea;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,7 +69,7 @@ INIT_ACCELERANT(int fd)
|
|||||||
INIT_BEN(gSi->fifoLock);
|
INIT_BEN(gSi->fifoLock);
|
||||||
}
|
}
|
||||||
|
|
||||||
TRACE("INIT_ACCELERANT: %d\n", ret);
|
TRACE("INIT_ACCELERANT: %"B_PRIx32"\n", ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,7 +119,7 @@ CLONE_ACCELERANT(void *data)
|
|||||||
INIT_BEN(gSi->fifoLock);
|
INIT_BEN(gSi->fifoLock);
|
||||||
}
|
}
|
||||||
|
|
||||||
TRACE("CLONE_ACCELERANT: %d\n", ret);
|
TRACE("CLONE_ACCELERANT: %"B_PRIx32"\n", ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,8 +8,9 @@
|
|||||||
* Eric Petit <[email protected]>
|
* Eric Petit <[email protected]>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "GlobalData.h"
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <SupportDefs.h>
|
||||||
|
#include "GlobalData.h"
|
||||||
|
|
||||||
#define MODE_FLAGS (B_8_BIT_DAC|B_PARALLEL_ACCESS)
|
#define MODE_FLAGS (B_8_BIT_DAC|B_PARALLEL_ACCESS)
|
||||||
#define MODE_COUNT (sizeof(kModeList) / sizeof(display_mode))
|
#define MODE_COUNT (sizeof(kModeList) / sizeof(display_mode))
|
||||||
@@ -60,7 +61,7 @@ PROPOSE_DISPLAY_MODE(display_mode *target, const display_mode *low,
|
|||||||
uint32
|
uint32
|
||||||
ACCELERANT_MODE_COUNT()
|
ACCELERANT_MODE_COUNT()
|
||||||
{
|
{
|
||||||
TRACE("ACCELERANT_MODE_COUNT: %d\n", MODE_COUNT);
|
TRACE("ACCELERANT_MODE_COUNT: %"B_PRIuSIZE"\n", MODE_COUNT);
|
||||||
return MODE_COUNT;
|
return MODE_COUNT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
* Eric Petit <[email protected]>
|
* Eric Petit <[email protected]>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
#include "GlobalData.h"
|
#include "GlobalData.h"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user