X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfxvideo%2Fdraw_fb.c;h=dbf0fc841509b630223720e14f5e4e041db45f52;hp=3e241d7a395a09354392e013dc5c2ab837efc023;hb=f3a63e25fac571e222b969f0d16c542061190797;hpb=16f7d5e779ba9a142a89f81d520b83dea66ca378

diff --git a/plugins/dfxvideo/draw_fb.c b/plugins/dfxvideo/draw_fb.c
index 3e241d7a..dbf0fc84 100644
--- a/plugins/dfxvideo/draw_fb.c
+++ b/plugins/dfxvideo/draw_fb.c
@@ -7,45 +7,20 @@
 
 #define _IN_DRAW
 
-#include "externals.h"
 #include "gpu.h"
-#include "draw.h"
-#include "prim.h"
-#include "menu.h"
-#include "interp.h"
-#include "swap.h"
 
 #include "plugin_lib.h"
+#include "arm_utils.h"
 #include "pcnt.h"
 
 // misc globals
-int            iResX;
-int            iResY;
 long           lLowerpart;
-BOOL           bIsFirstFrame = TRUE;
 BOOL           bCheckMask = FALSE;
-unsigned short sSetMask = 0;
-unsigned long  lSetMask = 0;
-int            iDesktopCol = 16;
-int            iShowFPS = 0;
-int            iWinSize; 
-int            iMaintainAspect = 0;
-int            iUseNoStretchBlt = 0;
-int            iFastFwd = 0;
-int            iFVDisplay = 0;
-PSXPoint_t     ptCursorPoint[8];
-unsigned short usCursorActive = 0;
-char *         pCaptionText;
-
-#ifndef __arm__
-#define bgr555_to_rgb565 memcpy
-#define bgr888_to_rgb888 memcpy
-#endif
+unsigned short sSetMask;
+unsigned long  lSetMask;
 
 static void blit(void)
 {
- extern void bgr555_to_rgb565(void *dst, void *src, int bytes);
- extern void bgr888_to_rgb888(void *dst, void *src, int bytes);
  int px = PSXDisplay.DisplayPosition.x & ~3; // XXX: align needed by bgr*_to_...
  int py = PSXDisplay.DisplayPosition.y;
  int w = PreviousPSXDisplay.Range.x1;
@@ -57,9 +32,13 @@ static void blit(void)
  if (w <= 0)
    return;
 
- // TODO: clear border if centering?
-
+#ifndef MAEMO
  pitch *= PSXDisplay.RGB24 ? 3 : 2;
+#else
+ // n900 doesn't do rgb24 for some reason
+ pitch *= 2;
+ #define bgr888_to_rgb888 bgr888_to_rgb565
+#endif
 
  // account for centering
  h -= PreviousPSXDisplay.Range.y0;
@@ -106,38 +85,13 @@ void DoBufferSwap(void)
  pl_fbdev_flip();
 }
 
-void DoClearScreenBuffer(void)                         // CLEAR DX BUFFER
-{
-}
-
-void DoClearFrontBuffer(void)                          // CLEAR DX BUFFER
+void DoClearScreenBuffer(void)
 {
 }
 
-static int initialize(void)
-{
- iDesktopCol=32;
-
- bUsingTWin=FALSE;
- bIsFirstFrame = FALSE;                                // done
-
- if(iShowFPS)
-  {
-   iShowFPS=0;
-   ulKeybits|=KEY_SHOWFPS;
-   szDispBuf[0]=0;
-   BuildDispMenu(0);
-  }
-
- return 0;
-}
-
 unsigned long ulInitDisplay(void)
 {
- iShowFPS=1;
- initialize();
-
- if (pl_fbdev_init() != 0)
+ if (pl_fbdev_open() != 0)
   return 0;
 
  return 1; /* ok */
@@ -145,19 +99,6 @@ unsigned long ulInitDisplay(void)
 
 void CloseDisplay(void)
 {
- CloseMenu();
- pl_fbdev_finish();
- //WriteConfig();
-}
-
-void CreatePic(unsigned char * pMem)
-{
+ pl_fbdev_close();
 }
 
-void DestroyPic(void)
-{
-}
-
-void HandleKey(int keycode)
-{
-}