diff options
| author | dawes <dawes> | 2000-11-08 04:43:58 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2000-11-08 04:43:58 +0000 |
| commit | 4457c5826d9e018d70dd732511bab01b5e470aae (patch) | |
| tree | 845dcec018e57f3f9f4284cca307c30850604e44 | |
| parent | c0165222e6e951370a11547de56870d8dd7145d5 (diff) | |
Missing 4.0.1e merges for files added since previous merge that alreadyX_4_0_1e-20001107-merge
existed in the DRI CVS.
38 files changed, 263 insertions, 206 deletions
diff --git a/xc/lib/GL/mesa/src/drv/common/stenciltmp.h b/xc/lib/GL/mesa/src/drv/common/stenciltmp.h index 9a0cb47c9..d22f6867c 100644 --- a/xc/lib/GL/mesa/src/drv/common/stenciltmp.h +++ b/xc/lib/GL/mesa/src/drv/common/stenciltmp.h @@ -1,3 +1,5 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/common/stenciltmp.h,v 1.2 2000/09/26 15:56:46 tsi Exp $ */ + #ifndef DBG #define DBG 0 #endif diff --git a/xc/lib/GL/mesa/src/drv/mga/mgacontext.h b/xc/lib/GL/mesa/src/drv/mga/mgacontext.h index a1523b794..1f6ffc6c6 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgacontext.h +++ b/xc/lib/GL/mesa/src/drv/mga/mgacontext.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgacontext.h,v 1.1 2000/09/24 13:51:06 alanh Exp $*/ /* * GLX Hardware Device Driver for Matrox Millenium G200 * Copyright (C) 1999 Wittawat Yamwong diff --git a/xc/lib/GL/mesa/src/drv/mga/mgatexcnv.c b/xc/lib/GL/mesa/src/drv/mga/mgatexcnv.c index 2f46e548f..4e5bf8607 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgatexcnv.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgatexcnv.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgatexcnv.c,v 1.1 2000/09/24 13:51:08 alanh Exp $ */ /* * GLX Hardware Device Driver for Matrox Millenium G200 * Copyright (C) 1999 Wittawat Yamwong diff --git a/xc/lib/GL/mesa/src/drv/mga/mgatexmem.c b/xc/lib/GL/mesa/src/drv/mga/mgatexmem.c index ad2d941a4..9d328f064 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgatexmem.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgatexmem.c @@ -1,3 +1,5 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgatexmem.c,v 1.1 2000/09/24 13:51:08 alanh Exp $ */ + #include <stdlib.h> #include <stdio.h> #include <GL/gl.h> diff --git a/xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fastpath.S b/xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fastpath.S index eb426f705..0f4cc4508 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fastpath.S +++ b/xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fastpath.S @@ -1,3 +1,5 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fastpath.S,v 1.2 2000/09/26 15:56:51 tsi Exp $ */ + #include "../../X86/assyntax.h" #define SETUP_RGBA 0x1 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fasttmp.h b/xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fasttmp.h index 78c5fef74..9ec4935d7 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fasttmp.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fasttmp.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fasttmp.h,v 1.2 2000/09/26 15:56:51 tsi Exp $ */ #if !defined(NASM_ASSEMBLER) && !defined(MASM_ASSEMBLER) #define TAGLLBL(a) TAG(.L##a) diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxclip.c b/xc/lib/GL/mesa/src/drv/tdfx/fxclip.c index 9d6f7e4c2..0cac71a06 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxclip.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxclip.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxclip.c,v 1.1 2000/09/24 13:51:12 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxcliptmp.h b/xc/lib/GL/mesa/src/drv/tdfx/fxcliptmp.h index 6cc1ae938..b84e3c3f2 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxcliptmp.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxcliptmp.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxcliptmp.h,v 1.1 2000/09/24 13:51:13 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxcva.c b/xc/lib/GL/mesa/src/drv/tdfx/fxcva.c index 9a7e2feb5..21a1c4dfb 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxcva.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxcva.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxcva.c,v 1.1 2000/09/24 13:51:14 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxcva.h b/xc/lib/GL/mesa/src/drv/tdfx/fxcva.h index f5f416da6..98ae5f075 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxcva.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxcva.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxcva.h,v 1.1 2000/09/24 13:51:14 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxcvatmp.h b/xc/lib/GL/mesa/src/drv/tdfx/fxcvatmp.h index 584ef7504..20523e33e 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxcvatmp.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxcvatmp.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxcvatmp.h,v 1.1 2000/09/24 13:51:14 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxdd.c b/xc/lib/GL/mesa/src/drv/tdfx/fxdd.c index 607376a84..4b5008caa 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxdd.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxdd.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxdd.c,v 1.1 2000/09/24 13:51:14 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxddspan.c b/xc/lib/GL/mesa/src/drv/tdfx/fxddspan.c index 732885a21..1170a3a68 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxddspan.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxddspan.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxddspan.c,v 1.1 2000/09/24 13:51:14 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxddtex.c b/xc/lib/GL/mesa/src/drv/tdfx/fxddtex.c index 72a29403c..11438f440 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxddtex.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxddtex.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxddtex.c,v 1.1 2000/09/24 13:51:14 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxddtex.h b/xc/lib/GL/mesa/src/drv/tdfx/fxddtex.h index 7a57df4e7..24b63ed07 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxddtex.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxddtex.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxddtex.h,v 1.1 2000/09/24 13:51:15 alanh Exp $ */ #ifndef FXDDTEX_H #define FXDDTEX_H diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxdrv.h b/xc/lib/GL/mesa/src/drv/tdfx/fxdrv.h index 5c9382a2c..08622ede1 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxdrv.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxdrv.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxdrv.h,v 1.1 2000/09/24 13:51:15 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxfastpath.c b/xc/lib/GL/mesa/src/drv/tdfx/fxfastpath.c index a86be1d92..f1c669e9a 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxfastpath.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxfastpath.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxfastpath.c,v 1.1 2000/09/24 13:51:15 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxfasttmp.h b/xc/lib/GL/mesa/src/drv/tdfx/fxfasttmp.h index 2d9439084..6f15462c4 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxfasttmp.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxfasttmp.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxfasttmp.h,v 1.1 2000/09/24 13:51:15 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxglidew.c b/xc/lib/GL/mesa/src/drv/tdfx/fxglidew.c index 70fb6b00e..c88d7ca3f 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxglidew.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxglidew.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxglidew.c,v 1.1 2000/09/24 13:51:15 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxglidew.h b/xc/lib/GL/mesa/src/drv/tdfx/fxglidew.h index 27c762124..388ca2d7c 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxglidew.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxglidew.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxglidew.h,v 1.1 2000/09/24 13:51:16 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxpipeline.c b/xc/lib/GL/mesa/src/drv/tdfx/fxpipeline.c index eb286e848..eaa2ab962 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxpipeline.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxpipeline.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxpipeline.c,v 1.1 2000/09/24 13:51:16 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxpipeline.h b/xc/lib/GL/mesa/src/drv/tdfx/fxpipeline.h index 01b0aecb1..49a98320d 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxpipeline.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxpipeline.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxpipeline.h,v 1.1 2000/09/24 13:51:16 alanh Exp $ */ #ifndef FXPIPELINE_H #define FXPIPELINE_H diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxrender.c b/xc/lib/GL/mesa/src/drv/tdfx/fxrender.c index d1f5d1ff3..7bcfae237 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxrender.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxrender.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxrender.c,v 1.1 2000/09/24 13:51:16 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxsanity.c b/xc/lib/GL/mesa/src/drv/tdfx/fxsanity.c index 9abee0d89..f614e8fae 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxsanity.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxsanity.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxsanity.c,v 1.1 2000/09/24 13:51:17 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxsdettmp.h b/xc/lib/GL/mesa/src/drv/tdfx/fxsdettmp.h index 71cf37e2e..95794538c 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxsdettmp.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxsdettmp.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxsdettmp.h,v 1.1 2000/09/24 13:51:19 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxsetup.c b/xc/lib/GL/mesa/src/drv/tdfx/fxsetup.c index 2dc5edab0..a84a6ee15 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxsetup.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxsetup.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxsetup.c,v 1.1 2000/09/24 13:51:19 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxsetup.h b/xc/lib/GL/mesa/src/drv/tdfx/fxsetup.h index 650392a11..b79d96ce9 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxsetup.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxsetup.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxsetup.h,v 1.1 2000/09/24 13:51:19 alanh Exp $ */ #ifndef FXSETUP_H #define FXSETUP_H diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxstripdet.c b/xc/lib/GL/mesa/src/drv/tdfx/fxstripdet.c index 0d3b6fec3..98e62b1ff 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxstripdet.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxstripdet.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxstripdet.c,v 1.1 2000/09/24 13:51:19 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxtexman.c b/xc/lib/GL/mesa/src/drv/tdfx/fxtexman.c index 037706292..c1d01b3d7 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxtexman.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxtexman.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxtexman.c,v 1.1 2000/09/24 13:51:20 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxtexman.h b/xc/lib/GL/mesa/src/drv/tdfx/fxtexman.h index 77b106db6..37fedcbb3 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxtexman.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxtexman.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxtexman.h,v 1.1 2000/09/24 13:51:20 alanh Exp $ */ #ifndef FXTEXMAN_H #define FXTEXMAN_H diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxtrifuncs.c b/xc/lib/GL/mesa/src/drv/tdfx/fxtrifuncs.c index 2ff250835..0980a7ad7 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxtrifuncs.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxtrifuncs.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxtrifuncs.c,v 1.1 2000/09/24 13:51:20 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxtritmp.h b/xc/lib/GL/mesa/src/drv/tdfx/fxtritmp.h index 6e6cb0a13..8e068bd9b 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxtritmp.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxtritmp.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxtritmp.h,v 1.1 2000/09/24 13:51:20 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxvs_tmp.h b/xc/lib/GL/mesa/src/drv/tdfx/fxvs_tmp.h index 29e050940..bc7621aa1 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxvs_tmp.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxvs_tmp.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxvs_tmp.h,v 1.1 2000/09/24 13:51:20 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxvsetup.c b/xc/lib/GL/mesa/src/drv/tdfx/fxvsetup.c index 12738bb0a..8102ea09c 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxvsetup.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxvsetup.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxvsetup.c,v 1.1 2000/09/24 13:51:20 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/lib/GL/mesa/src/drv/tdfx/fxvsetup.h b/xc/lib/GL/mesa/src/drv/tdfx/fxvsetup.h index 9c50f1cc9..85a5f1f66 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/fxvsetup.h +++ b/xc/lib/GL/mesa/src/drv/tdfx/fxvsetup.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/fxvsetup.h,v 1.1 2000/09/24 13:51:20 alanh Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 diff --git a/xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h b/xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h index 32a77ffb8..7fe7f6888 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h @@ -13,6 +13,8 @@ @end ***************************************************************************************/ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h,v 1.3 2000/10/24 22:45:08 dawes Exp $ */ + #ifndef _BINDING #define _BINDING @@ -157,6 +159,8 @@ typedef struct TAGMGAHWINFO { @field IN OUT ULONG | ulDstOrg | Origin of the drawing Offset in the frame (pixels) @field IN OUT ULONG | ulPanXGran | Panning in X granularity in pixel @field IN OUT ULONG | ulPanYGran | Panning in Y granularity in pixel + @field IN OUT ULONG | ulTVStandard | TV Standard + @field IN OUT ULONG | ulCableType | Cable Type @end **************************************************************************************************/ typedef struct TAGMAGMODEINFO { @@ -182,6 +186,8 @@ typedef struct TAGMAGMODEINFO { ULONG ulDstOrg; /* Origin of the drawing Offset in the frame (bytes) */ ULONG ulPanXGran; /* Panning in X granularity in pixel */ ULONG ulPanYGran; /* Panning in Y granularity in pixel */ + ULONG ulTVStandard; /* TV Standard */ + ULONG ulCableType; /* Cable Type */ } MGAMODEINFO, FAR *LPMGAMODEINFO; #define MGAHWINFOCAPS_CRTC1_ANALOG 1L @@ -203,8 +209,20 @@ typedef struct TAGMAGMODEINFO { #define MGAMODEINFO_DIGITAL2 (1L << 4) #define MGAMODEINFO_FORCE_PITCH (1L << 5) #define MGAMODEINFO_FORCE_DISPLAYORG (1L << 6) +#define MGAMODEINFO_TV (1L << 7) #define MGAMODEINFO_TESTONLY 0x80000000 +/* Cable Type */ +#define TV_YC_COMPOSITE 0 +#define TV_SCART_RGB 1 +#define TV_SCART_COMPOSITE 2 +#define TV_SCART_TYPE2 3 + +/* TV Standard */ + +#define TV_PAL 0 +#define TV_NTSC 1 + #if defined(__cplusplus) extern "C" { #endif @@ -223,6 +241,8 @@ ULONG MGAGetHardwareInfo(LPBOARDHANDLE pBoard, LPMGAHWINFO pMgaHwInfo); LPVOID MGAGetClientPointer(LPBOARDHANDLE pBoard); ULONG MGAOpenLibrary(LPBOARDHANDLE pBoard, LPVOID lpClient, ULONG ulClientSize); ULONG MGAGetBOARDHANDLESize(void); +ULONG MGASetTVStandard(LPBOARDHANDLE pBoard, ULONG ulTVStandard); +ULONG MGASetTVCableType(LPBOARDHANDLE pBoard, ULONG ulCableType); #if defined(__cplusplus) } diff --git a/xc/programs/Xserver/hw/xfree86/drivers/mga/client.h b/xc/programs/Xserver/hw/xfree86/drivers/mga/client.h index 8b66de2c2..8348b6498 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/mga/client.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/mga/client.h @@ -12,56 +12,55 @@ typedef void* LPBIOSREGS; typedef struct TAGCLIENTDATA { - ULONG ulFrameBufferBase; - ULONG ulRegisterBase; + ULONG ulFrameBufferBase; + ULONG ulRegisterBase; pointer pMga; } CLIENTDATA, *LPCLIENTDATA; extern ULONG DECL ClientReadConfigSpaceByte(LPBOARDHANDLE, ULONG, LPUCHAR); -extern ULONG DECL ClientReadConfigSpaceDword(LPBOARDHANDLE , ULONG, LPULONG ); -extern ULONG DECL ClientWriteConfigSpaceByte (LPBOARDHANDLE , ULONG, UCHAR); -extern ULONG DECL ClientWriteConfigSpaceDword(LPBOARDHANDLE , ULONG, ULONG); -extern ULONG DECL ClientOpenRegisterBase(LPBOARDHANDLE , ULONG, ULONG); -extern ULONG DECL ClientCloseRegisterBase (LPBOARDHANDLE ); -extern ULONG DECL ClientReadRegisterByte(LPBOARDHANDLE , ULONG, LPUCHAR ); -extern ULONG DECL ClientReadRegisterDword(LPBOARDHANDLE , ULONG, LPULONG ); -extern ULONG DECL ClientWriteRegisterByte (LPBOARDHANDLE , ULONG, UCHAR); -extern ULONG DECL ClientWriteRegisterDword(LPBOARDHANDLE , ULONG, ULONG); -extern ULONG DECL ClientOpenMemoryBase(LPBOARDHANDLE , ULONG, ULONG); -extern ULONG DECL ClientCloseMemoryBase(LPBOARDHANDLE ); -extern ULONG DECL ClientReadMemoryByte(LPBOARDHANDLE , ULONG, LPUCHAR ); -extern ULONG DECL ClientReadMemoryDword (LPBOARDHANDLE , ULONG, LPULONG ); -extern ULONG DECL ClientWriteMemoryByte(LPBOARDHANDLE , ULONG, UCHAR); -extern ULONG DECL ClientWriteMemoryDword (LPBOARDHANDLE , ULONG, ULONG); -extern ULONG DECL ClientOpenSystemDevice (LPBOARDHANDLE , ULONG, ULONG); -extern ULONG DECL ClientCloseSystemDevice (LPBOARDHANDLE ); -extern ULONG DECL ClientReadSystemDeviceByte(LPBOARDHANDLE , ULONG, LPUCHAR ); -extern ULONG DECL ClientReadSystemDeviceDword(LPBOARDHANDLE , ULONG, LPULONG ); -extern ULONG DECL ClientWriteSystemDeviceByte(LPBOARDHANDLE , ULONG, UCHAR); -extern ULONG DECL ClientWriteSystemDeviceDword (LPBOARDHANDLE , ULONG, ULONG); -extern ULONG DECL ClientWait (LPBOARDHANDLE , ULONG); -extern ULONG DECL ClientLocateFirstTwisterOfQuad(ULONG); -extern ULONG DECL ClientSearchDevNode(ULONG, UCHAR, UCHAR); -extern ULONG DECL ClientGetBiosInfo(LPBOARDHANDLE, LPUCHAR, LPULONG ); -extern ULONG DECL ClientDebug (LPBOARDHANDLE , ULONG, LPUCHAR, ULONG, LPVOID); -extern ULONG DECL ClientCallBiosInt10(LPBOARDHANDLE, LPBIOSREGS); -extern ULONG DECL ClientReadDDCEdid(LPBOARDHANDLE, LPUCHAR, ULONG); -extern ULONG DECL ClientCustomCall(LPBOARDHANDLE, ULONG, LPVOID, LPVOID); -extern ULONG DECL ClientApplyEpromPatch(LPBOARDHANDLE); -extern ULONG DECL ClientDetectHostInterface(LPBOARDHANDLE, LPULONG); -extern ULONG DECL ClientHSLPatchFunction(LPBOARDHANDLE, ULONG, ULONG, LPUCHAR); -extern ULONG DECL InitClientFunctions(LPBOARDHANDLE, ULONG); -extern ULONG DECL ClientInitTimeBase(LPBOARDHANDLE); -extern ULONG DECL ClientOpenDMABase(LPBOARDHANDLE, ULONG, ULONG); -extern ULONG DECL ClientReadDMAByte(LPBOARDHANDLE, ULONG, LPUCHAR); -extern ULONG DECL ClientReadBIOS(LPBOARDHANDLE, ULONG, ULONG, ULONG, ULONG, LPUCHAR); -extern ULONG DECL ClientWriteBIOS(LPBOARDHANDLE, ULONG, ULONG, ULONG, ULONG); - +extern ULONG DECL ClientReadConfigSpaceDword(LPBOARDHANDLE , ULONG, LPULONG ); +extern ULONG DECL ClientWriteConfigSpaceByte (LPBOARDHANDLE , ULONG, UCHAR); +extern ULONG DECL ClientWriteConfigSpaceDword(LPBOARDHANDLE , ULONG, ULONG); +extern ULONG DECL ClientOpenRegisterBase(LPBOARDHANDLE , ULONG, ULONG); +extern ULONG DECL ClientCloseRegisterBase (LPBOARDHANDLE ); +extern ULONG DECL ClientReadRegisterByte(LPBOARDHANDLE , ULONG, LPUCHAR ); +extern ULONG DECL ClientReadRegisterDword(LPBOARDHANDLE , ULONG, LPULONG ); +extern ULONG DECL ClientWriteRegisterByte (LPBOARDHANDLE , ULONG, UCHAR); +extern ULONG DECL ClientWriteRegisterDword(LPBOARDHANDLE , ULONG, ULONG); +extern ULONG DECL ClientOpenMemoryBase(LPBOARDHANDLE , ULONG, ULONG); +extern ULONG DECL ClientCloseMemoryBase(LPBOARDHANDLE ); +extern ULONG DECL ClientReadMemoryByte(LPBOARDHANDLE , ULONG, LPUCHAR ); +extern ULONG DECL ClientReadMemoryDword (LPBOARDHANDLE , ULONG, LPULONG ); +extern ULONG DECL ClientWriteMemoryByte(LPBOARDHANDLE , ULONG, UCHAR); +extern ULONG DECL ClientWriteMemoryDword (LPBOARDHANDLE , ULONG, ULONG); +extern ULONG DECL ClientOpenSystemDevice (LPBOARDHANDLE , ULONG, ULONG); +extern ULONG DECL ClientCloseSystemDevice (LPBOARDHANDLE ); +extern ULONG DECL ClientReadSystemDeviceByte(LPBOARDHANDLE , ULONG, LPUCHAR ); +extern ULONG DECL ClientReadSystemDeviceDword(LPBOARDHANDLE , ULONG, LPULONG ); +extern ULONG DECL ClientWriteSystemDeviceByte(LPBOARDHANDLE , ULONG, UCHAR); +extern ULONG DECL ClientWriteSystemDeviceDword (LPBOARDHANDLE , ULONG, ULONG); +extern ULONG DECL ClientWait (LPBOARDHANDLE , ULONG); +extern ULONG DECL ClientLocateFirstTwisterOfQuad(ULONG); +extern ULONG DECL ClientSearchDevNode(ULONG, UCHAR, UCHAR); +extern ULONG DECL ClientGetBiosInfo(LPBOARDHANDLE, LPUCHAR, LPULONG ); +extern ULONG DECL ClientDebug (LPBOARDHANDLE , ULONG, LPUCHAR, ULONG, LPVOID); +extern ULONG DECL ClientCallBiosInt10(LPBOARDHANDLE, LPBIOSREGS); +extern ULONG DECL ClientReadDDCEdid(LPBOARDHANDLE, LPUCHAR, ULONG); +extern ULONG DECL ClientCustomCall(LPBOARDHANDLE, ULONG, LPVOID, LPVOID); +extern ULONG DECL ClientApplyEpromPatch(LPBOARDHANDLE); +extern ULONG DECL ClientDetectHostInterface(LPBOARDHANDLE, LPULONG); +extern ULONG DECL ClientHSLPatchFunction(LPBOARDHANDLE, ULONG, ULONG, LPUCHAR); +extern ULONG DECL InitClientFunctions(LPBOARDHANDLE, ULONG); +extern ULONG DECL ClientInitTimeBase(LPBOARDHANDLE); +extern ULONG DECL ClientOpenDMABase(LPBOARDHANDLE, ULONG, ULONG); +extern ULONG DECL ClientReadDMAByte(LPBOARDHANDLE, ULONG, LPUCHAR); +extern ULONG DECL ClientReadBIOS(LPBOARDHANDLE, ULONG, ULONG, ULONG, ULONG, LPUCHAR); +extern ULONG DECL ClientWriteBIOS(LPBOARDHANDLE, ULONG, ULONG, ULONG, ULONG); + #if defined(__cplusplus) } #endif - #define ESC_CUSTOM_SET_FUNCTION_PTR 0x80000200 #define ESC_CUSTOM_GET_FUNCTION_PTR 0x80000201 #define ESC_CUSTOM_PATCH_HSL 0x80000202 diff --git a/xc/programs/Xserver/hw/xfree86/drivers/mga/clientlx.c b/xc/programs/Xserver/hw/xfree86/drivers/mga/clientlx.c index 28f70a4f5..706c12501 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/mga/clientlx.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/mga/clientlx.c @@ -1,12 +1,12 @@ /******************************************************************************\ clientlx.c - + Copyright © 1997, Matrox Graphics Inc. All Rights Reserved. -\******************************************************************************/ +\******************************************************************************/ #include "xf86_OSproc.h" #include "xf86Pci.h" #include "xf86_ansic.h" @@ -17,53 +17,53 @@ CLIENTTABLE ClientFunctions = { (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadConfigSpaceByte, (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadConfigSpaceDword, (ULONG (DECL *)(LPVOID,ULONG,UCHAR)) ClientWriteConfigSpaceByte, - (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientWriteConfigSpaceDword, - (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientOpenRegisterBase, - (ULONG (DECL *)(LPVOID)) ClientCloseRegisterBase, + (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientWriteConfigSpaceDword, + (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientOpenRegisterBase, + (ULONG (DECL *)(LPVOID)) ClientCloseRegisterBase, (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadRegisterByte, (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadRegisterDword, (ULONG (DECL *)(LPVOID,ULONG,UCHAR)) ClientWriteRegisterByte, (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientWriteRegisterDword, - (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientOpenMemoryBase, - (ULONG (DECL *)(LPVOID)) ClientCloseMemoryBase, + (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientOpenMemoryBase, + (ULONG (DECL *)(LPVOID)) ClientCloseMemoryBase, (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadMemoryByte, (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadMemoryDword, (ULONG (DECL *)(LPVOID,ULONG,UCHAR)) ClientWriteMemoryByte, (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientWriteMemoryDword, - (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientOpenSystemDevice, - (ULONG (DECL *)(LPVOID)) ClientCloseSystemDevice, + (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientOpenSystemDevice, + (ULONG (DECL *)(LPVOID)) ClientCloseSystemDevice, (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadSystemDeviceByte, (ULONG (DECL *)(LPVOID,ULONG,LPVOID)) ClientReadSystemDeviceDword, (ULONG (DECL *)(LPVOID,ULONG,UCHAR)) ClientWriteSystemDeviceByte, - (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientWriteSystemDeviceDword, + (ULONG (DECL *)(LPVOID,ULONG,ULONG)) ClientWriteSystemDeviceDword, (ULONG (DECL *)(LPVOID,ULONG)) ClientWait, - (ULONG (DECL *)(LPVOID,LPVOID,LPVOID)) ClientGetBiosInfo, - (ULONG (DECL *)(LPVOID,LPVOID,ULONG)) ClientReadDDCEdid -}; - + (ULONG (DECL *)(LPVOID,LPVOID,LPVOID)) ClientGetBiosInfo, + (ULONG (DECL *)(LPVOID,LPVOID,ULONG)) ClientReadDDCEdid +}; + /******************************************************************************\ Function : ClientReadConfigSpaceByte Description : Read a Byte from the configuration space. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure containing all the information about a specifib board. ULONG ulOffset | Offset of the Byte to be read. - UCHAR *pucByte | pointer to a byte that will receive + UCHAR *pucByte | pointer to a byte that will receive the data - + Return Val : ULONG - + \******************************************************************************/ -ULONG ClientReadConfigSpaceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, +ULONG ClientReadConfigSpaceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR *pucByte) { LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); - MGAPtr pMga = (MGAPtr)pClientStruct->pMga; + MGAPtr pMga = (MGAPtr)pClientStruct->pMga; ASSERT_HANDLER(pBoard); - + *pucByte = pciReadByte(pMga->PciTag,ulOffset); return 0; @@ -76,7 +76,7 @@ ULONG ClientReadConfigSpaceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, Description : Read a Dword from the configuration space. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure containing all the information about a specific board. ULONG ulOffset | Offset of the Byte to be read. ULONG *pulDword | Dword to receive the data @@ -84,14 +84,14 @@ ULONG ClientReadConfigSpaceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, Return Val : ULONG \******************************************************************************/ -ULONG ClientReadConfigSpaceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, +ULONG ClientReadConfigSpaceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, ULONG *pulDword) -{ +{ LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); - MGAPtr pMga = (MGAPtr)pClientStruct->pMga; - + MGAPtr pMga = (MGAPtr)pClientStruct->pMga; + ASSERT_HANDLER(pBoard); - + *pulDword = pciReadLong(pMga->PciTag,ulOffset); return 0; @@ -104,23 +104,23 @@ ULONG ClientReadConfigSpaceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, Description : Write a Byte from the configuration space. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure containing all the information about a specific board. ULONG ulOffset | Offset of the Byte to be read. UCHAR ucByte | Byte to receive the data - + Return Val : ULONG - + \******************************************************************************/ -ULONG ClientWriteConfigSpaceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, +ULONG ClientWriteConfigSpaceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR ucByte) { LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); - MGAPtr pMga = (MGAPtr)pClientStruct->pMga; - + MGAPtr pMga = (MGAPtr)pClientStruct->pMga; + ASSERT_HANDLER(pBoard); - pciWriteByte(pMga->PciTag,ulOffset, ucByte); + pciWriteByte(pMga->PciTag,ulOffset, ucByte); return 0; } @@ -130,22 +130,22 @@ ULONG ClientWriteConfigSpaceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, Function : ClientWriteConfigSpaceDword - Description : Write a Dword from the configuration space. + Description : Write a Dword from the configuration space. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure containing all the information about a specific board. ULONG ulOffset | Offset of the Byte to be read. ULONG ulDword | Dword containing the data to be written - + Return Val : ULONG \******************************************************************************/ -ULONG ClientWriteConfigSpaceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, +ULONG ClientWriteConfigSpaceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, ULONG ulDword) { LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); - MGAPtr pMga = (MGAPtr)pClientStruct->pMga; - + MGAPtr pMga = (MGAPtr)pClientStruct->pMga; + ASSERT_HANDLER(pBoard); pciWriteLong(pMga->PciTag,ulOffset, ulDword); @@ -158,10 +158,10 @@ ULONG ClientWriteConfigSpaceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, Function : ClientOpenRegisterBase - Description : Map the register base for future call to ClientReadRegisterX - and ClientWriteRegisterX. + Description : Map the register base for future call to ClientReadRegisterX + and ClientWriteRegisterX. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure containing all the information about a specific board. ULONG ulAddress | Physical address of the Register aperture ULONG ulSize | Size in Byte of the Register Aperture @@ -170,14 +170,14 @@ ULONG ClientWriteConfigSpaceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, \******************************************************************************/ ULONG ClientOpenRegisterBase(LPBOARDHANDLE pBoard, ULONG ulAddress, ULONG ulSize) -{ +{ LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); - MGAPtr pMga = (MGAPtr)pClientStruct->pMga; - + MGAPtr pMga = (MGAPtr)pClientStruct->pMga; + ASSERT_HANDLER(pBoard); - + pClientStruct->ulRegisterBase = (ULONG) pMga->IOBase; - + return 0; } @@ -186,12 +186,12 @@ ULONG ClientOpenRegisterBase(LPBOARDHANDLE pBoard, ULONG ulAddress, ULONG ulSize Function : ClientCloseRegisterBase - Description : Unmap the register base address and free resources needed + Description : Unmap the register base address and free resources needed to address it. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure containing all the information about a specific board. - + Return Val : ULONG \******************************************************************************/ @@ -203,25 +203,25 @@ ULONG ClientCloseRegisterBase(LPBOARDHANDLE pBoard) /******************************************************************************\ - + Function : ClientReadRegisterByte Description : Read a byte from the Register space. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure. + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure. containing all the information about a specific board. ULONG ulOffset | Offset of the Byte to be read. - UCHAR *pucByte | pointer to the byte that will receive + UCHAR *pucByte | pointer to the byte that will receive the data. Return Val : ULONG \******************************************************************************/ -ULONG ClientReadRegisterByte(LPBOARDHANDLE pBoard, ULONG ulOffset, +ULONG ClientReadRegisterByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR *pucByte) { LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); - + ASSERT_HANDLER(pBoard); *pucByte = *((UCHAR *)(pClientStruct->ulRegisterBase + ulOffset)); @@ -234,26 +234,26 @@ ULONG ClientReadRegisterByte(LPBOARDHANDLE pBoard, ULONG ulOffset, Function : ClientReadRegisterDword - Description : Read a Dword from the Register space. + Description : Read a Dword from the Register space. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. ULONG ulOffset | Offset of the Byte to be read. - ULONG *pulDword | pointer to the dword that will receive + ULONG *pulDword | pointer to the dword that will receive the data. Return Val : ULONG \******************************************************************************/ -ULONG ClientReadRegisterDword(LPBOARDHANDLE pBoard, ULONG ulOffset, +ULONG ClientReadRegisterDword(LPBOARDHANDLE pBoard, ULONG ulOffset, ULONG *pulDword) { LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); - + ASSERT_HANDLER(pBoard); - + *pulDword = *((ULONG *)(pClientStruct->ulRegisterBase + ulOffset)); - + return 0; } @@ -261,22 +261,22 @@ ULONG ClientReadRegisterDword(LPBOARDHANDLE pBoard, ULONG ulOffset, /******************************************************************************\ Function : ClientWriteRegisterByte - + Description : Write a Byte from the Register space. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure containing all the information about a specific board. ULONG ulOffset | Offset of the Byte to be read. UCHAR ucByte | CHAR to receive the data. - + Return Val : ULONG \******************************************************************************/ -ULONG ClientWriteRegisterByte(LPBOARDHANDLE pBoard, ULONG ulOffset, +ULONG ClientWriteRegisterByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR ucByte) { LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); - + ASSERT_HANDLER(pBoard); *((UCHAR *)(pClientStruct->ulRegisterBase + ulOffset)) = ucByte; @@ -289,21 +289,21 @@ ULONG ClientWriteRegisterByte(LPBOARDHANDLE pBoard, ULONG ulOffset, Function : ClientWriteRegisterSpaceDword - Description : Write a Dword from the Register space. + Description : Write a Dword from the Register space. - I/O Desc. : LPBOARDHANDLE *| pBoard | Handle to the board structure + I/O Desc. : LPBOARDHANDLE *| pBoard | Handle to the board structure containing all the information about a specific board. ULONG ulOffset | Offset of the Byte to be read. ULONG ulDword | Dword to receive the data - + Return Val : ULONG \******************************************************************************/ -ULONG ClientWriteRegisterDword(LPBOARDHANDLE pBoard, ULONG ulOffset, +ULONG ClientWriteRegisterDword(LPBOARDHANDLE pBoard, ULONG ulOffset, ULONG ulDword) { LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); - + ASSERT_HANDLER(pBoard); *((ULONG *)(pClientStruct->ulRegisterBase + ulOffset)) = ulDword; @@ -316,11 +316,11 @@ ULONG ClientWriteRegisterDword(LPBOARDHANDLE pBoard, ULONG ulOffset, Function : ClientOpenMemoryBase - Description : Map the Memory base for future call to ClientReadMemoryX + Description : Map the Memory base for future call to ClientReadMemoryX and ClientWriteMemoryX. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. ULONG ulAddress | Physical address of the Register aperture ULONG ulSize | Size in Byte of the Register Aperture Return Val : ULONG @@ -332,7 +332,7 @@ ULONG ClientOpenMemoryBase(LPBOARDHANDLE pBoard, ULONG ulAddress, ULONG ulSize) MGAPtr pMga = (MGAPtr) pClientStruct->pMga; ASSERT_HANDLER(pBoard); - + pClientStruct->ulFrameBufferBase = (ULONG) pMga->FbBase; return 0; @@ -343,12 +343,12 @@ ULONG ClientOpenMemoryBase(LPBOARDHANDLE pBoard, ULONG ulAddress, ULONG ulSize) Function : ClientCloseMemoryBase - Description : Unmap the Frame Buffer aperture and free resources + Description : Unmap the Frame Buffer aperture and free resources needed to address it. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. - + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. + Return Val : ULONG \******************************************************************************/ @@ -363,10 +363,10 @@ ULONG ClientCloseMemoryBase(LPBOARDHANDLE pBoard) Function : ClientReadMemoryByte - Description : Read a Byte from the Frame Buffer space. + Description : Read a Byte from the Frame Buffer space. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. ULONG ulOffset | Offset of the Byte to be read. UCHAR *ucByte | CHAR to receive the data @@ -375,7 +375,7 @@ ULONG ClientCloseMemoryBase(LPBOARDHANDLE pBoard) ULONG ClientReadMemoryByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR *pucByte) { LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); - + ASSERT_HANDLER(pBoard); *pucByte = *((UCHAR *)(pClientStruct->ulFrameBufferBase + ulOffset)); @@ -390,8 +390,8 @@ ULONG ClientReadMemoryByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR *pucByte) Description : Read a Dword from the Frame Buffer Space. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. ULONG ulOffset | Offset of the Byte to be read. ULONG *uDword | Dword to receive the data @@ -402,7 +402,7 @@ ULONG ClientReadMemoryDword(LPBOARDHANDLE pBoard, ULONG ulOffset, ULONG *pulDword) { LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); - + ASSERT_HANDLER(pBoard); *pulDword = *((ULONG *)(pClientStruct->ulFrameBufferBase + ulOffset)); @@ -415,20 +415,20 @@ ULONG ClientReadMemoryDword(LPBOARDHANDLE pBoard, ULONG ulOffset, Function : ClientWriteMemoryByte - Description : Write a Byte from the Frame Buffer space. + Description : Write a Byte from the Frame Buffer space. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. ULONG ulOffset | Offset of the Byte to be read. UCHAR ucByte | CHAR to receive the data - + Return Val : ULONG \******************************************************************************/ ULONG ClientWriteMemoryByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR ucByte) { LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); - + ASSERT_HANDLER(pBoard); *((UCHAR *)(pClientStruct->ulFrameBufferBase + ulOffset)) = ucByte; @@ -440,22 +440,22 @@ ULONG ClientWriteMemoryByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR ucByte) /******************************************************************************\ Function : ClientWriteMemoryDword - + Description : Write a Dword from the Frame Buffer space. - I/O desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. + I/O desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. ULONG ulOffset | Offset of the Byte to be read. ULONG ulDword | Dword to receive the data Return Val : ULONG \******************************************************************************/ -ULONG ClientWriteMemoryDword(LPBOARDHANDLE pBoard, ULONG ulOffset, +ULONG ClientWriteMemoryDword(LPBOARDHANDLE pBoard, ULONG ulOffset, ULONG ulDword) { LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard); - + ASSERT_HANDLER(pBoard); *((ULONG *)(pClientStruct->ulFrameBufferBase + ulOffset)) = ulDword; @@ -468,58 +468,58 @@ ULONG ClientWriteMemoryDword(LPBOARDHANDLE pBoard, ULONG ulOffset, Function : ClientOpenSystemDevice - Description : Map a System device aperture for future call to + Description : Map a System device aperture for future call to ClientReadSystemDeviceX and ClientWriteSystemDeviceX. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. ULONG ulAddress | Physical address of the Register aperture ULONG ulSize | Size in Byte of the Register Aperture - + Return Val : ULONG \******************************************************************************/ -ULONG ClientOpenSystemDevice(LPBOARDHANDLE pBoard, ULONG ulAddress, +ULONG ClientOpenSystemDevice(LPBOARDHANDLE pBoard, ULONG ulAddress, ULONG ulSize) { return 1; -} +} /******************************************************************************\ - + Function : ClientCloseSystemDevice - - Description : Unmap the System Device aperture address and free - resources needed to address it. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. - + Description : Unmap the System Device aperture address and free + resources needed to address it. + + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. + Return Val : ULONG \******************************************************************************/ ULONG ClientCloseSystemDevice (LPBOARDHANDLE pBoard) { return 1; -} +} /******************************************************************************\ Function : ClientReadSystemDeviceByte - + Description : Read a Byte from the device Space. - - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. + + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. ULONG ulOffset | Offset of the Byte to be read. ULONG pucByte | Byte to read the data Return Val : ULONG \******************************************************************************/ -ULONG ClientReadSystemDeviceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, +ULONG ClientReadSystemDeviceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR *pucByte) { return 1; @@ -529,18 +529,18 @@ ULONG ClientReadSystemDeviceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, /******************************************************************************\ Function : ClientReadSystemDeviceDword - + Description : Read a Dword from the Frame Buffer Space - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. ULONG ulOffset | Offset of the Byte to be read. ULONG ulDword | Dword to Read the data Return Val : ULONG \******************************************************************************/ -ULONG ClientReadSystemDeviceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, +ULONG ClientReadSystemDeviceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, ULONG *pulDword) { return 1; @@ -553,31 +553,31 @@ ULONG ClientReadSystemDeviceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, Description : Write a Byte from the System Device Aperture - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure containing all the information about a specific board. ULONG ulOffset | Offset of the Byte to be read. UCHAR ucByte | Byte to receive the data Return Val : ULONG \******************************************************************************/ -ULONG ClientWriteSystemDeviceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, +ULONG ClientWriteSystemDeviceByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR ucByte) { return 1; -} +} /******************************************************************************\ Function : ClientWriteSystemDword - + Description : Write a Dword from the System Device Aperture. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. ULONG ulOffset | Offset of the Byte to be read. ULONG uDword | Dword to receive the data - + Return Val : ULONG \******************************************************************************/ @@ -585,7 +585,7 @@ ULONG ClientWriteSystemDeviceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, ULONG ulDword) { return 1; -} +} /******************************************************************************\ @@ -594,10 +594,10 @@ ULONG ClientWriteSystemDeviceDword(LPBOARDHANDLE pBoard, ULONG ulOffset, Description : Wait for ulDelayus micro-seconds. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure containing all the information about a specific board. ULONG ulDelayus | Delay in uSec - + Return Val : ULONG \******************************************************************************/ @@ -607,7 +607,7 @@ ULONG ClientWait (LPBOARDHANDLE pBoard, ULONG ulDelayus) ULONG ulTmp; ASSERT_HANDLER(pBoard); - + for(i = 0; i < ulDelayus * 3; i++) { ClientReadRegisterDword(pBoard,0x1e14,&ulTmp); @@ -624,17 +624,17 @@ ULONG ClientWait (LPBOARDHANDLE pBoard, ULONG ulDelayus) Description : This function will be call if no PINS can be found in physical EEPROM. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure containing all the information about a specific board. LPUCHAR | Buffer where we copy bios pins. ULONG | Bios version - + Return Val : ULONG \******************************************************************************/ ULONG ClientGetBiosInfo(LPBOARDHANDLE pBoard, LPUCHAR pucPins,LPULONG pulBIOSVersion) { - Bool bNotFound = TRUE; + Bool bNotFound = TRUE; UCHAR ucBIOS[32768]; UCHAR ucTmpByte; UCHAR ucCheckSum; @@ -654,7 +654,7 @@ ULONG ClientGetBiosInfo(LPBOARDHANDLE pBoard, LPUCHAR pucPins,LPULONG pulBIOSVer { while((ulPinsOffset < 0x10000) && bNotFound) { - ulTmpDword = *(ULONG *)(ucBIOS + ulPinsOffset); + ulTmpDword = *(ULONG *)(ucBIOS + ulPinsOffset); ucPinsSize = (UCHAR) (ulTmpDword >> 16); if(((ulTmpDword & 0x0000ffff) == 0x0000412e) && ucPinsSize <= 128) @@ -675,7 +675,7 @@ ULONG ClientGetBiosInfo(LPBOARDHANDLE pBoard, LPUCHAR pucPins,LPULONG pulBIOSVer } if(bNotFound) - { + { return 1; } @@ -687,7 +687,7 @@ ULONG ClientGetBiosInfo(LPBOARDHANDLE pBoard, LPUCHAR pucPins,LPULONG pulBIOSVer { ulPCIINFOffset += 0x12; ulTmpDword = *(ULONG *)(ucBIOS + ulPCIINFOffset); - *pulBIOSVersion = ((ULONG) ((ulTmpDword & 0xf0) >> 4) << 16) | + *pulBIOSVersion = ((ULONG) ((ulTmpDword & 0xf0) >> 4) << 16) | ((ulTmpDword &0xf) << 12) | ((ulTmpDword >> 8) & 0xff); } @@ -722,12 +722,12 @@ ULONG ClientGetBiosInfo(LPBOARDHANDLE pBoard, LPUCHAR pucPins,LPULONG pulBIOSVer Description : Call the BIOS Int10h with specified parameters. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. - LPBIOSREGS pBiosRegs | Pointor to the Bios register + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. + LPBIOSREGS pBiosRegs | Pointor to the Bios register structure. - - Return Val : ULONG + + Return Val : ULONG \******************************************************************************/ ULONG ClientCallBiosInt10(LPBOARDHANDLE pBoard, LPBIOSREGS pBiosRegs) @@ -744,12 +744,12 @@ ULONG ClientCallBiosInt10(LPBOARDHANDLE pBoard, LPBIOSREGS pBiosRegs) Description : Not implemented. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. - LPBIOSREGS pBiosRegs | Pointor to the Bios register + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. + LPBIOSREGS pBiosRegs | Pointor to the Bios register structure. - - Return Val : ULONG + + Return Val : ULONG \******************************************************************************/ ULONG ClientReadDDCEdid(LPBOARDHANDLE pBoard, LPUCHAR pEdid, @@ -767,12 +767,12 @@ ULONG ClientReadDDCEdid(LPBOARDHANDLE pBoard, LPUCHAR pEdid, Description : Not implemented. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. - LPBIOSREGS pBiosRegs | Pointor to the Bios register + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. + LPBIOSREGS pBiosRegs | Pointor to the Bios register structure. - - Return Val : ULONG + + Return Val : ULONG \******************************************************************************/ ULONG ClientCustomCall(LPBOARDHANDLE pBoard, ULONG ulServiceNumber, @@ -790,12 +790,12 @@ ULONG ClientCustomCall(LPBOARDHANDLE pBoard, ULONG ulServiceNumber, Description : Not implemented. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. - LPBIOSREGS pBiosRegs | Pointor to the Bios register + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. + LPBIOSREGS pBiosRegs | Pointor to the Bios register structure. - - Return Val : ULONG + + Return Val : ULONG \******************************************************************************/ ULONG ClientApplyEpromPatch(LPBOARDHANDLE pBoard) @@ -812,12 +812,12 @@ ULONG ClientApplyEpromPatch(LPBOARDHANDLE pBoard) Description : Not implemented. - I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure - containing all the information about a specific board. - LPBIOSREGS pBiosRegs | Pointor to the Bios register + I/O Desc. : LPBOARDHANDLE pBoard | Handle to the board structure + containing all the information about a specific board. + LPBIOSREGS pBiosRegs | Pointor to the Bios register structure. - - Return Val : ULONG + + Return Val : ULONG \******************************************************************************/ ULONG ClientDetectHostInterface(LPBOARDHANDLE pBoard, LPULONG pulData) |