[pkg-fso-commits] [SCM] xf86-video-glamo, SMedia Glamo video driver for X.Org branch, master, updated. upstream/0.0.0+20090224.git703acea1-21-g98c012f

[Lars-Peter Clausen]

The following commit has been merged in the master branch:
commit b01702ae62c21326db8abae546794605e9084749
Author: Lars-Peter Clausen <lars at metafoo.de>
Date:   Sun Jul 5 13:08:20 2009 +0200

    s,HAS_ENGINE_IOCTLS,HAVE_ENGINE_IOCTLS,g

diff --git a/src/glamo-driver.c b/src/glamo-driver.c
index 6d0c6a4..79487dd 100644
--- a/src/glamo-driver.c
+++ b/src/glamo-driver.c
@@ -743,7 +743,7 @@ fail2:
 static void
 GlamoSaveHW(ScrnInfoPtr pScrn) {
     GlamoPtr pGlamo = GlamoPTR(pScrn);
-#ifndef HAS_ENGINE_IOCTLS
+#ifndef HAVE_ENGINE_IOCTLS
     volatile char *mmio = pGlamo->reg_base;
 #endif
 #if JBT6K74_SET_STATE
@@ -760,7 +760,7 @@ GlamoSaveHW(ScrnInfoPtr pScrn) {
     }
 #endif
 
-#ifndef HAS_ENGINE_IOCTLS
+#ifndef HAVE_ENGINE_IOCTLS
     pGlamo->saved_clock_2d = MMIO_IN16(mmio, GLAMO_REG_CLOCK_2D);
     pGlamo->saved_clock_isp = MMIO_IN16(mmio, GLAMO_REG_CLOCK_ISP);
     pGlamo->saved_clock_gen5_1 = MMIO_IN16(mmio, GLAMO_REG_CLOCK_GEN5_1);
@@ -778,7 +778,7 @@ GlamoSaveHW(ScrnInfoPtr pScrn) {
 static void
 GlamoRestoreHW(ScrnInfoPtr pScrn) {
     GlamoPtr pGlamo = GlamoPTR(pScrn);
-#ifndef HAS_ENGINE_IOCTLS
+#ifndef HAVE_ENGINE_IOCTLS
     volatile char *mmio = pGlamo->reg_base;
 #endif
 #ifdef JBT6K74_SET_STATE
@@ -791,7 +791,7 @@ GlamoRestoreHW(ScrnInfoPtr pScrn) {
                    strerror(errno));
     }
 
-#ifndef HAS_ENGINE_IOCTLS
+#ifndef HAVE_ENGINE_IOCTLS
     MMIOSetBitMask(mmio, GLAMO_REG_CLOCK_2D,
         GLAMO_CLOCK_2D_EN_M6CLK | GLAMO_CLOCK_2D_EN_M7CLK |
         GLAMO_CLOCK_2D_EN_GCLK | GLAMO_CLOCK_2D_DG_M7CLK |
diff --git a/src/glamo-engine.c b/src/glamo-engine.c
index 6bb4da5..a94d362 100644
--- a/src/glamo-engine.c
+++ b/src/glamo-engine.c
@@ -26,7 +26,7 @@
 #include "glamo-engine.h"
 #include "glamo-regs.h"
 
-#ifdef HAS_ENGINE_IOCTLS
+#ifdef HAVE_ENGINE_IOCTLS
 #   include <linux/types.h>
 #   include <sys/ioctl.h>
 #   include <errno.h>
@@ -35,7 +35,7 @@
 void
 GLAMOEngineReset(GlamoPtr pGlamo, enum GLAMOEngine engine)
 {
-#ifdef HAS_ENGINE_IOCTLS
+#ifdef HAVE_ENGINE_IOCTLS
     if (ioctl(pGlamo->fb_fd, GLAMOFB_ENGINE_RESET, (void*)((__u32)engine)) == -1)
         xf86DrvMsg(xf86Screens[pGlamo->pScreen->myNum]->scrnIndex, X_ERROR,
                   "Framebuffer ioctl GLAMOFB_ENGINE_RESET failed: %s\n",
@@ -75,7 +75,7 @@ GLAMOEngineReset(GlamoPtr pGlamo, enum GLAMOEngine engine)
 void
 GLAMOEngineDisable(GlamoPtr pGlamo, enum GLAMOEngine engine)
 {
-#ifdef HAS_ENGINE_IOCTLS
+#ifdef HAVE_ENGINE_IOCTLS
     if (ioctl(pGlamo->fb_fd, GLAMOFB_ENGINE_DISABLE, (void*)((__u32)engine)) == -1)
         xf86DrvMsg(xf86Screens[pGlamo->pScreen->myNum]->scrnIndex, X_ERROR,
                   "Framebuffer ioctl GLAMOFB_ENGINE_DISABLE failed: %s\n",
@@ -133,7 +133,7 @@ GLAMOEngineDisable(GlamoPtr pGlamo, enum GLAMOEngine engine)
 void
 GLAMOEngineEnable(GlamoPtr pGlamo, enum GLAMOEngine engine)
 {
-#ifdef HAS_ENGINE_IOCTLS
+#ifdef HAVE_ENGINE_IOCTLS
     if (ioctl(pGlamo->fb_fd, GLAMOFB_ENGINE_ENABLE, (void*)((__u32)engine)) == -1)
         xf86DrvMsg(xf86Screens[pGlamo->pScreen->myNum]->scrnIndex, X_ERROR,
                   "Framebuffer ioctl GLAMOFB_ENGINE_ENABLE failed: %s\n",
diff --git a/src/glamo-engine.h b/src/glamo-engine.h
index efba199..efc42fc 100644
--- a/src/glamo-engine.h
+++ b/src/glamo-engine.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#ifdef HAS_ENGINE_IOCTLS
+#ifdef HAVE_ENGINE_IOCTLS
 #include <linux/glamofb.h>
 
 typedef GLAMOEngine glamo_engine;
@@ -36,7 +36,7 @@ enum GLAMOEngine {
 	GLAMO_ENGINE_ALL,
 	NB_GLAMO_ENGINES /*should be the last entry*/
 };
-#endif /* #ifdef HAS_ENGINE_IOCTLS */
+#endif /* #ifdef HAVE_ENGINE_IOCTLS */
 
 void
 GLAMOEngineEnable(GlamoPtr pGlamo, enum GLAMOEngine engine);
diff --git a/src/glamo-regs.h b/src/glamo-regs.h
index 6023dba..ae6ddf7 100644
--- a/src/glamo-regs.h
+++ b/src/glamo-regs.h
@@ -727,7 +727,7 @@ enum glamo_register_mpeg {
       GLAMO_REG_MPEG_DEC_RB1          = REG_MPEG(0xcc),
 };
 
-#endif /* #ifndef HAS_ENGINE_IOCTLS */
+#endif /* #ifndef HAVE_ENGINE_IOCTLS */
 
 #define REG_CMDQ(x)           (GLAMO_REGOFS_CMDQUEUE+(x))
 
diff --git a/src/glamo.h b/src/glamo.h
index 704862f..ddccdfa 100644
--- a/src/glamo.h
+++ b/src/glamo.h
@@ -38,7 +38,7 @@
 #include "exa.h"
 #include <linux/fb.h>
 
-#define HAS_ENGINE_IOCTLS
+#define HAVE_ENGINE_IOCTLS
 
 #define GLAMO_REG_BASE(c)		((c)->attr.address[0])
 #define GLAMO_REG_SIZE(c)		(0x2400)
@@ -120,7 +120,7 @@ typedef struct {
 	unsigned char *fbmem;
 	int fboff;
 
-#ifndef HAS_ENGINE_IOCTLS
+#ifndef HAVE_ENGINE_IOCTLS
     /* save hardware registers */
     short saved_clock_2d;
     short saved_clock_isp;

-- 
xf86-video-glamo, SMedia Glamo video driver for X.Org