diff options
| author | Keith Packard <keithp@keithp.com> | 2000-09-03 05:11:46 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2000-09-03 05:11:46 +0000 |
| commit | c97fb611dd7dedef6d075ef9d56f3d32c8018d39 (patch) | |
| tree | 92dbb45f2e31b7ab709255d2d07a606f466c1a38 /hw/kdrive/igs | |
| parent | 38059656849a5bab5b56b23359a90aca4ba396c7 (diff) | |
Rework vesa driver for shadowing and multiple screen support. Allow enable
to fail and avoid crashing
Diffstat (limited to 'hw/kdrive/igs')
| -rw-r--r-- | hw/kdrive/igs/Imakefile | 9 | ||||
| -rw-r--r-- | hw/kdrive/igs/igs.c | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/hw/kdrive/igs/Imakefile b/hw/kdrive/igs/Imakefile index 788c91556..f282225ab 100644 --- a/hw/kdrive/igs/Imakefile +++ b/hw/kdrive/igs/Imakefile @@ -1,13 +1,12 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/igs/Imakefile,v 1.1 2000/05/06 22:17:42 keithp Exp $ -#include <Server.tmpl> +XCOMM $XFree86: xc/programs/Xserver/hw/kdrive/igs/Imakefile,v 1.2 2000/05/24 23:52:47 keithp Exp $ +KDRIVE=.. +#include "../Kdrive.tmpl" SRCS = igs.c igscmap.c igscurs.c igsdraw.c igsreg.c igsstub.c OBJS = igs.o igscmap.o igscurs.o igsdraw.o igsreg.o igsstub.o -INCLUDES = -I.. -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ - -I../../../fb -I../../../mi -I../../../include -I../../../os \ - -I$(EXTINCSRC) -I$(XINCLUDESRC) +INCLUDES = -I. $(KDINCS) NormalLibraryObjectRule() NormalLibraryTarget(igs,$(OBJS)) diff --git a/hw/kdrive/igs/igs.c b/hw/kdrive/igs/igs.c index 29c2a88ac..99ad6ec74 100644 --- a/hw/kdrive/igs/igs.c +++ b/hw/kdrive/igs/igs.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igs.c,v 1.1 2000/05/06 22:17:43 keithp Exp $ + * $XFree86: xc/programs/Xserver/hw/kdrive/igs/igs.c,v 1.2 2000/05/24 23:52:47 keithp Exp $ * * Copyright © 1999 SuSE, Inc. * @@ -331,7 +331,7 @@ igsGetClock (int target, int *Mp, int *Np, int *Pp, int maxM, int maxN, int maxP *Pp = P; } -void +Bool igsEnable (ScreenPtr pScreen) { KdScreenPriv(pScreen); @@ -562,6 +562,7 @@ igsEnable (ScreenPtr pScreen) VgaFetch (&igsvga->card, reg)); } #endif + return TRUE; } Bool |