From f445b04baff70800514fc93ec4f2edbd6959a60b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Sun, 14 Jan 2007 14:26:29 +0000
Subject: [PATCH] * Fixed warnings in the VMware accelerant - GCC 2.95.3 cannot
 compare function signatures   without any argument specifier, and a(void); !=
 a(); in C. * Added the VMware graphics driver to the image.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19795 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/HaikuImage                          |  3 ++-
 src/add-ons/accelerants/vmware/Acceleration.c |  9 +++++----
 src/add-ons/accelerants/vmware/Fifo.c         | 10 +++++-----
 src/add-ons/accelerants/vmware/GetModeInfo.c  |  4 ++--
 src/add-ons/accelerants/vmware/GlobalData.h   | 10 +++++-----
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index bf5120b35f..ff8276f9a6 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -62,7 +62,7 @@ BEOS_NETWORK_PROTOCOLS = ipv4 tcp udp icmp ;
 
 BEOS_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant $(X86_ONLY)nv.accelerant
 	$(X86_ONLY)mga.accelerant $(X86_ONLY)nm.accelerant $(X86_ONLY)intel_extreme.accelerant
-	vesa.accelerant
+	vesa.accelerant $(X86_ONLY)vmware.accelerant
 ;
 BEOS_ADD_ONS_TRANSLATORS = BMPTranslator GIFTranslator JPEGTranslator
 	JPEG2000Translator TIFFTranslator PNGTranslator PPMTranslator 
@@ -92,6 +92,7 @@ BEOS_ADD_ONS_SCREENSAVERS = Haiku IFS ;
 BEOS_ADD_ONS_DRIVERS_AUDIO = auich auvia emuxki ;
 BEOS_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon.driver $(X86_ONLY)nv.driver
 	$(X86_ONLY)nm.driver $(X86_ONLY)mga.driver $(X86_ONLY)intel_extreme vesa
+	$(X86_ONLY)vmware
 ;
 BEOS_ADD_ONS_DRIVERS_MIDI = emuxki ;
 BEOS_ADD_ONS_DRIVERS_NET = etherpci ipro1000 rtl8139 rtl8169 sis900
diff --git a/src/add-ons/accelerants/vmware/Acceleration.c b/src/add-ons/accelerants/vmware/Acceleration.c
index 288e3ff314..03ca0985a0 100644
--- a/src/add-ons/accelerants/vmware/Acceleration.c
+++ b/src/add-ons/accelerants/vmware/Acceleration.c
@@ -8,14 +8,15 @@
  *		Eric Petit <eric.petit@lapsus.org>
  */
 
+
 #include "GlobalData.h"
 
 
 void
 SCREEN_TO_SCREEN_BLIT(engine_token *et, blit_params *list, uint32 count)
 {
-	int i;
-	blit_params * b;
+	uint32 i;
+	blit_params *b;
 
 	for (i = 0; i < count; i++) {
 		b = &list[i];
@@ -40,8 +41,8 @@ void
 FILL_RECTANGLE(engine_token *et, uint32 colorIndex,
 	fill_rect_params *list, uint32 count)
 {
-	int i;
-	fill_rect_params * f;
+	uint32 i;
+	fill_rect_params *f;
 
 	for (i = 0; i < count; i++) {
 		f = &list[i];
diff --git a/src/add-ons/accelerants/vmware/Fifo.c b/src/add-ons/accelerants/vmware/Fifo.c
index 5d1e5cea71..94e2a4de31 100644
--- a/src/add-ons/accelerants/vmware/Fifo.c
+++ b/src/add-ons/accelerants/vmware/Fifo.c
@@ -49,7 +49,7 @@ FifoPrintCapabilities(int c)
 
 
 void
-FifoInit()
+FifoInit(void)
 {
 	uint32 *fifo = gSi->fifo;
 
@@ -87,14 +87,14 @@ FifoInit()
 
 
 void
-FifoSync()
+FifoSync(void)
 {
 	ioctl(gFd, VMWARE_FIFO_SYNC, NULL, 0);
 }
 
 
 void
-FifoBeginWrite()
+FifoBeginWrite(void)
 {
 	ACQUIRE_BEN(gSi->fifoLock);
 }
@@ -117,7 +117,7 @@ FifoWrite(uint32 value)
 
 
 void
-FifoEndWrite()
+FifoEndWrite(void)
 {
 	uint32 *fifo = gSi->fifo;
 
@@ -127,7 +127,7 @@ FifoEndWrite()
 
 
 void
-FifoUpdateFullscreen()
+FifoUpdateFullscreen(void)
 {
 	FifoBeginWrite();
 	FifoWrite(SVGA_CMD_UPDATE);
diff --git a/src/add-ons/accelerants/vmware/GetModeInfo.c b/src/add-ons/accelerants/vmware/GetModeInfo.c
index 76f26ace42..aeda52ffd4 100644
--- a/src/add-ons/accelerants/vmware/GetModeInfo.c
+++ b/src/add-ons/accelerants/vmware/GetModeInfo.c
@@ -26,8 +26,8 @@ GET_FRAME_BUFFER_CONFIG(frame_buffer_config *afb)
 {
 	TRACE("GET_FRAME_BUFFER_CONFIG\n");
 
-	afb->frame_buffer = gSi->fb + gSi->fbOffset;
-	afb->frame_buffer_dma = gSi->fbDma + gSi->fbOffset;
+	afb->frame_buffer = (uint8 *)gSi->fb + gSi->fbOffset;
+	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,
diff --git a/src/add-ons/accelerants/vmware/GlobalData.h b/src/add-ons/accelerants/vmware/GlobalData.h
index 72e817687d..e650033a9d 100644
--- a/src/add-ons/accelerants/vmware/GlobalData.h
+++ b/src/add-ons/accelerants/vmware/GlobalData.h
@@ -27,11 +27,11 @@ extern thread_id	gUpdateThread;
 extern volatile int	gUpdateThreadDie;
 
 /* Fifo.c */
-void FifoInit();
-void FifoSync();
-void FifoBeginWrite();
+void FifoInit(void);
+void FifoSync(void);
+void FifoBeginWrite(void);
 void FifoWrite(uint32 value);
-void FifoEndWrite();
-void FifoUpdateFullscreen();
+void FifoEndWrite(void);
+void FifoUpdateFullscreen(void);
 
 #endif	// GLOBAL_DATA_H