diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-05-24 08:17:11 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-24 08:17:11 +0100 |
| commit | 5ed959585f35a4eff2cd803ae222b46d164f210d (patch) | |
| tree | 61739fa5034aa483782eb35db0ddc1dbdf0e2a2f /src/compat-api.h | |
| parent | 2de17efdcb502f91fb145130c12be3cb164f03c5 (diff) | |
radeon: update compat-api.h for block handler + enable/disable fb.
This updates the compat stuff for the latest block handler code,
and the enable/disable interface.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/compat-api.h')
| -rw-r--r-- | src/compat-api.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/compat-api.h b/src/compat-api.h index 2356250d..aa6b9561 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -46,12 +46,16 @@ #define SCREEN_ARG_TYPE int #define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] -#define SCREEN_INIT_ARGS int i, ScreenPtr pScreen, int argc, char **argv +#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv + +#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask +#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask #define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen #define CLOSE_SCREEN_ARGS scrnIndex, pScreen #define VTFUNC_ARGS(flags) pScrn->scrnIndex, (flags) +#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex) #else #define SCRN_ARG_TYPE ScrnInfoPtr #define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) @@ -59,13 +63,18 @@ #define SCREEN_ARG_TYPE ScreenPtr #define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) -#define SCREEN_INIT_ARGS ScreenPtr pScreen, int argc, char **argv +#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask +#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen #define CLOSE_SCREEN_ARGS pScreen #define VTFUNC_ARGS(flags) pScrn, (flags) +#define XF86_ENABLEDISABLEFB_ARG(x) (x) + #endif #endif |