frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

This commit is contained in:
Daniel Stone 2006-10-23 02:58:30 +03:00 committed by Daniel Stone
parent fab1d37ecb 948a97b97e
commit c5b5b046e8
6 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/Xserver.man.pre
View File

@ -181,7 +181,7 @@ prints a usage message.
causes all remaining command line arguments to be ignored. causes all remaining command line arguments to be ignored.
.TP 8 .TP 8
.B \-maxbigreqsize \fIsize\fP .B \-maxbigreqsize \fIsize\fP
sets the maxmium big request to sets the maximum big request to
.I size .I size
MB. MB.
.TP 8 .TP 8
@ -449,7 +449,7 @@ the text after the /; it is used to distinguish between instances of
<action> ::= a | i | e <action> ::= a | i | e
<string> ::= <dbl quoted string> | <single quoted string> | <unqouted string> <string> ::= <dbl quoted string> | <single quoted string> | <unquoted string>
<dbl quoted string> ::= <space> " <not dqoute>* " <space> <dbl quoted string> ::= <space> " <not dqoute>* " <space>

2
hw/xfree86/common/xf86Module.h
View File

@ -85,7 +85,7 @@ typedef enum {
*/ */
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 3) #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 3)
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(1, 1) #define ABI_VIDEODRV_VERSION SET_ABI_VERSION(1, 1)
#define ABI_XINPUT_VERSION SET_ABI_VERSION(1, 0) #define ABI_XINPUT_VERSION SET_ABI_VERSION(0, 6)
#define ABI_EXTENSION_VERSION SET_ABI_VERSION(0, 3) #define ABI_EXTENSION_VERSION SET_ABI_VERSION(0, 3)
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 5) #define ABI_FONT_VERSION SET_ABI_VERSION(0, 5)

4
hw/xfree86/common/xf86PciInfo.h
View File

@ -92,6 +92,7 @@
#define PCI_VENDOR_TRITECH 0x1292 #define PCI_VENDOR_TRITECH 0x1292
#define PCI_VENDOR_NVIDIA_SGS 0x12D2 #define PCI_VENDOR_NVIDIA_SGS 0x12D2
#define PCI_VENDOR_VMWARE 0x15AD #define PCI_VENDOR_VMWARE 0x15AD
#define PCI_VENDOR_AST 0x1A03
#define PCI_VENDOR_3DLABS 0x3D3D #define PCI_VENDOR_3DLABS 0x3D3D
#define PCI_VENDOR_AVANCE_2 0x4005 #define PCI_VENDOR_AVANCE_2 0x4005
#define PCI_VENDOR_HERCULES 0x4843 #define PCI_VENDOR_HERCULES 0x4843
@ -358,6 +359,9 @@
#define PCI_CHIP_RS350_7834 0x7834 #define PCI_CHIP_RS350_7834 0x7834
#define PCI_CHIP_RS350_7835 0x7835 #define PCI_CHIP_RS350_7835 0x7835
/* ASPEED Technology (AST) */
#define PCI_CHIP_AST2000 0x2000
/* Avance Logic */ /* Avance Logic */
#define PCI_CHIP_ALG2064 0x2064 #define PCI_CHIP_ALG2064 0x2064
#define PCI_CHIP_ALG2301 0x2301 #define PCI_CHIP_ALG2301 0x2301

2
hw/xfree86/doc/man/xorg.conf.man.pre
View File

@ -1081,7 +1081,7 @@ Include the set of modes listed in the
.B Modes .B Modes
section called section called
.IR modesection-id. .IR modesection-id.
This make all of the modes defined in that section available for use by This makes all of the modes defined in that section available for use by
this monitor. this monitor.
.TP 7 .TP 7
.BI "Mode \*q" name \*q .BI "Mode \*q" name \*q

1
hw/xfree86/utils/xorgcfg/text-mode.c
View File

@ -1116,6 +1116,7 @@ CardConfig(void)
static char *xdrivers[] = { static char *xdrivers[] = {
"apm", "apm",
"ark", "ark",
"ast",
"ati", "ati",
"r128", "r128",
"radeon", "radeon",

5
hw/xfree86/utils/xorgconfig/Cards
View File

@ -51,6 +51,11 @@ NAME ** Ark Logic (generic) [ark]
SERVER SVGA SERVER SVGA
DRIVER ark DRIVER ark
NAME ** ASPEED Technology (generic) [ast]
#CHIPSET ast
SERVER SVGA
DRIVER ast
NAME ** ATI (generic) [ati] NAME ** ATI (generic) [ati]
#CHIPSET ati #CHIPSET ati
SERVER SVGA SERVER SVGA