summaryrefslogtreecommitdiff
path: root/src/smi.h
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-13 04:20:20 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-13 04:20:20 -0200
commit695a6066cfe7ad0e568edc596b8704bb9bf8754f (patch)
tree2b71110c23ab5af3aed913e4aa965cecb6c6a633 /src/smi.h
parent191cbd3f8419cc5b428f262607d7a8594e574f67 (diff)
Janitor/maintenance patches.
o Define HAVE_XMODES in config.h. o Correct the LEAVE() macro declaration when SMI_DEBUG is defined. o Remove prototype for SMI_DGAInit() if HAVE_XMODES is not defined. o Properly scale value read from sm501 CURRENT_CLOCK register, to print an appropriate message on startup.
Diffstat (limited to 'src/smi.h')
-rw-r--r--src/smi.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/smi.h b/src/smi.h
index 5305e54..c31426c 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -275,7 +275,7 @@ extern int smi_indent;
# define VERBLEV 1
# define ENTER() xf86ErrorFVerb(VERBLEV, "%*c %s\n",\
smi_indent++, '>', __FUNCTION__)
-# define LEAVE(value) \
+# define LEAVE(...) \
do { \
xf86ErrorFVerb(VERBLEV, "%*c %s\n", \
--smi_indent, '<', __FUNCTION__); \
@@ -373,11 +373,6 @@ void SMI_LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies,
xf86MonPtr SMI_ddc1(ScrnInfoPtr pScrn);
void SMI_PrintRegs(ScrnInfoPtr pScrn);
-#ifndef HAVE_XMODES
-/* smi_dga.c */
-Bool SMI_DGAInit(ScreenPtr pScrn);
-#endif
-
/* smi_video.c */
void SMI_InitVideo(ScreenPtr pScreen);
CARD32 SMI_AllocateMemory(ScrnInfoPtr pScrn, void **mem_struct, int size);