diff options
43 files changed, 172 insertions, 283 deletions
diff --git a/src/atiaccel.h b/src/atiaccel.h index 74cbdec..68fb607 100644 --- a/src/atiaccel.h +++ b/src/atiaccel.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiaccel.h,v 1.5 2003/04/23 21:51:27 tsi Exp $ */ /* - * Copyright 2001 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,17 +25,12 @@ #define ___ATIACCEL_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" #include "xf86fbman.h" -extern Bool ATIInitializeAcceleration FunctionPrototype((ScreenPtr, - ScrnInfoPtr, - ATIPtr)); +extern Bool ATIInitializeAcceleration(ScreenPtr, ScrnInfoPtr, ATIPtr); -extern FBLinearPtr ATIResizeOffscreenLinear FunctionPrototype((ScreenPtr, - FBLinearPtr, - int)); +extern FBLinearPtr ATIResizeOffscreenLinear(ScreenPtr, FBLinearPtr, int); #endif /* ___ATIACCEL_H___ */ diff --git a/src/atiadjust.h b/src/atiadjust.h index 0ac15ae..7a3db02 100644 --- a/src/atiadjust.h +++ b/src/atiadjust.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.h,v 1.8 2003/01/01 19:16:30 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,9 +25,8 @@ #define ___ATIADJUST_H___ 1 #include "atipriv.h" -#include "atiproto.h" -extern void ATIAdjustPreInit FunctionPrototype((ATIPtr)); -extern void ATIAdjustFrame FunctionPrototype((int, int, int, int)); +extern void ATIAdjustPreInit(ATIPtr); +extern void ATIAdjustFrame(int, int, int, int); #endif /* ___ATIADJUST_H___ */ diff --git a/src/atibank.h b/src/atibank.h index 43a91ac..559ce19 100644 --- a/src/atibank.h +++ b/src/atibank.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atibank.h,v 1.8 2003/01/01 19:16:30 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,7 +25,6 @@ #define ___ATIBANK_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "mibank.h" @@ -74,7 +73,7 @@ extern miBankProc ATIMach64SetReadPlanar, * used before ATIScreenInit() is called. */ -typedef void ATIBankProc FunctionPrototype((ATIPtr, unsigned int)); +typedef void ATIBankProc(ATIPtr, unsigned int); typedef ATIBankProc *ATIBankProcPtr; extern ATIBankProc ATIV3SetBank, diff --git a/src/atibus.h b/src/atibus.h index c5f35e0..d13a6fd 100644 --- a/src/atibus.h +++ b/src/atibus.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atibus.h,v 1.11 2003/01/01 19:16:30 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -31,7 +31,6 @@ #define ___ATIBUS_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" @@ -53,7 +52,6 @@ typedef enum extern const char *ATIBusNames[]; -extern int ATIClaimBusSlot FunctionPrototype((DriverPtr, int, GDevPtr, Bool, - ATIPtr)); +extern int ATIClaimBusSlot(DriverPtr, int, GDevPtr, Bool, ATIPtr); #endif /* ___ATIBUS_H___ */ diff --git a/src/atichip.h b/src/atichip.h index 40841e1..e605b91 100644 --- a/src/atichip.h +++ b/src/atichip.h @@ -134,13 +134,12 @@ extern const char *ATIFoundryNames[]; #ifndef AVOID_CPIO -extern void ATIMach32ChipID FunctionPrototype((ATIPtr)); +extern void ATIMach32ChipID(ATIPtr); #endif /* AVOID_CPIO */ -extern void ATIMach64ChipID FunctionPrototype((ATIPtr, const CARD16)); -extern ATIChipType ATIChipID FunctionPrototype((const CARD16, - const CARD8)); +extern void ATIMach64ChipID(ATIPtr, const CARD16); +extern ATIChipType ATIChipID(const CARD16, const CARD8); #define OldChipID(_1, _0) \ (SetBits(_0 - 'A', CHIP_CODE_0) | SetBits(_1 - 'A', CHIP_CODE_1)) diff --git a/src/aticlock.h b/src/aticlock.h index 641ba69..594a591 100644 --- a/src/aticlock.h +++ b/src/aticlock.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticlock.h,v 1.8 2003/01/01 19:16:31 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,7 +25,6 @@ #define ___ATICLOCK_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" @@ -75,12 +74,9 @@ typedef struct } ClockRec, *ClockPtr; extern ClockRec ATIClockDescriptors[]; -extern void ATIClockPreInit FunctionPrototype((ScrnInfoPtr, ATIPtr, GDevPtr, - ClockRangePtr)); -extern void ATIClockSave FunctionPrototype((ScrnInfoPtr, ATIPtr, - ATIHWPtr)); -extern Bool ATIClockCalculate FunctionPrototype((int, ATIPtr, ATIHWPtr, - DisplayModePtr)); -extern void ATIClockSet FunctionPrototype((ATIPtr, ATIHWPtr)); +extern void ATIClockPreInit(ScrnInfoPtr, ATIPtr, GDevPtr, ClockRangePtr); +extern void ATIClockSave(ScrnInfoPtr, ATIPtr, ATIHWPtr); +extern Bool ATIClockCalculate(int, ATIPtr, ATIHWPtr, DisplayModePtr); +extern void ATIClockSet(ATIPtr, ATIHWPtr); #endif /* ___ATICLOCK_H___ */ diff --git a/src/aticonfig.h b/src/aticonfig.h index bf9c24b..f0b44bc 100644 --- a/src/aticonfig.h +++ b/src/aticonfig.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticonfig.h,v 1.5 2003/01/01 19:16:31 tsi Exp $ */ /* - * Copyright 2000 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,10 +25,9 @@ #define ___ATICONFIG_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" -extern void ATIProcessOptions FunctionPrototype((ScrnInfoPtr, ATIPtr)); +extern void ATIProcessOptions(ScrnInfoPtr, ATIPtr); #endif /* ___ATICONFIG_H___ */ diff --git a/src/aticonsole.h b/src/aticonsole.h index 8157d83..55702e0 100644 --- a/src/aticonsole.h +++ b/src/aticonsole.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.h,v 1.9 2003/01/01 19:16:31 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,22 +25,20 @@ #define ___ATICONSOLE_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" -extern Bool ATISaveScreen FunctionPrototype((ScreenPtr, int)); -extern void ATISetDPMSMode FunctionPrototype((ScrnInfoPtr, int, int)); +extern Bool ATISaveScreen(ScreenPtr, int); +extern void ATISetDPMSMode(ScrnInfoPtr, int, int); -extern Bool ATIEnterGraphics FunctionPrototype((ScreenPtr, ScrnInfoPtr, - ATIPtr)); -extern void ATILeaveGraphics FunctionPrototype((ScrnInfoPtr, ATIPtr)); +extern Bool ATIEnterGraphics(ScreenPtr, ScrnInfoPtr, ATIPtr); +extern void ATILeaveGraphics(ScrnInfoPtr, ATIPtr); -extern Bool ATISwitchMode FunctionPrototype((int, DisplayModePtr, int)); +extern Bool ATISwitchMode(int, DisplayModePtr, int); -extern Bool ATIEnterVT FunctionPrototype((int, int)); -extern void ATILeaveVT FunctionPrototype((int, int)); +extern Bool ATIEnterVT(int, int); +extern void ATILeaveVT(int, int); -extern void ATIFreeScreen FunctionPrototype((int, int)); +extern void ATIFreeScreen(int, int); #endif /* ___ATICONSOLE_H___ */ diff --git a/src/aticursor.h b/src/aticursor.h index 9f8790d..5f7902c 100644 --- a/src/aticursor.h +++ b/src/aticursor.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticursor.h,v 1.3 2003/01/01 19:16:31 tsi Exp $ */ /* - * Copyright 2001 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,7 +25,6 @@ #define ___ATICURSOR_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "screenint.h" @@ -39,6 +38,6 @@ typedef enum ATI_CURSOR_DAC /* Hardware cursor provided by RAMDAC */ } ATICursorType; -extern Bool ATIInitializeCursor FunctionPrototype((ScreenPtr, ATIPtr)); +extern Bool ATIInitializeCursor(ScreenPtr, ATIPtr); #endif /* ___ATICURSOR_H___ */ diff --git a/src/atidac.h b/src/atidac.h index fc3b758..e2f7b89 100644 --- a/src/atidac.h +++ b/src/atidac.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidac.h,v 1.15 2003/01/01 19:16:31 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -32,7 +32,6 @@ #include "aticrtc.h" #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" @@ -86,18 +85,16 @@ extern const SymTabRec ATIDACDescriptors[]; (void)inb(pATI->CPIO_DAC_WAIT); \ } while (0) - extern void ATISetDACIOPorts FunctionPrototype((ATIPtr, ATICRTCType)); + extern void ATISetDACIOPorts(ATIPtr, ATICRTCType); #endif /* AVOID_CPIO */ -extern CARD8 ATIGetDACCmdReg FunctionPrototype((ATIPtr)); +extern CARD8 ATIGetDACCmdReg(ATIPtr); -extern void ATIDACPreInit FunctionPrototype((ScrnInfoPtr, ATIPtr, - ATIHWPtr)); -extern void ATIDACSave FunctionPrototype((ATIPtr, ATIHWPtr)); -extern void ATIDACSet FunctionPrototype((ATIPtr, ATIHWPtr)); +extern void ATIDACPreInit(ScrnInfoPtr, ATIPtr, ATIHWPtr); +extern void ATIDACSave(ATIPtr, ATIHWPtr); +extern void ATIDACSet(ATIPtr, ATIHWPtr); -extern void ATILoadPalette FunctionPrototype((ScrnInfoPtr, int, int *, - LOCO *, VisualPtr)); +extern void ATILoadPalette(ScrnInfoPtr, int, int *, LOCO *, VisualPtr); #endif /* ___ATIDAC_H___ */ diff --git a/src/atidga.h b/src/atidga.h index 96664d9..78e1565 100644 --- a/src/atidga.h +++ b/src/atidga.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidga.h,v 1.7 2003/04/23 21:51:28 tsi Exp $ */ /* - * Copyright 2000 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -27,11 +27,10 @@ #ifndef AVOID_DGA #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" -extern Bool ATIDGAInit FunctionPrototype((ScreenPtr, ScrnInfoPtr, ATIPtr)); +extern Bool ATIDGAInit(ScreenPtr, ScrnInfoPtr, ATIPtr); #endif /* AVOID_DGA */ diff --git a/src/atidri.h b/src/atidri.h index a0319a6..77622bb 100644 --- a/src/atidri.h +++ b/src/atidri.h @@ -31,8 +31,6 @@ #ifndef __ATIDRI_H__ #define __ATIDRI_H__ 1 -#include "atiproto.h" - /* DRI driver defaults */ #define ATI_DEFAULT_AGP_SIZE 8 /* MB (must be a power of 2 and > 4MB) */ #define ATI_DEFAULT_AGP_MODE 1 @@ -40,8 +38,8 @@ #define ATI_AGP_MAX_MODE 2 -extern Bool ATIDRIScreenInit FunctionPrototype((ScreenPtr)); -extern Bool ATIDRIFinishScreenInit FunctionPrototype((ScreenPtr)); -extern void ATIDRICloseScreen FunctionPrototype((ScreenPtr)); +extern Bool ATIDRIScreenInit(ScreenPtr); +extern Bool ATIDRIFinishScreenInit(ScreenPtr); +extern void ATIDRICloseScreen(ScreenPtr); #endif /* __ATIDRI_H__ */ diff --git a/src/atidripriv.h b/src/atidripriv.h index b16b14e..af42d6e 100644 --- a/src/atidripriv.h +++ b/src/atidripriv.h @@ -40,8 +40,6 @@ #include "GL/glxint.h" #include "GL/glxtokens.h" -#include "atiproto.h" - #define ATI_MAX_DRAWABLES 256 typedef struct { @@ -54,6 +52,6 @@ typedef struct { int dummy; } ATIDRIContextRec, *ATIDRIContextPtr; -extern void GlxSetVisualConfigs FunctionPrototype((int, __GLXvisualConfig *, void **)); +extern void GlxSetVisualConfigs(int, __GLXvisualConfig *, void **); #endif /* __ATIDRIPRIV_H__ */ diff --git a/src/atidsp.h b/src/atidsp.h index d6881cf..aa8cbe2 100644 --- a/src/atidsp.h +++ b/src/atidsp.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atidsp.h,v 1.10 2003/01/01 19:16:32 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,14 +25,12 @@ #define ___ATIDSP_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" -extern Bool ATIDSPPreInit FunctionPrototype((int, ATIPtr)); -extern void ATIDSPSave FunctionPrototype((ATIPtr, ATIHWPtr)); -extern void ATIDSPCalculate FunctionPrototype((ATIPtr, ATIHWPtr, - DisplayModePtr)); -extern void ATIDSPSet FunctionPrototype((ATIPtr, ATIHWPtr)); +extern Bool ATIDSPPreInit(int, ATIPtr); +extern void ATIDSPSave(ATIPtr, ATIHWPtr); +extern void ATIDSPCalculate(ATIPtr, ATIHWPtr, DisplayModePtr); +extern void ATIDSPSet(ATIPtr, ATIHWPtr); #endif /* ___ATIDSP_H___ */ diff --git a/src/atifillin.h b/src/atifillin.h index 824b791..dafd458 100644 --- a/src/atifillin.h +++ b/src/atifillin.h @@ -17,6 +17,6 @@ #include "atiadjust.h" #include "ativalid.h" -extern void ATIFillInScreenInfo FunctionPrototype((ScrnInfoPtr)); +extern void ATIFillInScreenInfo(ScrnInfoPtr); #endif diff --git a/src/atii2c.h b/src/atii2c.h index ddc0d97..59125bf 100644 --- a/src/atii2c.h +++ b/src/atii2c.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atii2c.h,v 1.1 2003/07/24 22:08:28 tsi Exp $ */ /* - * Copyright 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,7 +25,6 @@ #define ___ATII2C_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" @@ -36,15 +35,15 @@ typedef struct _ATII2CRec ATII2CRec, *ATII2CPtr; struct _ATII2CRec { ATIPtr pATI; - void (*I2CSetBits) FunctionPrototype((ATII2CPtr, ATIPtr, CARD32)); - CARD32 (*I2CGetBits) FunctionPrototype((ATIPtr)); + void (*I2CSetBits) (ATII2CPtr, ATIPtr, CARD32); + CARD32 (*I2CGetBits) (ATIPtr); CARD32 SCLDir, SCLGet, SCLSet; CARD32 SDADir, SDAGet, SDASet; CARD32 I2CCur; }; -extern void ATII2CPreInit FunctionPrototype((ScrnInfoPtr, ATIPtr)); -extern I2CBusPtr ATICreateI2CBusRec FunctionPrototype((int, ATIPtr, char *)); -extern void ATII2CFreeScreen FunctionPrototype((int)); +extern void ATII2CPreInit(ScrnInfoPtr, ATIPtr); +extern I2CBusPtr ATICreateI2CBusRec(int, ATIPtr, char *); +extern void ATII2CFreeScreen(int); #endif /* ___ATII2C_H___ */ diff --git a/src/atiident.h b/src/atiident.h index 74677c5..0345185 100644 --- a/src/atiident.h +++ b/src/atiident.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiident.h,v 1.10 2003/01/01 19:16:32 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -24,8 +24,6 @@ #ifndef ___ATIIDENT_H___ #define ___ATIIDENT_H___ 1 -#include "atiproto.h" - typedef enum { ATI_CHIPSET_ATI, @@ -49,7 +47,7 @@ typedef enum extern const char *ATIChipsetNames[]; -extern void ATIIdentify FunctionPrototype((int)); -extern int ATIIdentProbe FunctionPrototype((const char *)); +extern void ATIIdentify(int); +extern int ATIIdentProbe(const char *); #endif /* ___ATIIDENT_H___ */ diff --git a/src/atiload.h b/src/atiload.h index 3827223..96606e3 100644 --- a/src/atiload.h +++ b/src/atiload.h @@ -30,7 +30,6 @@ #ifdef XFree86LOADER #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" @@ -51,9 +50,8 @@ extern const char *ATIint10Symbols[], *ATIddcSymbols[], *ATIvbeSymbols[], *ATIfbSymbols[], *ATIshadowfbSymbols[], *ATIxaaSymbols[], *ATIramdacSymbols[], *ATIi2cSymbols[]; -extern pointer ATILoadModule FunctionPrototype((ScrnInfoPtr, const char *, - const char **)); -extern pointer ATILoadModules FunctionPrototype((ScrnInfoPtr, ATIPtr)); +extern pointer ATILoadModule(ScrnInfoPtr, const char *, const char **); +extern pointer ATILoadModules(ScrnInfoPtr, ATIPtr); #else /* XFree86LOADER */ diff --git a/src/atilock.h b/src/atilock.h index 9b94943..f07f748 100644 --- a/src/atilock.h +++ b/src/atilock.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.h,v 1.5 2003/01/01 19:16:32 tsi Exp $ */ /* - * Copyright 1999 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,9 +25,8 @@ #define ___ATILOCK_H___ 1 #include "atipriv.h" -#include "atiproto.h" -extern void ATIUnlock FunctionPrototype((ATIPtr)); -extern void ATILock FunctionPrototype((ATIPtr)); +extern void ATIUnlock(ATIPtr); +extern void ATILock(ATIPtr); #endif /* ___ATILOCK_H___ */ diff --git a/src/atimach64.h b/src/atimach64.h index dd2e9a9..fdb5795 100644 --- a/src/atimach64.h +++ b/src/atimach64.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.h,v 1.17 2003/04/23 21:51:28 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,16 +25,13 @@ #define ___ATIMACH64_H___ 1 #include "atipriv.h" -#include "atiproto.h" -extern void ATIMach64PreInit FunctionPrototype((ScrnInfoPtr, ATIPtr, - ATIHWPtr)); -extern void ATIMach64Save FunctionPrototype((ATIPtr, ATIHWPtr)); -extern void ATIMach64Calculate FunctionPrototype((ATIPtr, ATIHWPtr, - DisplayModePtr)); -extern void ATIMach64Set FunctionPrototype((ATIPtr, ATIHWPtr)); +extern void ATIMach64PreInit(ScrnInfoPtr, ATIPtr, ATIHWPtr); +extern void ATIMach64Save(ATIPtr, ATIHWPtr); +extern void ATIMach64Calculate(ATIPtr, ATIHWPtr, DisplayModePtr); +extern void ATIMach64Set(ATIPtr, ATIHWPtr); -extern void ATIMach64SaveScreen FunctionPrototype((ATIPtr, int)); -extern void ATIMach64SetDPMSMode FunctionPrototype((ScrnInfoPtr, ATIPtr, int)); +extern void ATIMach64SaveScreen(ATIPtr, int); +extern void ATIMach64SetDPMSMode(ScrnInfoPtr, ATIPtr, int); #endif /* ___ATIMACH64_H___ */ diff --git a/src/atimach64accel.h b/src/atimach64accel.h index 88f90a0..a1b9426 100644 --- a/src/atimach64accel.h +++ b/src/atimach64accel.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64accel.h,v 1.1 2003/04/23 21:51:29 tsi Exp $ */ /* - * Copyright 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,14 +25,13 @@ #define ___ATIMACH64ACCEL_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xaa.h" #define ATIMach64MaxX 8191 #define ATIMach64MaxY 32767 -extern int ATIMach64AccelInit FunctionPrototype((ATIPtr, XAAInfoRecPtr)); -extern void ATIMach64Sync FunctionPrototype((ScrnInfoPtr)); +extern int ATIMach64AccelInit(ATIPtr, XAAInfoRecPtr); +extern void ATIMach64Sync(ScrnInfoPtr); #endif /* ___ATIMACH64ACCEL_H___ */ diff --git a/src/atimach64cursor.h b/src/atimach64cursor.h index 6439f13..dcea5ca 100644 --- a/src/atimach64cursor.h +++ b/src/atimach64cursor.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64cursor.h,v 1.1 2003/04/23 21:51:29 tsi Exp $ */ /* - * Copyright 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -24,10 +24,8 @@ #ifndef ___ATIMACH64CURSOR_H___ #define ___ATIMACH64CURSOR_H___ 1 -#include "atiproto.h" - #include "xf86Cursor.h" -extern Bool ATIMach64CursorInit FunctionPrototype((xf86CursorInfoPtr)); +extern Bool ATIMach64CursorInit(xf86CursorInfoPtr); #endif /* ___ATIMACH64CURSOR_H___ */ diff --git a/src/atimach64i2c.h b/src/atimach64i2c.h index 9930952..33ad75a 100644 --- a/src/atimach64i2c.h +++ b/src/atimach64i2c.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64i2c.h,v 1.1 2003/07/24 22:08:28 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,10 +25,9 @@ #define ___ATIMACH64I2C_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" -extern void ATIMach64I2CPreInit FunctionPrototype((ScrnInfoPtr, ATIPtr)); +extern void ATIMach64I2CPreInit(ScrnInfoPtr, ATIPtr); #endif /* ___ATIMACH64I2C_H___ */ diff --git a/src/atimach64io.h b/src/atimach64io.h index 01cb32d..9dbf244 100644 --- a/src/atimach64io.h +++ b/src/atimach64io.h @@ -145,7 +145,7 @@ #endif /* AVOID_CPIO */ -extern void ATIMach64PollEngineStatus FunctionPrototype((ATIPtr)); +extern void ATIMach64PollEngineStatus(ATIPtr); /* * MMIO cache definitions. @@ -303,8 +303,7 @@ do } \ } while (0) -extern void ATIMach64AccessPLLReg FunctionPrototype((ATIPtr, const CARD8, - const Bool)); +extern void ATIMach64AccessPLLReg(ATIPtr, const CARD8, const Bool); #define ATIMach64GetPLLReg(_Index) \ ( \ diff --git a/src/atimach64xv.c b/src/atimach64xv.c index d45e306..7b109f6 100644 --- a/src/atimach64xv.c +++ b/src/atimach64xv.c @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64xv.c,v 1.6 2003/07/19 15:26:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64xv.c,v 1.7 2003/11/10 18:22:18 tsi Exp $ */ /* - * Copyright 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -150,8 +150,8 @@ typedef struct _ATIMach64Attribute { Atom AttributeID; INT32 MaxValue; /* ... for the hardware */ - void (*SetAttribute) NestedPrototype((ATIPtr, INT32)); - INT32 (*GetAttribute) NestedPrototype((ATIPtr)); + void (*SetAttribute) (ATIPtr, INT32); + INT32 (*GetAttribute) (ATIPtr); } ATIMach64AttributeRec, *ATIMach64AttributePtr; /* Functions to get/set XVideo adaptor attributes */ @@ -1438,7 +1438,7 @@ ATIMach64XVInitialiseAdaptor pAdaptor->PutImage = ATIMach64PutImage; pAdaptor->QueryImageAttributes = ATIMach64QueryImageAttributes; - REGION_INIT(pScreen, &pATI->VideoClip, NullBox, 0); + REGION_NULL(pScreen, &pATI->VideoClip); pATI->ActiveSurface = FALSE; if (ATIMach64XVAtomGeneration != serverGeneration) diff --git a/src/atimach64xv.h b/src/atimach64xv.h index 8d5c07c..8f5257c 100644 --- a/src/atimach64xv.h +++ b/src/atimach64xv.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64xv.h,v 1.1 2003/04/23 21:51:29 tsi Exp $ */ /* - * Copyright 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,16 +25,13 @@ #define ___ATIMACH64XV_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" #include "xf86xv.h" -extern int ATIMach64XVInitialiseAdaptor - FunctionPrototype((ScreenPtr, ScrnInfoPtr, ATIPtr, - XF86VideoAdaptorPtr **)); +extern int ATIMach64XVInitialiseAdaptor(ScreenPtr, ScrnInfoPtr, ATIPtr, + XF86VideoAdaptorPtr **); -extern void ATIMach64CloseXVideo - FunctionPrototype((ScreenPtr, ScrnInfoPtr, ATIPtr)); +extern void ATIMach64CloseXVideo(ScreenPtr, ScrnInfoPtr, ATIPtr); #endif /* ___ATIMACH64XV_H___ */ diff --git a/src/atimode.h b/src/atimode.h index 63cb765..7044374 100644 --- a/src/atimode.h +++ b/src/atimode.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.h,v 1.5 2003/01/01 19:16:32 tsi Exp $ */ /* - * Copyright 2000 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,17 +25,12 @@ #define ___ATIMODE_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" -extern void ATIModePreInit FunctionPrototype((ScrnInfoPtr, ATIPtr, - ATIHWPtr)); -extern void ATIModeSave FunctionPrototype((ScrnInfoPtr, ATIPtr, - ATIHWPtr)); -extern Bool ATIModeCalculate FunctionPrototype((int, ATIPtr, ATIHWPtr, - DisplayModePtr)); -extern void ATIModeSet FunctionPrototype((ScrnInfoPtr, ATIPtr, - ATIHWPtr)); +extern void ATIModePreInit(ScrnInfoPtr, ATIPtr, ATIHWPtr); +extern void ATIModeSave(ScrnInfoPtr, ATIPtr, ATIHWPtr); +extern Bool ATIModeCalculate(int, ATIPtr, ATIHWPtr, DisplayModePtr); +extern void ATIModeSet(ScrnInfoPtr, ATIPtr, ATIHWPtr); #endif /* ___ATIMODE_H___ */ diff --git a/src/atioption.h b/src/atioption.h index de406f9..8597079 100644 --- a/src/atioption.h +++ b/src/atioption.h @@ -27,8 +27,6 @@ #ifndef ___ATIOPTION_H___ #define ___ATIOPTION_H___ 1 -#include "atiproto.h" - #include "xf86str.h" /* @@ -70,6 +68,6 @@ typedef enum extern const OptionInfoRec ATIPublicOptions[]; extern const unsigned long ATIPublicOptionSize; -extern const OptionInfoRec * ATIAvailableOptions FunctionPrototype((int, int)); +extern const OptionInfoRec * ATIAvailableOptions(int, int); #endif /* ___ATIOPTION_H___ */ diff --git a/src/atipreinit.h b/src/atipreinit.h index 5404c2c..ada14b8 100644 --- a/src/atipreinit.h +++ b/src/atipreinit.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.h,v 1.6 2003/01/01 19:16:33 tsi Exp $ */ /* - * Copyright 1999 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -24,10 +24,8 @@ #ifndef ___ATIPREINIT_H___ #define ___ATIPREINIT_H___ 1 -#include "atiproto.h" - #include "xf86str.h" -extern Bool ATIPreInit FunctionPrototype((ScrnInfoPtr, int)); +extern Bool ATIPreInit(ScrnInfoPtr, int); #endif /* ___ATIPREINIT_H___ */ diff --git a/src/atiprint.h b/src/atiprint.h index d44cbdf..35c22db 100644 --- a/src/atiprint.h +++ b/src/atiprint.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprint.h,v 1.10 2003/01/01 19:16:33 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,13 +25,11 @@ #define ___ATIPRINT_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" -extern void ATIPrintBIOS FunctionPrototype((const CARD8 *, - const unsigned int)); -extern void ATIPrintRegisters FunctionPrototype((ATIPtr)); -extern void ATIPrintMode FunctionPrototype((DisplayModePtr)); +extern void ATIPrintBIOS(const CARD8 *, const unsigned int); +extern void ATIPrintRegisters(ATIPtr); +extern void ATIPrintMode(DisplayModePtr); #endif /* ___ATIPRINT_H___ */ diff --git a/src/atiprobe.h b/src/atiprobe.h index 6f3d855..cb4d9d6 100644 --- a/src/atiprobe.h +++ b/src/atiprobe.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.h,v 1.8 2003/01/01 19:16:33 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -24,10 +24,8 @@ #ifndef ___ATIPROBE_H___ #define ___ATIPROBE_H___ 1 -#include "atiproto.h" - #include "xf86str.h" -extern Bool ATIProbe FunctionPrototype((DriverPtr, int)); +extern Bool ATIProbe(DriverPtr, int); #endif /* ___ATIPROBE_H___ */ diff --git a/src/atirgb514.h b/src/atirgb514.h index 71f44d2..48439e1 100644 --- a/src/atirgb514.h +++ b/src/atirgb514.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atirgb514.h,v 1.3 2003/01/01 19:16:34 tsi Exp $ */ /* - * Copyright 2001 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,14 +25,12 @@ #define ___ATIRGB514_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" -extern void ATIRGB514PreInit FunctionPrototype((ATIPtr, ATIHWPtr)); -extern void ATIRGB514Save FunctionPrototype((ATIPtr, ATIHWPtr)); -extern void ATIRGB514Calculate FunctionPrototype((ATIPtr, ATIHWPtr, - DisplayModePtr)); -extern void ATIRGB514Set FunctionPrototype((ATIPtr, ATIHWPtr)); +extern void ATIRGB514PreInit(ATIPtr, ATIHWPtr); +extern void ATIRGB514Save(ATIPtr, ATIHWPtr); +extern void ATIRGB514Calculate(ATIPtr, ATIHWPtr, DisplayModePtr); +extern void ATIRGB514Set(ATIPtr, ATIHWPtr); #endif /* ___ATIRGB514_H___ */ diff --git a/src/atiscreen.h b/src/atiscreen.h index 7397042..c8e5fa7 100644 --- a/src/atiscreen.h +++ b/src/atiscreen.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.h,v 1.6 2003/01/01 19:16:34 tsi Exp $ */ /* - * Copyright 1999 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -24,11 +24,9 @@ #ifndef ___ATISCREEN_H___ #define ___ATISCREEN_H___ 1 -#include "atiproto.h" - #include "screenint.h" -extern Bool ATIScreenInit FunctionPrototype((int, ScreenPtr, int, char **)); -extern Bool ATICloseScreen FunctionPrototype((int, ScreenPtr)); +extern Bool ATIScreenInit(int, ScreenPtr, int, char **); +extern Bool ATICloseScreen(int, ScreenPtr); #endif /* ___ATISCREEN_H___ */ diff --git a/src/atiutil.h b/src/atiutil.h index f43295d..9041921 100644 --- a/src/atiutil.h +++ b/src/atiutil.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiutil.h,v 1.8 2003/01/01 19:16:34 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -24,8 +24,6 @@ #ifndef ___ATIUTIL_H___ #define ___ATIUTIL_H___ 1 -#include "atiproto.h" - /* * Prevent the C standard's insistence on unsigned long sizeof's from causing * counter-intuitive results. @@ -64,7 +62,7 @@ #define GetWord(_Value, _Word) GetBits(_Value, _WordMask(_Word)) #define SetWord(_Value, _Word) SetBits(_Value, _WordMask(_Word)) -extern void ATIReduceRatio FunctionPrototype((int *, int *)); -extern int ATIDivide FunctionPrototype((int, int, int, const int)); +extern void ATIReduceRatio(int *, int *); +extern int ATIDivide(int, int, int, const int); #endif /* ___ATIUTIL_H___ */ diff --git a/src/ativalid.h b/src/ativalid.h index 055ed50..880733a 100644 --- a/src/ativalid.h +++ b/src/ativalid.h @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativalid.h,v 1.8 2003/01/01 19:16:34 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativalid.h,v 1.9 2003/10/30 17:36:58 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -24,10 +24,8 @@ #ifndef ___ATIVALID_H___ #define ___ATIVALID_H___ 1 -#include "atiproto.h" - #include "xf86str.h" -extern int ATIValidMode FunctionPrototype((int, DisplayModePtr, Bool, int)); +extern ModeStatus ATIValidMode(int, DisplayModePtr, Bool, int); #endif /* ___ATIVALID_H___ */ diff --git a/src/ativga.h b/src/ativga.h index ff65b35..50ce54a 100644 --- a/src/ativga.h +++ b/src/ativga.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativga.h,v 1.10 2003/01/01 19:16:34 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,20 +25,18 @@ #define ___ATIVGA_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" #ifndef AVOID_CPIO -extern void ATIVGAPreInit FunctionPrototype((ATIPtr, ATIHWPtr)); -extern void ATIVGASave FunctionPrototype((ATIPtr, ATIHWPtr)); -extern void ATIVGACalculate FunctionPrototype((ATIPtr, ATIHWPtr, - DisplayModePtr)); -extern void ATIVGASet FunctionPrototype((ATIPtr, ATIHWPtr)); +extern void ATIVGAPreInit(ATIPtr, ATIHWPtr); +extern void ATIVGASave(ATIPtr, ATIHWPtr); +extern void ATIVGACalculate(ATIPtr, ATIHWPtr, DisplayModePtr); +extern void ATIVGASet(ATIPtr, ATIHWPtr); -extern void ATIVGASaveScreen FunctionPrototype((ATIPtr, int)); -extern void ATIVGASetDPMSMode FunctionPrototype((ATIPtr, int)); +extern void ATIVGASaveScreen(ATIPtr, int); +extern void ATIVGASetDPMSMode(ATIPtr, int); #endif /* AVOID_CPIO */ diff --git a/src/ativgaio.h b/src/ativgaio.h index e08ecff..a463fda 100644 --- a/src/ativgaio.h +++ b/src/ativgaio.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativgaio.h,v 1.5 2003/01/01 19:16:34 tsi Exp $ */ /* - * Copyright 2000 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -32,11 +32,10 @@ #include "atiio.h" #include "atipriv.h" -#include "atiproto.h" #ifndef AVOID_CPIO -extern void ATISetVGAIOBase FunctionPrototype((ATIPtr, const CARD8)); +extern void ATISetVGAIOBase(ATIPtr, const CARD8); /* Odds and ends to ease reading and writting of indexed registers */ #define GetReg(_Register, _Index) \ diff --git a/src/atividmem.h b/src/atividmem.h index 7e4c26c..fbb6a0b 100644 --- a/src/atividmem.h +++ b/src/atividmem.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atividmem.h,v 1.9 2003/01/01 19:16:35 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -24,7 +24,6 @@ #ifndef ___ATIVIDMEM_H___ #define ___ATIVIDMEM_H___ 1 -#include "atiproto.h" #include "atipriv.h" /* Memory types for 68800's and 88800GX's */ @@ -69,7 +68,7 @@ typedef enum } ATI264MemoryType; extern const char *ATIMemoryTypeNames_264xT[]; -extern Bool ATIMapApertures FunctionPrototype((int, ATIPtr)); -extern void ATIUnmapApertures FunctionPrototype((int, ATIPtr)); +extern Bool ATIMapApertures(int, ATIPtr); +extern void ATIUnmapApertures(int, ATIPtr); #endif /* ___ATIVIDMEM_H___ */ diff --git a/src/atiwonder.h b/src/atiwonder.h index 34f19cf..7bb39af 100644 --- a/src/atiwonder.h +++ b/src/atiwonder.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonder.h,v 1.9 2003/01/01 19:16:35 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,17 +25,15 @@ #define ___ATIWONDER_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" #ifndef AVOID_CPIO -extern void ATIVGAWonderPreInit FunctionPrototype((ATIPtr, ATIHWPtr)); -extern void ATIVGAWonderSave FunctionPrototype((ATIPtr, ATIHWPtr)); -extern void ATIVGAWonderCalculate FunctionPrototype((ATIPtr, ATIHWPtr, - DisplayModePtr)); -extern void ATIVGAWonderSet FunctionPrototype((ATIPtr, ATIHWPtr)); +extern void ATIVGAWonderPreInit(ATIPtr, ATIHWPtr); +extern void ATIVGAWonderSave(ATIPtr, ATIHWPtr); +extern void ATIVGAWonderCalculate(ATIPtr, ATIHWPtr, DisplayModePtr); +extern void ATIVGAWonderSet(ATIPtr, ATIHWPtr); #endif /* AVOID_CPIO */ diff --git a/src/atiwonderio.h b/src/atiwonderio.h index dd0fa58..cdd6087 100644 --- a/src/atiwonderio.h +++ b/src/atiwonderio.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiwonderio.h,v 1.4 2003/01/01 19:16:35 tsi Exp $ */ /* - * Copyright 2000 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -35,8 +35,7 @@ #ifndef AVOID_CPIO -extern void ATIModifyExtReg FunctionPrototype((ATIPtr, const CARD8, int, - const CARD8, CARD8)); +extern void ATIModifyExtReg(ATIPtr, const CARD8, int, const CARD8, CARD8); #define ATIGetExtReg(_Index) \ GetReg(pATI->CPIO_VGAWonder, _Index) diff --git a/src/atixv.h b/src/atixv.h index 56f8da8..64674de 100644 --- a/src/atixv.h +++ b/src/atixv.h @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atixv.h,v 1.4 2003/04/23 21:51:31 tsi Exp $ */ /* - * Copyright 2001 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -25,14 +25,11 @@ #define ___ATIXV_H___ 1 #include "atipriv.h" -#include "atiproto.h" #include "xf86str.h" -extern void ATIXVPreInit FunctionPrototype((ATIPtr)); -extern Bool ATIInitializeXVideo FunctionPrototype((ScreenPtr, ScrnInfoPtr, - ATIPtr)); -extern void ATICloseXVideo FunctionPrototype((ScreenPtr, ScrnInfoPtr, - ATIPtr)); +extern void ATIXVPreInit(ATIPtr); +extern Bool ATIInitializeXVideo(ScreenPtr, ScrnInfoPtr, ATIPtr); +extern void ATICloseXVideo(ScreenPtr, ScrnInfoPtr, ATIPtr); #endif /* ___ATIXV_H___ */ diff --git a/src/r128_probe.h b/src/r128_probe.h index 34810dd..99508fb 100644 --- a/src/r128_probe.h +++ b/src/r128_probe.h @@ -37,45 +37,28 @@ #ifndef _R128_PROBE_H_ #define _R128_PROBE_H_ 1 -#include "atiproto.h" - #include "xf86str.h" /* r128_probe.c */ -extern const OptionInfoRec * R128AvailableOptions - FunctionPrototype((int, int)); -extern void R128Identify - FunctionPrototype((int)); -extern Bool R128Probe - FunctionPrototype((DriverPtr, int)); +extern const OptionInfoRec * R128AvailableOptions(int, int); +extern void R128Identify(int); +extern Bool R128Probe(DriverPtr, int); extern PciChipsets R128PciChipsets[]; /* r128_driver.c */ -extern void R128LoaderRefSymLists - FunctionPrototype((void)); -extern Bool R128PreInit - FunctionPrototype((ScrnInfoPtr, int)); -extern Bool R128ScreenInit - FunctionPrototype((int, ScreenPtr, int, char **)); -extern Bool R128SwitchMode - FunctionPrototype((int, DisplayModePtr, int)); -extern void R128AdjustFrame - FunctionPrototype((int, int, int, int)); -extern Bool R128EnterVT - FunctionPrototype((int, int)); -extern void R128LeaveVT - FunctionPrototype((int, int)); -extern void R128FreeScreen - FunctionPrototype((int, int)); -extern ModeStatus R128ValidMode - FunctionPrototype((int, DisplayModePtr, Bool, - int)); +extern void R128LoaderRefSymLists(void); +extern Bool R128PreInit(ScrnInfoPtr, int); +extern Bool R128ScreenInit(int, ScreenPtr, int, char **); +extern Bool R128SwitchMode(int, DisplayModePtr, int); +extern void R128AdjustFrame(int, int, int, int); +extern Bool R128EnterVT(int, int); +extern void R128LeaveVT(int, int); +extern void R128FreeScreen(int, int); +extern ModeStatus R128ValidMode(int, DisplayModePtr, Bool, int); -extern const OptionInfoRec * R128OptionsWeak - FunctionPrototype((void)); +extern const OptionInfoRec * R128OptionsWeak(void); -extern void R128FillInScreenInfo - FunctionPrototype((ScrnInfoPtr)); +extern void R128FillInScreenInfo(ScrnInfoPtr); #endif /* _R128_PROBE_H_ */ diff --git a/src/radeon_probe.h b/src/radeon_probe.h index a104cbc..7e0276a 100644 --- a/src/radeon_probe.h +++ b/src/radeon_probe.h @@ -37,8 +37,6 @@ #ifndef _RADEON_PROBE_H_ #define _RADEON_PROBE_H_ 1 -#include "atiproto.h" - #include "xf86str.h" #include "xf86DDC.h" @@ -139,46 +137,30 @@ typedef struct } RADEONEntRec, *RADEONEntPtr; /* radeon_probe.c */ -extern const OptionInfoRec *RADEONAvailableOptions - FunctionPrototype((int, int)); -extern void RADEONIdentify - FunctionPrototype((int)); -extern Bool RADEONProbe - FunctionPrototype((DriverPtr, int)); +extern const OptionInfoRec *RADEONAvailableOptions(int, int); +extern void RADEONIdentify(int); +extern Bool RADEONProbe(DriverPtr, int); extern SymTabRec RADEONChipsets[]; extern PciChipsets RADEONPciChipsets[]; /* radeon_driver.c */ -extern void RADEONLoaderRefSymLists - FunctionPrototype((void)); -extern Bool RADEONPreInit - FunctionPrototype((ScrnInfoPtr, int)); -extern Bool RADEONScreenInit - FunctionPrototype((int, ScreenPtr, int, char **)); -extern Bool RADEONSwitchMode - FunctionPrototype((int, DisplayModePtr, int)); +extern void RADEONLoaderRefSymLists(void); +extern Bool RADEONPreInit(ScrnInfoPtr, int); +extern Bool RADEONScreenInit(int, ScreenPtr, int, char **); +extern Bool RADEONSwitchMode(int, DisplayModePtr, int); #ifdef X_XF86MiscPassMessage -extern Bool RADEONHandleMessage - FunctionPrototype((int, const char*, const char*, - char**)); +extern Bool RADEONHandleMessage(int, const char*, const char*, + char**); #endif -extern void RADEONAdjustFrame - FunctionPrototype((int, int, int, int)); -extern Bool RADEONEnterVT - FunctionPrototype((int, int)); -extern void RADEONLeaveVT - FunctionPrototype((int, int)); -extern void RADEONFreeScreen - FunctionPrototype((int, int)); -extern ModeStatus RADEONValidMode - FunctionPrototype((int, DisplayModePtr, Bool, - int)); - -extern const OptionInfoRec *RADEONOptionsWeak - FunctionPrototype((void)); - -extern void RADEONFillInScreenInfo - FunctionPrototype((ScrnInfoPtr)); +extern void RADEONAdjustFrame(int, int, int, int); +extern Bool RADEONEnterVT(int, int); +extern void RADEONLeaveVT(int, int); +extern void RADEONFreeScreen(int, int); +extern ModeStatus RADEONValidMode(int, DisplayModePtr, Bool, int); + +extern const OptionInfoRec *RADEONOptionsWeak(void); + +extern void RADEONFillInScreenInfo(ScrnInfoPtr); #endif /* _RADEON_PROBE_H_ */ |