Delete some unused macros detected with -Wp,-Wunused-macros use

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6856 c046a42c-6fe2-441c-8c8c-71466251a162

9 files changed, 0 insertions, 39 deletions

diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index fb8218990b..08fd4c29a6 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -49,8 +49,6 @@
  *
  ***************************************/
 
-#define qemu_MIN(a,b) ((a) < (b) ? (a) : (b))
-
 // ID
 #define CIRRUS_ID_CLGD5422  (0x23<<2)
 #define CIRRUS_ID_CLGD5426  (0x24<<2)
@@ -173,10 +171,6 @@
 #define CIRRUS_MMIO_LINEDRAW_MODE     0x39	// byte
 #define CIRRUS_MMIO_BLTSTATUS         0x40	// byte
 
-// PCI 0x02: device
-#define PCI_DEVICE_CLGD5462           0x00d0
-#define PCI_DEVICE_CLGD5465           0x00d6
-
 // PCI 0x04: command(word), 0x06(word): status
 #define PCI_COMMAND_IOACCESS                0x0001
 #define PCI_COMMAND_MEMACCESS               0x0002
diff --git a/hw/dma.c b/hw/dma.c
index 971c8d466f..b95407be91 100644
--- a/hw/dma.c
+++ b/hw/dma.c
@@ -28,11 +28,9 @@
 
 #define dolog(...) fprintf (stderr, "dma: " __VA_ARGS__)
 #ifdef DEBUG_DMA
-#define lwarn(...) fprintf (stderr, "dma: " __VA_ARGS__)
 #define linfo(...) fprintf (stderr, "dma: " __VA_ARGS__)
 #define ldebug(...) fprintf (stderr, "dma: " __VA_ARGS__)
 #else
-#define lwarn(...)
 #define linfo(...)
 #define ldebug(...)
 #endif
diff --git a/hw/eepro100.c b/hw/eepro100.c
index 9dd67fe689..2948d3c154 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -47,22 +47,11 @@
 
 /* Common declarations for all PCI devices. */
 
-#define PCI_VENDOR_ID           0x00    /* 16 bits */
 #define PCI_DEVICE_ID           0x02    /* 16 bits */
 #define PCI_COMMAND             0x04    /* 16 bits */
 #define PCI_STATUS              0x06    /* 16 bits */
 
 #define PCI_REVISION_ID         0x08    /* 8 bits  */
-#define PCI_CLASS_CODE          0x0b    /* 8 bits */
-#define PCI_SUBCLASS_CODE       0x0a    /* 8 bits */
-#define PCI_HEADER_TYPE         0x0e    /* 8 bits */
-
-#define PCI_BASE_ADDRESS_0      0x10    /* 32 bits */
-#define PCI_BASE_ADDRESS_1      0x14    /* 32 bits */
-#define PCI_BASE_ADDRESS_2      0x18    /* 32 bits */
-#define PCI_BASE_ADDRESS_3      0x1c    /* 32 bits */
-#define PCI_BASE_ADDRESS_4      0x20    /* 32 bits */
-#define PCI_BASE_ADDRESS_5      0x24    /* 32 bits */
 
 #define PCI_CONFIG_8(offset, value) \
     (pci_conf[offset] = (value))
@@ -199,12 +188,6 @@ typedef enum {
     ru_ready = 4
 } ru_state_t;
 
-#if defined(__BIG_ENDIAN_BITFIELD)
-#define X(a,b)	b,a
-#else
-#define X(a,b)	a,b
-#endif
-
 typedef struct {
 #if 1
     uint8_t cmd;
@@ -1465,8 +1448,6 @@ static int nic_can_receive(void *opaque)
     //~ return !eepro100_buffer_full(s);
 }
 
-#define MIN_BUF_SIZE 60
-
 static void nic_receive(void *opaque, const uint8_t * buf, int size)
 {
     /* TODO:
diff --git a/hw/openpic.c b/hw/openpic.c
index 46a2706b3d..733284ae8d 100644
--- a/hw/openpic.c
+++ b/hw/openpic.c
@@ -44,7 +44,6 @@
 #else
 #define DPRINTF(fmt, args...) do { } while (0)
 #endif
-#define ERROR(fmr, args...) do { printf("ERROR: " fmr , ##args); } while (0)
 
 #define USE_MPCxxx /* Intel model is broken, for now */
 
diff --git a/hw/pckbd.c b/hw/pckbd.c
index 3a004f7a8e..dd5265134b 100644
--- a/hw/pckbd.c
+++ b/hw/pckbd.c
@@ -109,8 +109,6 @@
 #define MOUSE_STATUS_ENABLED    0x20
 #define MOUSE_STATUS_SCALE21    0x10
 
-#define KBD_QUEUE_SIZE 256
-
 #define KBD_PENDING_KBD         1
 #define KBD_PENDING_AUX         2
 
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index 53e20a0ab8..b8607aaa7f 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -210,9 +210,6 @@ PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic)
 static PCIDevice *piix3_dev;
 PCIDevice *piix4_dev;
 
-/* just used for simpler irq handling. */
-#define PCI_IRQ_WORDS   ((PCI_DEVICES_MAX + 31) / 32)
-
 static void piix3_set_irq(qemu_irq *pic, int irq_num, int level)
 {
     int i, pic_irq, pic_level;
diff --git a/hw/sd.c b/hw/sd.c
index fa1c02cf0e..4618883fa6 100644
--- a/hw/sd.c
+++ b/hw/sd.c
@@ -242,8 +242,6 @@ static void sd_set_cid(SDState *sd)
 #define SECTOR_SHIFT	5			/* 16 kilobytes */
 #define WPGROUP_SHIFT	7			/* 2 megs */
 #define CMULT_SHIFT	9			/* 512 times HWBLOCK_SIZE */
-#define BLOCK_SIZE	(1 << (HWBLOCK_SHIFT))
-#define SECTOR_SIZE	(1 << (HWBLOCK_SHIFT + SECTOR_SHIFT))
 #define WPGROUP_SIZE	(1 << (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT))
 
 static const uint8_t sd_csd_rw_mask[16] = {
diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c
index dffa11539a..9ee5ff89b0 100644
--- a/hw/slavio_intctl.c
+++ b/hw/slavio_intctl.c
@@ -77,7 +77,6 @@ typedef struct SLAVIO_CPUINTCTLState {
 #define MASTER_IRQ_MASK ~0x0fa2007f
 #define MASTER_DISABLE 0x80000000
 #define CPU_SOFTIRQ_MASK 0xfffe0000
-#define CPU_HARDIRQ_MASK 0x0000fffe
 #define CPU_IRQ_INT15_IN 0x0004000
 #define CPU_IRQ_INT15_MASK 0x80000000
 
diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c
index 79d4018fab..8da7f4ad98 100644
--- a/hw/slavio_misc.c
+++ b/hw/slavio_misc.c
@@ -56,10 +56,7 @@ typedef struct MiscState {
 
 #define MISC_SIZE 1
 #define SYSCTRL_SIZE 4
-#define LED_MAXADDR 1
-#define LED_SIZE (LED_MAXADDR + 1)
 
-#define MISC_MASK 0x0fff0000
 #define MISC_LEDS 0x01600000
 #define MISC_CFG  0x01800000
 #define MISC_DIAG 0x01a00000