diff options
author | Aaron Plattner <aplattner@nvidia.com> | 2007-07-24 21:21:06 -0700 |
---|---|---|
committer | Aaron Plattner <aplattner@nvidia.com> | 2007-07-24 21:21:57 -0700 |
commit | 3bb842cb55fd201a559bef19c06db4aee0485d26 (patch) | |
tree | 29a3f3ff1b24cd1699a4f939815140c4045b9f39 /src | |
parent | 08b68473351081fe1ed96ba7e206ed0d301b8a91 (diff) |
Nuke old RCS tags.
Fix the ends of files. Update the known cards date.
Diffstat (limited to 'src')
-rw-r--r-- | src/nv_const.h | 3 | ||||
-rw-r--r-- | src/nv_cursor.c | 2 | ||||
-rw-r--r-- | src/nv_dac.c | 3 | ||||
-rw-r--r-- | src/nv_dga.c | 2 | ||||
-rw-r--r-- | src/nv_dma.h | 2 | ||||
-rw-r--r-- | src/nv_driver.c | 8 | ||||
-rw-r--r-- | src/nv_hw.c | 3 | ||||
-rw-r--r-- | src/nv_include.h | 2 | ||||
-rw-r--r-- | src/nv_local.h | 1 | ||||
-rw-r--r-- | src/nv_proto.h | 3 | ||||
-rw-r--r-- | src/nv_setup.c | 3 | ||||
-rw-r--r-- | src/nv_shadow.c | 4 | ||||
-rw-r--r-- | src/nv_type.h | 2 | ||||
-rw-r--r-- | src/nv_video.c | 2 | ||||
-rw-r--r-- | src/nv_xaa.c | 3 | ||||
-rw-r--r-- | src/nvreg.h | 7 | ||||
-rw-r--r-- | src/nvvga.h | 4 | ||||
-rw-r--r-- | src/riva_const.h | 3 | ||||
-rw-r--r-- | src/riva_cursor.c | 2 | ||||
-rw-r--r-- | src/riva_dac.c | 3 | ||||
-rw-r--r-- | src/riva_dga.c | 2 | ||||
-rw-r--r-- | src/riva_driver.c | 3 | ||||
-rw-r--r-- | src/riva_hw.c | 2 | ||||
-rw-r--r-- | src/riva_hw.h | 2 | ||||
-rw-r--r-- | src/riva_include.h | 2 | ||||
-rw-r--r-- | src/riva_local.h | 1 | ||||
-rw-r--r-- | src/riva_proto.h | 3 | ||||
-rw-r--r-- | src/riva_setup.c | 2 | ||||
-rw-r--r-- | src/riva_shadow.c | 4 | ||||
-rw-r--r-- | src/riva_tbl.h | 3 | ||||
-rw-r--r-- | src/riva_type.h | 2 | ||||
-rw-r--r-- | src/riva_xaa.c | 3 |
32 files changed, 4 insertions, 87 deletions
diff --git a/src/nv_const.h b/src/nv_const.h index 7a7bdea..b1285ba 100644 --- a/src/nv_const.h +++ b/src/nv_const.h @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_const.h,v 1.6 2001/12/07 00:09:55 mvojkovi Exp $ */ - #ifndef __NV_CONST_H__ #define __NV_CONST_H__ @@ -8,4 +6,3 @@ #define NV_DRIVER_NAME "nv" #endif /* __NV_CONST_H__ */ - diff --git a/src/nv_cursor.c b/src/nv_cursor.c index 453ca52..a648f60 100644 --- a/src/nv_cursor.c +++ b/src/nv_cursor.c @@ -37,8 +37,6 @@ |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_cursor.c,v 1.13 2004/03/13 22:07:05 mvojkovi Exp $ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/nv_dac.c b/src/nv_dac.c index 7e8340d..ec7739b 100644 --- a/src/nv_dac.c +++ b/src/nv_dac.c @@ -37,8 +37,6 @@ |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c,v 1.45 2005/07/09 00:53:00 mvojkovi Exp $ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -433,4 +431,3 @@ NVDACi2cInit(ScrnInfoPtr pScrn) } return TRUE; } - diff --git a/src/nv_dga.c b/src/nv_dga.c index ea78db9..ccbbf4d 100644 --- a/src/nv_dga.c +++ b/src/nv_dga.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dga.c,v 1.11 2002/01/25 21:56:06 tsi Exp $ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/nv_dma.h b/src/nv_dma.h index ca0bf1b..150918a 100644 --- a/src/nv_dma.h +++ b/src/nv_dma.h @@ -38,8 +38,6 @@ |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dma.h,v 1.4 2004/03/20 01:52:16 mvojkovi Exp $ */ - #define SURFACE_FORMAT 0x00000300 #define SURFACE_FORMAT_DEPTH8 0x00000001 #define SURFACE_FORMAT_DEPTH15 0x00000002 diff --git a/src/nv_driver.c b/src/nv_driver.c index 47d0fbb..07ca621 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -1,5 +1,3 @@ -/* $XdotOrg: driver/xf86-video-nv/src/nv_driver.c,v 1.21 2006/01/24 16:45:29 aplattner Exp $ */ -/* $XConsortium: nv_driver.c /main/3 1996/10/28 05:13:37 kaleb $ */ /* * Copyright 1996-1997 David J. McKay * @@ -29,8 +27,6 @@ /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen <jpaana@s2.org> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.144 2006/06/16 00:19:32 mvojkovi Exp $ */ - #include "nv_include.h" #include "xf86int10.h" @@ -95,7 +91,7 @@ _X_EXPORT DriverRec NV = { 0 }; -/* Known cards as of 2006/06/16 */ +/* Known cards as of 2007/07/24 */ static SymTabRec NVKnownChipsets[] = { @@ -2505,4 +2501,4 @@ NVDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer data) return FALSE; } -#endif +#endif /* RANDR */ diff --git a/src/nv_hw.c b/src/nv_hw.c index 63f9067..9bc16f4 100644 --- a/src/nv_hw.c +++ b/src/nv_hw.c @@ -36,7 +36,6 @@ |* those rights set forth herein. *| |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c,v 1.21 2006/06/16 00:19:33 mvojkovi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1605,5 +1604,3 @@ void NVSetStartAddress ( pNv->PCRTC[0x800/4] = start; } } - - diff --git a/src/nv_include.h b/src/nv_include.h index 648ac31..b579b37 100644 --- a/src/nv_include.h +++ b/src/nv_include.h @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_include.h,v 1.9 2000/10/06 12:31:03 eich Exp $ */ - #ifndef __NV_INCLUDE_H__ #define __NV_INCLUDE_H__ diff --git a/src/nv_local.h b/src/nv_local.h index 3d5d202..74cdc09 100644 --- a/src/nv_local.h +++ b/src/nv_local.h @@ -36,7 +36,6 @@ |* those rights set forth herein. *| |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_local.h,v 1.8tsi Exp $ */ #ifndef __NV_LOCAL_H__ #define __NV_LOCAL_H__ diff --git a/src/nv_proto.h b/src/nv_proto.h index 5905309..142cd4c 100644 --- a/src/nv_proto.h +++ b/src/nv_proto.h @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_proto.h,v 1.11 2004/03/20 01:52:16 mvojkovi Exp $ */ - #ifndef __NV_PROTO_H__ #define __NV_PROTO_H__ @@ -58,4 +56,3 @@ void NVRefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox); void NVPointerMoved(int index, int x, int y); #endif /* __NV_PROTO_H__ */ - diff --git a/src/nv_setup.c b/src/nv_setup.c index 1bf58e0..5772dd0 100644 --- a/src/nv_setup.c +++ b/src/nv_setup.c @@ -37,8 +37,6 @@ |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.48 2005/09/14 02:28:03 mvojkovi Exp $ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -708,4 +706,3 @@ NVCommonSetup(ScrnInfoPtr pScrn) pNv->LVDS ? "LVDS" : "TMDS"); } } - diff --git a/src/nv_shadow.c b/src/nv_shadow.c index e695288..7f835a1 100644 --- a/src/nv_shadow.c +++ b/src/nv_shadow.c @@ -2,7 +2,6 @@ Copyright (c) 1999, The XFree86 Project Inc. Written by Mark Vojkovich <markv@valinux.com> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_shadow.c,v 1.5 2000/03/13 18:49:29 mvojkovi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -208,6 +207,3 @@ NVRefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox) pbox++; } } - - - diff --git a/src/nv_type.h b/src/nv_type.h index b4f1cd3..160441b 100644 --- a/src/nv_type.h +++ b/src/nv_type.h @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h,v 1.51 2005/04/16 23:57:26 mvojkovi Exp $ */ - #ifndef __NV_STRUCT_H__ #define __NV_STRUCT_H__ diff --git a/src/nv_video.c b/src/nv_video.c index c9ee5fe..e11e0d0 100644 --- a/src/nv_video.c +++ b/src/nv_video.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c,v 1.23 2004/03/20 22:07:06 mvojkovi Exp $ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/nv_xaa.c b/src/nv_xaa.c index 2504882..5eb4fd8 100644 --- a/src/nv_xaa.c +++ b/src/nv_xaa.c @@ -37,8 +37,6 @@ |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_xaa.c,v 1.35 2004/03/20 16:25:18 mvojkovi Exp $ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -729,4 +727,3 @@ NVAccelInit(ScreenPtr pScreen) return (XAAInit(pScreen, accel)); } - diff --git a/src/nvreg.h b/src/nvreg.h index c7bd6ba..aa12b0c 100644 --- a/src/nvreg.h +++ b/src/nvreg.h @@ -1,4 +1,3 @@ -/* $XConsortium: nvreg.h /main/2 1996/10/28 05:13:41 kaleb $ */ /* * Copyright 1996-1997 David J. McKay * @@ -21,8 +20,6 @@ * SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nvreg.h,v 1.6 2002/01/25 21:56:06 tsi Exp $ */ - #ifndef __NVREG_H_ #define __NVREG_H_ @@ -195,6 +192,4 @@ typedef enum {NV1,NV3,NV4,NV10,NumNVChips} NVChipType; NVChipType GetChipType(void); -#endif - - +#endif /* __NVREG_H_ */ diff --git a/src/nvvga.h b/src/nvvga.h index e194792..e614be1 100644 --- a/src/nvvga.h +++ b/src/nvvga.h @@ -20,8 +20,6 @@ * SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nvvga.h,v 1.2 2001/11/19 15:33:41 tsi Exp $ */ - #ifndef __NVVGA_H__ #define __NVVGA_H__ @@ -79,4 +77,4 @@ typedef struct { }regs; } vgaNVRec, *vgaNVPtr; -#endif +#endif /* __NVVGA_H__ */ diff --git a/src/riva_const.h b/src/riva_const.h index 4949fc1..890bcaa 100644 --- a/src/riva_const.h +++ b/src/riva_const.h @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_const.h $ */ - #ifndef __RIVA_CONST_H__ #define __RIVA_CONST_H__ @@ -8,4 +6,3 @@ #define RIVA_DRIVER_NAME "riva128" #endif /* __RIVA_CONST_H__ */ - diff --git a/src/riva_cursor.c b/src/riva_cursor.c index 9c9c267..b8dc2bf 100644 --- a/src/riva_cursor.c +++ b/src/riva_cursor.c @@ -23,8 +23,6 @@ /* Rewritten with reference from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen <jpaana@s2.org> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_cursor.c $ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/riva_dac.c b/src/riva_dac.c index d371a05..6e9f346 100644 --- a/src/riva_dac.c +++ b/src/riva_dac.c @@ -23,8 +23,6 @@ /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen <jpaana@s2.org> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_dac.c,v 1.1 2003/07/31 20:24:29 mvojkovi Exp $ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -281,4 +279,3 @@ RivaDACi2cInit(ScrnInfoPtr pScrn) } return TRUE; } - diff --git a/src/riva_dga.c b/src/riva_dga.c index 5338554..c6f2d92 100644 --- a/src/riva_dga.c +++ b/src/riva_dga.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/riva/riva_dga.c $ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/riva_driver.c b/src/riva_driver.c index c6b805c..d17d699 100644 --- a/src/riva_driver.c +++ b/src/riva_driver.c @@ -23,8 +23,6 @@ /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen <jpaana@s2.org> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_driver.c,v 1.5 2003/11/03 05:11:26 tsi Exp $ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -1342,4 +1340,3 @@ RivaSave(ScrnInfoPtr pScrn) (*pRiva->Save)(pScrn, vgaReg, rivaReg, pRiva->Primary); } - diff --git a/src/riva_hw.c b/src/riva_hw.c index 15bef0e..32dc2a3 100644 --- a/src/riva_hw.c +++ b/src/riva_hw.c @@ -36,7 +36,6 @@ |* those rights set forth herein. *| |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_hw.c,v 1.51tsi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -990,4 +989,3 @@ int RivaGetConfig chip->Line = (RivaLine *)&(chip->FIFO[0x0000C000/4]); return (0); } - diff --git a/src/riva_hw.h b/src/riva_hw.h index ec2b90b..2882afa 100644 --- a/src/riva_hw.h +++ b/src/riva_hw.h @@ -36,7 +36,6 @@ |* those rights set forth herein. *| |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_hw.h,v 1.26 2003/07/31 20:24:31 mvojkovi Exp $ */ #ifndef __RIVA_HW_H__ #define __RIVA_HW_H__ @@ -363,4 +362,3 @@ typedef struct _riva_hw_state while ((hwinst).Busy(&(hwinst))); \ } #endif /* __RIVA_HW_H__ */ - diff --git a/src/riva_include.h b/src/riva_include.h index 2f269df..6726fcc 100644 --- a/src/riva_include.h +++ b/src/riva_include.h @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_include.h $ */ - #ifndef __RIVA_INCLUDE_H__ #define __RIVA_INCLUDE_H__ diff --git a/src/riva_local.h b/src/riva_local.h index 833ed04..9d40524 100644 --- a/src/riva_local.h +++ b/src/riva_local.h @@ -36,7 +36,6 @@ |* those rights set forth herein. *| |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_local.h,v 1.1tsi Exp $ */ #ifndef __RIVA_LOCAL_H__ #define __RIVA_LOCAL_H__ diff --git a/src/riva_proto.h b/src/riva_proto.h index bff07a2..e9d7261 100644 --- a/src/riva_proto.h +++ b/src/riva_proto.h @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_proto.h $ */ - #ifndef __RIVA_PROTO_H__ #define __RIVA_PROTO_H__ @@ -38,4 +36,3 @@ Bool RivaDGAInit(ScreenPtr pScreen); #endif /* __RIVA_PROTO_H__ */ - diff --git a/src/riva_setup.c b/src/riva_setup.c index faedf9a..7bceb09 100644 --- a/src/riva_setup.c +++ b/src/riva_setup.c @@ -23,8 +23,6 @@ /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen <jpaana@s2.org> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_setup.c $ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/riva_shadow.c b/src/riva_shadow.c index eac3592..24933f9 100644 --- a/src/riva_shadow.c +++ b/src/riva_shadow.c @@ -2,7 +2,6 @@ Copyright (c) 1999, The XFree86 Project Inc. Written by Mark Vojkovich <markv@valinux.com> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_shadow.c $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -193,6 +192,3 @@ RivaRefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox) pbox++; } } - - - diff --git a/src/riva_tbl.h b/src/riva_tbl.h index bb2a329..c7fc277 100644 --- a/src/riva_tbl.h +++ b/src/riva_tbl.h @@ -36,8 +36,6 @@ |* those rights set forth herein. *| |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_tbl.h,v 1.10 2003/07/31 20:24:31 mvojkovi Exp $ */ - /* * RIVA Fixed Functionality Init Tables. @@ -251,4 +249,3 @@ static unsigned nv3TablePRAMIN_32BPP[][2] = {0x00000D1C, 0x10419208}, {0x00000D30, 0x10118201} }; - diff --git a/src/riva_type.h b/src/riva_type.h index 204c758..606e3e5 100644 --- a/src/riva_type.h +++ b/src/riva_type.h @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_type.h $ */ - #ifndef __Riva_STRUCT_H__ #define __Riva_STRUCT_H__ diff --git a/src/riva_xaa.c b/src/riva_xaa.c index 6863143..cffe9f8 100644 --- a/src/riva_xaa.c +++ b/src/riva_xaa.c @@ -40,8 +40,6 @@ /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen <jpaana@s2.org> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_xaa.c $ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -555,4 +553,3 @@ RivaAccelInit(ScreenPtr pScreen) return(XAAInit(pScreen, infoPtr)); } - |