Commit Graph

4055 Commits

Author SHA1 Message Date
Eamon Walsh 3c23dec596 Call ClientStateCallback on serverClient devPrivates initialization. 2006-08-02 13:39:49 -04:00
Ian Romanick 23f44df900 Remove pciConfigPtr and all of the associated cruft. 2006-08-02 09:55:32 -07:00
Ian Romanick 966ebd3d2d Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-08-02 08:14:58 -07:00
Aaron Plattner ee02e64788 Wrap libwfb memory access.
Use the READ and WRITE macros to wrap memory accesses that could be in video
memory.  Add MEMCPY_WRAPPED and MEMSET_WRAPPED macros to wrap memcpy and
memset, respectively.
2006-08-01 13:45:43 -07:00
Matthew Allum 39169fd373 Back out 'mystery' spurious host window hints. 2006-08-01 13:39:22 +01:00
Eamon Walsh f737cc38ba Adding devPrivates support to the ExtensionEntry structure. 2006-07-31 19:58:42 -04:00
Eamon Walsh b04d648547 Added devPrivates support to the ExtensionEntry structure. 2006-07-31 19:35:08 -04:00
Ian Romanick a94176627c Eliminate all uses of the businfo field of pciDevice / pciConfigPtr. 2006-07-31 14:33:58 -07:00
Aaron Plattner a69335dc29 Make ReadMemoryProcPtr take a const pointer.
Fixes some warnings when using READ with a const pointer.
2006-07-31 14:15:55 -07:00
Ian Romanick 26c9587f90 Build fixes for last pull from HEAD. 2006-07-31 13:54:36 -07:00
Ian Romanick 65dc25d8f8 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-31 12:30:30 -07:00
Ian Romanick b74c845a12 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-07-31 10:26:06 -07:00
Ian Romanick 3112a6c4f2 Noting uses libdummy.a, so don't build it. Only libdummy-nonserver.a
is actually used.
2006-07-31 10:25:31 -07:00
Matthew Allum 02daa6bb10 Improve XRes to;
- Better estimate general pixmap memory usage.
 - Account for pixmaps shared between clients.
 - Account for window background and border pixmaps,
   and GC stripple and tile pixmaps.
2006-07-31 17:32:05 +01:00
Ian Romanick 69533fc04f Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/common/xf86AutoConfig.c
2006-07-31 09:26:04 -07:00
Daniel Stone 24051ef974 remove filename that's too long for tar 2006-07-30 12:15:33 +03:00
Daniel Stone ecb7d43a76 add sym.h to sources 2006-07-30 11:52:41 +03:00
Daniel Stone bf2d7499c8 add securitysrv.h 2006-07-30 11:17:02 +03:00
Daniel Stone e87e68634d remove .cvsignores from EXTRA_DIST 2006-07-30 11:11:59 +03:00
Daniel Stone ed0c807de9 bump to 1.1.99.3 2006-07-30 11:08:54 +03:00
Daniel Stone a68dc013a3 remove README (which doesn't exist) from EXTRA_DIST 2006-07-30 11:08:47 +03:00
Daniel Stone 87fe85f38b Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-07-30 10:51:34 +03:00
Kevin E Martin 654619d76c Revert xkb changes that broke XkbGetKeyboard() 2006-07-28 17:16:32 -04:00
Luc Verhaegen 79016d4036 Bug #5386 (partial): Move CVT mode generator from cvt(1) to server core, and
export it from the X server to modules.
2006-07-28 16:02:02 -04:00
Aaron Plattner e6ae1612be Add fbHasVisualTypes and fbSetVisualTypesAndMasks to wfbrename.h and include -DXFree86Server. 2006-07-27 18:24:59 -07:00
Adam Jackson 2a4ceb09ed Remove dead function prototypes. 2006-07-26 19:39:17 -04:00
Adam Jackson 990a400905 Remove getconfig horrorshow. Replace with a static built-in rule list for now. 2006-07-26 19:03:39 -04:00
Aaron Plattner 377a581ddf Switch to using void* pointers.
Pass the size of the data pointed to by src or dst as an argument to
wfb{Read,Write}Memory.  This allows one set of macros to be used with any size
pointer.  Assumes that sizeof(FbBits) >= sizeof(FbStip).
2006-07-26 15:48:51 -07:00
Aaron Plattner a4005c15fb Add framebuffer access wrapper infrastructure.
Create fbPrepareAccess macros to call into the driver to set up the
wfbReadMemory and wfbWriteWemory pointers.  Call these from fbGetDrawable and
fbGetStipDrawable.

Add the READ and WRITE macros, which expand to simple memory accesses for fb,
and calls through the function pointers for wfb.

Add fbFinishAccess macro to give the driver an opportunity to clean up.  Add
calls to this in the appropriate places.
2006-07-26 15:48:51 -07:00
Aaron Plattner 319efac445 Prefix all of the exported symbols in libwfb.so with "wfb".
For now, just #define all of the exported symbols in wfbrename.h.  Later,
we should add FBPREFIX() around the exported symbols and use -fvisiblity=hidden
to hide the rest.
2006-07-26 15:48:51 -07:00
Aaron Plattner 7608a63ff7 Build infrastructure for libwfb.so.
Builds fb/* twice, defining FB_ACCESS_WRAPPER for libwfb.la.  Define a macro,
FBPREFIX(X) which expands to fbX for libfb.la and wfbX for libwfb.la.  Use the
macro on [w]fbModuleData so the new module loads.
2006-07-26 15:48:50 -07:00
Adam Jackson 39158e98ac Remove another latent PowerMAX hunk.
All your favorite running jokes of 2005, today!
2006-07-26 18:39:28 -04:00
Ian Romanick ef1aecaaf6 Pass correct pointer to xf86MapLegacyIO. 2006-07-26 13:25:13 -07:00
Daniel Stone 3518e2d0de Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-07-26 11:29:21 +03:00
Daniel Stone eb7733a48a kdrive: drop excessive NewInputDeviceRequest debugging 2006-07-26 11:28:45 +03:00
Kristian Høgsberg 3821f6aeaa Unlibc-wrap DMX glxscreens.c and fix tag-removal typo. 2006-07-26 01:56:02 -04:00
Ian Romanick 28ba8d5691 Gut anything having to do with the PciBusPtr (or PciBusRec) type.
Bump required version of libpciaccess to 0.5.0 so that
pci_device_get_bridge_buses can be used.
2006-07-25 15:38:09 -07:00
Ian Romanick 380b51d605 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/common/xf86Init.c
	hw/xfree86/int10/pci.c
	hw/xfree86/scanpci/xf86PciData.h
	hw/xfree86/scanpci/xf86PciStdIds.h
	hw/xfree86/scanpci/xf86PciStr.h
	hw/xfree86/scanpci/xf86ScanPci.h
	hw/xfree86/utils/pcitweak/pcitweak.c
	hw/xfree86/utils/scanpci/scanpci.c

Re-removed most of the conflicting files.
2006-07-25 11:30:04 -07:00
Daniel Stone 4ea475924c re-add OpenedHand copyright
Ae-add OpenedHand copyright, accidentally dropped in KDrive new world
order patch.  Sorry guys.
2006-07-25 20:00:48 +03:00
Ian Romanick 82f6b7e75e Don't re-look-up pointers that are already stored in structures. 2006-07-24 13:52:58 -07:00
Ian Romanick 2fd6b995ff Global s/xf86MapDomainIO/xf86MapLegacyIO/. Let's call a duck a duck,
okay?  Since xf86MapLegacyIO is called from only one place, cut the
parameter list down to the one parameter that actually conveys some
information:  the one that gives a PCI device.  Change from using a
PCITAG to a pci_device.
2006-07-24 13:33:34 -07:00
Ian Romanick aed6fe0bb1 Refactor linuxGetSizesStruct to take a pci_device pointer instead of a
PCITAG.  Modify xf86BusAccWindowsFromOS and xf86AccResFromOS to call
linuxGetSizesStruct directly with a pci_device pointer.  Remove
linuxGetSizes.
2006-07-24 13:13:05 -07:00
Ian Romanick e487627992 Modify xf86BusAccWindowsFromOS and xf86AccResFromOS to use the
libpciaccess interfaces.
2006-07-24 12:23:23 -07:00
Ian Romanick 4b474cbc1a The functions xf86PciBusAccWindowsFromOS and xf86BusAccWindowsFromOS
are identical.  Just have one call the other.
2006-07-24 12:17:27 -07:00
Ian Romanick 7dff8d98a9 Remove source files that have been dead since day-1 of this branch. 2006-07-24 11:56:37 -07:00
Ian Romanick eb95128f61 Changes that were missed on the previous commit. Perhaps oddness
caused by doing git-update-index at the wrong time.
2006-07-24 11:53:37 -07:00
Ian Romanick 05f8b772ae ScanPciDisplayPCICardInfo now uses pci_device interface for PCI
scanning.  Log messages simplified to make the code shorter and less
convoluted.  ScanPciDisplayPCICardInfo is now void since it was only
called from one place with a constant parameter.
2006-07-24 11:23:03 -07:00
Daniel Stone ca3f4fc1b0 add fallback ChangeDeviceControl, allow XOpenDevice on closed device
Add a fallback ChangeDeviceControl, which allows the attributes we know about
so far.
Allow XOpenDevice on closed devices.
2006-07-23 19:02:12 -04:00
Daniel Stone e73e5e2a4d Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-07-22 13:56:30 -04:00
Dave Airlie 8977b07434 glx: fix typo from tag removal 2006-07-23 03:50:52 +10:00