Remove xorgconfig. Use X -configure instead.
This commit is contained in:
Adam Jackson
parent
574c62e305
commit
d34430414a
|
|
@ -3,5 +3,4 @@ SUBDIRS = \
|
|||
cvt \
|
||||
ioport \
|
||||
kbd_mode \
|
||||
xorgcfg \
|
||||
xorgconfig
|
||||
xorgcfg
|
||||
|
|
|
|||
1
hw/xfree86/utils/xorgconfig/.gitignore
vendored
1
hw/xfree86/utils/xorgconfig/.gitignore
vendored
|
|
@ -1 +0,0 @@
|
|||
xorgconfig.1
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,647 +0,0 @@
|
|||
# $XFree86: xc/programs/Xserver/hw/xfree98/xf86config/Cards98,v 1.7 1998/06/04 16:43:45 hohndel Exp $
|
||||
#
|
||||
#
|
||||
#
|
||||
# $XConsortium: Cards /main/27 1996/10/28 05:43:53 kaleb $
|
||||
# This is the database of card definitions used by xf86config.
|
||||
# Each definition should have a NAME entry, CHIPSET (descriptive) and
|
||||
# SERVER (one of EGC, GANBWAP, PEGC, NKVNEC, WABS, WABEP, WSNA, TGUI,
|
||||
# MGA, SVGA, NECS3, PWSKB, PWLB, GA968).
|
||||
# A reference to another definition is made with SEE (already defined
|
||||
# entries are not overridden).
|
||||
# Optional entries are RAMDAC (identifier), CLOCKCHIP (identifier),
|
||||
# DACSPEED, NOCLOCKPROBE (advises never to probe clocks), UNSUPPORTED
|
||||
# (indicates card that is not yet properly supported by a dedicated
|
||||
# server). A LINE entry adds a line of text to be included in the
|
||||
# Device section (can include options or comments).
|
||||
# There's no CLOCKS option (although a Clocks line can be included
|
||||
# with LINE), as it is very undesirable to have a Clocks line that
|
||||
# is incorrect. The idea is that the Clocks are probed for to be
|
||||
# sure (a commented suggested Clocks line can be included).
|
||||
#
|
||||
# The majority of entries are just a binding of a model name to a
|
||||
# chipset/server and untested.
|
||||
#
|
||||
|
||||
# EGC
|
||||
|
||||
NAME EGC16
|
||||
CHIPSET EGC
|
||||
SERVER EGC
|
||||
LINE Chipset "vga"
|
||||
|
||||
# PEGC
|
||||
|
||||
NAME PEGC
|
||||
CHIPSET PEGC
|
||||
SERVER PEGC
|
||||
LINE VideoRam 512
|
||||
LINE Clocks 31.5
|
||||
LINE # Virtual resolution for 640x400
|
||||
LINE # Clocks 28.322
|
||||
|
||||
# GANBWAP
|
||||
|
||||
NAME GA-98NBI
|
||||
CHIPSET CL-GD5434
|
||||
SERVER GANBWAP
|
||||
LINE ClockChip "cirrus"
|
||||
LINE Option "ga98nb1"
|
||||
LINE Option "no_mmio"
|
||||
LINE # Option "sw_cursor"
|
||||
|
||||
NAME GA-98NBII
|
||||
CHIPSET CL-GD5434
|
||||
SERVER GANBWAP
|
||||
LINE ClockChip "cirrus"
|
||||
LINE Option "ga98nb2"
|
||||
LINE Option "no_mmio"
|
||||
LINE # Option "sw_cursor"
|
||||
|
||||
NAME GA-98NBIV
|
||||
CHIPSET CL-GD5434
|
||||
SERVER GANBWAP
|
||||
LINE ClockChip "cirrus"
|
||||
LINE Option "ga98nb4"
|
||||
LINE Option "no_mmio"
|
||||
LINE # Option "sw_cursor"
|
||||
|
||||
NAME WAP-2000/4000
|
||||
CHIPSET CL-GD5434
|
||||
SERVER GANBWAP
|
||||
LINE Option "wap"
|
||||
LINE Option "no_mmio"
|
||||
LINE # Option "epsonmemwin"
|
||||
|
||||
# NKVNEC
|
||||
|
||||
NAME PCNKV/PCNKV2/NEC_CIRRUS
|
||||
CHIPSET CL-GD5428/5429/5430
|
||||
SERVER NKVNEC
|
||||
LINE # Option "fast_dram"
|
||||
LINE VideoRam 1024
|
||||
|
||||
NAME PC9821Bf/U8W
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Bp/U8W/U7W
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Bs/U7W
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Be/U7W
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821BA3/U2/W
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821BX3/U2/W
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821BX4/U2
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Cb
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Ce
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Cf
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Ce2
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Cs
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Cs2
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Cx
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Cx2
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Es
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Nd
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Ne2
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Nf
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Np
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Ns
|
||||
LINE Option "nec_cirrus"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821V7/C
|
||||
LINE Chipset "clgd5430"
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821V10/C,S
|
||||
LINE Chipset "clgd5430"
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821V12/S
|
||||
LINE Chipset "clgd5430"
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821V13/S
|
||||
LINE Chipset "clgd5430"
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821V16/S
|
||||
LINE Chipset "clgd5430"
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821V16/S5V,P
|
||||
LINE Chipset "clgd5446"
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821V20/S7
|
||||
LINE Chipset "clgd5430"
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Xb10
|
||||
LINE Chipset "clgd5430"
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Xc13/S5
|
||||
LINE Chipset "clgd5446"
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Xc16/M,S
|
||||
LINE Chipset "clgd5446"
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Xc200/M,S
|
||||
LINE Chipset "clgd5446"
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Xa7e
|
||||
LINE Chipset "clgd5430"
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Xe
|
||||
LINE Chipset "clgd5430"
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC9821Xe10
|
||||
LINE Chipset "clgd5430"
|
||||
LINE Option "nec_cirrus"
|
||||
LINE Option "no_mmio"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC486MR
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC486MS
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC486MU
|
||||
LINE Chipset "clgd5429"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC486MV
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC586MV
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
NAME PC586RV
|
||||
LINE Chipset "clgd5429"
|
||||
SEE PCNKV/PCNKV2/NEC_CIRRUS
|
||||
|
||||
# WABS
|
||||
|
||||
NAME WAB-S
|
||||
CHIPSET CL-GD5426/5428
|
||||
SERVER WABS
|
||||
LINE VideoRam 1024
|
||||
LINE # VideoRam 2048
|
||||
|
||||
NAME WAB-1000/2000
|
||||
CHIPSET CL-GD5428
|
||||
SERVER WABS
|
||||
LINE VideoRam 1024
|
||||
LINE # VideoRam 2048
|
||||
|
||||
NAME WSR-E/G
|
||||
SEE WAB-1000/2000
|
||||
|
||||
# WABEP
|
||||
|
||||
NAME WAB-EP
|
||||
CHIPSET CL-GD5428
|
||||
SERVER WABEP
|
||||
LINE Option "med_dram"
|
||||
|
||||
# WSNA
|
||||
|
||||
NAME WSN-A2F
|
||||
CHIPSET CL-GD5434
|
||||
SERVER WSNA
|
||||
LINE Option "no_mmio"
|
||||
LINE Option "med_dram"
|
||||
|
||||
# TGUI
|
||||
|
||||
NAME NEC Trident
|
||||
CHIPSET TGUI9680/9682
|
||||
SERVER TGUI
|
||||
LINE Option "xaa_no_color_exp"
|
||||
LINE # Option "noaccel"
|
||||
LINE # Option "Linear"
|
||||
LINE # Option "med_dram"
|
||||
LINE # Option "hw_cursor"
|
||||
|
||||
NAME PC9821Ra20/N
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821RaII23/N,W
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821Ra266/N,W
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821Rs20/B20
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821RsII26/B40
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821V13/M7
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821V16/M7
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821V20/M7
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821Xa7/C,K
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821Xa9/C,K
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821Xa10/C,K
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821Xa12/C,K
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821Xa13/C,K,W
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821Xa16/R,W
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821Xa20/W
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821Xc13/M,S
|
||||
SEE NEC Trident
|
||||
|
||||
NAME PC9821Xv13/R
|
||||
SEE NEC Trident
|
||||
|
||||
NAME GA-DRV/98
|
||||
CHIPSET TGUI9680
|
||||
SERVER TGUI
|
||||
LINE Option "noaccel"
|
||||
LINE # Option "med_dram"
|
||||
LINE # Option "hw_cursor"
|
||||
|
||||
# MGA
|
||||
|
||||
NAME MGA Millennium
|
||||
CHIPSET MGA2064W
|
||||
SERVER MGA
|
||||
|
||||
NAME PC9821Xt13
|
||||
SEE MGA Millennium
|
||||
|
||||
NAME PC9821Xt16
|
||||
SEE MGA Millennium
|
||||
|
||||
NAME PC9821Xv13/W
|
||||
SEE MGA Millennium
|
||||
|
||||
NAME PC9821Xv20/W
|
||||
SEE MGA Millennium
|
||||
|
||||
NAME PC9821St15
|
||||
SEE MGA Millennium
|
||||
|
||||
NAME PC9821St20
|
||||
SEE MGA Millennium
|
||||
|
||||
NAME PC9821RvII26/N20
|
||||
SEE MGA Millennium
|
||||
|
||||
NAME NEC FC-WAB-X2
|
||||
SEE MGA Millennium
|
||||
|
||||
NAME MGA Mystique
|
||||
CHIPSET MGA1064SG
|
||||
SERVER MGA
|
||||
|
||||
NAME PC9821V166/S
|
||||
LINE VideoRam 2048
|
||||
SEE MGA Mystique
|
||||
|
||||
NAME PC9821V200/S
|
||||
LINE VideoRam 2048
|
||||
SEE MGA Mystique
|
||||
|
||||
NAME PC9821V200/M
|
||||
LINE VideoRam 4096
|
||||
SEE MGA Mystique
|
||||
|
||||
NAME PC9821V233/M7
|
||||
LINE VideoRam 2048
|
||||
SEE MGA Mystique
|
||||
|
||||
NAME PC9821V233/M7V
|
||||
LINE VideoRam 4096
|
||||
SEE MGA Mystique
|
||||
|
||||
# SVGA
|
||||
|
||||
NAME NEC Cirrus 755x
|
||||
CHIPSET CL-GD7555
|
||||
LINE Chipset "clgd7555"
|
||||
LINE # VideoRam 2048
|
||||
LINE # Option "no_bitblt"
|
||||
LINE # Option "fast_dram"
|
||||
LINE Option "linear"
|
||||
LINE Option "noaccel"
|
||||
SERVER SVGA
|
||||
|
||||
NAME PC9821Nr12
|
||||
SEE NEC Cirrus 755x
|
||||
|
||||
NAME PC9821Nr13
|
||||
SEE NEC Cirrus 755x
|
||||
|
||||
NAME PC9821La13
|
||||
SEE NEC Cirrus 755x
|
||||
|
||||
NAME PC9821Ls12
|
||||
SEE NEC Cirrus 755x
|
||||
|
||||
NAME PC9821Ls13
|
||||
SEE NEC Cirrus 755x
|
||||
|
||||
NAME PC9821Ls150
|
||||
SEE NEC Cirrus 755x
|
||||
|
||||
# NECS3
|
||||
|
||||
NAME NEC WAB-A/B
|
||||
CHIPSET S3 928
|
||||
SERVER NECS3
|
||||
LINE Chipset "s3_generic"
|
||||
LINE Dacspeed 110
|
||||
LINE Ramdac "sc15025"
|
||||
LINE Option "dac_8_bit"
|
||||
LINE # Option "necwab"
|
||||
LINE # Option "nomemaccess"
|
||||
LINE Clocks 25.0 28.0 40.0 0.0 50.0 77.0 36.0 45.0
|
||||
LINE Clocks 130.0 120.0 80.0 31.0 110.0 65.0 75.0 94.0
|
||||
|
||||
NAME NEC FC-WAB-A/B
|
||||
CHIPSET S3 928
|
||||
SERVER NECS3
|
||||
LINE Chipset "s3_generic"
|
||||
LINE Dacspeed 110
|
||||
LINE Ramdac "bt485"
|
||||
LINE Option "necwab"
|
||||
LINE Option "nomemaccess"
|
||||
LINE Option "noinit"
|
||||
LINE Option "nolinear"
|
||||
LINE Clocks 25.0 28.0 40.0 0.0 50.0 77.0 36.0 45.0
|
||||
LINE Clocks 130.0 120.0 80.0 31.0 110.0 65.0 75.0 94.0
|
||||
|
||||
NAME PC9821Af/U9W E09?
|
||||
SEE NEC WAB-A/B
|
||||
|
||||
NAME PC9821An/U8W
|
||||
SEE NEC WAB-A/B
|
||||
|
||||
NAME PC9821Ap2/U8W/C9W
|
||||
SEE NEC WAB-A/B
|
||||
|
||||
NAME PC9821As2/U7W/U8W
|
||||
SEE NEC WAB-A/B
|
||||
|
||||
NAME NEC 864
|
||||
CHIPSET S3 864
|
||||
SERVER NECS3
|
||||
LINE Chipset "s3_generic"
|
||||
LINE Option "necwab"
|
||||
LINE Ramdac "s3_sdac"
|
||||
LINE ClockChip "s3_sdac"
|
||||
|
||||
NAME PC9821Ap3
|
||||
SEE NEC 864
|
||||
|
||||
NAME PC9821As3
|
||||
SEE NEC 864
|
||||
|
||||
NAME PC9821Xp
|
||||
SEE NEC 864
|
||||
|
||||
NAME PC9821Xs
|
||||
SEE NEC 864
|
||||
|
||||
# PWSKB
|
||||
|
||||
NAME PowerWindow 928/801
|
||||
CHIPSET S3 928
|
||||
SERVER PWSKB
|
||||
LINE Chipset "s3_generic"
|
||||
LINE # Chipset "mmio_928"
|
||||
LINE Ramdac "sc15025"
|
||||
LINE Dacspeed 110
|
||||
LINE Option "dac_8_bit"
|
||||
LINE # Option "epsonmemwin"
|
||||
LINE # Option "nomemaccess"
|
||||
LINE ClockChip "icd2061a"
|
||||
|
||||
NAME PowerWindow 928II
|
||||
CHIPSET S3 928
|
||||
SERVER PWSKB
|
||||
LINE Chipset "s3_generic"
|
||||
LINE # Chipset "mmio_928"
|
||||
LINE Ramdac "att20c505"
|
||||
LINE # Ramdac "bt485"
|
||||
LINE Dacspeed 110
|
||||
LINE Option "dac_8_bit"
|
||||
LINE # Option "pw_mux"
|
||||
LINE Option "bt485_curs"
|
||||
LINE # Option "epsonmemwin"
|
||||
LINE # Option "nomemaccess"
|
||||
LINE ClockChip "icd2061a"
|
||||
|
||||
NAME PowerWindow 805i
|
||||
CHIPSET S3 805
|
||||
SERVER PWSKB
|
||||
LINE Chipset "s3_generic"
|
||||
LINE Ramdac "s3gendac"
|
||||
LINE Dacspeed 110
|
||||
LINE Option "dac_8_bit"
|
||||
LINE # Option "pw805i"
|
||||
LINE # Option "epsonmemwin"
|
||||
LINE # Option "nomemaccess"
|
||||
LINE ClockChip "s3_sdac"
|
||||
|
||||
NAME PowerWindow 928G
|
||||
CHIPSET S3 928
|
||||
SERVER PWSKB
|
||||
LINE Chipset "s3_generic"
|
||||
LINE # Chipset "mmio_928"
|
||||
LINE Ramdac "sc15025"
|
||||
LINE Dacspeed 110
|
||||
LINE Option "dac_8_bit"
|
||||
LINE # Option "nomemaccess"
|
||||
LINE # Option "nolinear"
|
||||
LINE ClockChip "icd2061a"
|
||||
|
||||
NAME PCSKB/PCSKB2
|
||||
CHIPSET S3 911/924
|
||||
SERVER PWSKB
|
||||
LINE Chipset "s3_generic"
|
||||
LINE Ramdac "sc15025"
|
||||
LINE Dacspeed 110
|
||||
LINE Option "dac_8_bit"
|
||||
LINE # Option "nomemaccess"
|
||||
LINE Option "pcskb"
|
||||
LINE Clocks 25.0 28.0 40.0 0.0 50.0 77.0 36.0 45.0
|
||||
LINE Clocks 130.0 120.0 80.0 31.0 110.0 65.0 75.0 94.0
|
||||
|
||||
NAME PCSKB3/PCSKB4/PCPKB4
|
||||
CHIPSET S3 928
|
||||
SERVER PWSKB
|
||||
LINE Chipset "s3_generic"
|
||||
LINE Ramdac "sc15025"
|
||||
LINE # Ramdac "att20c498"
|
||||
LINE Dacspeed 110
|
||||
LINE Option "dac_8_bit"
|
||||
LINE Option "nomemaccess"
|
||||
LINE Option "pcskb4"
|
||||
LINE Clocks 25.0 28.0 40.0 0.0 50.0 77.0 36.0 45.0
|
||||
LINE Clocks 130.0 120.0 80.0 31.0 110.0 65.0 75.0 94.0
|
||||
|
||||
# PWLB
|
||||
|
||||
NAME PowerWindow 928GLB
|
||||
CHIPSET S3 928
|
||||
SERVER PWLB
|
||||
LINE Chipset "s3_generic"
|
||||
LINE # Chipset "mmio_928"
|
||||
LINE Ramdac "sc15025"
|
||||
LINE Dacspeed 110
|
||||
LINE Option "dac_8_bit"
|
||||
LINE # Option "pw_localbus"
|
||||
LINE # Option "nomemaccess"
|
||||
LINE # Option "nolinear"
|
||||
LINE ClockChip "icd2061a"
|
||||
|
||||
NAME PowerWindow 928IILB
|
||||
CHIPSET S3 928
|
||||
SERVER PWLB
|
||||
LINE Chipset "s3_generic"
|
||||
LINE # Chipset "mmio_928"
|
||||
LINE Ramdac "att20c505"
|
||||
LINE # Ramdac "bt485"
|
||||
LINE Dacspeed 110
|
||||
LINE Option "dac_8_bit"
|
||||
LINE Option "bt485_curs"
|
||||
LINE Option "pw_localbus"
|
||||
LINE # Option "pw_mux"
|
||||
LINE # Option "nomemaccess"
|
||||
LINE # Option "nolinear"
|
||||
LINE ClockChip "icd2061a"
|
||||
|
||||
NAME PowerWindow 964LB
|
||||
CHIPSET S3 964
|
||||
SERVER PWLB
|
||||
LINE Chipset "s3_generic"
|
||||
LINE Option "pw_localbus"
|
||||
LINE Option "number_nine"
|
||||
LINE Ramdac "ti3025"
|
||||
LINE ClockChip "ti3025"
|
||||
LINE VideoRam 4096
|
||||
|
||||
# GA968
|
||||
|
||||
NAME GA-968V4/PCI
|
||||
CHIPSET S3 968
|
||||
SERVER GA968
|
||||
LINE Chipset "s3_generic"
|
||||
LINE # Chipset "mmio_928"
|
||||
LINE VideoRam 4096
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a
|
||||
# copy of this software and associated documentation files (the
|
||||
# "Software"), to deal in the Software without restriction, including
|
||||
# without limitation the rights to use, copy, modify, merge, publish,
|
||||
# distribute, and/or sell copies of the Software, and to permit persons
|
||||
# to whom the Software is furnished to do so, provided that the above
|
||||
# copyright notice(s) and this permission notice appear in all copies of
|
||||
# the Software and that both the above copyright notice(s) and this
|
||||
# permission notice appear in supporting documentation.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
||||
# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
|
||||
# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
|
||||
# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
|
||||
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
|
||||
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
#
|
||||
# Except as contained in this notice, the name of a copyright holder
|
||||
# shall not be used in advertising or otherwise to promote the sale, use
|
||||
# or other dealings in this Software without prior written authorization
|
||||
# of the copyright holder.
|
||||
#
|
||||
|
||||
bin_PROGRAMS = xorgconfig
|
||||
|
||||
X11dir = $(libdir)/X11
|
||||
dist_X11_DATA = Cards
|
||||
|
||||
xorgconfig_CFLAGS = @XORGCONFIG_DEP_CFLAGS@ \
|
||||
-DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \
|
||||
-DPROJECTROOT='"$(PROJECTROOT)"' \
|
||||
-DFILEMANSUFFIX='"$(FILE_MAN_SUFFIX)"' \
|
||||
-DXVERSIONSTRING='"$(PACKAGE_STRING)"'
|
||||
|
||||
xorgconfig_LDADD = @XORGCONFIG_DEP_LIBS@
|
||||
|
||||
xorgconfig_SOURCES = \
|
||||
cards.c \
|
||||
cards.h \
|
||||
xorgconfig.c
|
||||
|
||||
# Man page
|
||||
include $(top_srcdir)/cpprules.in
|
||||
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
|
||||
appman_PRE = xorgconfig.man
|
||||
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
||||
|
||||
EXTRAMANDEFS = \
|
||||
-D__XCONFIGFILE__=$(__XCONFIGFILE__) \
|
||||
-D__XSERVERNAME__=$(XSERVERNAME)
|
||||
|
||||
BUILT_SOURCES = $(appman_PRE)
|
||||
CLEANFILES = $(appman_PRE) $(appman_DATA)
|
||||
|
||||
SUFFIXES += .$(APP_MAN_SUFFIX) .man
|
||||
|
||||
.man.$(APP_MAN_SUFFIX):
|
||||
-rm -f $@
|
||||
$(LN_S) $< $@
|
||||
|
||||
EXTRA_DIST = \
|
||||
Cards98 \
|
||||
xorgconfig.man.pre
|
||||
|
|
@ -1,278 +0,0 @@
|
|||
/*
|
||||
* Functions to manipulate card database.
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "cards.h"
|
||||
|
||||
/* Some vars to make path names in texts more flexible. */
|
||||
#ifndef PROJECTROOT
|
||||
# define PROJECTROOT "/usr"
|
||||
#endif
|
||||
#define TREEROOT PROJECTROOT
|
||||
#define TREEROOTLX TREEROOT "/lib/X11"
|
||||
#define TREEROOTCFG TREEROOT "/etc/X11"
|
||||
#ifdef XDOCDIR
|
||||
# define TREEROOTDOC XDOCDIR
|
||||
#else
|
||||
# define TREEROOTDOC TREEROOTLX "/doc"
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Database format:
|
||||
*
|
||||
* NAME <name of card>
|
||||
* CHIPSET <chipset description>
|
||||
* SERVER <server name>
|
||||
* DRIVER <driver name>
|
||||
*
|
||||
* Optional keywords:
|
||||
* RAMDAC <ramdac identifier>
|
||||
* CLOCKCHIP <clockchip identifier>
|
||||
* DACSPEED <dacspeed>
|
||||
* NOCLOCKPROBE
|
||||
* UNSUPPORTED
|
||||
*
|
||||
* SEE <name of card> refers to another card definition; parameters that
|
||||
* are already defined are not overridden.
|
||||
*
|
||||
* <server name> is one of Mono, VGA16, SVGA, S3, Mach32, Mach8, 8514,
|
||||
* P9000, AGX, W32.
|
||||
*
|
||||
* A useful additional keywords may be CLOCKS.
|
||||
*/
|
||||
|
||||
|
||||
|
||||
/* Database vars. */
|
||||
|
||||
int lastcard;
|
||||
|
||||
Card card[MAX_CARDS];
|
||||
|
||||
|
||||
static int
|
||||
getnextline(FILE *f, char *l)
|
||||
{
|
||||
if (fgets(l, 128, f) == NULL)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
appendstring(char **destp, char *src)
|
||||
{
|
||||
char *newstr;
|
||||
newstr = malloc(strlen(*destp) + strlen(src) + 1);
|
||||
strcpy(newstr, *destp);
|
||||
strcat(newstr, src);
|
||||
if (strlen(*destp) > 0)
|
||||
free(*destp);
|
||||
*destp = newstr;
|
||||
}
|
||||
|
||||
int
|
||||
lookupcard(char *name) {
|
||||
int i;
|
||||
for (i = 0; i <= lastcard; i++)
|
||||
if (strcmp(name, card[i].name) == 0)
|
||||
return i;
|
||||
return -1;
|
||||
}
|
||||
|
||||
static char *s3_comment =
|
||||
"# Use Option \"nolinear\" if the server doesn't start up correctly\n"
|
||||
"# (this avoids the linear framebuffer probe). If that fails try\n"
|
||||
"# option \"nomemaccess\".\n"
|
||||
"#\n"
|
||||
"# Refer to " TREEROOTDOC "/README.S3, and the XF86_S3 man page.\n";
|
||||
|
||||
static char *cirrus_comment =
|
||||
"# Use Option \"no_bitblt\" if you have graphics problems. If that fails\n"
|
||||
"# try Option \"noaccel\".\n"
|
||||
"# Refer to " TREEROOTDOC "/README.cirrus.\n"
|
||||
"# To allow linear addressing, uncomment the Option line and the\n"
|
||||
"# address that the card maps the framebuffer to.\n";
|
||||
|
||||
int parse_database() {
|
||||
FILE *f;
|
||||
char buf[128];
|
||||
int i, lineno;
|
||||
char filename[128];
|
||||
|
||||
strcpy(filename, CARD_DATABASE_FILE);
|
||||
f = fopen(filename, "r");
|
||||
if (f == NULL)
|
||||
return -1;
|
||||
|
||||
lastcard = -1;
|
||||
lineno = 0;
|
||||
|
||||
for (;;) {
|
||||
if (getnextline(f, buf))
|
||||
break;
|
||||
lineno++;
|
||||
if (buf[0] == '#')
|
||||
/* Comment. */
|
||||
continue;
|
||||
if (strncmp(buf, "END", 3) == 0)
|
||||
/* End of database. */
|
||||
break;
|
||||
if (strncmp(buf, "LINE", 4) == 0 && lastcard>=0) {
|
||||
/* Line of Device comment. */
|
||||
/* Append to existing lines. */
|
||||
appendstring(&card[lastcard].lines, buf + 5);
|
||||
continue;
|
||||
}
|
||||
/*
|
||||
* The following keywords require the trailing newline
|
||||
* to be deleted.
|
||||
*/
|
||||
i = strlen(buf);
|
||||
buf[--i] = '\0';
|
||||
|
||||
/* remove trailing spaces or tabs */
|
||||
for(--i; i>=0 && (buf[i] == ' ' || buf[i] == '\011'); i--) ;
|
||||
if (i>=0)
|
||||
buf[i+1] = '\0';
|
||||
else
|
||||
continue; /* skip empty lines */
|
||||
|
||||
if (strncmp(buf, "NAME", 4) == 0) {
|
||||
/* New entry. */
|
||||
lastcard++;
|
||||
card[lastcard].name = malloc(strlen(buf + 5) + 1);
|
||||
strcpy(card[lastcard].name, buf + 5);
|
||||
card[lastcard].chipset = NULL;
|
||||
card[lastcard].server = NULL;
|
||||
card[lastcard].driver = NULL;
|
||||
card[lastcard].ramdac = NULL;
|
||||
card[lastcard].clockchip = NULL;
|
||||
card[lastcard].dacspeed = NULL;
|
||||
card[lastcard].flags = 0;
|
||||
card[lastcard].lines = "";
|
||||
continue;
|
||||
}
|
||||
if (lastcard < 0) /* no NAME line found yet */
|
||||
continue;
|
||||
if (strncmp(buf, "SEE", 3) == 0) {
|
||||
/* Reference to another entry. */
|
||||
int i;
|
||||
i = lookupcard(buf + 4);
|
||||
if (i == -1) {
|
||||
printf("Error in database, invalid reference: %s.\n",
|
||||
buf + 4);
|
||||
free(card[lastcard].name);
|
||||
lastcard--;
|
||||
continue;
|
||||
}
|
||||
if (card[lastcard].chipset == NULL)
|
||||
card[lastcard].chipset = card[i].chipset;
|
||||
if (card[lastcard].server == NULL)
|
||||
card[lastcard].server = card[i].server;
|
||||
if (card[lastcard].driver == NULL)
|
||||
card[lastcard].driver = card[i].driver;
|
||||
if (card[lastcard].ramdac == NULL)
|
||||
card[lastcard].ramdac = card[i].ramdac;
|
||||
if (card[lastcard].clockchip == NULL)
|
||||
card[lastcard].clockchip = card[i].clockchip;
|
||||
if (card[lastcard].dacspeed == NULL)
|
||||
card[lastcard].dacspeed = card[i].dacspeed;
|
||||
card[lastcard].flags |= card[i].flags;
|
||||
appendstring(&card[lastcard].lines, card[i].lines);
|
||||
continue;
|
||||
}
|
||||
if (strncmp(buf, "CHIPSET", 7) == 0) {
|
||||
/* Chipset description. */
|
||||
card[lastcard].chipset = malloc(strlen(buf + 8) + 1);
|
||||
strcpy(card[lastcard].chipset, buf + 8);
|
||||
continue;
|
||||
}
|
||||
if (strncmp(buf, "SERVER", 6) == 0) {
|
||||
/* Server identifier. */
|
||||
card[lastcard].server = malloc(strlen(buf + 7) + 1);
|
||||
strcpy(card[lastcard].server, buf + 7);
|
||||
continue;
|
||||
}
|
||||
if (strncmp(buf, "DRIVER", 6) == 0) {
|
||||
/* Driver identifier. */
|
||||
card[lastcard].driver = malloc(strlen(buf + 7) + 1);
|
||||
strcpy(card[lastcard].driver, buf + 7);
|
||||
continue;
|
||||
}
|
||||
if (strncmp(buf, "RAMDAC", 6) == 0) {
|
||||
/* Ramdac indentifier. */
|
||||
card[lastcard].ramdac = malloc(strlen(buf + 7) + 1);
|
||||
strcpy(card[lastcard].ramdac, buf + 7);
|
||||
continue;
|
||||
}
|
||||
if (strncmp(buf, "CLOCKCHIP", 9) == 0) {
|
||||
/* Clockchip indentifier. */
|
||||
card[lastcard].clockchip = malloc(strlen(buf + 10) + 1);
|
||||
strcpy(card[lastcard].clockchip, buf + 10);
|
||||
card[lastcard].flags |= NOCLOCKPROBE;
|
||||
continue;
|
||||
}
|
||||
if (strncmp(buf, "DACSPEED", 8) == 0) {
|
||||
/* Clockchip indentifier. */
|
||||
card[lastcard].dacspeed = malloc(strlen(buf + 9) + 1);
|
||||
strcpy(card[lastcard].dacspeed, buf + 9);
|
||||
continue;
|
||||
}
|
||||
if (strncmp(buf, "NOCLOCKPROBE", 12) == 0) {
|
||||
card[lastcard].flags |= NOCLOCKPROBE;
|
||||
continue;
|
||||
}
|
||||
if (strncmp(buf, "UNSUPPORTED", 12) == 0) {
|
||||
card[lastcard].flags |= UNSUPPORTED;
|
||||
continue;
|
||||
}
|
||||
/* test for missing required fields */
|
||||
if (card[lastcard].driver == NULL) {
|
||||
fprintf(stderr, "Warning DRIVER specification missing "
|
||||
"in Card database entry %s (line %d).\n",
|
||||
card[lastcard].name, lineno);
|
||||
keypress();
|
||||
card[lastcard].driver = "unknown";
|
||||
}
|
||||
if (card[lastcard].chipset == NULL) {
|
||||
fprintf(stderr, "Warning CHIPSET specification missing "
|
||||
"in Card database entry %s (line %d).\n",
|
||||
card[lastcard].name, lineno);
|
||||
keypress();
|
||||
card[lastcard].chipset = "unknown";
|
||||
}
|
||||
}
|
||||
|
||||
fclose(f);
|
||||
|
||||
/*
|
||||
* Add general comments.
|
||||
*/
|
||||
for (i = 0; i <= lastcard; i++) {
|
||||
if (card[i].server && strcmp(card[i].server, "S3") == 0)
|
||||
appendstring(&card[i].lines, s3_comment);
|
||||
if (card[i].chipset &&
|
||||
strncmp(card[i].chipset, "CL-GD", 5) == 0)
|
||||
appendstring(&card[i].lines, cirrus_comment);
|
||||
}
|
||||
|
||||
sort_database();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
compare_card(const void *e1, const void *e2)
|
||||
{
|
||||
return strcmp(((Card *)e1)->name, ((Card *)e2)->name);
|
||||
}
|
||||
|
||||
void
|
||||
sort_database() {
|
||||
/* Each element is a bunch of words, but nothing too bad. */
|
||||
qsort(card, lastcard + 1, sizeof(Card), compare_card);
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
#ifndef CARD_DATABASE_FILE
|
||||
#define CARD_DATABASE_FILE "Cards"
|
||||
#endif
|
||||
|
||||
#define MAX_CARDS 1000
|
||||
|
||||
typedef struct {
|
||||
char *name; /* Name of the card. */
|
||||
char *chipset; /* Chipset (decriptive). */
|
||||
char *server; /* Server identifier. */
|
||||
char *driver; /* Driver identifier. */
|
||||
char *ramdac; /* Ramdac identifier. */
|
||||
char *clockchip; /* Clockchip identifier. */
|
||||
char *dacspeed; /* DAC speed rating. */
|
||||
int flags;
|
||||
char *lines; /* Additional Device section lines. */
|
||||
} Card;
|
||||
|
||||
/* Flags: */
|
||||
#define NOCLOCKPROBE 0x1 /* Never probe clocks of the card. */
|
||||
#define UNSUPPORTED 0x2 /* Card is not supported (only VGA). */
|
||||
|
||||
extern int lastcard;
|
||||
|
||||
extern Card card[MAX_CARDS];
|
||||
|
||||
extern int lookupcard ( char *name );
|
||||
extern int parse_database ( void );
|
||||
extern void sort_database ( void );
|
||||
extern void keypress ( void );
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,22 +0,0 @@
|
|||
.\" $XdotOrg: $
|
||||
.\" $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.man,v 1.5 2001/11/01 23:35:34 dawes Exp $
|
||||
.TH xorgconfig 1 __vendorversion__
|
||||
.SH NAME
|
||||
xorgconfig \- generate an __XCONFIGFILE__ file
|
||||
.SH SYNOPSIS
|
||||
.B xorgconfig
|
||||
.SH DESCRIPTION
|
||||
\fIxorgconfig\fP is an interactive program for generating an __XCONFIGFILE__ file
|
||||
for use with __XSERVERNAME__ X servers.
|
||||
.PP
|
||||
Note that the default name used by \fIxorgconfig\fP for the __XCONFIGFILE__ file
|
||||
is system-dependent. For instance, on OS/2, XConfig is used.
|
||||
.SH FILES
|
||||
.TP
|
||||
.I __projectroot__/lib/X11/Cards
|
||||
Video cards database
|
||||
.SH "SEE ALSO"
|
||||
__XSERVERNAME__(1), __XCONFIGFILE__(__filemansuffix__), xorgcfg(1), reconfig(1)
|
||||
.SH AUTHOR
|
||||
Harm Hanemaayer.
|
||||
.\" $TOG: xf86conf.man /main/9 1997/07/19 10:53:08 kaleb $
|
||||
Loading…
Reference in New Issue
Block a user