From d6d3999ccb2cb72d55820770260172eccbbb68d7 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 16 Apr 2012 09:17:34 +0200 Subject: libX11 xserver pixman mesa git update 16 Apr 2012 --- xorg-server/hw/kdrive/ephyr/ephyrglxext.h | 3 +- xorg-server/hw/kdrive/ephyr/ephyrlog.h | 10 ++-- xorg-server/hw/kdrive/ephyr/ephyrproxyext.h | 3 +- xorg-server/hw/kdrive/fake/fakeinit.c | 86 ++++++++++++++--------------- xorg-server/hw/kdrive/fake/kbd.c | 12 ++-- xorg-server/hw/kdrive/fake/mouse.c | 9 ++- xorg-server/hw/kdrive/fake/os.c | 13 ++--- xorg-server/hw/kdrive/fbdev/fbdev.h | 56 +++++++++---------- xorg-server/hw/kdrive/src/fourcc.h | 3 +- 9 files changed, 95 insertions(+), 100 deletions(-) (limited to 'xorg-server/hw/kdrive') diff --git a/xorg-server/hw/kdrive/ephyr/ephyrglxext.h b/xorg-server/hw/kdrive/ephyr/ephyrglxext.h index 22ea605d7..053f8d303 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrglxext.h +++ b/xorg-server/hw/kdrive/ephyr/ephyrglxext.h @@ -29,7 +29,6 @@ #define __EPHYR_GLXEXT_H__ #include -Bool ephyrHijackGLXExtension (void) ; +Bool ephyrHijackGLXExtension(void); #endif /*__EPHYR_GLXEXT_H__*/ - diff --git a/xorg-server/hw/kdrive/ephyr/ephyrlog.h b/xorg-server/hw/kdrive/ephyr/ephyrlog.h index a07a0a097..0da0a2518 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrlog.h +++ b/xorg-server/hw/kdrive/ephyr/ephyrlog.h @@ -35,7 +35,7 @@ /*we are not in debug mode*/ #define EPHYR_LOG(...) #define EPHYR_LOG_ERROR(...) -#endif /*!DEBUG*/ +#endif /*!DEBUG */ #define ERROR_LOG_LEVEL 3 #define INFO_LOG_LEVEL 4 @@ -45,23 +45,23 @@ LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, "in %s:%d:%s: ",\ __FILE__, __LINE__, __func__) ; \ LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, __VA_ARGS__) -#endif /*nomadik_log*/ +#endif /*nomadik_log */ #ifndef EPHYR_LOG_ERROR #define EPHYR_LOG_ERROR(...) \ LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, "Error:in %s:%d:%s: ",\ __FILE__, __LINE__, __func__) ; \ LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, __VA_ARGS__) -#endif /*EPHYR_LOG_ERROR*/ +#endif /*EPHYR_LOG_ERROR */ #ifndef EPHYR_RETURN_IF_FAIL #define EPHYR_RETURN_IF_FAIL(cond) \ if (!(cond)) {EPHYR_LOG_ERROR("condition %s failed\n", #cond);return;} -#endif /*nomadik_return_if_fail*/ +#endif /*nomadik_return_if_fail */ #ifndef EPHYR_RETURN_VAL_IF_FAIL #define EPHYR_RETURN_VAL_IF_FAIL(cond,val) \ if (!(cond)) {EPHYR_LOG_ERROR("condition %s failed\n", #cond);return val;} -#endif /*nomadik_return_val_if_fail*/ +#endif /*nomadik_return_val_if_fail */ #endif /*__EPHYRLOG_H__*/ diff --git a/xorg-server/hw/kdrive/ephyr/ephyrproxyext.h b/xorg-server/hw/kdrive/ephyr/ephyrproxyext.h index e52f8d887..018b69b34 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrproxyext.h +++ b/xorg-server/hw/kdrive/ephyr/ephyrproxyext.h @@ -28,7 +28,6 @@ #ifndef __EPHYRPROXYEXT_H__ #define __EPHYRPROXYEXT_H__ -Bool ephyrProxyExtensionInit (const char *a_extension_name) ; +Bool ephyrProxyExtensionInit(const char *a_extension_name); #endif /*__EPHYRPROXYEXT_H__*/ - diff --git a/xorg-server/hw/kdrive/fake/fakeinit.c b/xorg-server/hw/kdrive/fake/fakeinit.c index e25093fbf..0aae1ddc1 100644 --- a/xorg-server/hw/kdrive/fake/fakeinit.c +++ b/xorg-server/hw/kdrive/fake/fakeinit.c @@ -26,94 +26,94 @@ #include "fake.h" void -InitCard (char *name) +InitCard(char *name) { - KdCardInfoAdd (&fakeFuncs, 0); + KdCardInfoAdd(&fakeFuncs, 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) { KdPointerInfo *pi; KdKeyboardInfo *ki; - pi = KdNewPointer (); + pi = KdNewPointer(); if (!pi) return; pi->driver = &FakePointerDriver; KdAddPointer(pi); - ki = KdNewKeyboard (); + ki = KdNewKeyboard(); if (!ki) return; ki->driver = &FakeKeyboardDriver; KdAddKeyboard(ki); - KdInitInput (); + KdInitInput(); } void -CloseInput (void) +CloseInput(void) { - KdCloseInput (); + KdCloseInput(); } #ifdef DDXBEFORERESET void -ddxBeforeReset (void) +ddxBeforeReset(void) { } #endif void -ddxUseMsg (void) +ddxUseMsg(void) { KdUseMsg(); } int -ddxProcessArgument (int argc, char **argv, int i) +ddxProcessArgument(int argc, char **argv, int i) { - return KdProcessArgument (argc, argv, i); + return KdProcessArgument(argc, argv, i); } void -OsVendorInit (void) +OsVendorInit(void) { - KdOsInit (&FakeOsFuncs); + KdOsInit(&FakeOsFuncs); } -KdCardFuncs fakeFuncs = { - fakeCardInit, /* cardinit */ - fakeScreenInit, /* scrinit */ - fakeInitScreen, /* initScreen */ - fakeFinishInitScreen, /* finishInitScreen */ - fakeCreateResources, /* createRes */ - fakePreserve, /* preserve */ - fakeEnable, /* enable */ - fakeDPMS, /* dpms */ - fakeDisable, /* disable */ - fakeRestore, /* restore */ - fakeScreenFini, /* scrfini */ - fakeCardFini, /* cardfini */ - - 0, /* initCursor */ - 0, /* enableCursor */ - 0, /* disableCursor */ - 0, /* finiCursor */ - 0, /* recolorCursor */ - - 0, /* initAccel */ - 0, /* enableAccel */ - 0, /* disableAccel */ - 0, /* finiAccel */ - - fakeGetColors, /* getColors */ - fakePutColors, /* putColors */ +KdCardFuncs fakeFuncs = { + fakeCardInit, /* cardinit */ + fakeScreenInit, /* scrinit */ + fakeInitScreen, /* initScreen */ + fakeFinishInitScreen, /* finishInitScreen */ + fakeCreateResources, /* createRes */ + fakePreserve, /* preserve */ + fakeEnable, /* enable */ + fakeDPMS, /* dpms */ + fakeDisable, /* disable */ + fakeRestore, /* restore */ + fakeScreenFini, /* scrfini */ + fakeCardFini, /* cardfini */ + + 0, /* initCursor */ + 0, /* enableCursor */ + 0, /* disableCursor */ + 0, /* finiCursor */ + 0, /* recolorCursor */ + + 0, /* initAccel */ + 0, /* enableAccel */ + 0, /* disableAccel */ + 0, /* finiAccel */ + + fakeGetColors, /* getColors */ + fakePutColors, /* putColors */ }; diff --git a/xorg-server/hw/kdrive/fake/kbd.c b/xorg-server/hw/kdrive/fake/kbd.c index 769730d64..83a3c66cf 100644 --- a/xorg-server/hw/kdrive/fake/kbd.c +++ b/xorg-server/hw/kdrive/fake/kbd.c @@ -29,7 +29,7 @@ #define FAKE_WIDTH 2 static Status -FakeKeyboardInit (KdKeyboardInfo *ki) +FakeKeyboardInit(KdKeyboardInfo * ki) { ki->minScanCode = 8; ki->maxScanCode = 255; @@ -37,29 +37,29 @@ FakeKeyboardInit (KdKeyboardInfo *ki) } static Status -FakeKeyboardEnable (KdKeyboardInfo *ki) +FakeKeyboardEnable(KdKeyboardInfo * ki) { return Success; } static void -FakeKeyboardDisable (KdKeyboardInfo *ki) +FakeKeyboardDisable(KdKeyboardInfo * ki) { return; } static void -FakeKeyboardFini (KdKeyboardInfo *ki) +FakeKeyboardFini(KdKeyboardInfo * ki) { } static void -FakeKeyboardLeds (KdKeyboardInfo *ki, int leds) +FakeKeyboardLeds(KdKeyboardInfo * ki, int leds) { } static void -FakeKeyboardBell (KdKeyboardInfo *ki, int volume, int frequency, int duration) +FakeKeyboardBell(KdKeyboardInfo * ki, int volume, int frequency, int duration) { } diff --git a/xorg-server/hw/kdrive/fake/mouse.c b/xorg-server/hw/kdrive/fake/mouse.c index 758f6cd22..bb4c25eeb 100644 --- a/xorg-server/hw/kdrive/fake/mouse.c +++ b/xorg-server/hw/kdrive/fake/mouse.c @@ -33,30 +33,29 @@ #include "kdrive.h" static Status -MouseInit (KdPointerInfo *pi) +MouseInit(KdPointerInfo * pi) { return Success; } static Status -MouseEnable (KdPointerInfo *pi) +MouseEnable(KdPointerInfo * pi) { return Success; } static void -MouseDisable (KdPointerInfo *pi) +MouseDisable(KdPointerInfo * pi) { return; } static void -MouseFini (KdPointerInfo *pi) +MouseFini(KdPointerInfo * pi) { return; } - KdPointerDriver FakePointerDriver = { "fake", MouseInit, diff --git a/xorg-server/hw/kdrive/fake/os.c b/xorg-server/hw/kdrive/fake/os.c index 76cd9e728..01bb37bd5 100644 --- a/xorg-server/hw/kdrive/fake/os.c +++ b/xorg-server/hw/kdrive/fake/os.c @@ -26,33 +26,33 @@ #include "fake.h" static int -FakeInit (void) +FakeInit(void) { return 1; } static void -FakeEnable (void) +FakeEnable(void) { } static Bool -FakeSpecialKey (KeySym sym) +FakeSpecialKey(KeySym sym) { return FALSE; } static void -FakeDisable (void) +FakeDisable(void) { } static void -FakeFini (void) +FakeFini(void) { } -KdOsFuncs FakeOsFuncs = { +KdOsFuncs FakeOsFuncs = { FakeInit, FakeEnable, FakeSpecialKey, @@ -60,4 +60,3 @@ KdOsFuncs FakeOsFuncs = { FakeFini, 0 }; - diff --git a/xorg-server/hw/kdrive/fbdev/fbdev.h b/xorg-server/hw/kdrive/fbdev/fbdev.h index ec53784af..0706f4e11 100644 --- a/xorg-server/hw/kdrive/fbdev/fbdev.h +++ b/xorg-server/hw/kdrive/fbdev/fbdev.h @@ -33,67 +33,67 @@ #endif typedef struct _fbdevPriv { - struct fb_var_screeninfo var; - struct fb_fix_screeninfo fix; - __u16 red[256]; - __u16 green[256]; - __u16 blue[256]; - int fd; - char *fb; - char *fb_base; + struct fb_var_screeninfo var; + struct fb_fix_screeninfo fix; + __u16 red[256]; + __u16 green[256]; + __u16 blue[256]; + int fd; + char *fb; + char *fb_base; } FbdevPriv; typedef struct _fbdevScrPriv { - Rotation randr; - Bool shadow; + Rotation randr; + Bool shadow; } FbdevScrPriv; -extern KdCardFuncs fbdevFuncs; -extern char* fbdevDevicePath; +extern KdCardFuncs fbdevFuncs; +extern char *fbdevDevicePath; Bool -fbdevCardInit (KdCardInfo *card); + fbdevCardInit(KdCardInfo * card); Bool -fbdevScreenInit (KdScreenInfo *screen); + fbdevScreenInit(KdScreenInfo * screen); Bool -fbdevInitScreen (ScreenPtr pScreen); + fbdevInitScreen(ScreenPtr pScreen); Bool -fbdevFinishInitScreen (ScreenPtr pScreen); + fbdevFinishInitScreen(ScreenPtr pScreen); Bool -fbdevCreateResources (ScreenPtr pScreen); + fbdevCreateResources(ScreenPtr pScreen); void -fbdevPreserve (KdCardInfo *card); + fbdevPreserve(KdCardInfo * card); Bool -fbdevEnable (ScreenPtr pScreen); + fbdevEnable(ScreenPtr pScreen); Bool -fbdevDPMS (ScreenPtr pScreen, int mode); + fbdevDPMS(ScreenPtr pScreen, int mode); void -fbdevDisable (ScreenPtr pScreen); + fbdevDisable(ScreenPtr pScreen); void -fbdevRestore (KdCardInfo *card); + fbdevRestore(KdCardInfo * card); void -fbdevScreenFini (KdScreenInfo *screen); + fbdevScreenFini(KdScreenInfo * screen); void -fbdevCardFini (KdCardInfo *card); + fbdevCardFini(KdCardInfo * card); void -fbdevGetColors (ScreenPtr pScreen, int n, xColorItem *pdefs); + fbdevGetColors(ScreenPtr pScreen, int n, xColorItem * pdefs); void -fbdevPutColors (ScreenPtr pScreen, int n, xColorItem *pdefs); + fbdevPutColors(ScreenPtr pScreen, int n, xColorItem * pdefs); Bool -fbdevMapFramebuffer (KdScreenInfo *screen); + fbdevMapFramebuffer(KdScreenInfo * screen); -#endif /* _FBDEV_H_ */ +#endif /* _FBDEV_H_ */ diff --git a/xorg-server/hw/kdrive/src/fourcc.h b/xorg-server/hw/kdrive/src/fourcc.h index 54be7ebe8..534ec452f 100644 --- a/xorg-server/hw/kdrive/src/fourcc.h +++ b/xorg-server/hw/kdrive/src/fourcc.h @@ -69,7 +69,6 @@ XvTopToBottom \ } - #define FOURCC_UYVY 0x59565955 #define XVIMAGE_UYVY \ { \ @@ -130,4 +129,4 @@ XvTopToBottom \ } -#endif /* _XF86_FOURCC_H_ */ +#endif /* _XF86_FOURCC_H_ */ -- cgit v1.2.3