--- a/src/video/ps2gs/SDL_gsvideo.c	Mon May 29 03:53:21 2006 +0000
+++ b/src/video/ps2gs/SDL_gsvideo.c	Mon May 29 04:04:35 2006 +0000
@@ -42,66 +42,65 @@
 
 
 /* Initialization/Query functions */
-static int GS_VideoInit (_THIS, SDL_PixelFormat * vformat);
-static SDL_Rect **GS_ListModes (_THIS, SDL_PixelFormat * format,
-                                Uint32 flags);
-static SDL_Surface *GS_SetVideoMode (_THIS, SDL_Surface * current, int width,
-                                     int height, int bpp, Uint32 flags);
-static int GS_SetColors (_THIS, int firstcolor, int ncolors,
-                         SDL_Color * colors);
-static void GS_VideoQuit (_THIS);
+static int GS_VideoInit(_THIS, SDL_PixelFormat * vformat);
+static SDL_Rect **GS_ListModes(_THIS, SDL_PixelFormat * format, Uint32 flags);
+static SDL_Surface *GS_SetVideoMode(_THIS, SDL_Surface * current, int width,
+                                    int height, int bpp, Uint32 flags);
+static int GS_SetColors(_THIS, int firstcolor, int ncolors,
+                        SDL_Color * colors);
+static void GS_VideoQuit(_THIS);
 
 /* Hardware surface functions */
-static int GS_AllocHWSurface (_THIS, SDL_Surface * surface);
-static int GS_LockHWSurface (_THIS, SDL_Surface * surface);
-static void GS_UnlockHWSurface (_THIS, SDL_Surface * surface);
-static void GS_FreeHWSurface (_THIS, SDL_Surface * surface);
+static int GS_AllocHWSurface(_THIS, SDL_Surface * surface);
+static int GS_LockHWSurface(_THIS, SDL_Surface * surface);
+static void GS_UnlockHWSurface(_THIS, SDL_Surface * surface);
+static void GS_FreeHWSurface(_THIS, SDL_Surface * surface);
 
 /* GS driver bootstrap functions */
 
 static int
-GS_Available (void)
+GS_Available(void)
 {
     int console, memory;
 
-    console = open (PS2_DEV_GS, O_RDWR, 0);
+    console = open(PS2_DEV_GS, O_RDWR, 0);
     if (console >= 0) {
-        close (console);
+        close(console);
     }
-    memory = open (PS2_DEV_MEM, O_RDWR, 0);
+    memory = open(PS2_DEV_MEM, O_RDWR, 0);
     if (memory >= 0) {
-        close (memory);
+        close(memory);
     }
     return ((console >= 0) && (memory >= 0));
 }
 
 static void
-GS_DeleteDevice (SDL_VideoDevice * device)
+GS_DeleteDevice(SDL_VideoDevice * device)
 {
-    SDL_free (device->hidden);
-    SDL_free (device);
+    SDL_free(device->hidden);
+    SDL_free(device);
 }
 
 static SDL_VideoDevice *
-GS_CreateDevice (int devindex)
+GS_CreateDevice(int devindex)
 {
     SDL_VideoDevice *this;
 
     /* Initialize all variables that we clean on shutdown */
-    this = (SDL_VideoDevice *) SDL_malloc (sizeof (SDL_VideoDevice));
+    this = (SDL_VideoDevice *) SDL_malloc(sizeof(SDL_VideoDevice));
     if (this) {
-        SDL_memset (this, 0, (sizeof *this));
+        SDL_memset(this, 0, (sizeof *this));
         this->hidden = (struct SDL_PrivateVideoData *)
-            SDL_malloc ((sizeof *this->hidden));
+            SDL_malloc((sizeof *this->hidden));
     }
     if ((this == NULL) || (this->hidden == NULL)) {
-        SDL_OutOfMemory ();
+        SDL_OutOfMemory();
         if (this) {
-            SDL_free (this);
+            SDL_free(this);
         }
         return (0);
     }
-    SDL_memset (this->hidden, 0, (sizeof *this->hidden));
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
     mouse_fd = -1;
     keyboard_fd = -1;
 
@@ -167,7 +166,7 @@
     PS2_GS_PSMCT32              /* 32 bpp */
 };
 
-static unsigned long long head_tags[] __attribute__ ((aligned (16))) = {
+static unsigned long long head_tags[] __attribute__ ((aligned(16))) = {
     4 | (1LL << 60),            /* GIFtag */
         0x0e,                   /* A+D */
         0,                      /* 2 */
@@ -180,8 +179,8 @@
 #define MAXTAGS		8
 
 static inline int
-loadimage_nonblock (int fd, struct ps2_image *image, int size,
-                    unsigned long long *hm, unsigned long long *im)
+loadimage_nonblock(int fd, struct ps2_image *image, int size,
+                   unsigned long long *hm, unsigned long long *im)
 {
     struct ps2_plist plist;
     struct ps2_packet packet[1 + MAXTAGS * 2];
@@ -196,7 +195,7 @@
 
     /* make BITBLT packet */
     packet[pnum].ptr = hm;
-    packet[pnum].len = sizeof (head_tags);
+    packet[pnum].len = sizeof(head_tags);
     pnum++;
     hm[2] = ((unsigned long long) image->fbp << 32) |
         ((unsigned long long) image->fbw << 48) |
@@ -213,7 +212,7 @@
         eop = (size == 0);
 
         packet[pnum].ptr = &im[it];
-        packet[pnum].len = sizeof (unsigned long long) * 2;
+        packet[pnum].len = sizeof(unsigned long long) * 2;
         pnum++;
         im[it++] = (isize >> 4) | (eop ? (1 << 15) : 0) | (2LL << 58);
         im[it++] = 0;
@@ -225,15 +224,15 @@
     }
     plist.num = pnum;
 
-    return ioctl (fd, PS2IOC_SENDL, &plist);
+    return ioctl(fd, PS2IOC_SENDL, &plist);
 }
 
-static unsigned long long tex_tags[] __attribute__ ((aligned (16))) = {
+static unsigned long long tex_tags[] __attribute__ ((aligned(16))) = {
     3 | (1LL << 60),            /* GIFtag */
         0x0e,                   /* A+D */
         0,                      /* 2 */
 PS2_GS_TEX0_1, (1 << 5) + (1 << 6), PS2_GS_TEX1_1, 0, PS2_GS_TEXFLUSH};
-static unsigned long long scale_tags[] __attribute__ ((aligned (16))) = {
+static unsigned long long scale_tags[] __attribute__ ((aligned(16))) = {
     5 | (1LL << 60),            /* GIFtag */
         0x0e,                   /* A+D */
         6 + (1 << 4) + (1 << 8), PS2_GS_PRIM, ((unsigned long long) 0 * 16) + (((unsigned long long) 0 * 16) << 16), PS2_GS_UV, ((unsigned long long) 0 * 16) + (((unsigned long long) 0 * 16) << 16), PS2_GS_XYZ2, 0,  /* 8 */
@@ -242,7 +241,7 @@
 
 
 int
-scaleimage_nonblock (int fd, unsigned long long *tm, unsigned long long *sm)
+scaleimage_nonblock(int fd, unsigned long long *tm, unsigned long long *sm)
 {
     struct ps2_plist plist;
     struct ps2_packet packet[2];
@@ -252,15 +251,15 @@
     plist.packet = packet;
 
     packet[0].ptr = tm;
-    packet[0].len = sizeof (tex_tags);
+    packet[0].len = sizeof(tex_tags);
     packet[1].ptr = sm;
-    packet[1].len = sizeof (scale_tags);
+    packet[1].len = sizeof(scale_tags);
 
-    return ioctl (fd, PS2IOC_SENDL, &plist);
+    return ioctl(fd, PS2IOC_SENDL, &plist);
 }
 
 static int
-power_of_2 (int value)
+power_of_2(int value)
 {
     int shift;
 
@@ -271,29 +270,29 @@
 }
 
 static int
-GS_VideoInit (_THIS, SDL_PixelFormat * vformat)
+GS_VideoInit(_THIS, SDL_PixelFormat * vformat)
 {
     struct ps2_screeninfo vinfo;
 
     /* Initialize the library */
-    console_fd = open (PS2_DEV_GS, O_RDWR, 0);
+    console_fd = open(PS2_DEV_GS, O_RDWR, 0);
     if (console_fd < 0) {
-        SDL_SetError ("Unable to open %s", PS2_DEV_GS);
+        SDL_SetError("Unable to open %s", PS2_DEV_GS);
         return (-1);
     }
-    memory_fd = open (PS2_DEV_MEM, O_RDWR, 0);
+    memory_fd = open(PS2_DEV_MEM, O_RDWR, 0);
     if (memory_fd < 0) {
-        close (console_fd);
+        close(console_fd);
         console_fd = -1;
-        SDL_SetError ("Unable to open %s", PS2_DEV_MEM);
+        SDL_SetError("Unable to open %s", PS2_DEV_MEM);
         return (-1);
     }
 
-    if (ioctl (console_fd, PS2IOC_GSCREENINFO, &vinfo) < 0) {
-        close (memory_fd);
-        close (console_fd);
+    if (ioctl(console_fd, PS2IOC_GSCREENINFO, &vinfo) < 0) {
+        close(memory_fd);
+        close(console_fd);
         console_fd = -1;
-        SDL_SetError ("Couldn't get console pixel format");
+        SDL_SetError("Couldn't get console pixel format");
         return (-1);
     }
 
@@ -309,8 +308,8 @@
     case PS2_GS_PSMCT16:
         break;
     default:
-        GS_VideoQuit (this);
-        SDL_SetError ("Unknown console pixel format: %d", vinfo.psm);
+        GS_VideoQuit(this);
+        SDL_SetError("Unknown console pixel format: %d", vinfo.psm);
         return (-1);
     }
     vformat->BitsPerPixel = GS_pixelmasks[vinfo.psm].bpp;
@@ -320,18 +319,18 @@
     saved_vinfo = vinfo;
 
     /* Enable mouse and keyboard support */
-    if (GS_OpenKeyboard (this) < 0) {
-        GS_VideoQuit (this);
-        SDL_SetError ("Unable to open keyboard");
+    if (GS_OpenKeyboard(this) < 0) {
+        GS_VideoQuit(this);
+        SDL_SetError("Unable to open keyboard");
         return (-1);
     }
-    if (GS_OpenMouse (this) < 0) {
+    if (GS_OpenMouse(this) < 0) {
         const char *sdl_nomouse;
 
-        sdl_nomouse = SDL_getenv ("SDL_NOMOUSE");
+        sdl_nomouse = SDL_getenv("SDL_NOMOUSE");
         if (!sdl_nomouse) {
-            GS_VideoQuit (this);
-            SDL_SetError ("Unable to open mouse");
+            GS_VideoQuit(this);
+            SDL_SetError("Unable to open mouse");
             return (-1);
         }
     }
@@ -341,7 +340,7 @@
 }
 
 static SDL_Rect **
-GS_ListModes (_THIS, SDL_PixelFormat * format, Uint32 flags)
+GS_ListModes(_THIS, SDL_PixelFormat * format, Uint32 flags)
 {
     static SDL_Rect GS_vesa_mode_list[] = {
         {0, 0, 1280, 1024},
@@ -400,22 +399,22 @@
 }
 
 /* Various screen update functions available */
-static void GS_DMAFullUpdate (_THIS, int numrects, SDL_Rect * rects);
+static void GS_DMAFullUpdate(_THIS, int numrects, SDL_Rect * rects);
 
 static SDL_Surface *
-GS_SetVideoMode (_THIS, SDL_Surface * current,
-                 int width, int height, int bpp, Uint32 flags)
+GS_SetVideoMode(_THIS, SDL_Surface * current,
+                int width, int height, int bpp, Uint32 flags)
 {
     struct ps2_screeninfo vinfo;
 
     /* Set the terminal into graphics mode */
-    if (GS_EnterGraphicsMode (this) < 0) {
+    if (GS_EnterGraphicsMode(this) < 0) {
         return (NULL);
     }
 
     /* Set the video mode and get the final screen format */
-    if (ioctl (console_fd, PS2IOC_GSCREENINFO, &vinfo) < 0) {
-        SDL_SetError ("Couldn't get console screen info");
+    if (ioctl(console_fd, PS2IOC_GSCREENINFO, &vinfo) < 0) {
+        SDL_SetError("Couldn't get console screen info");
         return (NULL);
     }
     if ((vinfo.w != width) || (vinfo.h != height) ||
@@ -436,8 +435,8 @@
                 vinfo.res = PS2_GS_1280x1024;
                 break;
             default:
-                SDL_SetError ("Unsupported resolution: %dx%d\n",
-                              width, height);
+                SDL_SetError("Unsupported resolution: %dx%d\n",
+                             width, height);
                 return (NULL);
             }
             vinfo.res |= (PS2_GS_75Hz << 8);
@@ -447,24 +446,24 @@
         vinfo.fbp = 0;
         vinfo.psm = GS_formatmap[bpp / 8];
         if (vinfo.psm < 0) {
-            SDL_SetError ("Unsupported depth: %d bpp\n", bpp);
+            SDL_SetError("Unsupported depth: %d bpp\n", bpp);
             return (NULL);
         }
-        if (ioctl (console_fd, PS2IOC_SSCREENINFO, &vinfo) < 0) {
-            SDL_SetError ("Couldn't set console screen info");
+        if (ioctl(console_fd, PS2IOC_SSCREENINFO, &vinfo) < 0) {
+            SDL_SetError("Couldn't set console screen info");
             return (NULL);
         }
 
         /* Unmap the previous DMA buffer */
         if (mapped_mem) {
-            munmap (mapped_mem, mapped_len);
+            munmap(mapped_mem, mapped_len);
             mapped_mem = NULL;
         }
     }
-    if (!SDL_ReallocFormat (current, GS_pixelmasks[vinfo.psm].bpp,
-                            GS_pixelmasks[vinfo.psm].r,
-                            GS_pixelmasks[vinfo.psm].g,
-                            GS_pixelmasks[vinfo.psm].b, 0)) {
+    if (!SDL_ReallocFormat(current, GS_pixelmasks[vinfo.psm].bpp,
+                           GS_pixelmasks[vinfo.psm].r,
+                           GS_pixelmasks[vinfo.psm].g,
+                           GS_pixelmasks[vinfo.psm].b, 0)) {
         return (NULL);
     }
 
@@ -472,21 +471,21 @@
     current->flags = SDL_FULLSCREEN;
     current->w = width;
     current->h = height;
-    current->pitch = SDL_CalculatePitch (current);
+    current->pitch = SDL_CalculatePitch(current);
 
     /* Memory map the DMA area for block memory transfer */
     if (!mapped_mem) {
         pixels_len = height * current->pitch;
         mapped_len = pixels_len +
             /* Screen update DMA command area */
-            sizeof (head_tags) + ((2 * MAXTAGS) * 16);
+            sizeof(head_tags) + ((2 * MAXTAGS) * 16);
         if (saved_vinfo.mode != PS2_GS_VESA) {
-            mapped_len += sizeof (tex_tags) + sizeof (scale_tags);
+            mapped_len += sizeof(tex_tags) + sizeof(scale_tags);
         }
-        mapped_mem = mmap (0, mapped_len, PROT_READ | PROT_WRITE,
-                           MAP_SHARED, memory_fd, 0);
+        mapped_mem = mmap(0, mapped_len, PROT_READ | PROT_WRITE,
+                          MAP_SHARED, memory_fd, 0);
         if (mapped_mem == MAP_FAILED) {
-            SDL_SetError ("Unable to map %d bytes for DMA", mapped_len);
+            SDL_SetError("Unable to map %d bytes for DMA", mapped_len);
             mapped_mem = NULL;
             return (NULL);
         }
@@ -524,23 +523,23 @@
         /* Set up the memory for screen update DMA commands */
         head_tags_mem = (unsigned long long *) (mapped_mem + pixels_len);
         image_tags_mem = (unsigned long long *)
-            ((caddr_t) head_tags_mem + sizeof (head_tags));
-        SDL_memcpy (head_tags_mem, head_tags, sizeof (head_tags));
+            ((caddr_t) head_tags_mem + sizeof(head_tags));
+        SDL_memcpy(head_tags_mem, head_tags, sizeof(head_tags));
         if (saved_vinfo.mode != PS2_GS_VESA) {
             tex_tags_mem = (unsigned long long *)
                 ((caddr_t) image_tags_mem + ((2 * MAXTAGS) * 16));
             scale_tags_mem = (unsigned long long *)
-                ((caddr_t) tex_tags_mem + sizeof (tex_tags));
-            SDL_memcpy (tex_tags_mem, tex_tags, sizeof (tex_tags));
+                ((caddr_t) tex_tags_mem + sizeof(tex_tags));
+            SDL_memcpy(tex_tags_mem, tex_tags, sizeof(tex_tags));
             tex_tags_mem[2] =
                 (vinfo.h * vinfo.w) / 64 +
                 ((unsigned long long) screen_image.fbw << 14) +
                 ((unsigned long long) screen_image.psm << 20) +
-                ((unsigned long long) power_of_2 (screen_image.w) << 26) +
-                ((unsigned long long) power_of_2 (screen_image.h) << 30) +
+                ((unsigned long long) power_of_2(screen_image.w) << 26) +
+                ((unsigned long long) power_of_2(screen_image.h) << 30) +
                 ((unsigned long long) 1 << 34) +
                 ((unsigned long long) 1 << 35);
-            SDL_memcpy (scale_tags_mem, scale_tags, sizeof (scale_tags));
+            SDL_memcpy(scale_tags_mem, scale_tags, sizeof(scale_tags));
             scale_tags_mem[8] =
                 ((unsigned long long) screen_image.w * 16) +
                 (((unsigned long long) screen_image.h * 16) << 16);
@@ -550,7 +549,7 @@
         }
     }
     current->pixels = NULL;
-    if (SDL_getenv ("SDL_FULLSCREEN_UPDATE")) {
+    if (SDL_getenv("SDL_FULLSCREEN_UPDATE")) {
         /* Correct semantics */
         current->flags |= SDL_ASYNCBLIT;
     } else {
@@ -570,32 +569,32 @@
 
 /* We don't support hardware surfaces yet */
 static int
-GS_AllocHWSurface (_THIS, SDL_Surface * surface)
+GS_AllocHWSurface(_THIS, SDL_Surface * surface)
 {
     return (-1);
 }
 static void
-GS_FreeHWSurface (_THIS, SDL_Surface * surface)
+GS_FreeHWSurface(_THIS, SDL_Surface * surface)
 {
     return;
 }
 static int
-GS_LockHWSurface (_THIS, SDL_Surface * surface)
+GS_LockHWSurface(_THIS, SDL_Surface * surface)
 {
     if (surface == this->screen) {
         /* Since mouse motion affects 'pixels', lock it */
-        SDL_LockCursor ();
+        SDL_LockCursor();
 
         /* Make sure any pending DMA has completed */
         if (dma_pending) {
-            ioctl (console_fd, PS2IOC_SENDQCT, 1);
+            ioctl(console_fd, PS2IOC_SENDQCT, 1);
             dma_pending = 0;
         }
 
         /* If the cursor is drawn on the DMA area, remove it */
         if (cursor_drawn) {
             surface->pixels = mapped_mem + surface->offset;
-            SDL_EraseCursorNoLock (this->screen);
+            SDL_EraseCursorNoLock(this->screen);
             cursor_drawn = 0;
         }
 
@@ -603,88 +602,88 @@
         surface->pixels = mapped_mem;
 
         /* We're finished! */
-        SDL_UnlockCursor ();
+        SDL_UnlockCursor();
     }
     return (0);
 }
 static void
-GS_UnlockHWSurface (_THIS, SDL_Surface * surface)
+GS_UnlockHWSurface(_THIS, SDL_Surface * surface)
 {
     if (surface == this->screen) {
         /* Since mouse motion affects 'pixels', lock it */
-        SDL_LockCursor ();
+        SDL_LockCursor();
         surface->pixels = NULL;
-        SDL_UnlockCursor ();
+        SDL_UnlockCursor();
     }
 }
 
 static void
-GS_DMAFullUpdate (_THIS, int numrects, SDL_Rect * rects)
+GS_DMAFullUpdate(_THIS, int numrects, SDL_Rect * rects)
 {
     /* Lock so we aren't interrupted by a mouse update */
-    SDL_LockCursor ();
+    SDL_LockCursor();
 
     /* Make sure any pending DMA has completed */
     if (dma_pending) {
-        ioctl (console_fd, PS2IOC_SENDQCT, 1);
+        ioctl(console_fd, PS2IOC_SENDQCT, 1);
         dma_pending = 0;
     }
 
     /* If the mouse is visible, draw it on the DMA area */
     if ((SDL_cursorstate & CURSOR_VISIBLE) && !cursor_drawn) {
         this->screen->pixels = mapped_mem + this->screen->offset;
-        SDL_DrawCursorNoLock (this->screen);
+        SDL_DrawCursorNoLock(this->screen);
         this->screen->pixels = NULL;
         cursor_drawn = 1;
     }
 
     /* Put the image onto the screen */
-    loadimage_nonblock (console_fd,
-                        &screen_image, screen_image_size,
-                        head_tags_mem, image_tags_mem);
+    loadimage_nonblock(console_fd,
+                       &screen_image, screen_image_size,
+                       head_tags_mem, image_tags_mem);
     if (screen_image.y > 0) {
         /* Need to scale offscreen image to TV output */
-        ioctl (console_fd, PS2IOC_SENDQCT, 1);
+        ioctl(console_fd, PS2IOC_SENDQCT, 1);
         dma_pending = 0;
-        scaleimage_nonblock (console_fd, tex_tags_mem, scale_tags_mem);
+        scaleimage_nonblock(console_fd, tex_tags_mem, scale_tags_mem);
     } else {
         dma_pending = 1;
     }
 
     /* We're finished! */
-    SDL_UnlockCursor ();
+    SDL_UnlockCursor();
 }
 
 static int
-GS_SetColors (_THIS, int firstcolor, int ncolors, SDL_Color * colors)
+GS_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color * colors)
 {
     return (0);
 }
 
 static void
-GS_VideoQuit (_THIS)
+GS_VideoQuit(_THIS)
 {
     /* Close console and input file descriptors */
     if (console_fd > 0) {
         /* Unmap the video framebuffer */
         if (mapped_mem) {
             /* Unmap the video framebuffer */
-            munmap (mapped_mem, mapped_len);
+            munmap(mapped_mem, mapped_len);
             mapped_mem = NULL;
         }
-        close (memory_fd);
+        close(memory_fd);
 
         /* Restore the original video mode */
-        if (GS_InGraphicsMode (this)) {
-            ioctl (console_fd, PS2IOC_SSCREENINFO, &saved_vinfo);
+        if (GS_InGraphicsMode(this)) {
+            ioctl(console_fd, PS2IOC_SSCREENINFO, &saved_vinfo);
         }
 
         /* We're all done with the graphics device */
-        close (console_fd);
+        close(console_fd);
         console_fd = -1;
     }
-    GS_CloseMouse (this);
-    GS_CloseKeyboard (this);
+    GS_CloseMouse(this);
+    GS_CloseKeyboard(this);
 }
 
 /* vi: set ts=4 sw=4 expandtab: */