Mercurial > sdl-ios-xcode
view src/video/fbcon/SDL_fb3dfx.c @ 1551:02e19471a694
Fixed bug #4
[Note: I'm applying this patch since it's a cleaner version of what's already implemented, and supports this controller on older kernels. I'll ask to make sure this doesn't break on the new kernels where it's no longer necessary]
Date: Mon, 21 Mar 2005 09:41:11 -0500
From: Chris Nelson
Subject: SDL Patch
Hey, Ryan.
I submitted the following patch about a year ago. It's just a simple
patch for the linux port, to make multiple joysticks each appear to SDL
as their own device, if they are on the same USB port (specifically,
these guys
<http://www.consoleplus.co.uk/product_info.php?pName=super-joybox-5-quad-joypad-converter>,
which allow 4 Playstation2 controllers to be accessed via a single USB
port). Without this patch, SDL pretty much drops the ball, and reports
that there are 4 joysticks available when less than that number are
plugged in.
My work built upon the work of another person with the same device. When
I submitted the patch to the list, he tested it, but it didn't work for
him, so the patch was never accepted. Maybe about 3 times in the past
year, I've tried to email the guy, to see if he couldn't run my new
version, complete with debug code to diagnose the problem he was having.
He never got back to me.
So, I'm attaching the patch. I wish I knew why it didn't work for him,
but I've been using it for the last year with no problems. Let me know
if you need any more information, or have any ideas as to how I could
test it. I'd like to see it in the tree, but I want to make sure it works.
-Chris
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Sun, 19 Mar 2006 06:31:34 +0000 |
parents | d910939febfa |
children | 14717b52abc0 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2006 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" #include "SDL_video.h" #include "../SDL_blit.h" #include "SDL_fb3dfx.h" #include "3dfx_mmio.h" /* Wait for vertical retrace */ static void WaitVBL(_THIS) { /* find start of retrace */ tdfx_waitidle(); while( (tdfx_in32(TDFX_STATUS) & STATUS_RETRACE) == STATUS_RETRACE ) ; /* wait until we're past the start */ while( (tdfx_in32(TDFX_STATUS) & STATUS_RETRACE) == 0 ) ; } static void WaitIdle(_THIS) { tdfx_waitidle(); } /* Sets video mem colorkey and accelerated blit function */ static int SetHWColorKey(_THIS, SDL_Surface *surface, Uint32 key) { return(0); } static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color) { int bpp; char *dst_base; Uint32 format; int dstX, dstY; /* Don't blit to the display surface when switched away */ if ( dst == this->screen ) { SDL_mutexP(hw_lock); } /* Set the destination pixel format */ dst_base = (char *)((char *)dst->pixels - mapped_mem); bpp = dst->format->BitsPerPixel; format = dst->pitch | ((bpp+((bpp==8) ? 0 : 8)) << 13); /* Calculate source and destination base coordinates */ dstX = rect->x; dstY = rect->y; /* Execute the fill command */ tdfx_wait(6); tdfx_out32(DSTBASE, (Uint32)dst_base); tdfx_out32(DSTFORMAT, format); tdfx_out32(COLORFORE, color); tdfx_out32(COMMAND_2D, COMMAND_2D_FILLRECT); tdfx_out32(DSTSIZE, rect->w | (rect->h << 16)); tdfx_out32(LAUNCH_2D, dstX | (dstY << 16)); FB_AddBusySurface(dst); if ( dst == this->screen ) { SDL_mutexV(hw_lock); } return(0); } static int HWAccelBlit(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect) { SDL_VideoDevice *this = current_video; int bpp; Uint32 src_format; Uint32 dst_format; char *src_base; char *dst_base; int srcX, srcY; int dstX, dstY; Uint32 blitop; Uint32 use_colorkey; /* Don't blit to the display surface when switched away */ if ( dst == this->screen ) { SDL_mutexP(hw_lock); } /* Set the source and destination pixel format */ src_base = (char *)((char *)src->pixels - mapped_mem); bpp = src->format->BitsPerPixel; src_format = src->pitch | ((bpp+((bpp==8) ? 0 : 8)) << 13); dst_base = (char *)((char *)dst->pixels - mapped_mem); bpp = dst->format->BitsPerPixel; dst_format = dst->pitch | ((bpp+((bpp==8) ? 0 : 8)) << 13); srcX = srcrect->x; srcY = srcrect->y; dstX = dstrect->x; dstY = dstrect->y; /* Assemble the blit operation */ blitop = COMMAND_2D_BITBLT | (0xCC << 24); if ( srcX <= dstX ) { blitop |= BIT(14); srcX += (dstrect->w - 1); dstX += (dstrect->w - 1); } if ( srcY <= dstY ) { blitop |= BIT(15); srcY += (dstrect->h - 1); dstY += (dstrect->h - 1); } /* Perform the blit! */ if ( (src->flags & SDL_SRCCOLORKEY) == SDL_SRCCOLORKEY ) { tdfx_wait(3); tdfx_out32(SRCCOLORKEYMIN, src->format->colorkey); tdfx_out32(SRCCOLORKEYMAX, src->format->colorkey); tdfx_out32(ROP_2D, 0xAA00); use_colorkey = 1; } else { use_colorkey = 0; } tdfx_wait(9); tdfx_out32(SRCBASE, (Uint32)src_base); tdfx_out32(SRCFORMAT, src_format); tdfx_out32(DSTBASE, (Uint32)dst_base); tdfx_out32(DSTFORMAT, src_format); tdfx_out32(COMMAND_2D, blitop); tdfx_out32(COMMANDEXTRA_2D, use_colorkey); tdfx_out32(DSTSIZE, dstrect->w | (dstrect->h << 16)); tdfx_out32(DSTXY, dstX | (dstY << 16)); tdfx_out32(LAUNCH_2D, srcX | (srcY << 16)); FB_AddBusySurface(src); FB_AddBusySurface(dst); if ( dst == this->screen ) { SDL_mutexV(hw_lock); } return(0); } static int CheckHWBlit(_THIS, SDL_Surface *src, SDL_Surface *dst) { int accelerated; /* Set initial acceleration on */ src->flags |= SDL_HWACCEL; /* Set the surface attributes */ if ( (src->flags & SDL_SRCALPHA) == SDL_SRCALPHA ) { if ( ! this->info.blit_hw_A ) { src->flags &= ~SDL_HWACCEL; } } if ( (src->flags & SDL_SRCCOLORKEY) == SDL_SRCCOLORKEY ) { if ( ! this->info.blit_hw_CC ) { src->flags &= ~SDL_HWACCEL; } } /* Check to see if final surface blit is accelerated */ accelerated = !!(src->flags & SDL_HWACCEL); if ( accelerated ) { src->map->hw_blit = HWAccelBlit; } return(accelerated); } void FB_3DfxAccel(_THIS, __u32 card) { /* We have hardware accelerated surface functions */ this->CheckHWBlit = CheckHWBlit; wait_vbl = WaitVBL; wait_idle = WaitIdle; /* Reset the 3Dfx controller */ tdfx_out32(BRESERROR0, 0); tdfx_out32(BRESERROR1, 0); /* The 3Dfx has an accelerated color fill */ this->info.blit_fill = 1; this->FillHWRect = FillHWRect; /* The 3Dfx has accelerated normal and colorkey blits */ this->info.blit_hw = 1; this->info.blit_hw_CC = 1; this->SetHWColorKey = SetHWColorKey; }