From bab8041291ff81c81a98aca385cce561ecddc9d1 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 5 Jun 2012 19:35:39 +0100
Subject: cirrus: drop xf86PciInfo.

This drops usage of deprecated header file.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 src/CirrusClk.c     |  1 -
 src/alp_driver.c    |  7 -------
 src/alp_hwcurs.c    |  1 -
 src/alp_i2c.c       |  1 -
 src/alp_xaa.c       |  1 -
 src/alp_xaam.c      |  1 -
 src/cir_dga.c       |  1 -
 src/cir_driver.c    |  7 -------
 src/cir_pcirename.h | 24 ++++++++++++++++++++++++
 src/cir_shadow.c    |  1 -
 src/lg_driver.c     |  3 ---
 src/lg_hwcurs.c     |  1 -
 src/lg_i2c.c        |  1 -
 src/lg_xaa.c        |  1 -
 14 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/CirrusClk.c b/src/CirrusClk.c
index 6fd6270..a8b24ac 100644
--- a/src/CirrusClk.c
+++ b/src/CirrusClk.c
@@ -17,7 +17,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86PciInfo.h"
 #include "xf86Pci.h"
 
 #include "cir.h"
diff --git a/src/alp_driver.c b/src/alp_driver.c
index 77a5ba9..d1300df 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -24,13 +24,6 @@
 /* Everything using inb/outb, etc needs "compiler.h" */
 #include "compiler.h"
 
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
-#ifndef PCI_CHIP_GD7556  /*  for old xf86PciInfo.h  */
-#define PCI_CHIP_GD7556            0x004C
-#endif
-
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
diff --git a/src/alp_hwcurs.c b/src/alp_hwcurs.c
index 97c72e1..afab7a0 100644
--- a/src/alp_hwcurs.c
+++ b/src/alp_hwcurs.c
@@ -9,7 +9,6 @@
 #include "compiler.h"
 
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 
 #include "vgaHW.h"
 
diff --git a/src/alp_i2c.c b/src/alp_i2c.c
index 7365215..9341543 100644
--- a/src/alp_i2c.c
+++ b/src/alp_i2c.c
@@ -9,7 +9,6 @@
 #include "compiler.h"
 
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 
 #include "vgaHW.h"
 
diff --git a/src/alp_xaa.c b/src/alp_xaa.c
index cc8c0d9..5a43357 100644
--- a/src/alp_xaa.c
+++ b/src/alp_xaa.c
@@ -9,7 +9,6 @@
 #include "compiler.h"
 
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 
 #include "vgaHW.h"
 
diff --git a/src/alp_xaam.c b/src/alp_xaam.c
index 42bbb31..79f621d 100644
--- a/src/alp_xaam.c
+++ b/src/alp_xaam.c
@@ -10,7 +10,6 @@
 #include "compiler.h"
 
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 
 #include "vgaHW.h"
 
diff --git a/src/cir_dga.c b/src/cir_dga.c
index 44abfd9..b841be3 100644
--- a/src/cir_dga.c
+++ b/src/cir_dga.c
@@ -30,7 +30,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 #include "xaa.h"
 #include "xaalocal.h"
 #include "vgaHW.h"
diff --git a/src/cir_driver.c b/src/cir_driver.c
index c6967da..5468b6b 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -24,13 +24,6 @@
 #endif
 /* All drivers need this */
 
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
-#ifndef PCI_CHIP_GD7556  /*  for old xf86PciInfo.h  */
-#define PCI_CHIP_GD7556            0x004C
-#endif
-
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
diff --git a/src/cir_pcirename.h b/src/cir_pcirename.h
index 669b8fe..c1fb249 100644
--- a/src/cir_pcirename.h
+++ b/src/cir_pcirename.h
@@ -146,4 +146,28 @@ typedef struct pci_device *pciVideoPtr;
 
 #endif /* XSERVER_LIBPCIACCESS */
 
+#ifndef _XF86_PCIINFO_H
+
+#define PCI_VENDOR_CIRRUS		0x1013
+/* Cirrus Logic */
+#define PCI_CHIP_GD7548			0x0038
+#define PCI_CHIP_GD7555			0x0040
+#define PCI_CHIP_GD7556                 0x004C
+#define PCI_CHIP_GD5430			0x00A0
+#define PCI_CHIP_GD5434_4		0x00A4
+#define PCI_CHIP_GD5434_8		0x00A8
+#define PCI_CHIP_GD5436			0x00AC
+#define PCI_CHIP_GD5446			0x00B8
+#define PCI_CHIP_GD5480			0x00BC
+#define PCI_CHIP_GD5462			0x00D0
+#define PCI_CHIP_GD5464			0x00D4
+#define PCI_CHIP_GD5464BD		0x00D5
+#define PCI_CHIP_GD5465			0x00D6
+#define PCI_CHIP_6729			0x1100
+#define PCI_CHIP_6832			0x1110
+#define PCI_CHIP_GD7542			0x1200
+#define PCI_CHIP_GD7543			0x1202
+#define PCI_CHIP_GD7541			0x1204
+
+#endif
 #endif /* CIRPCIRENAME_H */
diff --git a/src/cir_shadow.c b/src/cir_shadow.c
index 5dc8d08..a9b425b 100644
--- a/src/cir_shadow.c
+++ b/src/cir_shadow.c
@@ -9,7 +9,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "shadowfb.h"
 #include "servermd.h"
diff --git a/src/lg_driver.c b/src/lg_driver.c
index 1ae6765..ab613d8 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -28,9 +28,6 @@
 
 #include "compiler.h"
 
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
diff --git a/src/lg_hwcurs.c b/src/lg_hwcurs.c
index 80d1dff..4012db0 100644
--- a/src/lg_hwcurs.c
+++ b/src/lg_hwcurs.c
@@ -20,7 +20,6 @@
 #include "compiler.h"
 
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 
 #include "vgaHW.h"
 
diff --git a/src/lg_i2c.c b/src/lg_i2c.c
index 145cc2e..3e8c962 100644
--- a/src/lg_i2c.c
+++ b/src/lg_i2c.c
@@ -9,7 +9,6 @@
 #include "compiler.h"
 
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 
 #include "vgaHW.h"
 
diff --git a/src/lg_xaa.c b/src/lg_xaa.c
index 7abfb20..45ecea7 100644
--- a/src/lg_xaa.c
+++ b/src/lg_xaa.c
@@ -20,7 +20,6 @@
 #include "compiler.h"
 
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 
 #include "vgaHW.h"
 
-- 
cgit v1.2.3