Commit 700b0dc5 authored by Adam Jackson's avatar Adam Jackson 🎧

Convert the ATI drivers to ANSI function prototypes.

parent 17e5f3c1
/* $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___ */
/* $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___ */
/* $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,
......
/* $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___ */
......@@ -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))
......
/* $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___ */
/* $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___ */
/* $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___ */
/* $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___ */
/* $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___ */
/* $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 */
......
......@@ -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__ */
......@@ -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__ */
/* $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___ */
......@@ -17,6 +17,6 @@
#include "atiadjust.h"
#include "ativalid.h"
extern void ATIFillInScreenInfo FunctionPrototype((ScrnInfoPtr));
extern void ATIFillInScreenInfo(ScrnInfoPtr);
#endif
/* $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___ */
/* $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___ */
......@@ -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 */
......
/* $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___ */
/* $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___ */
/* $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___ */
/* $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___ */
/* $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___ */
......@@ -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) \
( \
......
/* $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)
......
/* $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___ */
/* $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___ */
......@@ -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___ */
/* $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_