mirror of
https://github.com/openbsd/xenocara.git
synced 2025-12-14 21:29:14 +00:00
Fix loading the driver without XAA
This commit is contained in:
@@ -41,10 +41,10 @@
|
|||||||
|
|
||||||
static Bool I740_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, int *, int *, int *);
|
static Bool I740_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, int *, int *, int *);
|
||||||
static Bool I740_SetMode(ScrnInfoPtr, DGAModePtr);
|
static Bool I740_SetMode(ScrnInfoPtr, DGAModePtr);
|
||||||
static void I740_Sync(ScrnInfoPtr);
|
|
||||||
static int I740_GetViewport(ScrnInfoPtr);
|
static int I740_GetViewport(ScrnInfoPtr);
|
||||||
static void I740_SetViewport(ScrnInfoPtr, int, int, int);
|
static void I740_SetViewport(ScrnInfoPtr, int, int, int);
|
||||||
#ifdef HAVE_XAA_H
|
#ifdef HAVE_XAA_H
|
||||||
|
static void I740_Sync(ScrnInfoPtr);
|
||||||
static void I740_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
|
static void I740_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
|
||||||
static void I740_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
|
static void I740_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
|
||||||
#if 0
|
#if 0
|
||||||
@@ -57,8 +57,8 @@ static DGAFunctionRec I740DGAFuncs = {
|
|||||||
I740_SetMode,
|
I740_SetMode,
|
||||||
I740_SetViewport,
|
I740_SetViewport,
|
||||||
I740_GetViewport,
|
I740_GetViewport,
|
||||||
I740_Sync,
|
|
||||||
#ifdef HAVE_XAA_H
|
#ifdef HAVE_XAA_H
|
||||||
|
I740_Sync,
|
||||||
I740_FillRect,
|
I740_FillRect,
|
||||||
I740_BlitRect,
|
I740_BlitRect,
|
||||||
#if 0
|
#if 0
|
||||||
@@ -67,7 +67,7 @@ static DGAFunctionRec I740DGAFuncs = {
|
|||||||
NULL
|
NULL
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
NULL, NULL, NULL
|
NULL, NULL, NULL, NULL
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -38,10 +38,10 @@
|
|||||||
static Bool NEO_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
|
static Bool NEO_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
|
||||||
int *, int *, int *);
|
int *, int *, int *);
|
||||||
static Bool NEO_SetMode(ScrnInfoPtr, DGAModePtr);
|
static Bool NEO_SetMode(ScrnInfoPtr, DGAModePtr);
|
||||||
static void NEO_Sync(ScrnInfoPtr);
|
|
||||||
static int NEO_GetViewport(ScrnInfoPtr);
|
static int NEO_GetViewport(ScrnInfoPtr);
|
||||||
static void NEO_SetViewport(ScrnInfoPtr, int, int, int);
|
static void NEO_SetViewport(ScrnInfoPtr, int, int, int);
|
||||||
#ifdef HAVE_XAA_H
|
#ifdef HAVE_XAA_H
|
||||||
|
static void NEO_Sync(ScrnInfoPtr);
|
||||||
static void NEO_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
|
static void NEO_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
|
||||||
static void NEO_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
|
static void NEO_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
|
||||||
#if 0
|
#if 0
|
||||||
@@ -57,8 +57,8 @@ DGAFunctionRec NEODGAFuncs = {
|
|||||||
NEO_SetMode,
|
NEO_SetMode,
|
||||||
NEO_SetViewport,
|
NEO_SetViewport,
|
||||||
NEO_GetViewport,
|
NEO_GetViewport,
|
||||||
NEO_Sync,
|
|
||||||
#ifdef HAVE_XAA_H
|
#ifdef HAVE_XAA_H
|
||||||
|
NEO_Sync,
|
||||||
NEO_FillRect,
|
NEO_FillRect,
|
||||||
NEO_BlitRect,
|
NEO_BlitRect,
|
||||||
#if 0
|
#if 0
|
||||||
@@ -67,7 +67,7 @@ DGAFunctionRec NEODGAFuncs = {
|
|||||||
NULL
|
NULL
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
NULL, NULL, NULL
|
NULL, NULL, NULL, NULL
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -37,10 +37,10 @@
|
|||||||
static Bool TRIDENT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
|
static Bool TRIDENT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
|
||||||
int *, int *, int *);
|
int *, int *, int *);
|
||||||
static Bool TRIDENT_SetMode(ScrnInfoPtr, DGAModePtr);
|
static Bool TRIDENT_SetMode(ScrnInfoPtr, DGAModePtr);
|
||||||
static void TRIDENT_Sync(ScrnInfoPtr);
|
|
||||||
static int TRIDENT_GetViewport(ScrnInfoPtr);
|
static int TRIDENT_GetViewport(ScrnInfoPtr);
|
||||||
static void TRIDENT_SetViewport(ScrnInfoPtr, int, int, int);
|
static void TRIDENT_SetViewport(ScrnInfoPtr, int, int, int);
|
||||||
#ifdef HAVE_XAA_H
|
#ifdef HAVE_XAA_H
|
||||||
|
static void TRIDENT_Sync(ScrnInfoPtr);
|
||||||
static void TRIDENT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
|
static void TRIDENT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
|
||||||
static void TRIDENT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
|
static void TRIDENT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
|
||||||
#if 0
|
#if 0
|
||||||
@@ -56,8 +56,8 @@ DGAFunctionRec TRIDENTDGAFuncs = {
|
|||||||
TRIDENT_SetMode,
|
TRIDENT_SetMode,
|
||||||
TRIDENT_SetViewport,
|
TRIDENT_SetViewport,
|
||||||
TRIDENT_GetViewport,
|
TRIDENT_GetViewport,
|
||||||
TRIDENT_Sync,
|
|
||||||
#ifdef HAVE_XAA_H
|
#ifdef HAVE_XAA_H
|
||||||
|
TRIDENT_Sync,
|
||||||
TRIDENT_FillRect,
|
TRIDENT_FillRect,
|
||||||
TRIDENT_BlitRect,
|
TRIDENT_BlitRect,
|
||||||
#if 0
|
#if 0
|
||||||
@@ -66,7 +66,7 @@ DGAFunctionRec TRIDENTDGAFuncs = {
|
|||||||
NULL
|
NULL
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
NULL, NULL, NULL
|
NULL, NULL, NULL, NULL
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user