summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2014-04-22 14:05:17 +0200
committerEgbert Eich <eich@freedesktop.org>2014-04-30 17:27:09 +0200
commit00fa895306c14bc320c9eb47368b20e6738ba430 (patch)
tree69af6d6c428d5b6a4cdecd037cb3abfe74330d7a
parenta70eac7e6e5b23fa5cc140c29880a4abdf54adeb (diff)
Clean up namespace in ast_accel.c
- Made sure exported functions have 'AST' in their name. This avoids name space conflicts with the server or other drivers. - Placed declaration of exported functions in a header file. This ensures that changes to the function type or arguments are followed thru everywhere. Signed-off-by: Egbert Eich <eich@suse.de> Acked-by: Y.C. Chen <yc_chen@aspeedtech.com>
-rw-r--r--src/ast.h7
-rw-r--r--src/ast_accel.c1
-rw-r--r--src/ast_driver.c6
3 files changed, 7 insertions, 7 deletions
diff --git a/src/ast.h b/src/ast.h
index 89971d3..a50f182 100644
--- a/src/ast.h
+++ b/src/ast.h
@@ -345,6 +345,13 @@ void ASTDisableHWC(ScrnInfoPtr pScrn);
/* ast_mode.c */
Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
+/* ast_accel.c */
+#ifdef HAVE_XAA_H
+Bool ASTAccelInit(ScreenPtr pScreen);
+#endif
+void ASTDisplayVideo(ScrnInfoPtr pScrn, ASTPortPrivPtr pPriv, RegionPtr clipBoxes, int id);
+
+
/* Include Files */
#include "ast_mode.h"
#include "ast_vgatool.h"
diff --git a/src/ast_accel.c b/src/ast_accel.c
index 6fd0ca9..1217b01 100644
--- a/src/ast_accel.c
+++ b/src/ast_accel.c
@@ -98,7 +98,6 @@ int ASTXAAPatternROP[16]=
};
/* Prototype type declaration */
-Bool ASTAccelInit(ScreenPtr pScreen);
static void ASTSync(ScrnInfoPtr pScrn);
static void ASTSetupForScreenToScreenCopy(ScrnInfoPtr pScrn,
int xdir, int ydir, int rop,
diff --git a/src/ast_driver.c b/src/ast_driver.c
index 8e3a814..3d3f01a 100644
--- a/src/ast_driver.c
+++ b/src/ast_driver.c
@@ -63,10 +63,6 @@ extern Bool ASTUnmapMem(ScrnInfoPtr pScrn);
extern Bool ASTMapMMIO(ScrnInfoPtr pScrn);
extern void ASTUnmapMMIO(ScrnInfoPtr pScrn);
-#ifdef HAVE_XAA_H
-extern Bool ASTAccelInit(ScreenPtr pScreen);
-#endif
-
/* Mandatory functions */
static void ASTIdentify(int flags);
const OptionInfoRec *ASTAvailableOptions(int chipid, int busid);
@@ -2096,8 +2092,6 @@ static int ASTQueryImageAttributes(ScrnInfoPtr pScrn, int id,
return size;
}
-extern void ASTDisplayVideo(ScrnInfoPtr pScrn, ASTPortPrivPtr pPriv, RegionPtr clipBoxes, int id);
-
static int ASTPutImage(ScrnInfoPtr pScrn,
short src_x, short src_y,
short drw_x, short drw_y,