From 0f834b91a4768673833ab4917e87d86c237bb1a6 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 23 Mar 2012 10:05:55 +0100
Subject: libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git
 update 23 Mar 2012

---
 xorg-server/hw/kdrive/fbdev/fbinit.c | 98 ++++++++++++++++++------------------
 1 file changed, 48 insertions(+), 50 deletions(-)

(limited to 'xorg-server/hw/kdrive/fbdev/fbinit.c')

diff --git a/xorg-server/hw/kdrive/fbdev/fbinit.c b/xorg-server/hw/kdrive/fbdev/fbinit.c
index 1d66fce32..d2a14019d 100644
--- a/xorg-server/hw/kdrive/fbdev/fbinit.c
+++ b/xorg-server/hw/kdrive/fbdev/fbinit.c
@@ -26,82 +26,80 @@
 #include <fbdev.h>
 
 void
-InitCard (char *name)
+InitCard(char *name)
 {
-    KdCardInfoAdd (&fbdevFuncs, 0);
+    KdCardInfoAdd(&fbdevFuncs, 0);
 }
 
 void
-InitOutput (ScreenInfo *pScreenInfo, int argc, char **argv)
+InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
 {
-    KdInitOutput (pScreenInfo, argc, argv);
+    KdInitOutput(pScreenInfo, argc, argv);
 }
 
 void
-InitInput (int argc, char **argv)
+InitInput(int argc, char **argv)
 {
-    KdOsAddInputDrivers ();
-    KdInitInput ();
+    KdOsAddInputDrivers();
+    KdInitInput();
 }
 
 void
-CloseInput (void)
+CloseInput(void)
 {
-    KdCloseInput ();
+    KdCloseInput();
 }
 
 void
-ddxUseMsg (void)
+ddxUseMsg(void)
 {
-  KdUseMsg();
-  ErrorF("\nXfbdev Device Usage:\n");
-  ErrorF("-fb path         Framebuffer device to use. Defaults to /dev/fb0\n");
-  ErrorF("\n");
+    KdUseMsg();
+    ErrorF("\nXfbdev Device Usage:\n");
+    ErrorF
+        ("-fb path         Framebuffer device to use. Defaults to /dev/fb0\n");
+    ErrorF("\n");
 }
 
 int
-ddxProcessArgument (int argc, char **argv, int i)
+ddxProcessArgument(int argc, char **argv, int i)
 {
-  if (!strcmp (argv[i], "-fb"))
-    {
-      if (i+1 < argc)
-	{
-	  fbdevDevicePath = argv[i+1];
-	  return 2;
-	}
-      UseMsg();
-      exit(1);
+    if (!strcmp(argv[i], "-fb")) {
+        if (i + 1 < argc) {
+            fbdevDevicePath = argv[i + 1];
+            return 2;
+        }
+        UseMsg();
+        exit(1);
     }
 
-  return KdProcessArgument (argc, argv, i);
+    return KdProcessArgument(argc, argv, i);
 }
 
+KdCardFuncs fbdevFuncs = {
+    fbdevCardInit,              /* cardinit */
+    fbdevScreenInit,            /* scrinit */
+    fbdevInitScreen,            /* initScreen */
+    fbdevFinishInitScreen,      /* finishInitScreen */
+    fbdevCreateResources,       /* createRes */
+    fbdevPreserve,              /* preserve */
+    fbdevEnable,                /* enable */
+    fbdevDPMS,                  /* dpms */
+    fbdevDisable,               /* disable */
+    fbdevRestore,               /* restore */
+    fbdevScreenFini,            /* scrfini */
+    fbdevCardFini,              /* cardfini */
 
-KdCardFuncs	fbdevFuncs = {
-    fbdevCardInit,	    /* cardinit */
-    fbdevScreenInit,	    /* scrinit */
-    fbdevInitScreen,	    /* initScreen */
-    fbdevFinishInitScreen,  /* finishInitScreen */
-    fbdevCreateResources,   /* createRes */
-    fbdevPreserve,	    /* preserve */
-    fbdevEnable,	    /* enable */
-    fbdevDPMS,		    /* dpms */
-    fbdevDisable,	    /* disable */
-    fbdevRestore,	    /* restore */
-    fbdevScreenFini,	    /* scrfini */
-    fbdevCardFini,	    /* cardfini */
+    0,                          /* initCursor */
+    0,                          /* enableCursor */
+    0,                          /* disableCursor */
+    0,                          /* finiCursor */
+    0,                          /* recolorCursor */
 
-    0,			    /* initCursor */
-    0,			    /* enableCursor */
-    0,			    /* disableCursor */
-    0,			    /* finiCursor */
-    0,			    /* recolorCursor */
+    0,                          /* initAccel */
+    0,                          /* enableAccel */
+    0,                          /* disableAccel */
+    0,                          /* finiAccel */
 
-    0,			    /* initAccel */
-    0,			    /* enableAccel */
-    0,			    /* disableAccel */
-    0,			    /* finiAccel */
-
-    fbdevGetColors,    	    /* getColors */
-    fbdevPutColors,	    /* putColors */
+    fbdevGetColors,             /* getColors */
+    fbdevPutColors,             /* putColors */
 };
-- 
cgit v1.2.3