diff options
author | Roland Mainz <roland.mainz@nrubsig.org> | 2004-12-16 01:30:36 +0000 |
---|---|---|
committer | Roland Mainz <roland.mainz@nrubsig.org> | 2004-12-16 01:30:36 +0000 |
commit | 6f441f00e920c9abdcdefb896e9c86cae3081c34 (patch) | |
tree | 1662db18e0c3e45362bfb237472780f3c6ce35b4 | |
parent | a7d27d00febe51416a3f2d719982f6586ebe1bff (diff) |
xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_video.cXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8-branch
//bugs.freedesktop.org/show_bug.cgi?id=1937) attachment #1396
(https://bugs.freedesktop.org/attachment.cgi?id=1396): XV support
doesn't depend on 2D acceleration any more. This patch removes this
limitation from the NSC driver. This is a patch that I have committed
to XFree86 a while ago but never ported over to X.Org. Patch by Egbert
Eich <eich@freedesktop.org> and Matthieu Herrb <matthieu.herrb@laas.fr>
78 files changed, 202 insertions, 214 deletions
diff --git a/man/nsc.man b/man/nsc.man index f5a5f6f..d9addac 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.2 2003/05/29 21:48:09 herrb Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.man,v 1.1 2002/12/10 15:12:23 alanh 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 XFree86 driver for National Semiconductors GEODE processor family. +is an __xservername__ 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 XF86Config(__filemansuffix__) for general configuration +Please refer to __xconfigfile__(__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" -XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) .SH AUTHOR Author: Sarma V. Kolluru diff --git a/src/durango.c b/src/durango.c index 8033f52..94c5795 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.5 2003/01/24 17:16:52 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/durango.c,v 1.4 2003/01/14 09:34:30 alanh Exp $ */ /* * $Workfile: durango.c $ * $Revision$ diff --git a/src/gfx/disp_gu1.c b/src/gfx/disp_gu1.c index b177264..531bc47 100644 --- a/src/gfx/disp_gu1.c +++ b/src/gfx/disp_gu1.c @@ -410,6 +410,9 @@ 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 ba72e88..94ed470 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.4 2003/02/06 17:46:02 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/disp_gu2.c,v 1.4tsi Exp $ */ /* * $Workfile: disp_gu2.c $ * @@ -1558,13 +1558,13 @@ void gfx_set_display_video_enable(int enable) #endif { - unsigned long lock, gcfg, dcfg; + unsigned long lock, gcfg; /* READ CURRENT VALUES */ lock = READ_REG32(MDC_UNLOCK); gcfg = READ_REG32(MDC_GENERAL_CFG); - dcfg = READ_REG32(MDC_DISPLAY_CFG); + (void) 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 56bc65a..b43acd0 100644 --- a/src/gfx/durango.c +++ b/src/gfx/durango.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/durango.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: durango.c $ * diff --git a/src/gfx/gfx_dcdr.c b/src/gfx/gfx_dcdr.c index 187b440..e416016 100644 --- a/src/gfx/gfx_dcdr.c +++ b/src/gfx/gfx_dcdr.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_dcdr.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: gfx_dcdr.c $ * diff --git a/src/gfx/gfx_defs.h b/src/gfx/gfx_defs.h index 8847e5b..d3a38eb 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.2 2002/12/11 22:51:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_defs.h,v 1.2tsi Exp $ */ /* * $Workfile: gfx_defs.h $ * @@ -144,13 +144,13 @@ (*(volatile unsigned short *)(gfx_virt_regptr + (offset))) = (value) #define WRITE_REG32(offset, value) \ - (*(volatile unsigned long *)(gfx_virt_regptr + (offset))) = (value) + (*(volatile unsigned int *)(gfx_virt_regptr + (offset))) = (value) #define READ_REG16(offset) \ (*(volatile unsigned short *)(gfx_virt_regptr + (offset))) #define READ_REG32(offset) \ - (*(volatile unsigned long *)(gfx_virt_regptr + (offset))) + (*(volatile unsigned int *)(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 long *)(gfx_virt_gpptr + (offset))) = (value) + (*(volatile unsigned int *)(gfx_virt_gpptr + (offset))) = (value) #define READ_GP16(offset) \ (*(volatile unsigned short *)(gfx_virt_gpptr + (offset))) #define READ_GP32(offset) \ - (*(volatile unsigned long *)(gfx_virt_gpptr + (offset))) + (*(volatile unsigned int *)(gfx_virt_gpptr + (offset))) /* ACCESS TO THE FRAME BUFFER */ #define WRITE_FB32(offset, value) \ - (*(volatile unsigned long *)(gfx_virt_fbptr + (offset))) = (value) + (*(volatile unsigned int *)(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 long *)(gfx_virt_vidptr + (offset))) + (*(volatile unsigned int *)(gfx_virt_vidptr + (offset))) #define WRITE_VID32(offset, value) \ - (*(volatile unsigned long *)(gfx_virt_vidptr + (offset))) = (value) + (*(volatile unsigned int *)(gfx_virt_vidptr + (offset))) = (value) /* ACCESS TO THE VIP HARDWARE */ #define READ_VIP32(offset) \ - (*(volatile unsigned long *)(gfx_virt_vipptr + (offset))) + (*(volatile unsigned int *)(gfx_virt_vipptr + (offset))) #define WRITE_VIP32(offset, value) \ - (*(volatile unsigned long *)(gfx_virt_vipptr + (offset))) = (value) + (*(volatile unsigned int *)(gfx_virt_vipptr + (offset))) = (value) /* ACCESS TO THE SCRATCHPAD RAM */ #define WRITE_SCRATCH32(offset, value) \ - (*(volatile unsigned long *)(gfx_virt_spptr + (offset))) = (value) + (*(volatile unsigned int *)(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 long *)(gfx_virt_spptr + (offset))) + (*(volatile unsigned int *)(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 long *)(gfx_gx1_scratch_base + i)) = *((unsigned long *)(aroffset + i)); \ + *((volatile unsigned int *)(gfx_gx1_scratch_base + i)) = *((unsigned int *)(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 long *)(aroffset + i))); \ + WRITE_FB32 ((fboffset) + i, *((unsigned int *)(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 long *)temp + counter)); \ + WRITE_GP32 (regoffset, *((unsigned int *)temp + counter)); \ } /************************************************************************************ diff --git a/src/gfx/gfx_disp.c b/src/gfx/gfx_disp.c index 54adcb3..02faa92 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.2 2003/01/14 09:34:34 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_disp.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */ /* * $Workfile: gfx_disp.c $ * diff --git a/src/gfx/gfx_i2c.c b/src/gfx/gfx_i2c.c index 385ee9f..424b0c7 100644 --- a/src/gfx/gfx_i2c.c +++ b/src/gfx/gfx_i2c.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_i2c.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: gfx_i2c.c $ * diff --git a/src/gfx/gfx_init.c b/src/gfx/gfx_init.c index 2aa93d5..9c576e6 100644 --- a/src/gfx/gfx_init.c +++ b/src/gfx/gfx_init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_init.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: gfx_init.c $ * diff --git a/src/gfx/gfx_mode.h b/src/gfx/gfx_mode.h index 100b36c..73d5dbe 100644 --- a/src/gfx/gfx_mode.h +++ b/src/gfx/gfx_mode.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_mode.h,v 1.1 2002/12/10 15:12:25 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: gfx_mode.h $ * diff --git a/src/gfx/gfx_msr.c b/src/gfx/gfx_msr.c index c6b1caf..47ce580 100644 --- a/src/gfx/gfx_msr.c +++ b/src/gfx/gfx_msr.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_msr.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: gfx_msr.c $ * diff --git a/src/gfx/gfx_regs.h b/src/gfx/gfx_regs.h index 7b11887..a1cfd9f 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.2 2003/02/05 18:38:43 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_regs.h,v 1.1 2002/12/10 15:12:25 alanh Exp $ */ /* * $Workfile: gfx_regs.h $ * diff --git a/src/gfx/gfx_rndr.c b/src/gfx/gfx_rndr.c index 5b6b881..9b8aefb 100644 --- a/src/gfx/gfx_rndr.c +++ b/src/gfx/gfx_rndr.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_rndr.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: gfx_rndr.c $ * diff --git a/src/gfx/gfx_rtns.h b/src/gfx/gfx_rtns.h index aefd6c0..5451eea 100644 --- a/src/gfx/gfx_rtns.h +++ b/src/gfx/gfx_rtns.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_rtns.h,v 1.1 2002/12/10 15:12:25 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: gfx_rtns.h $ * diff --git a/src/gfx/gfx_tv.c b/src/gfx/gfx_tv.c index 6cb825d..61e0aae 100644 --- a/src/gfx/gfx_tv.c +++ b/src/gfx/gfx_tv.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_tv.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: gfx_tv.c $ * diff --git a/src/gfx/gfx_tv.h b/src/gfx/gfx_tv.h index 430c8a5..e920cc5 100644 --- a/src/gfx/gfx_tv.h +++ b/src/gfx/gfx_tv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_tv.h,v 1.1 2002/12/10 15:12:26 alanh Exp $ */ +/* $XFree86$ */ typedef struct tagTVDISPLAYMODE { diff --git a/src/gfx/gfx_type.h b/src/gfx/gfx_type.h index a50d5bd..8694e0f 100644 --- a/src/gfx/gfx_type.h +++ b/src/gfx/gfx_type.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_type.h,v 1.1 2002/12/10 15:12:26 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: gfx_type.h $ * diff --git a/src/gfx/gfx_vga.c b/src/gfx/gfx_vga.c index a2c0dd6..ace602d 100644 --- a/src/gfx/gfx_vga.c +++ b/src/gfx/gfx_vga.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_vga.c,v 1.1 2002/12/10 15:12:26 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: gfx_vga.c $ * diff --git a/src/gfx/gfx_vid.c b/src/gfx/gfx_vid.c index 9ddde27..3889718 100644 --- a/src/gfx/gfx_vid.c +++ b/src/gfx/gfx_vid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_vid.c,v 1.1 2002/12/10 15:12:26 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: gfx_vid.c $ * diff --git a/src/gfx/gfx_vip.c b/src/gfx/gfx_vip.c index 1f506ae..080c18a 100644 --- a/src/gfx/gfx_vip.c +++ b/src/gfx/gfx_vip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_vip.c,v 1.1 2002/12/10 15:12:26 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: gfx_vip.c $ * diff --git a/src/gfx/history.h b/src/gfx/history.h index 36f7fb9..62d6a17 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.2 2003/02/05 18:38:43 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/history.h,v 1.1 2002/12/10 15:12:26 alanh Exp $ */ /* * $Workfile: history.h $ * diff --git a/src/gfx/i2c_acc.c b/src/gfx/i2c_acc.c index ff205eb..bb9d8e5 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.1 2002/12/10 15:12:26 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/i2c_acc.c,v 1.1tsi 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 == -1) + if (freq == (char)(-1)) freq = 0x71; else { freq = freq << 1; diff --git a/src/gfx/i2c_gpio.c b/src/gfx/i2c_gpio.c index 096750d..e9c6669 100644 --- a/src/gfx/i2c_gpio.c +++ b/src/gfx/i2c_gpio.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/i2c_gpio.c,v 1.1 2002/12/10 15:12:26 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: i2c_gpio.c $ * diff --git a/src/gfx/init_gu1.c b/src/gfx/init_gu1.c index 09fb79c..29fc68a 100644 --- a/src/gfx/init_gu1.c +++ b/src/gfx/init_gu1.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/init_gu1.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: init_gu1.c $ * diff --git a/src/gfx/init_gu2.c b/src/gfx/init_gu2.c index 143ce52..4eee209 100644 --- a/src/gfx/init_gu2.c +++ b/src/gfx/init_gu2.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/init_gu2.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: init_gu2.c $ * diff --git a/src/gfx/msr_rdcl.c b/src/gfx/msr_rdcl.c index ce3ce05..66c6462 100644 --- a/src/gfx/msr_rdcl.c +++ b/src/gfx/msr_rdcl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/msr_rdcl.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: msr_rdcl.c $ * diff --git a/src/gfx/release.txt b/src/gfx/release.txt index 8d0c87f..7b495bb 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.3 2003/02/06 17:46:02 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/release.txt,v 1.1 2002/12/10 15:12:27 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 6d71f59..12ace2f 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.2 2003/01/14 09:34:34 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/rndr_gu1.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */ /* * $Workfile: rndr_gu1.c $ * diff --git a/src/gfx/rndr_gu2.c b/src/gfx/rndr_gu2.c index 9378328..a75dcae 100644 --- a/src/gfx/rndr_gu2.c +++ b/src/gfx/rndr_gu2.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/rndr_gu2.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: rndr_gu2.c $ * diff --git a/src/gfx/saa7114.c b/src/gfx/saa7114.c index 885e65f..26bed27 100644 --- a/src/gfx/saa7114.c +++ b/src/gfx/saa7114.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/saa7114.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: saa7114.c $ * diff --git a/src/gfx/tv_1200.c b/src/gfx/tv_1200.c index 512b28e..bada406 100644 --- a/src/gfx/tv_1200.c +++ b/src/gfx/tv_1200.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_1200.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: tv_1200.c $ * diff --git a/src/gfx/tv_fs450.c b/src/gfx/tv_fs450.c index b14bc16..e109a62 100644 --- a/src/gfx/tv_fs450.c +++ b/src/gfx/tv_fs450.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_fs450.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: tv_fs450.c $ * diff --git a/src/gfx/tv_fs450.h b/src/gfx/tv_fs450.h index 2b87710..7eb15da 100644 --- a/src/gfx/tv_fs450.h +++ b/src/gfx/tv_fs450.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_fs450.h,v 1.1 2002/12/10 15:12:27 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: tv_fs450.h $ * diff --git a/src/gfx/tv_fs451.c b/src/gfx/tv_fs451.c index 6072ec7..29b74f2 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.1 2002/12/10 15:12:27 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_fs451.c,v 1.1tsi Exp $ */ /* * $Workfile: tv_fs451.c $ * $Revision$ @@ -139,10 +139,10 @@ */ #if GFX_TV_DYNAMIC int -fs451_set_tv_format(int format, int resolution) +fs451_set_tv_format(TVStandardType format, GfxOnTVType resolution) #else int -gfx_set_tv_format(int format, int resolution) +gfx_set_tv_format(TVStandardType format, GfxOnTVType resolution) #endif { /* ### ADD ### IMPLEMENTATION */ diff --git a/src/gfx/tv_geode.c b/src/gfx/tv_geode.c index 1938083..af25930 100644 --- a/src/gfx/tv_geode.c +++ b/src/gfx/tv_geode.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_geode.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */ +/* $XFree86$ */ /*----------------------------------------------------------------------------- * TV_GEODE.C * diff --git a/src/gfx/vga_gu1.c b/src/gfx/vga_gu1.c index d5fa263..d8cbdce 100644 --- a/src/gfx/vga_gu1.c +++ b/src/gfx/vga_gu1.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vga_gu1.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: vga_gu1.c $ * diff --git a/src/gfx/vid_1200.c b/src/gfx/vid_1200.c index f52d02b..e25dc7e 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.2 2003/01/14 09:34:34 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_1200.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */ /* * $Workfile: vid_1200.c $ * diff --git a/src/gfx/vid_1400.c b/src/gfx/vid_1400.c index 11f9361..3ca83ba 100644 --- a/src/gfx/vid_1400.c +++ b/src/gfx/vid_1400.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_1400.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */ +/* $XFree86$ */ /*----------------------------------------------------------------------------- * VID_1400.C * diff --git a/src/gfx/vid_5530.c b/src/gfx/vid_5530.c index 17d5f3b..114973a 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.2 2003/02/21 16:51:10 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_5530.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */ /* * $Workfile: vid_5530.c $ * diff --git a/src/gfx/vid_rdcl.c b/src/gfx/vid_rdcl.c index 8e429d8..4712b78 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.3 2003/02/21 16:51:10 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_rdcl.c,v 1.3tsi Exp $ */ /* * $Workfile: vid_rdcl.c $ * @@ -446,7 +446,6 @@ 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; @@ -462,7 +461,6 @@ 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 f2458f6..f0681ba 100644 --- a/src/gfx/vip_1200.c +++ b/src/gfx/vip_1200.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vip_1200.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: vip_1200.c $ * diff --git a/src/gfx/vip_1400.c b/src/gfx/vip_1400.c index 7896288..876479d 100644 --- a/src/gfx/vip_1400.c +++ b/src/gfx/vip_1400.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vip_1400.c,v 1.1 2002/12/10 15:12:28 alanh Exp $ */ +/* $XFree86$ */ /*----------------------------------------------------------------------------- * VIP_1400.C * @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.h,v 1.5 2003/02/21 16:51:09 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.h,v 1.5tsi Exp $ */ /* * $Workfile: nsc.h $ * $Revision$ @@ -409,7 +409,7 @@ typedef struct GeodeRec, *GeodePtr; /* option flags are self-explanatory */ -enum +typedef enum { OPTION_SW_CURSOR, OPTION_HW_CURSOR, diff --git a/src/nsc_driver.c b/src/nsc_driver.c index da856c6..e312683 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.5 2003/04/23 21:51:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_driver.c,v 1.4tsi Exp $ */ /* * $Workfile: nsc_driver.c $ * $Revision$ @@ -398,7 +398,7 @@ static XF86ModuleVersionInfo NscVersionRec = { MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_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 321eb83..dbb9a72 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.2 2003/01/14 09:34:30 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_fourcc.h,v 1.1 2002/12/10 15:12:23 alanh Exp $ */ /* * $Workfile: nsc_fourcc.h $ * $Revision$ diff --git a/src/nsc_galfns.c b/src/nsc_galfns.c index 83a364b..9666c8e 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.3 2003/02/05 18:38:42 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_galfns.c,v 1.2 2003/01/14 09:34:30 alanh Exp $ */ /* * $Workfile: nsc_galfns.c $ * $Revision$ diff --git a/src/nsc_galstub.c b/src/nsc_galstub.c index 5366f27..7cd3a7b 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.2 2003/01/14 09:34:31 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_galstub.c,v 1.1 2002/12/10 15:12:23 alanh Exp $ */ /* * $Workfile: nsc_galstub.c $ * $Revision$ diff --git a/src/nsc_gx1_cursor.c b/src/nsc_gx1_cursor.c index 9132ac6..5cd4a40 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.5 2003/02/21 16:51:09 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_cursor.c,v 1.5tsi Exp $ */ /* * $Workfile: nsc_gx1_cursor.c $ * $Revision$ @@ -298,14 +298,13 @@ GX1SetCursorPosition(ScrnInfoPtr pScreenInfo, int x, int y) void GX1LoadCursorImage(ScrnInfoPtr pScreenInfo, unsigned char *src) { - int i, j; + int i; 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 9d2f7b4..d3144ff 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.2 2003/01/14 09:34:31 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_dga.c,v 1.1 2002/12/10 15:12:23 alanh Exp $ */ /* * $Workfile: nsc_gx1_dga.c $ * $Revision$ diff --git a/src/nsc_gx1_driver.c b/src/nsc_gx1_driver.c index 35deb93..4cc852e 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.9 2003/08/23 15:03:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_driver.c,v 1.10tsi 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 int GX1ValidMode(int, DisplayModePtr, Bool, int); +static ModeStatus 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,10 +1019,11 @@ 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: @@ -1086,6 +1087,7 @@ GX1PreInit(ScrnInfoPtr pScreenInfo, int flags) GeodeDebug(("GX1PreInit(19)!\n")); GeodeDebug(("GX1PreInit(20)!\n")); GeodeDebug(("GX1PreInit ... done successfully!\n")); + (void) from; return TRUE; } @@ -1258,7 +1260,8 @@ GX1SetMode(ScrnInfoPtr pScreenInfo, DisplayModePtr pMode) #else /* sequence might be important */ gfx_set_tv_display(pGeode->TvParam.wWidth, pGeode->TvParam.wHeight); - gfx_set_tv_format(pGeode->TvParam.wStandard, pGeode->TvParam.wType); + gfx_set_tv_format((TVStandardType)pGeode->TvParam.wStandard, + (GfxOnTVType)pGeode->TvParam.wType); gfx_set_tv_output(pGeode->TvParam.wOutput); gfx_set_tv_enable(pGeode->TvParam.bState); @@ -2306,7 +2309,7 @@ GX1FreeScreen(int scrnIndex, int flags) * Comments :none. *---------------------------------------------------------------------------- */ -static int +static ModeStatus GX1ValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, int flags) { ScrnInfoPtr pScreenInfo = xf86Screens[scrnIndex]; @@ -2328,7 +2331,7 @@ GX1ValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, int flags) #else ret = gfx_is_tv_display_mode_supported(pMode->CrtcHDisplay, pMode->CrtcVDisplay, - pGeode->TvParam.wStandard); + (TVStandardType)pGeode->TvParam.wStandard); #endif } } else { diff --git a/src/nsc_gx1_shadow.c b/src/nsc_gx1_shadow.c index d3a139f..68899cb 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.2 2003/01/14 09:34:32 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_shadow.c,v 1.1 2002/12/10 15:12:23 alanh Exp $ */ /* * $Workfile: nsc_gx1_shadow.c $ * $Revision$ diff --git a/src/nsc_gx1_video.c b/src/nsc_gx1_video.c index fc0c6ed..b46d5de 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.7 2003/04/23 21:51:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_video.c,v 1.7tsi Exp $ */ /* * $Workfile: nsc_gx1_video.c $ * $Revision$ @@ -240,45 +240,42 @@ GX1InitVideo(ScreenPtr pScreen) GeodePtr pGeode; ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL; + XF86VideoAdaptorPtr newAdaptor = NULL; + + int num_adaptors; pGeode = GEODEPTR(pScreenInfo); - if (!pGeode->NoAccel) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL; - XF86VideoAdaptorPtr newAdaptor = NULL; - - int num_adaptors; - - DEBUGMSG(0, (0, X_NONE, "InitVideo\n")); - newAdaptor = GX1SetupImageVideo(pScreen); - GX1InitOffscreenImages(pScreen); - - num_adaptors = xf86XVListGenericAdaptors(pScrn, &adaptors); - - if (newAdaptor) { - if (!num_adaptors) { - num_adaptors = 1; - adaptors = &newAdaptor; - } else { - newAdaptors = /* need to free this someplace */ - xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *)); - if (newAdaptors) { + + DEBUGMSG(0, (0, X_NONE, "InitVideo\n")); + newAdaptor = GX1SetupImageVideo(pScreen); + GX1InitOffscreenImages(pScreen); + + num_adaptors = xf86XVListGenericAdaptors(pScreenInfo, &adaptors); + + if (newAdaptor) { + if (!num_adaptors) { + num_adaptors = 1; + adaptors = &newAdaptor; + } else { + newAdaptors = /* need to free this someplace */ + xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *)); + if (newAdaptors) { memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr)); newAdaptors[num_adaptors] = newAdaptor; adaptors = newAdaptors; num_adaptors++; - } - } - } - - if (num_adaptors) - xf86XVScreenInit(pScreen, adaptors, num_adaptors); - - if (newAdaptors) - xfree(newAdaptors); + } + } } + + if (num_adaptors) + xf86XVScreenInit(pScreen, adaptors, num_adaptors); + + if (newAdaptors) + xfree(newAdaptors); } /* client libraries expect an encoding */ @@ -413,17 +410,15 @@ GX1SetColorkey(ScrnInfoPtr pScrn, GeodePortPrivPtr pPriv) void GX1ResetVideo(ScrnInfoPtr pScrn) { - GeodePtr pGeode = GEODEPTR(pScrn); + GeodePtr pGeode = GEODEPTR(pScrn); - if (!pGeode->NoAccel) { - GeodePortPrivPtr pPriv = pGeode->adaptor->pPortPrivates[0].ptr; + GeodePortPrivPtr pPriv = pGeode->adaptor->pPortPrivates[0].ptr; - DEBUGMSG(0, (0, X_NONE, "ResetVideo\n")); - GX1AccelSync(pScrn); - GFX(set_video_palette(NULL)); - GX1SetColorkey(pScrn, pPriv); - GFX(set_video_filter(pPriv->filter, pPriv->filter)); - } + DEBUGMSG(0, (0, X_NONE, "ResetVideo\n")); + if (!pGeode->NoAccel) GX1AccelSync(pScrn); + GFX(set_video_palette(NULL)); + GX1SetColorkey(pScrn, pPriv); + GFX(set_video_filter(pPriv->filter, pPriv->filter)); } /*---------------------------------------------------------------------------- @@ -492,7 +487,7 @@ GX1SetupImageVideo(ScreenPtr pScreen) #endif /* gotta uninit this someplace */ - REGION_INIT(pScreen, &pPriv->clip, NullBox, 0); + REGION_NULL(pScreen, &pPriv->clip); pGeode->adaptor = adapt; @@ -537,7 +532,7 @@ GX1StopVideo(ScrnInfoPtr pScrn, pointer data, Bool exit) DEBUGMSG(0, (0, X_NONE, "StopVideo\n")); REGION_EMPTY(pScrn->pScreen, &pPriv->clip); - GX1AccelSync(pScrn); + if (!pGeode->NoAccel) GX1AccelSync(pScrn); if (exit) { if (pPriv->videoStatus & CLIENT_VIDEO_ON) { GFX(set_video_enable(0)); @@ -580,8 +575,9 @@ GX1SetPortAttribute(ScrnInfoPtr pScrn, Atom attribute, INT32 value, pointer data) { GeodePortPrivPtr pPriv = (GeodePortPrivPtr) data; + GeodePtr pGeode = GEODEPTR(pScrn); - GX1AccelSync(pScrn); + if (!pGeode->NoAccel) GX1AccelSync(pScrn); if (attribute == xvColorKey) { pPriv->colorKey = value; GX1SetColorkey(pScrn, pPriv); @@ -1002,7 +998,7 @@ GX1DisplayVideo(ScrnInfoPtr pScrn, GeodePtr pGeode = GEODEPTR(pScrn); /* DisplayModePtr mode = pScrn->currentMode; */ - GX1AccelSync(pScrn); + if (!pGeode->NoAccel) GX1AccelSync(pScrn); GFX(set_video_enable(1)); @@ -1353,7 +1349,7 @@ GX1BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask) (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); pScreen->BlockHandler = GX1BlockHandler; - GX1AccelSync(pScrn); + if (!pGeode->NoAccel) GX1AccelSync(pScrn); if (pPriv->videoStatus & TIMER_MASK) { UpdateCurrentTime(); if (pPriv->videoStatus & OFF_TIMER) { diff --git a/src/nsc_gx2_cursor.c b/src/nsc_gx2_cursor.c index f4a35db..10106a6 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.5 2003/02/21 16:51:09 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_cursor.c,v 1.5tsi Exp $ */ /* * $Workfile: nsc_gx2_cursor.c $ * $Revision$ @@ -295,14 +295,13 @@ GX2SetCursorPosition(ScrnInfoPtr pScreenInfo, int x, int y) void GX2LoadCursorImage(ScrnInfoPtr pScreenInfo, unsigned char *src) { - int i, j; + int i; 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 0287eda..99dd2a8 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.2 2003/01/14 09:34:32 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_dga.c,v 1.1 2002/12/10 15:12:24 alanh Exp $ */ /* * $Workfile: nsc_gx2_dga.c $ * $Revision$ diff --git a/src/nsc_gx2_driver.c b/src/nsc_gx2_driver.c index ece8855..37944a3 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.8 2003/08/23 15:03:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_driver.c,v 1.9tsi 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 int GX2ValidMode(int, DisplayModePtr, Bool, int); +static ModeStatus GX2ValidMode(int, DisplayModePtr, Bool, int); static void GX2LoadPalette(ScrnInfoPtr pScreenInfo, int numColors, int *indizes, LOCO * colors, VisualPtr pVisual); @@ -474,9 +474,8 @@ GX2PreInit(ScrnInfoPtr pScreenInfo, int flags) MessageType from; int i = 0; GeodePtr pGeode; - char *mod = NULL; - #if CFB + char *mod = NULL; char *reqSymbol = NULL; #endif /* CFB */ #if defined(STB_X) @@ -979,10 +978,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: @@ -1052,6 +1051,7 @@ 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 int +static ModeStatus 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 4ecadf1..8f37fed 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.2 2003/01/14 09:34:32 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_shadow.c,v 1.1 2002/12/10 15:12:24 alanh Exp $ */ /* * $Workfile: nsc_gx2_shadow.c $ * $Revision$ diff --git a/src/nsc_gx2_vga.c b/src/nsc_gx2_vga.c index 9e79e66..35b71b4 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.2 2003/01/14 09:34:32 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_vga.c,v 1.2tsi Exp $ */ /* * $Workfile: nsc_gx2_vga.c $ * $Revision$ @@ -227,12 +227,10 @@ gu2_vga_seq_blanking(void) int gu2_vga_attr_ctrl(int reset) { - int tmp; - - tmp = gfx_inb(0x3DA); + (void) gfx_inb(0x3DA); gfx_outb(0x3C0, (unsigned char)(reset ? 0x00 : 0x20)); if (reset) - tmp = gfx_inb(0x3DA); + (void) gfx_inb(0x3DA); return (GFX_STATUS_OK); } @@ -250,7 +248,6 @@ gu2_vga_to_gfx(void) void gu2_gfx_to_vga(int vga_mode) { - int tmp; char sequencer; gu2_vga_extcrtc(0x40, vga_mode); @@ -268,9 +265,9 @@ gu2_gfx_to_vga(int vga_mode) gfx_outw(0x3C4, 0x300); /* turn on the attribute controler */ - tmp = gfx_inb(0x3DA); + (void) gfx_inb(0x3DA); gfx_outb(0x3C0, 0x20); - tmp = gfx_inb(0x3DA); + (void) gfx_inb(0x3DA); gu2_vga_extcrtc(0x3F, 0); } diff --git a/src/nsc_gx2_video.c b/src/nsc_gx2_video.c index 8d914ad..be2fceb 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.6 2003/04/23 21:51:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_video.c,v 1.6tsi Exp $ */ /* * $Workfile: nsc_gx2_video.c $ * $Revision$ @@ -233,46 +233,42 @@ static Atom xvColorKey, xvColorKeyMode, xvFilter void GX2InitVideo(ScreenPtr pScreen) { - GeodePtr pGeode; - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + GeodePtr pGeode; + ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL; + XF86VideoAdaptorPtr newAdaptor = NULL; - pGeode = GEODEPTR(pScreenInfo); + int num_adaptors; - if (!pGeode->NoAccel) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL; - XF86VideoAdaptorPtr newAdaptor = NULL; + pGeode = GEODEPTR(pScreenInfo); - int num_adaptors; + newAdaptor = GX2SetupImageVideo(pScreen); + GX2InitOffscreenImages(pScreen); - newAdaptor = GX2SetupImageVideo(pScreen); - GX2InitOffscreenImages(pScreen); + num_adaptors = xf86XVListGenericAdaptors(pScreenInfo, &adaptors); - num_adaptors = xf86XVListGenericAdaptors(pScrn, &adaptors); - - if (newAdaptor) { - if (!num_adaptors) { + if (newAdaptor) { + if (!num_adaptors) { num_adaptors = 1; adaptors = &newAdaptor; - } else { + } else { newAdaptors = /* need to free this someplace */ - xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *)); + xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *)); if (newAdaptors) { - memcpy(newAdaptors, adaptors, num_adaptors * - sizeof(XF86VideoAdaptorPtr)); - newAdaptors[num_adaptors] = newAdaptor; - adaptors = newAdaptors; - num_adaptors++; + memcpy(newAdaptors, adaptors, num_adaptors * + sizeof(XF86VideoAdaptorPtr)); + newAdaptors[num_adaptors] = newAdaptor; + adaptors = newAdaptors; + num_adaptors++; } - } - } + } + } - if (num_adaptors) - xf86XVScreenInit(pScreen, adaptors, num_adaptors); + if (num_adaptors) + xf86XVScreenInit(pScreen, adaptors, num_adaptors); - if (newAdaptors) - xfree(newAdaptors); - } + if (newAdaptors) + xfree(newAdaptors); } /* client libraries expect an encoding */ @@ -416,16 +412,14 @@ GX2SetColorkey(ScrnInfoPtr pScrn, GeodePortPrivPtr pPriv) void GX2ResetVideo(ScrnInfoPtr pScrn) { - GeodePtr pGeode = GEODEPTR(pScrn); + GeodePtr pGeode = GEODEPTR(pScrn); - if (!pGeode->NoAccel) { - GeodePortPrivPtr pPriv = pGeode->adaptor->pPortPrivates[0].ptr; + GeodePortPrivPtr pPriv = pGeode->adaptor->pPortPrivates[0].ptr; - GX2AccelSync(pScrn); - GFX(set_video_palette(NULL)); - GX2SetColorkey(pScrn, pPriv); - GFX(set_video_filter(pPriv->filter, pPriv->filter)); - } + if (!pGeode->NoAccel) GX2AccelSync(pScrn); + GFX(set_video_palette(NULL)); + GX2SetColorkey(pScrn, pPriv); + GFX(set_video_filter(pPriv->filter, pPriv->filter)); } /*---------------------------------------------------------------------------- @@ -493,7 +487,7 @@ GX2SetupImageVideo(ScreenPtr pScreen) #endif /* gotta uninit this someplace */ - REGION_INIT(pScreen, &pPriv->clip, NullBox, 0); + REGION_NULL(pScreen, &pPriv->clip); pGeode->adaptor = adapt; @@ -537,7 +531,7 @@ GX2StopVideo(ScrnInfoPtr pScrn, pointer data, Bool exit) REGION_EMPTY(pScrn->pScreen, &pPriv->clip); - GX2AccelSync(pScrn); + if (!pGeode->NoAccel) GX2AccelSync(pScrn); if (exit) { if (pPriv->videoStatus & CLIENT_VIDEO_ON) { GFX(set_video_enable(0)); @@ -580,8 +574,9 @@ GX2SetPortAttribute(ScrnInfoPtr pScrn, Atom attribute, INT32 value, pointer data) { GeodePortPrivPtr pPriv = (GeodePortPrivPtr) data; + GeodePtr pGeode = GEODEPTR(pScrn); - GX2AccelSync(pScrn); + if (!pGeode->NoAccel) GX2AccelSync(pScrn); if (attribute == xvColorKey) { pPriv->colorKey = value; GX2SetColorkey(pScrn, pPriv); @@ -941,7 +936,7 @@ GX2DisplayVideo(ScrnInfoPtr pScrn, { GeodePtr pGeode = GEODEPTR(pScrn); - GX2AccelSync(pScrn); + if (!pGeode->NoAccel) GX2AccelSync(pScrn); GFX(set_video_enable(1)); @@ -1298,7 +1293,7 @@ GX2BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask) (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); pScreen->BlockHandler = GX2BlockHandler; - GX2AccelSync(pScrn); + if (!pGeode->NoAccel) GX2AccelSync(pScrn); if (pPriv->videoStatus & TIMER_MASK) { UpdateCurrentTime(); if (pPriv->videoStatus & OFF_TIMER) { diff --git a/src/nsc_msr_asm.S b/src/nsc_msr_asm.S index c0c4a3c..a09b730 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/12 22:13:34 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_msr_asm.s,v 1.1 2002/12/10 15:12:25 alanh Exp $ ########################################################################## # NSC_LIC_ALTERNATIVE_PREAMBLE # diff --git a/src/nsc_regacc.c b/src/nsc_regacc.c index 45c720d..6b94d17 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.2 2003/01/14 09:34:32 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_regacc.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */ /* * $Workfile: nsc_regacc.c $ * $Revision$ diff --git a/src/panel.c b/src/panel.c index 9f79c6c..ea2732f 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.3 2003/01/14 09:34:32 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel.c,v 1.2 2002/12/11 22:51:00 dawes Exp $ */ /* * $Workfile: panel.c $ * $Revision$ diff --git a/src/panel/92xx.h b/src/panel/92xx.h index 15420d3..427fc50 100644 --- a/src/panel/92xx.h +++ b/src/panel/92xx.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/92xx.h,v 1.1 2002/12/10 15:12:28 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: 92xx.h $ * $Revision$ diff --git a/src/panel/cen9211.c b/src/panel/cen9211.c index 85aecdf..b62b1fe 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.1 2002/12/10 15:12:28 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/cen9211.c,v 1.1tsi Exp $ */ /* * $Workfile: cen9211.c $ * @@ -832,11 +832,9 @@ 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 4ce56cb..f3836c9 100644 --- a/src/panel/cen9211.h +++ b/src/panel/cen9211.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/cen9211.h,v 1.1 2002/12/10 15:12:28 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: cen9211.h $ * $Revision$ diff --git a/src/panel/dora9211.c b/src/panel/dora9211.c index de30ab3..020afe8 100644 --- a/src/panel/dora9211.c +++ b/src/panel/dora9211.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/dora9211.c,v 1.1 2002/12/10 15:12:28 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: dora9211.c $ * $Revision$ diff --git a/src/panel/dora9211.h b/src/panel/dora9211.h index 4413114..a215b86 100644 --- a/src/panel/dora9211.h +++ b/src/panel/dora9211.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/dora9211.h,v 1.1 2002/12/10 15:12:28 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: dora9211.h $ * $Revision$ diff --git a/src/panel/drac9210.c b/src/panel/drac9210.c index 8d9f477..d0e108a 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.2 2003/01/14 09:34:35 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/drac9210.c,v 1.1 2002/12/10 15:12:28 alanh Exp $ */ /* * $Workfile: drac9210.c $ * $Revision$ diff --git a/src/panel/drac9210.h b/src/panel/drac9210.h index f71a97f..ce4fceb 100644 --- a/src/panel/drac9210.h +++ b/src/panel/drac9210.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/drac9210.h,v 1.1 2002/12/10 15:12:28 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: drac9210.h $ * $Revision$ diff --git a/src/panel/gx2_9211.c b/src/panel/gx2_9211.c index 71909f8..bff4458 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.3 2003/01/14 09:34:35 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/gx2_9211.c,v 1.2 2002/12/11 22:51:02 dawes Exp $ */ /* * $Workfile: gx2_9211.c $ * diff --git a/src/panel/gx2_9211.h b/src/panel/gx2_9211.h index a545cb1..9ea685b 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.3 2003/01/14 09:34:35 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/gx2_9211.h,v 1.2 2002/12/11 22:51:02 dawes Exp $ */ /* * $Workfile: gx2_9211.h $ * diff --git a/src/panel/panel.c b/src/panel/panel.c index 194bbed..5880974 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.3 2003/01/14 09:34:35 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/panel.c,v 1.2 2002/12/11 22:51:02 dawes Exp $ */ /* * $Workfile: panel.c $ * $Revision$ diff --git a/src/panel/panel.h b/src/panel/panel.h index 79c1d21..e8d36dd 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.3 2003/01/14 09:34:36 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/panel.h,v 1.2 2002/12/11 22:51:02 dawes Exp $ */ /* * $Workfile: panel.h $ * $Revision$ diff --git a/src/panel/platform.c b/src/panel/platform.c index 1248b09..f8eb67f 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.3 2003/01/14 09:34:36 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/platform.c,v 1.3tsi 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 0xFFFF +#define PLT_UNKNOWN ((SYS_BOARD) 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; + int i, cursor = 0; /* silence compiler */ (void)cursor; diff --git a/src/panel/pnl_bios.c b/src/panel/pnl_bios.c index 433f568..a7ba861 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.3 2003/01/14 09:34:36 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/pnl_bios.c,v 1.2 2002/12/11 22:51:02 dawes Exp $ */ /* * $Workfile: pnl_bios.c $ * $Revision$ diff --git a/src/panel/pnl_defs.h b/src/panel/pnl_defs.h index 37a37c7..55f40b7 100644 --- a/src/panel/pnl_defs.h +++ b/src/panel/pnl_defs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/pnl_defs.h,v 1.1 2002/12/10 15:12:28 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: pnl_defs.h $ * diff --git a/src/panel/pnl_init.c b/src/panel/pnl_init.c index 1c5a0e0..23ee2aa 100644 --- a/src/panel/pnl_init.c +++ b/src/panel/pnl_init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/pnl_init.c,v 1.1 2002/12/10 15:12:28 alanh Exp $ */ +/* $XFree86$ */ /* * $Workfile: pnl_init.c $ * $Revision$ diff --git a/src/panel/readme.txt b/src/panel/readme.txt index bfe92f3..6bcb8ec 100644 --- a/src/panel/readme.txt +++ b/src/panel/readme.txt @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/readme.txt,v 1.2 2002/12/10 15:41:27 alanh Exp $ */ +/* $XFree86$ */ Panel Library Release 1.3.2 OS - Can be used in all OS's. |