Drop some unused includes

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

1 files changed, 2 insertions, 103 deletions

diff --git a/src/common.h b/src/common.h
index e3ab1f22..86e5b11d 100644
--- a/src/common.h
+++ b/src/common.h
@@ -38,6 +38,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _INTEL_COMMON_H_
 #define _INTEL_COMMON_H_
 
+#include <xf86.h>
+
 /* Provide substitutes for gcc's __FUNCTION__ on other compilers */
 #if !defined(__GNUC__) && !defined(__FUNCTION__)
 # if defined(__STDC__) && (__STDC_VERSION__>=199901L) /* C99 */
@@ -47,117 +49,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # endif
 #endif
 
-
 #define PFX __FILE__,__LINE__,__FUNCTION__
 #define FUNCTION_NAME __FUNCTION__
 
 #define KB(x) ((x) * 1024)
 #define MB(x) ((x) * KB(1024))
 
-/* Using usleep() makes things noticably slow. */
-#if 0
-#define DELAY(x) usleep(x)
-#else
-#define DELAY(x) do {;} while (0)
-#endif
-
-/* I830 hooks for the I810 driver setup/probe. */
-extern const OptionInfoRec *I830AvailableOptions(int chipid, int busid);
 extern Bool intel_init_scrn(ScrnInfoPtr scrn);
 
-/* Symbol lists shared by the i810 and i830 parts. */
-extern int I830EntityIndex;
-
-#ifdef _I830_H_
-#define PrintErrorState i830_dump_error_state
-#define WaitRingFunc I830WaitLpRing
-#define RecPtr intel
-#else
-#define PrintErrorState I810PrintErrorState
-#define WaitRingFunc I810WaitLpRing
-#define RecPtr pI810
-#endif
-
-static inline void memset_volatile(volatile void *b, int c, size_t len)
-{
-    size_t i;
-
-    for (i = 0; i < len; i++)
-	((volatile char *)b)[i] = c;
-}
-
-static inline void memcpy_volatile(volatile void *dst, const void *src,
-				   size_t len)
-{
-    size_t i;
-
-    for (i = 0; i < len; i++)
-	((volatile char *)dst)[i] = ((const volatile char *)src)[i];
-}
-
-/* Memory mapped register access macros */
-#define INREG8(addr)        *(volatile uint8_t *)(RecPtr->MMIOBase + (addr))
-#define INREG16(addr)       *(volatile uint16_t *)(RecPtr->MMIOBase + (addr))
-#define INREG(addr)         *(volatile uint32_t *)(RecPtr->MMIOBase + (addr))
-#define INGTT(addr)         *(volatile uint32_t *)(RecPtr->GTTBase + (addr))
-#define POSTING_READ(addr)  (void)INREG(addr)
-
-#define OUTREG8(addr, val) do {						\
-   *(volatile uint8_t *)(RecPtr->MMIOBase  + (addr)) = (val);		\
-   if (I810_DEBUG&DEBUG_VERBOSE_OUTREG) {				\
-      ErrorF("OUTREG8(0x%lx, 0x%lx) in %s\n", (unsigned long)(addr),	\
-		(unsigned long)(val), FUNCTION_NAME);			\
-   }									\
-} while (0)
-
-#define OUTREG16(addr, val) do {					\
-   *(volatile uint16_t *)(RecPtr->MMIOBase + (addr)) = (val);		\
-   if (I810_DEBUG&DEBUG_VERBOSE_OUTREG) {				\
-      ErrorF("OUTREG16(0x%lx, 0x%lx) in %s\n", (unsigned long)(addr),	\
-		(unsigned long)(val), FUNCTION_NAME);			\
-   }									\
-} while (0)
-
-#define OUTREG(addr, val) do {						\
-   *(volatile uint32_t *)(RecPtr->MMIOBase + (addr)) = (val);		\
-   if (I810_DEBUG&DEBUG_VERBOSE_OUTREG) {				\
-      ErrorF("OUTREG(0x%lx, 0x%lx) in %s\n", (unsigned long)(addr),	\
-		(unsigned long)(val), FUNCTION_NAME);			\
-   }									\
-} while (0)
-
-
-#define DEBUG_VERBOSE_ACCEL  0x1
-#define DEBUG_VERBOSE_SYNC   0x2
-#define DEBUG_VERBOSE_VGA    0x4
-#define DEBUG_VERBOSE_RING   0x8
-#define DEBUG_VERBOSE_OUTREG 0x10
-#define DEBUG_VERBOSE_MEMORY 0x20
-#define DEBUG_VERBOSE_CURSOR 0x40
-#define DEBUG_ALWAYS_SYNC    0x80
-#define DEBUG_VERBOSE_DRI    0x100
-#define DEBUG_VERBOSE_BIOS   0x200
-
-/* Size of the mmio region.
- */
-#define I810_REG_SIZE 0x80000
-
-#define GTT_PAGE_SIZE			KB(4)
-#define PRIMARY_RINGBUFFER_SIZE		KB(128)
-#define MIN_SCRATCH_BUFFER_SIZE		KB(16)
-#define MAX_SCRATCH_BUFFER_SIZE		KB(64)
-#define HWCURSOR_SIZE			GTT_PAGE_SIZE
-#define HWCURSOR_SIZE_ARGB		GTT_PAGE_SIZE * 4
-
-/* Use a 64x64 HW cursor */
-#define I810_CURSOR_X			64
-#define I810_CURSOR_Y			I810_CURSOR_X
-
-#define PIPE_NAME(n)			('A' + (n))
-
-struct pci_device *
-intel_host_bridge (void);
-
 /**
  * Hints to CreatePixmap to tell the driver how the pixmap is going to be
  * used.