Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
This commit is contained in:
commit
de63a469dc
10
fb/fb.h
10
fb/fb.h
|
@ -488,20 +488,20 @@ extern void fbSetBits (FbStip *bits, int stride, FbStip data);
|
|||
* The term "lane" comes from the hardware term "byte-lane" which
|
||||
*/
|
||||
|
||||
#define FbLaneCase1(n,a,o) ((n) == 0x01 ? \
|
||||
#define FbLaneCase1(n,a,o) ((n) == 0x01 ? (void) \
|
||||
WRITE((CARD8 *) ((a)+FbPatternOffset(o,CARD8)), \
|
||||
fgxor) : 0)
|
||||
#define FbLaneCase2(n,a,o) ((n) == 0x03 ? \
|
||||
fgxor) : (void) 0)
|
||||
#define FbLaneCase2(n,a,o) ((n) == 0x03 ? (void) \
|
||||
WRITE((CARD16 *) ((a)+FbPatternOffset(o,CARD16)), \
|
||||
fgxor) : \
|
||||
((void)FbLaneCase1((n)&1,a,o), \
|
||||
FbLaneCase1((n)>>1,a,(o)+1)))
|
||||
#define FbLaneCase4(n,a,o) ((n) == 0x0f ? \
|
||||
#define FbLaneCase4(n,a,o) ((n) == 0x0f ? (void) \
|
||||
WRITE((CARD32 *) ((a)+FbPatternOffset(o,CARD32)), \
|
||||
fgxor) : \
|
||||
((void)FbLaneCase2((n)&3,a,o), \
|
||||
FbLaneCase2((n)>>2,a,(o)+2)))
|
||||
#define FbLaneCase8(n,a,o) ((n) == 0x0ff ? (*(FbBits *) ((a)+(o)) = fgxor) : \
|
||||
#define FbLaneCase8(n,a,o) ((n) == 0x0ff ? (void) (*(FbBits *) ((a)+(o)) = fgxor) : \
|
||||
((void)FbLaneCase4((n)&15,a,o), \
|
||||
FbLaneCase4((n)>>4,a,(o)+4)))
|
||||
|
||||
|
|
|
@ -11,11 +11,9 @@
|
|||
# specified for a device (see the syntax description below).
|
||||
#
|
||||
# Don't make gratuitous changes, and please send back
|
||||
# changes/additions that aren't XFree86-specific to the pciids
|
||||
# changes/additions that aren't X-specific to the pciids
|
||||
# project (http://pciids.sf.net/).
|
||||
#
|
||||
# $XdotOrg: xserver/xorg/hw/xfree86/scanpci/extrapci.ids,v 1.6 2005/09/19 18:54:05 alanc Exp $
|
||||
# $XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.11 2003/12/18 16:22:27 dawes Exp $
|
||||
#
|
||||
|
||||
# Vendors, devices and subsystems. Please keep sorted.
|
||||
|
@ -39,10 +37,7 @@
|
|||
|
||||
# Some NVIDIA cards that are not in the master pci.ids file yet.
|
||||
10de "
|
||||
0046 NV40 [GeForce 6800 GT]
|
||||
0048 GeForce 6800 XT
|
||||
0147 GeForce 6700 XL
|
||||
0160 GeForce 6500
|
||||
0163 GeForce 6200 LE
|
||||
0169 GeForce 6250
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -135,8 +135,7 @@ if ($infofile) {
|
|||
# Print out header information.
|
||||
|
||||
$proj = "XdotOrg";
|
||||
print "/* \$$proj\$ */
|
||||
|
||||
print "
|
||||
/*
|
||||
* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT
|
||||
*
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user