diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index becb0c2c5..367844136 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -1107,16 +1107,6 @@ Here is what InitOutput() does:
them.
-
- All additional resources that the screen needs must be registered
- here. This should be done with
- xf86RegisterResources(). If some of the fixed
- resources registered in the Probe phase are not needed or not
- decoded by the hardware when in the OPERATING server state, their
- status should be updated with
- xf86SetOperatingState().
-
-
Modules may be loaded at any point in this function, and all
modules that the driver will need must be loaded before the end
@@ -2599,20 +2589,6 @@ The
These two helper functions make use of several core functions that are
available at the driver level:
-
-
- void xf86ClaimFixedResources(resList list, int entityIndex);
-
-
- This function registers the non-relocatable resources which cannot
- be disabled and which therefore would cause the server to fail
- immediately if they were found to conflict. It also records
- non-relocatable but sharable resources for processing after the
- Probe() phase.
-
-
-
-
void xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex);
@@ -2692,52 +2668,6 @@ Several functions are provided to simplify resource registration:
-
-The primary function for registration of resources is:
-
-
- resPtr xf86RegisterResources(int entityIndex, resList list,
- int access);
-
-
- This function tries to register the resources in
- list. If list is NULL it tries
- to determine the resources automatically. This only works for
- entities that provide a generic way to read out the resource ranges
- they decode. So far this is only the case for PCI devices. By
- default the PCI resources are registered as shared
- (ResShared) if the driver wants to set a different
- access type it can do so by specifying the access flags in the
- third argument. A value of 0 means to use the
- default settings. If for any reason the resource broker is not
- able to register some of the requested resources the function will
- return a pointer to a list of the failed ones. In this case the
- driver may be able to move the resource to different locations.
- In case of PCI bus entities this is done by passing the list of
- failed resources to xf86ReallocatePciResources().
- When the registration succeeds, the return value is
- NULL.
-
-
-
-
-
-
-
- resPtr xf86ReallocatePciResources(int entityIndex, resPtr pRes);
-
-
- This function takes a list of PCI resources that need to be
- reallocated and returns NULL when all relocations are
- successful.
- xf86RegisterResources() should be called again to
- register the relocated resources with the broker.
- If the reallocation fails, a list of the resources that could not be
- relocated is returned.
-
-
-
-
Two functions are provided to obtain a resource range of a given type:
@@ -2795,93 +2725,6 @@ Two functions are provided to obtain a resource range of a given type:
-
-The driver may replace the generic access control functions for an entity.
-This is done with the xf86SetAccessFuncs():
-
-
- void xf86SetAccessFuncs(EntityInfoPtr pEnt,
- xf86SetAccessFuncPtr funcs,
- xf86SetAccessFuncPtr oldFuncs);
-
- with:
-
- typedef struct {
- xf86AccessPtr mem;
- xf86AccessPtr io;
- xf86AccessPtr io_mem;
- } xf86SetAccessFuncRec, *xf86SetAccessFuncPtr;
-
-
- The driver can pass three functions: one for I/O access, one for
- memory access and one for combined memory and I/O access. If the
- memory access and combined access functions are identical the
- common level assumes that the memory access cannot be controlled
- independently of I/O access, if the I/O access function and the
- combined access functions are the same it is assumed that I/O can
- not be controlled independently. If memory and I/O have to be
- controlled together all three values should be the same. If a
- non NULL value is passed as third argument it is
- interpreted as an address where to store the old access record.
- If the third argument is NULL it will be assumed
- that the generic access should be enabled before replacing the
- access functions. Otherwise it will be disabled. The driver may
- enable them itself using the returned values. It should do this
- from its replacement access functions as the generic access may
- be disabled by the common level on certain occasions. If replacement
- functions are specified they must control all resources of the
- specific type registered for the entity.
-
-
-
-
-
-
-To find out if a specific resource range conflicts with another
-resource the xf86ChkConflict() function may be used:
-
-
- memType xf86ChkConflict(resRange *rgp, int entityIndex);
-
-
- This function checks if the resource range rgp of
- for the specified entity conflicts with with another resource.
- If a conflict is found, the address of the start of the conflict
- is returned. The return value is zero when there is no conflict.
-
-
-
-
-
-
-The OPERATING state properties of previously registered fixed resources
-can be set with the xf86SetOperatingState() function:
-
-
- resPtr xf86SetOperatingState(resList list, int entityIndex,
- int mask);
-
-
- This function is used to set the status of a resource during
- OPERATING state. list holds a list to which
- mask is to be applied. The parameter
- mask may have the value ResUnusedOpr
- and ResDisableOpr. The first one should be used
- if a resource isn't used by the driver during OPERATING state
- although it is decoded by the device, while the latter one indicates
- that the resource is not decoded during OPERATING state. Note
- that the resource ranges have to match those specified during
- registration. If a range has been specified starting at
- A and ending at B and suppose
- C us a value satisfying
- A < C < B one may not
- specify the resource range (A,B) by splitting it
- into two ranges (A,C) and (C,B).
-
-
-
-
-
The following two functions are provided for special cases:
@@ -2896,17 +2739,6 @@ The following two functions are provided for special cases:
-
-
-
- void xf86DeallocateResourcesForEntity(int entityIndex, long type);
-
-
- This function deallocates all resources of a given type registered
- for a certain entity from the resource broker list.
-
-
-