[PULL] bus cleanup, darwin hw/xfree86, build regression fixes

[Jeremy Huddleston]

On Sep 24, 2011, at 12:35, Jeremy Huddleston wrote:

> 
> On Sep 24, 2011, at 09:31, Matthieu Herrb wrote:
> 
>>> IOADDRESS is used massively throughout the drivers.  I really don't
>>> see why it needs to be removed.  Leaving the typedef in xf86Pci.h will
>>> save you/us a lot of work.  At that point you might as well drop the
>>> changesto remove IOADDRESS usage in the int10 module.
>> 
>> I agree with Mark on this.
> 
> Ok.  Then how about leaving the PCITAG and IOADDRESS typedefs in place but deprecate their use.  I also think we should change them from unsigned long to CARD32 for better compatibility with pciaccess (yes, ABI break, but we know that). 

I updated my branch based on your comment above.  The effective changes from the last point are below.  I'm also running this through my tinderbox, http://tinderbox.x.org/builds/2011-09-24-0017


diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 3038c04..d274c9d 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -82,7 +82,7 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(11, 0)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(12, 0)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(13, 0)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(6, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h
index 8ecead0..74ead20 100644
--- a/hw/xfree86/os-support/bus/xf86Pci.h
+++ b/hw/xfree86/os-support/bus/xf86Pci.h
@@ -235,6 +235,8 @@
 
 /* Primitive Types */
 typedef unsigned long ADDRESS;		/* Memory/PCI address */
+typedef unsigned long IOADDRESS _X_DEPRECATED;	/* Must be large enough for a pointer */
+typedef CARD32 PCITAG _X_DEPRECATED;
 
 typedef enum {
     PCI_MEM,