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/sis530 | |
| parent | 38059656849a5bab5b56b23359a90aca4ba396c7 (diff) | |
Rework vesa driver for shadowing and multiple screen support. Allow enable
to fail and avoid crashing
Diffstat (limited to 'hw/kdrive/sis530')
| -rw-r--r-- | hw/kdrive/sis530/Imakefile | 7 | ||||
| -rw-r--r-- | hw/kdrive/sis530/sis.c | 3 | ||||
| -rw-r--r-- | hw/kdrive/sis530/sis.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/hw/kdrive/sis530/Imakefile b/hw/kdrive/sis530/Imakefile index 28568ab5c..aa0da2eb4 100644 --- a/hw/kdrive/sis530/Imakefile +++ b/hw/kdrive/sis530/Imakefile @@ -1,14 +1,13 @@ XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $ XCOMM $XFree86: xc/programs/Xserver/hw/nvfb/Imakefile,v 3.8 1996/12/23 06:30:19 dawes Exp $ -#include <Server.tmpl> +KDRIVE=.. +#include "../Kdrive.tmpl" SRCS = sis.c sisclock.c siscmap.c siscurs.c sisdraw.c sisio.c sisstub.c OBJS = sis.o sisclock.o siscmap.o siscurs.o sisdraw.o sisio.o sisstub.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(sis530,$(OBJS)) diff --git a/hw/kdrive/sis530/sis.c b/hw/kdrive/sis530/sis.c index dca811eac..6024fd0df 100644 --- a/hw/kdrive/sis530/sis.c +++ b/hw/kdrive/sis530/sis.c @@ -530,7 +530,7 @@ sisPreserve (KdCardInfo *card) memcpy (sisc->save.text_save, sisc->frameBuffer, SIS_TEXT_SAVE); } -void +Bool sisEnable (ScreenPtr pScreen) { KdScreenPriv(pScreen); @@ -827,6 +827,7 @@ sisEnable (ScreenPtr pScreen) #endif _sisSetCrtc (sisc, &crtc); + return TRUE; } Bool diff --git a/hw/kdrive/sis530/sis.h b/hw/kdrive/sis530/sis.h index 3c9a68806..f900ff0ad 100644 --- a/hw/kdrive/sis530/sis.h +++ b/hw/kdrive/sis530/sis.h @@ -1149,7 +1149,7 @@ typedef struct _sisScreenInfo { Bool sisCardInit (KdCardInfo *); Bool sisScreenInit (KdScreenInfo *); -void sisEnable (ScreenPtr pScreen); +Bool sisEnable (ScreenPtr pScreen); void sisDisable (ScreenPtr pScreen); void sisFini (ScreenPtr pScreen); |