Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed warnings in the VMware accelerant - GCC 2.95.3 cannot compare function signatures

Browse Source 
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
This commit is contained in:
Axel Dörfler 2007-01-14 14:26:29 +00:00
parent 67d68c7766
commit f445b04baf
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/jam/HaikuImage
View File

@ -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

9
src/add-ons/accelerants/vmware/Acceleration.c
View File

@ -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];

10
src/add-ons/accelerants/vmware/Fifo.c
View File

@ -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);

4
src/add-ons/accelerants/vmware/GetModeInfo.c
View File

@ -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,

10
src/add-ons/accelerants/vmware/GlobalData.h
View File

@ -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