[PATCHv3,4/4] qemu: cleanup unused macros in cirrus

Message ID 20091008161727.GA13794@redhat.com
State New
Headers show

Commit Message

Michael S. Tsirkin Oct. 8, 2009, 4:17 p.m.
Cirrus vga has a copy of many PCI macros,
and it doesn't even use them. Clean up.
Also do not init header type, it has the
right value by default.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Respin only the last patch in the series:
improve comment, and remove a commented out line
I added by mistake.

 hw/cirrus_vga.c |   37 ------------------------------------
 1 files changed, 0 insertions(+), 36 deletions(-)


diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 2b895db..f901d53 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -171,41 +171,6 @@ 
 #define CIRRUS_MMIO_LINEDRAW_MODE     0x39	// byte
 #define CIRRUS_MMIO_BLTSTATUS         0x40	// byte
-// PCI 0x04: command(word), 0x06(word): status
-#define PCI_COMMAND_IOACCESS                0x0001
-#define PCI_COMMAND_MEMACCESS               0x0002
-#define PCI_COMMAND_BUSMASTER               0x0004
-#define PCI_COMMAND_SPECIALCYCLE            0x0008
-#define PCI_COMMAND_MEMWRITEINVALID         0x0010
-#define PCI_COMMAND_PALETTESNOOPING         0x0020
-#define PCI_COMMAND_PARITYDETECTION         0x0040
-#define PCI_COMMAND_SERR                    0x0100
-#define PCI_COMMAND_BACKTOBACKTRANS         0x0200
-// PCI 0x08, 0xff000000 (0x09-0x0b:class,0x08:rev)
-#define PCI_CLASS_BASE_DISPLAY        0x03
-// PCI 0x08, 0x00ff0000
-#define PCI_CLASS_SUB_VGA             0x00
-// PCI 0x0c, 0x00ff0000 (0x0c:cacheline,0x0d:latency,0x0e:headertype,0x0f:Built-in self test)
-// 0x10-0x3f (headertype 00h)
-// PCI 0x10,0x14,0x18,0x1c,0x20,0x24: base address mapping registers
-//   0x10: MEMBASE, 0x14: IOBASE(hard-coded in XFree86 3.x)
-#define PCI_MAP_MEM                 0x0
-#define PCI_MAP_IO                  0x1
-#define PCI_MAP_MEM_ADDR_MASK       (~0xf)
-#define PCI_MAP_IO_ADDR_MASK        (~0x3)
-#define PCI_MAP_MEMFLAGS_32BIT      0x0
-#define PCI_MAP_MEMFLAGS_32BIT_1M   0x1
-#define PCI_MAP_MEMFLAGS_64BIT      0x4
-// PCI 0x28: cardbus CIS pointer
-// PCI 0x2c: subsystem vendor id, 0x2e: subsystem id
-// PCI 0x30: expansion ROM base address
-#define PCI_ROMBIOS_ENABLED         0x1
-// PCI 0x34: 0xffffff00=reserved, 0x000000ff=capabilities pointer
-// PCI 0x38: reserved
-// PCI 0x3c: 0x3c=int-line, 0x3d=int-pin, 0x3e=min-gnt, 0x3f=maax-lat
 #define CIRRUS_PNPMMIO_SIZE         0x1000
 #define ABS(a) ((signed)(a) > 0 ? a : -a)
@@ -3230,8 +3195,7 @@  static int pci_cirrus_vga_initfn(PCIDevice *dev)
      /* setup PCI */
      pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_CIRRUS);
      pci_config_set_device_id(pci_conf, device_id);
      pci_config_set_class(pci_conf, PCI_CLASS_DISPLAY_VGA);
      /* setup memory space */
      /* memory #0 LFB */