DRI XFree86-4_3_99_12-merge importDRI-trunk-20040721DRI-trunk-20040613DRI-XFree86-4_3_99_12-merge

80 files changed, 142 insertions, 150 deletions

diff --git a/man/nsc.man b/man/nsc.man
index d9addac..f5a5f6f 100644
--- a/man/nsc.man
+++ b/man/nsc.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.man,v 1.1 2002/12/10 15:12:23 alanh Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.man,v 1.2 2003/05/29 21:48:09 herrb Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH NSC __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ nsc \- Nsc video driver
 .fi
 .SH DESCRIPTION
 .B nsc
-is an __xservername__ driver for National Semiconductors GEODE processor family.
+is an XFree86 driver for National Semiconductors GEODE processor family.
 It uses the DURANGO kit provided by National Semiconductor.
 The driver is accelerated, and provides support for the following 
 framebuffer depths: 8, 16 and 24.
@@ -24,7 +24,7 @@ The
 driver supports GXLV (5530 companion chip), SC1200, SC1400 and
 GX2 (5535 companion chip).
 .SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+Please refer to XF86Config(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .PP
@@ -129,6 +129,6 @@ view on TV. The parameters xx: X-offset, yy: Y-offset, ww: Viewable width,
 hh: Viewable height.
 Default: no TV.
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHOR
 Author: Sarma V. Kolluru
diff --git a/src/durango.c b/src/durango.c
index 94c5795..8033f52 100644
--- a/src/durango.c
+++ b/src/durango.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/durango.c,v 1.4 2003/01/14 09:34:30 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/durango.c,v 1.5 2003/01/24 17:16:52 tsi Exp $ */
 /*
  * $Workfile: durango.c $
  * $Revision$
diff --git a/src/gfx/disp_gu1.c b/src/gfx/disp_gu1.c
index 531bc47..b177264 100644
--- a/src/gfx/disp_gu1.c
+++ b/src/gfx/disp_gu1.c
@@ -410,9 +410,6 @@ gu1_video_shutdown(void)
 
    gfx_reset_video();
 
-   /* Cyrix Corporation 5530 Video [Kahlua] rev 0 needs some more time */
-   gfx_delay_milliseconds(1);
-
    /* UNLOCK THE DISPLAY CONTROLLER REGISTERS */
 
    unlock = READ_REG32(DC_UNLOCK);
diff --git a/src/gfx/disp_gu2.c b/src/gfx/disp_gu2.c
index 94ed470..ba72e88 100644
--- a/src/gfx/disp_gu2.c
+++ b/src/gfx/disp_gu2.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/disp_gu2.c,v 1.4tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/disp_gu2.c,v 1.4 2003/02/06 17:46:02 alanh Exp $ */
 /*
  * $Workfile: disp_gu2.c $
  *
@@ -1558,13 +1558,13 @@ void
 gfx_set_display_video_enable(int enable)
 #endif
 {
-   unsigned long lock, gcfg;
+   unsigned long lock, gcfg, dcfg;
 
    /* READ CURRENT VALUES */
 
    lock = READ_REG32(MDC_UNLOCK);
    gcfg = READ_REG32(MDC_GENERAL_CFG);
-   (void) READ_REG32(MDC_DISPLAY_CFG);
+   dcfg = READ_REG32(MDC_DISPLAY_CFG);
 
    /* SET OR CLEAR VIDEO ENABLE IN GENERAL_CFG */
 
diff --git a/src/gfx/durango.c b/src/gfx/durango.c
index b43acd0..56bc65a 100644
--- a/src/gfx/durango.c
+++ b/src/gfx/durango.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/durango.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
 /*
  * $Workfile: durango.c $
  *
diff --git a/src/gfx/gfx_dcdr.c b/src/gfx/gfx_dcdr.c
index e416016..187b440 100644
--- a/src/gfx/gfx_dcdr.c
+++ b/src/gfx/gfx_dcdr.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_dcdr.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
 /*
  * $Workfile: gfx_dcdr.c $
  *
diff --git a/src/gfx/gfx_defs.h b/src/gfx/gfx_defs.h
index d3a38eb..8847e5b 100644
--- a/src/gfx/gfx_defs.h
+++ b/src/gfx/gfx_defs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_defs.h,v 1.2tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_defs.h,v 1.2 2002/12/11 22:51:01 dawes Exp $ */
 /*
  * $Workfile: gfx_defs.h $
  *
@@ -144,13 +144,13 @@
 	(*(volatile unsigned short *)(gfx_virt_regptr + (offset))) = (value)
 
 #define WRITE_REG32(offset, value) \
-	(*(volatile unsigned int *)(gfx_virt_regptr + (offset))) = (value)
+	(*(volatile unsigned long *)(gfx_virt_regptr + (offset))) = (value)
 
 #define READ_REG16(offset) \
     (*(volatile unsigned short *)(gfx_virt_regptr + (offset)))
 
 #define READ_REG32(offset) \
-    (*(volatile unsigned int *)(gfx_virt_regptr + (offset)))
+    (*(volatile unsigned long *)(gfx_virt_regptr + (offset)))
 
 /* ACCESS TO THE ACCELERATOR REGISTERS (REDCLOUD ONLY) */
 
@@ -161,18 +161,18 @@
 	(*(volatile unsigned short *)(gfx_virt_gpptr + (offset))) = (value)
 
 #define WRITE_GP32(offset, value) \
-	(*(volatile unsigned int *)(gfx_virt_gpptr + (offset))) = (value)
+	(*(volatile unsigned long *)(gfx_virt_gpptr + (offset))) = (value)
 
 #define READ_GP16(offset) \
     (*(volatile unsigned short *)(gfx_virt_gpptr + (offset)))
 
 #define READ_GP32(offset) \
-    (*(volatile unsigned int *)(gfx_virt_gpptr + (offset)))
+    (*(volatile unsigned long *)(gfx_virt_gpptr + (offset)))
 
 /* ACCESS TO THE FRAME BUFFER */
 
 #define WRITE_FB32(offset, value) \
-	(*(volatile unsigned int *)(gfx_virt_fbptr + (offset))) = (value)
+	(*(volatile unsigned long *)(gfx_virt_fbptr + (offset))) = (value)
 
 #define WRITE_FB16(offset, value) \
 	(*(volatile unsigned short *)(gfx_virt_fbptr + (offset))) = (value)
@@ -183,23 +183,23 @@
 /* ACCESS TO THE VIDEO HARDWARE */
 
 #define READ_VID32(offset) \
-	(*(volatile unsigned int *)(gfx_virt_vidptr + (offset)))
+	(*(volatile unsigned long *)(gfx_virt_vidptr + (offset)))
 
 #define WRITE_VID32(offset, value) \
-	(*(volatile unsigned int *)(gfx_virt_vidptr + (offset))) = (value)
+	(*(volatile unsigned long *)(gfx_virt_vidptr + (offset))) = (value)
 
 /* ACCESS TO THE VIP HARDWARE */
 
 #define READ_VIP32(offset) \
-	(*(volatile unsigned int *)(gfx_virt_vipptr + (offset)))
+	(*(volatile unsigned long *)(gfx_virt_vipptr + (offset)))
 
 #define WRITE_VIP32(offset, value) \
-	(*(volatile unsigned int *)(gfx_virt_vipptr + (offset))) = (value)
+	(*(volatile unsigned long *)(gfx_virt_vipptr + (offset))) = (value)
 
 /* ACCESS TO THE SCRATCHPAD RAM */
 
 #define WRITE_SCRATCH32(offset, value) \
-	(*(volatile unsigned int *)(gfx_virt_spptr + (offset))) = (value)
+	(*(volatile unsigned long *)(gfx_virt_spptr + (offset))) = (value)
 
 #define WRITE_SCRATCH16(offset, value) \
 	(*(volatile unsigned short *)(gfx_virt_spptr + (offset))) = (value)
@@ -211,7 +211,7 @@
     (*(volatile unsigned short *)(gfx_virt_spptr + (offset)))
 
 #define READ_SCRATCH32(offset) \
-    (*(volatile unsigned int *)(gfx_virt_spptr + (offset)))
+    (*(volatile unsigned long *)(gfx_virt_spptr + (offset)))
 
 /* ACCESS TO MSRS */
 
@@ -318,7 +318,7 @@ void gfx_msr_asm_read(unsigned short msrReg, unsigned long msrAddr,
 	/* WRITE DWORDS */                                                                                  \
 	                                                                                                    \
 	for (i = 0; i < dword_bytes; i += 4)                                                                \
-		*((volatile unsigned int *)(gfx_gx1_scratch_base + i)) = *((unsigned int *)(aroffset + i));   \
+		*((volatile unsigned long *)(gfx_gx1_scratch_base + i)) = *((unsigned long *)(aroffset + i));   \
 	                                                                                                    \
 	/* WRITE BYTES */                                                                                   \
 	                                                                                                    \
@@ -348,7 +348,7 @@ void gfx_msr_asm_read(unsigned short msrReg, unsigned long msrAddr,
 	unsigned long i;                                                                         \
 	unsigned long aroffset = (unsigned long)array + (array_offset);                          \
 	for (i = 0; i < bytes; i += 4)                                                           \
-		WRITE_FB32 ((fboffset) + i, *((unsigned int *)(aroffset + i)));                \
+		WRITE_FB32 ((fboffset) + i, *((unsigned long *)(aroffset + i)));                \
 }
 
 #endif
@@ -393,7 +393,7 @@ void gfx_msr_asm_read(unsigned short msrReg, unsigned long msrAddr,
 {                                                                                            \
 	temp = (unsigned long)array + (array_offset);                                            \
 	for (counter = 0; counter < dwords; counter++)                                         \
-		WRITE_GP32 (regoffset, *((unsigned int *)temp + counter));                        \
+		WRITE_GP32 (regoffset, *((unsigned long *)temp + counter));                        \
 }
 
 /************************************************************************************
diff --git a/src/gfx/gfx_disp.c b/src/gfx/gfx_disp.c
index 02faa92..54adcb3 100644
--- a/src/gfx/gfx_disp.c
+++ b/src/gfx/gfx_disp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_disp.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_disp.c,v 1.2 2003/01/14 09:34:34 alanh Exp $ */
 /*
  * $Workfile: gfx_disp.c $
  *
diff --git a/src/gfx/gfx_i2c.c b/src/gfx/gfx_i2c.c
index 424b0c7..385ee9f 100644
--- a/src/gfx/gfx_i2c.c
+++ b/src/gfx/gfx_i2c.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_i2c.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
 /*
  * $Workfile: gfx_i2c.c $
  *
diff --git a/src/gfx/gfx_init.c b/src/gfx/gfx_init.c
index 9c576e6..2aa93d5 100644
--- a/src/gfx/gfx_init.c
+++ b/src/gfx/gfx_init.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_init.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
 /*
  * $Workfile: gfx_init.c $
  *
diff --git a/src/gfx/gfx_mode.h b/src/gfx/gfx_mode.h
index 73d5dbe..100b36c 100644
--- a/src/gfx/gfx_mode.h
+++ b/src/gfx/gfx_mode.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_mode.h,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
 /*
  * $Workfile: gfx_mode.h $
  *
diff --git a/src/gfx/gfx_msr.c b/src/gfx/gfx_msr.c
index 47ce580..c6b1caf 100644
--- a/src/gfx/gfx_msr.c
+++ b/src/gfx/gfx_msr.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_msr.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
 /*
  * $Workfile: gfx_msr.c $
  *
diff --git a/src/gfx/gfx_regs.h b/src/gfx/gfx_regs.h
index a1cfd9f..7b11887 100644
--- a/src/gfx/gfx_regs.h
+++ b/src/gfx/gfx_regs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_regs.h,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_regs.h,v 1.2 2003/02/05 18:38:43 alanh Exp $ */
 /*
  * $Workfile: gfx_regs.h $
  *
diff --git a/src/gfx/gfx_rndr.c b/src/gfx/gfx_rndr.c
index 9b8aefb..5b6b881 100644
--- a/src/gfx/gfx_rndr.c
+++ b/src/gfx/gfx_rndr.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_rndr.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
 /*
  * $Workfile: gfx_rndr.c $
  *
diff --git a/src/gfx/gfx_rtns.h b/src/gfx/gfx_rtns.h
index 5451eea..aefd6c0 100644
--- a/src/gfx/gfx_rtns.h
+++ b/src/gfx/gfx_rtns.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_rtns.h,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
 /*
  * $Workfile: gfx_rtns.h $
  *
diff --git a/src/gfx/gfx_tv.c b/src/gfx/gfx_tv.c
index 61e0aae..6cb825d 100644
--- a/src/gfx/gfx_tv.c
+++ b/src/gfx/gfx_tv.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_tv.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
 /*
  * $Workfile: gfx_tv.c $
  *
diff --git a/src/gfx/gfx_tv.h b/src/gfx/gfx_tv.h
index e920cc5..430c8a5 100644
--- a/src/gfx/gfx_tv.h
+++ b/src/gfx/gfx_tv.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_tv.h,v 1.1 2002/12/10 15:12:26 alanh Exp $ */
 
 typedef struct tagTVDISPLAYMODE
 {
diff --git a/src/gfx/gfx_type.h b/src/gfx/gfx_type.h
index 8694e0f..a50d5bd 100644
--- a/src/gfx/gfx_type.h
+++ b/src/gfx/gfx_type.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_type.h,v 1.1 2002/12/10 15:12:26 alanh Exp $ */
 /*
  * $Workfile: gfx_type.h $
  *
diff --git a/src/gfx/gfx_vga.c b/src/gfx/gfx_vga.c
index ace602d..a2c0dd6 100644
--- a/src/gfx/gfx_vga.c
+++ b/src/gfx/gfx_vga.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_vga.c,v 1.1 2002/12/10 15:12:26 alanh Exp $ */
 /*
  * $Workfile: gfx_vga.c $
  *
diff --git a/src/gfx/gfx_vid.c b/src/gfx/gfx_vid.c
index 3889718..9ddde27 100644
--- a/src/gfx/gfx_vid.c
+++ b/src/gfx/gfx_vid.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_vid.c,v 1.1 2002/12/10 15:12:26 alanh Exp $ */
 /*
  * $Workfile: gfx_vid.c $
  *
diff --git a/src/gfx/gfx_vip.c b/src/gfx/gfx_vip.c
index 080c18a..1f506ae 100644
--- a/src/gfx/gfx_vip.c
+++ b/src/gfx/gfx_vip.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_vip.c,v 1.1 2002/12/10 15:12:26 alanh Exp $ */
 /*
  * $Workfile: gfx_vip.c $
  *
diff --git a/src/gfx/history.h b/src/gfx/history.h
index 62d6a17..36f7fb9 100644
--- a/src/gfx/history.h
+++ b/src/gfx/history.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/history.h,v 1.1 2002/12/10 15:12:26 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/history.h,v 1.2 2003/02/05 18:38:43 alanh Exp $ */
 /*
  * $Workfile: history.h $
  *
diff --git a/src/gfx/i2c_acc.c b/src/gfx/i2c_acc.c
index bb9d8e5..ff205eb 100644
--- a/src/gfx/i2c_acc.c
+++ b/src/gfx/i2c_acc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/i2c_acc.c,v 1.1tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/i2c_acc.c,v 1.1 2002/12/10 15:12:26 alanh Exp $ */
 /*
  * $Workfile: i2c_acc.c $
  *
@@ -937,7 +937,7 @@ acc_i2c_set_freq(unsigned char busnum, char freq)
 
    OUTB((unsigned short)(bus_base_address + ACBCTL2), 0x0);
 
-   if (freq == (char)(-1))
+   if (freq == -1)
       freq = 0x71;
    else {
       freq = freq << 1;
diff --git a/src/gfx/i2c_gpio.c b/src/gfx/i2c_gpio.c
index e9c6669..096750d 100644
--- a/src/gfx/i2c_gpio.c
+++ b/src/gfx/i2c_gpio.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/i2c_gpio.c,v 1.1 2002/12/10 15:12:26 alanh Exp $ */
 /*
  * $Workfile: i2c_gpio.c $
  *
diff --git a/src/gfx/init_gu1.c b/src/gfx/init_gu1.c
index 29fc68a..09fb79c 100644
--- a/src/gfx/init_gu1.c
+++ b/src/gfx/init_gu1.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/init_gu1.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*
  * $Workfile: init_gu1.c $
  *
diff --git a/src/gfx/init_gu2.c b/src/gfx/init_gu2.c
index 4eee209..143ce52 100644
--- a/src/gfx/init_gu2.c
+++ b/src/gfx/init_gu2.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/init_gu2.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*
  * $Workfile: init_gu2.c $
  *
diff --git a/src/gfx/msr_rdcl.c b/src/gfx/msr_rdcl.c
index 66c6462..ce3ce05 100644
--- a/src/gfx/msr_rdcl.c
+++ b/src/gfx/msr_rdcl.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/msr_rdcl.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*
  * $Workfile: msr_rdcl.c $
  *
diff --git a/src/gfx/release.txt b/src/gfx/release.txt
index 7b495bb..8d0c87f 100644
--- a/src/gfx/release.txt
+++ b/src/gfx/release.txt
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/release.txt,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/release.txt,v 1.3 2003/02/06 17:46:02 alanh Exp $ */
 Durango Release Notes
 Version 2.49.01
 Win98/WinXP/DOS/Linux
diff --git a/src/gfx/rndr_gu1.c b/src/gfx/rndr_gu1.c
index 12ace2f..6d71f59 100644
--- a/src/gfx/rndr_gu1.c
+++ b/src/gfx/rndr_gu1.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/rndr_gu1.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/rndr_gu1.c,v 1.2 2003/01/14 09:34:34 alanh Exp $ */
 /*
  * $Workfile: rndr_gu1.c $
  *
diff --git a/src/gfx/rndr_gu2.c b/src/gfx/rndr_gu2.c
index a75dcae..9378328 100644
--- a/src/gfx/rndr_gu2.c
+++ b/src/gfx/rndr_gu2.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/rndr_gu2.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*
  * $Workfile: rndr_gu2.c $
  *
diff --git a/src/gfx/saa7114.c b/src/gfx/saa7114.c
index 26bed27..885e65f 100644
--- a/src/gfx/saa7114.c
+++ b/src/gfx/saa7114.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/saa7114.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*
  * $Workfile: saa7114.c $
  *
diff --git a/src/gfx/tv_1200.c b/src/gfx/tv_1200.c
index bada406..512b28e 100644
--- a/src/gfx/tv_1200.c
+++ b/src/gfx/tv_1200.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_1200.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*
  * $Workfile: tv_1200.c $
  *
diff --git a/src/gfx/tv_fs450.c b/src/gfx/tv_fs450.c
index e109a62..b14bc16 100644
--- a/src/gfx/tv_fs450.c
+++ b/src/gfx/tv_fs450.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_fs450.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*
  * $Workfile: tv_fs450.c $
  *
diff --git a/src/gfx/tv_fs450.h b/src/gfx/tv_fs450.h
index 7eb15da..2b87710 100644
--- a/src/gfx/tv_fs450.h
+++ b/src/gfx/tv_fs450.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_fs450.h,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*
  * $Workfile: tv_fs450.h $
  *
diff --git a/src/gfx/tv_fs451.c b/src/gfx/tv_fs451.c
index 29b74f2..6072ec7 100644
--- a/src/gfx/tv_fs451.c
+++ b/src/gfx/tv_fs451.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_fs451.c,v 1.1tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_fs451.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*
  * $Workfile: tv_fs451.c $
  * $Revision$
@@ -139,10 +139,10 @@
  */
 #if GFX_TV_DYNAMIC
 int
-fs451_set_tv_format(TVStandardType format, GfxOnTVType resolution)
+fs451_set_tv_format(int format, int resolution)
 #else
 int
-gfx_set_tv_format(TVStandardType format, GfxOnTVType resolution)
+gfx_set_tv_format(int format, int resolution)
 #endif
 {
    /* ### ADD ### IMPLEMENTATION */
diff --git a/src/gfx/tv_geode.c b/src/gfx/tv_geode.c
index af25930..1938083 100644
--- a/src/gfx/tv_geode.c
+++ b/src/gfx/tv_geode.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_geode.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*-----------------------------------------------------------------------------
  * TV_GEODE.C
  *
diff --git a/src/gfx/vga_gu1.c b/src/gfx/vga_gu1.c
index d8cbdce..d5fa263 100644
--- a/src/gfx/vga_gu1.c
+++ b/src/gfx/vga_gu1.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vga_gu1.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*
  * $Workfile: vga_gu1.c $
  *
diff --git a/src/gfx/vid_1200.c b/src/gfx/vid_1200.c
index e25dc7e..f52d02b 100644
--- a/src/gfx/vid_1200.c
+++ b/src/gfx/vid_1200.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_1200.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_1200.c,v 1.2 2003/01/14 09:34:34 alanh Exp $ */
 /*
  * $Workfile: vid_1200.c $
  *
diff --git a/src/gfx/vid_1400.c b/src/gfx/vid_1400.c
index 3ca83ba..11f9361 100644
--- a/src/gfx/vid_1400.c
+++ b/src/gfx/vid_1400.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_1400.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*-----------------------------------------------------------------------------
  * VID_1400.C
  *
diff --git a/src/gfx/vid_5530.c b/src/gfx/vid_5530.c
index 114973a..17d5f3b 100644
--- a/src/gfx/vid_5530.c
+++ b/src/gfx/vid_5530.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_5530.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_5530.c,v 1.2 2003/02/21 16:51:10 alanh Exp $ */
 /*
  * $Workfile: vid_5530.c $
  *
diff --git a/src/gfx/vid_rdcl.c b/src/gfx/vid_rdcl.c
index 4712b78..8e429d8 100644
--- a/src/gfx/vid_rdcl.c
+++ b/src/gfx/vid_rdcl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_rdcl.c,v 1.3tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_rdcl.c,v 1.3 2003/02/21 16:51:10 alanh Exp $ */
 /*
  * $Workfile: vid_rdcl.c $
  *
@@ -446,6 +446,7 @@ gfx_set_clock_frequency(unsigned long frequency)
 {
    Q_WORD msr_value;
    unsigned int i, index = 0;
+   unsigned long value;
    long timeout = 1000;
    long min, diff;
    RCDFPLLENTRY *PllTable;
@@ -461,6 +462,7 @@ gfx_set_clock_frequency(unsigned long frequency)
    /* FIND THE REGISTER VALUES FOR THE DESIRED FREQUENCY */
    /* Search the table for the closest frequency (16.16 format). */
 
+   value = PllTable[0].pll_value;
    min = (long)PllTable[0].frequency - frequency;
    if (min < 0L)
       min = -min;
diff --git a/src/gfx/vip_1200.c b/src/gfx/vip_1200.c
index f0681ba..f2458f6 100644
--- a/src/gfx/vip_1200.c
+++ b/src/gfx/vip_1200.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vip_1200.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*
  * $Workfile: vip_1200.c $
  *
diff --git a/src/gfx/vip_1400.c b/src/gfx/vip_1400.c
index 876479d..7896288 100644
--- a/src/gfx/vip_1400.c
+++ b/src/gfx/vip_1400.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vip_1400.c,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
 /*-----------------------------------------------------------------------------
  * VIP_1400.C
  *
diff --git a/src/nsc.h b/src/nsc.h
index 2500cfc..d3e2e86 100644
--- a/src/nsc.h
+++ b/src/nsc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.h,v 1.5tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.h,v 1.5 2003/02/21 16:51:09 alanh Exp $ */
 /*
  * $Workfile: nsc.h $
  * $Revision$
@@ -409,7 +409,7 @@ typedef struct
 GeodeRec, *GeodePtr;
 
 /* option flags are self-explanatory */
-typedef enum
+enum
 {
    OPTION_SW_CURSOR,
    OPTION_HW_CURSOR,
diff --git a/src/nsc_driver.c b/src/nsc_driver.c
index e312683..da856c6 100644
--- a/src/nsc_driver.c
+++ b/src/nsc_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_driver.c,v 1.4tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_driver.c,v 1.5 2003/04/23 21:51:41 tsi Exp $ */
 /*
  * $Workfile: nsc_driver.c $
  * $Revision$
@@ -398,7 +398,7 @@ static XF86ModuleVersionInfo NscVersionRec = {
    MODULEVENDORSTRING,
    MODINFOSTRING1,
    MODINFOSTRING2,
-   XORG_VERSION_CURRENT,
+   XF86_VERSION_CURRENT,
    NSC_VERSION_MAJOR, NSC_VERSION_MINOR, NSC_PATCHLEVEL,
    ABI_CLASS_VIDEODRV,			/* This is a video driver */
    ABI_VIDEODRV_VERSION,
diff --git a/src/nsc_fourcc.h b/src/nsc_fourcc.h
index dbb9a72..321eb83 100644
--- a/src/nsc_fourcc.h
+++ b/src/nsc_fourcc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_fourcc.h,v 1.1 2002/12/10 15:12:23 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_fourcc.h,v 1.2 2003/01/14 09:34:30 alanh Exp $ */
 /*
  * $Workfile: nsc_fourcc.h $
  * $Revision$
diff --git a/src/nsc_galfns.c b/src/nsc_galfns.c
index 9666c8e..83a364b 100644
--- a/src/nsc_galfns.c
+++ b/src/nsc_galfns.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_galfns.c,v 1.2 2003/01/14 09:34:30 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_galfns.c,v 1.3 2003/02/05 18:38:42 alanh Exp $ */
 /*
  * $Workfile: nsc_galfns.c $
  * $Revision$
diff --git a/src/nsc_galstub.c b/src/nsc_galstub.c
index 7cd3a7b..5366f27 100644
--- a/src/nsc_galstub.c
+++ b/src/nsc_galstub.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_galstub.c,v 1.1 2002/12/10 15:12:23 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_galstub.c,v 1.2 2003/01/14 09:34:31 alanh Exp $ */
 /*
  * $Workfile: nsc_galstub.c $
  * $Revision$
diff --git a/src/nsc_gx1_accel.c b/src/nsc_gx1_accel.c
index 46f8dfb..7359c0d 100644
--- a/src/nsc_gx1_accel.c
+++ b/src/nsc_gx1_accel.c
@@ -1,5 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.8 2003/12/07 23:18:16 alanh Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.7 2003/12/07 22:40:38 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.5 2003/02/11 13:36:41 alanh Exp $ */
 /*
  * $Workfile: nsc_gx1_accel.c $
  * $Revision$
@@ -172,6 +171,7 @@ static int Geodesrcx;
 static int Geodesrcy;
 static int Geodewidth;
 static int Geodeheight;
+static int Geodebpp;
 static int GeodeCounter;
 
 #if !defined(STB_X)
@@ -181,9 +181,7 @@ static unsigned short Geode_vector_mode = 0;
 static unsigned short Geode_buffer_width = 0;
 #endif
 static unsigned int gu1_bpp = 0;
-#if SCR2SCREXP
 static unsigned int gu1_xshift = 1;
-#endif
 static unsigned int gu1_yshift = 1;
 static unsigned short GeodebufferWidthPixels;
 static unsigned int ImgBufOffset;
@@ -191,11 +189,9 @@ static unsigned short Geodebb0Base;
 static unsigned short Geodebb1Base;
 static XAAInfoRecPtr localRecPtr;
 
-#if SCR2SCREXP
 #define CALC_FBOFFSET(_SrcX, _SrcY) \
 	(((unsigned int) (_SrcY) << gu1_yshift) |\
 		(((unsigned int) (_SrcX)) << gu1_xshift))
-#endif
 
 #define GFX_WAIT_BUSY while(READ_REG16(GP_BLIT_STATUS) & BS_BLIT_BUSY) { ; }
 #define GFX_WAIT_PENDING while(READ_REG16(GP_BLIT_STATUS) & BS_BLIT_PENDING) { ; }
@@ -274,11 +270,9 @@ void OPTGX1SubsequentBresenhamLine(ScrnInfoPtr pScreenInfo, int x1, int y1,
 void OPTGX1SubsequentSolidTwoPointLine(ScrnInfoPtr pScreenInfo,
 				       int x0, int y0, int x1, int y1,
 				       int flags);
-#if 0 /* disabled due to bugs */
 void OPTGX1SubsequentHorVertLine(ScrnInfoPtr pScreenInfo, int x, int y,
 				 int len, int dir);
 
-#endif
 void OPTGX1SetupForScanlineImageWrite(ScrnInfoPtr pScreenInfo,
 				      int rop, unsigned int planemask,
 				      int transparency_color, int bpp,
@@ -479,7 +473,7 @@ GX1Subsequent8x8PatternColorExpand(ScrnInfoPtr pScreenInfo,
  *       fg		:Specifies the foreground color
  *       bg     :Specifies the background color
  *	planemask	:Specifies the value of masking from rop data
- *
+
  * Returns		:none.
  *
  * Comments     :none.
@@ -676,6 +670,7 @@ GX1SetupForScanlineImageWrite(ScrnInfoPtr pScreenInfo,
    /* SAVE TRANSPARENCY FLAG */
    GeodeTransparent = (transparency_color == -1) ? 0 : 1;
    GeodeTransColor = transparency_color;
+   Geodebpp = bpp;
 }
 
 /*----------------------------------------------------------------------------
@@ -1374,6 +1369,7 @@ OPTGX1SetupForScanlineImageWrite(ScrnInfoPtr pScreenInfo,
 				 int rop, unsigned int planemask,
 				 int transparency_color, int bpp, int depth)
 {
+   Geodebpp = bpp;
    OPTGX1SetupForScreenToScreenCopy(pScreenInfo,
 				    0, 0, rop, planemask, transparency_color);
 }
@@ -1610,7 +1606,6 @@ OPTGX1SubsequentSolidTwoPointLine(ScrnInfoPtr pScreenInfo,
    WRITE_REG16(GP_VECTOR_MODE, (Geode_vector_mode | vec_flags));
 }
 
-#if 0 /* disabled due to bugs - can't fallback to fillrectsolid */
 /*---------------------------------------------------------------------------
  * OPTGX1SubsequentHorVertLine
  *
@@ -1638,7 +1633,6 @@ OPTGX1SubsequentHorVertLine(ScrnInfoPtr pScreenInfo,
 						  len));
 }
 #endif
-#endif
 
 /*----------------------------------------------------------------------------
  * GX1AccelInit.
@@ -1673,9 +1667,7 @@ GX1AccelInit(ScreenPtr pScreen)
       break;
    }
 
-#if SCR2SCREXP
    gu1_xshift = pScreenInfo->bitsPerPixel >> 4;
-#endif
 
    switch (pGeode->Pitch) {
    case 1024:
@@ -1743,10 +1735,8 @@ GX1AccelInit(ScreenPtr pScreen)
    localRecPtr->SetupForSolidLine = OPTACCEL(GX1SetupForSolidLine);
    localRecPtr->SubsequentSolidBresenhamLine =
 	 OPTACCEL(GX1SubsequentBresenhamLine);
-#if !defined(OPT_ACCEL)
    localRecPtr->SubsequentSolidHorVertLine =
 	 OPTACCEL(GX1SubsequentHorVertLine);
-#endif
    localRecPtr->SubsequentSolidTwoPointLine =
 	 OPTACCEL(GX1SubsequentSolidTwoPointLine);
    localRecPtr->SolidBresenhamLineErrorTermBits = 15;
diff --git a/src/nsc_gx1_cursor.c b/src/nsc_gx1_cursor.c
index 5cd4a40..9132ac6 100644
--- a/src/nsc_gx1_cursor.c
+++ b/src/nsc_gx1_cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_cursor.c,v 1.5tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_cursor.c,v 1.5 2003/02/21 16:51:09 alanh Exp $ */
 /*
  * $Workfile: nsc_gx1_cursor.c $
  * $Revision$
@@ -298,13 +298,14 @@ GX1SetCursorPosition(ScrnInfoPtr pScreenInfo, int x, int y)
 void
 GX1LoadCursorImage(ScrnInfoPtr pScreenInfo, unsigned char *src)
 {
-   int i;
+   int i, j;
    unsigned long shape;
    unsigned long mask;
    unsigned long andMask[32] = { 0, };
    unsigned long xorMask[32] = { 0, };
    GeodePtr pGeode = GEODEPTR(pScreenInfo);
 
+   j = 0;
    for (i = 0; i < 32; i++) {
       if (src) {
 	 shape = ((unsigned long)src[i * 4] << 24) |
diff --git a/src/nsc_gx1_dga.c b/src/nsc_gx1_dga.c
index d3144ff..9d2f7b4 100644
--- a/src/nsc_gx1_dga.c
+++ b/src/nsc_gx1_dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_dga.c,v 1.1 2002/12/10 15:12:23 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_dga.c,v 1.2 2003/01/14 09:34:31 alanh Exp $ */
 /*
  * $Workfile: nsc_gx1_dga.c $
  * $Revision$
diff --git a/src/nsc_gx1_driver.c b/src/nsc_gx1_driver.c
index 4cc852e..35deb93 100644
--- a/src/nsc_gx1_driver.c
+++ b/src/nsc_gx1_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_driver.c,v 1.10tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_driver.c,v 1.9 2003/08/23 15:03:09 dawes Exp $ */
 /*
  * $Workfile: nsc_gx1_driver.c $
  * $Revision$
@@ -271,7 +271,7 @@ static void GX1LeaveVT(int, int);
 static void GX1FreeScreen(int, int);
 void GX1AdjustFrame(int, int, int, int);
 Bool GX1SwitchMode(int, DisplayModePtr, int);
-static ModeStatus GX1ValidMode(int, DisplayModePtr, Bool, int);
+static int GX1ValidMode(int, DisplayModePtr, Bool, int);
 static void GX1LoadPalette(ScrnInfoPtr pScreenInfo,
 			   int numColors, int *indizes,
 			   LOCO * colors, VisualPtr pVisual);
@@ -474,9 +474,9 @@ GX1PreInit(ScrnInfoPtr pScreenInfo, int flags)
    MessageType from;
    int i = 0;
    GeodePtr pGeode;
-#if CFB
    char *mod = NULL;
 
+#if CFB
    char *reqSymbol = NULL;
 #endif
 
@@ -1019,11 +1019,10 @@ GX1PreInit(ScrnInfoPtr pScreenInfo, int flags)
    /* Set the display resolution */
    xf86SetDpi(pScreenInfo, 0, 0);
    GeodeDebug(("GX1PreInit(14)!\n"));
-
-#if CFB
    /* Load bpp-specific modules */
    mod = NULL;
 
+#if CFB
    /* Load bpp-specific modules */
    switch (pScreenInfo->bitsPerPixel) {
    case 8:
@@ -1087,7 +1086,6 @@ GX1PreInit(ScrnInfoPtr pScreenInfo, int flags)
    GeodeDebug(("GX1PreInit(19)!\n"));
    GeodeDebug(("GX1PreInit(20)!\n"));
    GeodeDebug(("GX1PreInit ... done successfully!\n"));
-   (void) from;
    return TRUE;
 }
 
@@ -1260,8 +1258,7 @@ GX1SetMode(ScrnInfoPtr pScreenInfo, DisplayModePtr pMode)
 #else
       /* sequence might be important */
       gfx_set_tv_display(pGeode->TvParam.wWidth, pGeode->TvParam.wHeight);
-      gfx_set_tv_format((TVStandardType)pGeode->TvParam.wStandard,
-			(GfxOnTVType)pGeode->TvParam.wType);
+      gfx_set_tv_format(pGeode->TvParam.wStandard, pGeode->TvParam.wType);
       gfx_set_tv_output(pGeode->TvParam.wOutput);
       gfx_set_tv_enable(pGeode->TvParam.bState);
 
@@ -2309,7 +2306,7 @@ GX1FreeScreen(int scrnIndex, int flags)
  * Comments     :none.
 *----------------------------------------------------------------------------
 */
-static ModeStatus
+static int
 GX1ValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, int flags)
 {
    ScrnInfoPtr pScreenInfo = xf86Screens[scrnIndex];
@@ -2331,7 +2328,7 @@ GX1ValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, int flags)
 #else
 	 ret = gfx_is_tv_display_mode_supported(pMode->CrtcHDisplay,
 						pMode->CrtcVDisplay,
-			(TVStandardType)pGeode->TvParam.wStandard);
+						pGeode->TvParam.wStandard);
 #endif
       }
    } else {
diff --git a/src/nsc_gx1_shadow.c b/src/nsc_gx1_shadow.c
index 68899cb..d3a139f 100644
--- a/src/nsc_gx1_shadow.c
+++ b/src/nsc_gx1_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_shadow.c,v 1.1 2002/12/10 15:12:23 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_shadow.c,v 1.2 2003/01/14 09:34:32 alanh Exp $ */
 /*
  * $Workfile: nsc_gx1_shadow.c $
  * $Revision$
diff --git a/src/nsc_gx1_video.c b/src/nsc_gx1_video.c
index 06e671e..fc0c6ed 100644
--- a/src/nsc_gx1_video.c
+++ b/src/nsc_gx1_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_video.c,v 1.7tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_video.c,v 1.7 2003/04/23 21:51:41 tsi Exp $ */
 /*
  * $Workfile: nsc_gx1_video.c $
  * $Revision$
@@ -492,7 +492,7 @@ GX1SetupImageVideo(ScreenPtr pScreen)
 #endif
 
    /* gotta uninit this someplace */
-   REGION_NULL(pScreen, &pPriv->clip);
+   REGION_INIT(pScreen, &pPriv->clip, NullBox, 0);
 
    pGeode->adaptor = adapt;
 
diff --git a/src/nsc_gx2_accel.c b/src/nsc_gx2_accel.c
index a41b8b7..d8730e4 100644
--- a/src/nsc_gx2_accel.c
+++ b/src/nsc_gx2_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_accel.c,v 1.4tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_accel.c,v 1.4 2003/02/21 16:51:09 alanh Exp $ */
 /*
  * $Workfile: nsc_gx2_accel.c $
  * $Revision$
@@ -168,6 +168,7 @@ static int Geodesrcx;
 static int Geodesrcy;
 static int Geodewidth;
 static int Geodeheight;
+static int Geodebpp;
 static int GeodeCounter;
 
 #if !defined(STB_X)
@@ -179,9 +180,7 @@ static unsigned int gu2_xshift = 1;
 static unsigned int gu2_yshift = 1;
 static unsigned int gu2_bpp = 1;
 static unsigned int SetCPUToScreen = 0;
-#if IMGWRITE_SUPPORT
 static unsigned int SetImageWriteRect = 0;
-#endif
 static unsigned int ImgBufOffset;
 
 #define GU2_WAIT_PENDING while(READ_GP32(MGP_BLT_STATUS) & MGP_BS_BLT_PENDING)
@@ -694,6 +693,7 @@ GX2SetupForImageWrite(ScrnInfoPtr pScreenInfo,
    /* SAVE TRANSPARENCY FLAG */
    GeodeTransparent = (transparency_color == -1) ? 0 : 1;
    GeodeTransColor = transparency_color;
+   Geodebpp = bpp;
 }
 
 void
@@ -704,9 +704,7 @@ GX2SubsequentImageWriteRect(ScrnInfoPtr pScreenInfo,
    Geodedsty = y;
    Geodewidth = w;
    Geodeheight = h;
-#if IMGWRITE_SUPPORT
    SetImageWriteRect = 1;
-#endif
 
 }
 
@@ -742,6 +740,7 @@ GX2SetupForScanlineImageWrite(ScrnInfoPtr pScreenInfo,
    /* SAVE TRANSPARENCY FLAG */
    GeodeTransparent = (transparency_color == -1) ? 0 : 1;
    GeodeTransColor = transparency_color;
+   Geodebpp = bpp;
 }
 
 /*----------------------------------------------------------------------------
@@ -1612,9 +1611,8 @@ OPTGX2SubsequentImageWriteRect(ScrnInfoPtr pScreenInfo,
    Geodedsty = y;
    Geodewidth = w;
    Geodeheight = h;
-#if IMGWRITE_SUPPORT
+
    SetImageWriteRect = 1;
-#endif
 }
 
 /*----------------------------------------------------------------------------
@@ -1640,6 +1638,7 @@ OPTGX2SetupForScanlineImageWrite(ScrnInfoPtr pScreenInfo,
 				 int rop, unsigned int planemask,
 				 int transparency_color, int bpp, int depth)
 {
+   Geodebpp = bpp;
    OPTGX2SetupForScreenToScreenCopy(pScreenInfo,
 				    0, 0, rop, planemask, transparency_color);
 }
diff --git a/src/nsc_gx2_cursor.c b/src/nsc_gx2_cursor.c
index 10106a6..f4a35db 100644
--- a/src/nsc_gx2_cursor.c
+++ b/src/nsc_gx2_cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_cursor.c,v 1.5tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_cursor.c,v 1.5 2003/02/21 16:51:09 alanh Exp $ */
 /*
  * $Workfile: nsc_gx2_cursor.c $
  * $Revision$
@@ -295,13 +295,14 @@ GX2SetCursorPosition(ScrnInfoPtr pScreenInfo, int x, int y)
 void
 GX2LoadCursorImage(ScrnInfoPtr pScreenInfo, unsigned char *src)
 {
-   int i;
+   int i, j;
    unsigned long shape;
    unsigned long mask;
    unsigned long andMask[32] = { 0, };
    unsigned long xorMask[32] = { 0, };
    GeodePtr pGeode = GEODEPTR(pScreenInfo);
 
+   j = 0;
    for (i = 0; i < 32; i++) {
       if (src) {
 	 shape = ((unsigned long)src[i * 4] << 24) |
diff --git a/src/nsc_gx2_dga.c b/src/nsc_gx2_dga.c
index 99dd2a8..0287eda 100644
--- a/src/nsc_gx2_dga.c
+++ b/src/nsc_gx2_dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_dga.c,v 1.1 2002/12/10 15:12:24 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_dga.c,v 1.2 2003/01/14 09:34:32 alanh Exp $ */
 /*
  * $Workfile: nsc_gx2_dga.c $
  * $Revision$
diff --git a/src/nsc_gx2_driver.c b/src/nsc_gx2_driver.c
index 37944a3..ece8855 100644
--- a/src/nsc_gx2_driver.c
+++ b/src/nsc_gx2_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_driver.c,v 1.9tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_driver.c,v 1.8 2003/08/23 15:03:09 dawes Exp $ */
 /*
  * $Workfile: nsc_gx2_driver.c $
  * $Revision$
@@ -230,7 +230,7 @@ static void GX2LeaveVT(int, int);
 static void GX2FreeScreen(int, int);
 void GX2AdjustFrame(int, int, int, int);
 Bool GX2SwitchMode(int, DisplayModePtr, int);
-static ModeStatus GX2ValidMode(int, DisplayModePtr, Bool, int);
+static int GX2ValidMode(int, DisplayModePtr, Bool, int);
 static void GX2LoadPalette(ScrnInfoPtr pScreenInfo,
 			   int numColors, int *indizes,
 			   LOCO * colors, VisualPtr pVisual);
@@ -474,8 +474,9 @@ GX2PreInit(ScrnInfoPtr pScreenInfo, int flags)
    MessageType from;
    int i = 0;
    GeodePtr pGeode;
-#if CFB
    char *mod = NULL;
+
+#if CFB
    char *reqSymbol = NULL;
 #endif /* CFB */
 #if defined(STB_X)
@@ -978,10 +979,10 @@ GX2PreInit(ScrnInfoPtr pScreenInfo, int flags)
    xf86SetDpi(pScreenInfo, 0, 0);
    GeodeDebug(("GX2PreInit(14)!\n"));
 
-#if CFB
    /* Load bpp-specific modules */
    mod = NULL;
 
+#if CFB
    /* Load bpp-specific modules */
    switch (pScreenInfo->bitsPerPixel) {
    case 8:
@@ -1051,7 +1052,6 @@ GX2PreInit(ScrnInfoPtr pScreenInfo, int flags)
    }
    GX2UnmapMem(pScreenInfo);
    GeodeDebug(("GX2PreInit ... done successfully!\n"));
-   (void) from;
    return TRUE;
 }
 
@@ -2217,7 +2217,7 @@ GX2FreeScreen(int scrnIndex, int flags)
  * Comments     :none.
 *----------------------------------------------------------------------------
 */
-static ModeStatus
+static int
 GX2ValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, int flags)
 {
    unsigned int total_memory_required;
diff --git a/src/nsc_gx2_shadow.c b/src/nsc_gx2_shadow.c
index 8f37fed..4ecadf1 100644
--- a/src/nsc_gx2_shadow.c
+++ b/src/nsc_gx2_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_shadow.c,v 1.1 2002/12/10 15:12:24 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_shadow.c,v 1.2 2003/01/14 09:34:32 alanh Exp $ */
 /*
  * $Workfile: nsc_gx2_shadow.c $
  * $Revision$
diff --git a/src/nsc_gx2_vga.c b/src/nsc_gx2_vga.c
index 35b71b4..9e79e66 100644
--- a/src/nsc_gx2_vga.c
+++ b/src/nsc_gx2_vga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_vga.c,v 1.2tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_vga.c,v 1.2 2003/01/14 09:34:32 alanh Exp $ */
 /*
  * $Workfile: nsc_gx2_vga.c $
  * $Revision$
@@ -227,10 +227,12 @@ gu2_vga_seq_blanking(void)
 int
 gu2_vga_attr_ctrl(int reset)
 {
-   (void) gfx_inb(0x3DA);
+   int tmp;
+
+   tmp = gfx_inb(0x3DA);
    gfx_outb(0x3C0, (unsigned char)(reset ? 0x00 : 0x20));
    if (reset)
-      (void) gfx_inb(0x3DA);
+      tmp = gfx_inb(0x3DA);
    return (GFX_STATUS_OK);
 }
 
@@ -248,6 +250,7 @@ gu2_vga_to_gfx(void)
 void
 gu2_gfx_to_vga(int vga_mode)
 {
+   int tmp;
    char sequencer;
 
    gu2_vga_extcrtc(0x40, vga_mode);
@@ -265,9 +268,9 @@ gu2_gfx_to_vga(int vga_mode)
    gfx_outw(0x3C4, 0x300);
 
    /* turn on the attribute controler */
-   (void) gfx_inb(0x3DA);
+   tmp = gfx_inb(0x3DA);
    gfx_outb(0x3C0, 0x20);
-   (void) gfx_inb(0x3DA);
+   tmp = gfx_inb(0x3DA);
 
    gu2_vga_extcrtc(0x3F, 0);
 }
diff --git a/src/nsc_gx2_video.c b/src/nsc_gx2_video.c
index 2213f32..8d914ad 100644
--- a/src/nsc_gx2_video.c
+++ b/src/nsc_gx2_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_video.c,v 1.6tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_video.c,v 1.6 2003/04/23 21:51:42 tsi Exp $ */
 /*
  * $Workfile: nsc_gx2_video.c $
  * $Revision$
@@ -493,7 +493,7 @@ GX2SetupImageVideo(ScreenPtr pScreen)
 #endif
 
    /* gotta uninit this someplace */
-   REGION_NULL(pScreen, &pPriv->clip);
+   REGION_INIT(pScreen, &pPriv->clip, NullBox, 0);
 
    pGeode->adaptor = adapt;
 
diff --git a/src/nsc_msr_asm.S b/src/nsc_msr_asm.S
index a09b730..c0c4a3c 100644
--- a/src/nsc_msr_asm.S
+++ b/src/nsc_msr_asm.S
@@ -1,5 +1,5 @@
 /*
-# $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_msr_asm.s,v 1.1 2002/12/10 15:12:25 alanh Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_msr_asm.S,v 1.1 2002/12/12 22:13:34 dawes Exp $
 ##########################################################################
 # NSC_LIC_ALTERNATIVE_PREAMBLE
 #
diff --git a/src/nsc_regacc.c b/src/nsc_regacc.c
index 6b94d17..45c720d 100644
--- a/src/nsc_regacc.c
+++ b/src/nsc_regacc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_regacc.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_regacc.c,v 1.2 2003/01/14 09:34:32 alanh Exp $ */
 /*
  * $Workfile: nsc_regacc.c $
  * $Revision$
diff --git a/src/panel.c b/src/panel.c
index ea2732f..9f79c6c 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel.c,v 1.2 2002/12/11 22:51:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel.c,v 1.3 2003/01/14 09:34:32 alanh Exp $ */
 /*
  * $Workfile: panel.c $
  * $Revision$
diff --git a/src/panel/92xx.h b/src/panel/92xx.h
index 427fc50..15420d3 100644
--- a/src/panel/92xx.h
+++ b/src/panel/92xx.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/92xx.h,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
 /*
  * $Workfile: 92xx.h $
  * $Revision$
diff --git a/src/panel/cen9211.c b/src/panel/cen9211.c
index b62b1fe..85aecdf 100644
--- a/src/panel/cen9211.c
+++ b/src/panel/cen9211.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/cen9211.c,v 1.1tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/cen9211.c,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
 /*
  * $Workfile: cen9211.c $
  *
@@ -832,9 +832,11 @@ CentaurusProgramFRMload(void)
    };
 
    unsigned char i;
+   unsigned short index;
    unsigned long data;
 
    Centaurus_write_gpio(FOUR_BYTES, CS92xx_FRM_MEMORY_INDEX, 0);
+   index = CS92xx_FRM_MEMORY_DATA;
    for (i = 0; i < 64; i += 2) {
       data = CentaurusFRMtable[i];
       Centaurus_write_gpio(FOUR_BYTES, CS92xx_FRM_MEMORY_DATA, data);
diff --git a/src/panel/cen9211.h b/src/panel/cen9211.h
index f3836c9..4ce56cb 100644
--- a/src/panel/cen9211.h
+++ b/src/panel/cen9211.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/cen9211.h,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
 /*
  * $Workfile: cen9211.h $
  * $Revision$
diff --git a/src/panel/dora9211.c b/src/panel/dora9211.c
index 020afe8..de30ab3 100644
--- a/src/panel/dora9211.c
+++ b/src/panel/dora9211.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/dora9211.c,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
 /*
  * $Workfile: dora9211.c $
  * $Revision$
diff --git a/src/panel/dora9211.h b/src/panel/dora9211.h
index a215b86..4413114 100644
--- a/src/panel/dora9211.h
+++ b/src/panel/dora9211.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/dora9211.h,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
 /*
  * $Workfile: dora9211.h $
  * $Revision$
diff --git a/src/panel/drac9210.c b/src/panel/drac9210.c
index d0e108a..8d9f477 100644
--- a/src/panel/drac9210.c
+++ b/src/panel/drac9210.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/drac9210.c,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/drac9210.c,v 1.2 2003/01/14 09:34:35 alanh Exp $ */
 /*
  * $Workfile: drac9210.c $
  * $Revision$
diff --git a/src/panel/drac9210.h b/src/panel/drac9210.h
index ce4fceb..f71a97f 100644
--- a/src/panel/drac9210.h
+++ b/src/panel/drac9210.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/drac9210.h,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
 /*
  * $Workfile: drac9210.h $
  * $Revision$
diff --git a/src/panel/gx2_9211.c b/src/panel/gx2_9211.c
index bff4458..71909f8 100644
--- a/src/panel/gx2_9211.c
+++ b/src/panel/gx2_9211.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/gx2_9211.c,v 1.2 2002/12/11 22:51:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/gx2_9211.c,v 1.3 2003/01/14 09:34:35 alanh Exp $ */
 /*
  * $Workfile: gx2_9211.c $
  *
diff --git a/src/panel/gx2_9211.h b/src/panel/gx2_9211.h
index 9ea685b..a545cb1 100644
--- a/src/panel/gx2_9211.h
+++ b/src/panel/gx2_9211.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/gx2_9211.h,v 1.2 2002/12/11 22:51:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/gx2_9211.h,v 1.3 2003/01/14 09:34:35 alanh Exp $ */
 /*
  * $Workfile: gx2_9211.h $
  *
diff --git a/src/panel/panel.c b/src/panel/panel.c
index 5880974..194bbed 100644
--- a/src/panel/panel.c
+++ b/src/panel/panel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/panel.c,v 1.2 2002/12/11 22:51:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/panel.c,v 1.3 2003/01/14 09:34:35 alanh Exp $ */
 /*
  * $Workfile: panel.c $
  * $Revision$
diff --git a/src/panel/panel.h b/src/panel/panel.h
index e8d36dd..79c1d21 100644
--- a/src/panel/panel.h
+++ b/src/panel/panel.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/panel.h,v 1.2 2002/12/11 22:51:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/panel.h,v 1.3 2003/01/14 09:34:36 alanh Exp $ */
 /*
  * $Workfile: panel.h $
  * $Revision$
diff --git a/src/panel/platform.c b/src/panel/platform.c
index f8eb67f..1248b09 100644
--- a/src/panel/platform.c
+++ b/src/panel/platform.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/platform.c,v 1.3tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/platform.c,v 1.3 2003/01/14 09:34:36 alanh Exp $ */
 /*
  * $Workfile: platform.c $
  * $Revision$
@@ -153,7 +153,7 @@
 #define PLT_READ_WORDS   5
 #define PLT_WRITE_DWORDS 6
 #define PLT_READ_DWORDS  7
-#define PLT_UNKNOWN	 ((SYS_BOARD) 0xFFFF)
+#define PLT_UNKNOWN 		0xFFFF
 
 typedef struct
 {
@@ -295,7 +295,7 @@ FindStringInSeg(unsigned int segment_address, char *string_ptr)
    char *psegment_buf;
    unsigned long mem_ptr = (unsigned long)segment_address << 16;
    char segment_buffer[SEGMENT_LENGTH + 1];
-   int i, cursor = 0;
+   int i, cursor;
 
    /* silence compiler */
    (void)cursor;
diff --git a/src/panel/pnl_bios.c b/src/panel/pnl_bios.c
index a7ba861..433f568 100644
--- a/src/panel/pnl_bios.c
+++ b/src/panel/pnl_bios.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/pnl_bios.c,v 1.2 2002/12/11 22:51:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/pnl_bios.c,v 1.3 2003/01/14 09:34:36 alanh Exp $ */
 /*
  * $Workfile: pnl_bios.c $
  * $Revision$
diff --git a/src/panel/pnl_defs.h b/src/panel/pnl_defs.h
index 55f40b7..37a37c7 100644
--- a/src/panel/pnl_defs.h
+++ b/src/panel/pnl_defs.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/pnl_defs.h,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
 /*
  * $Workfile: pnl_defs.h $
  *
diff --git a/src/panel/pnl_init.c b/src/panel/pnl_init.c
index 23ee2aa..1c5a0e0 100644
--- a/src/panel/pnl_init.c
+++ b/src/panel/pnl_init.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/pnl_init.c,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
 /*
  * $Workfile: pnl_init.c $
  * $Revision$
diff --git a/src/panel/readme.txt b/src/panel/readme.txt
index 6bcb8ec..bfe92f3 100644
--- a/src/panel/readme.txt
+++ b/src/panel/readme.txt
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/readme.txt,v 1.2 2002/12/10 15:41:27 alanh Exp $ */
 Panel Library
 Release 1.3.2
 OS - Can be used in all OS's.