Clean up messages from PIO

Grzegorz Jabłoński
1 parent 254a2710
Showing 1 changed file with 24 additions and 9 deletions
hw/at91_pio.c
@@ -26,6 +26,11 @@
 #include "sysbus.h"
+//#define DPRINTF(fmt, ...) printf(fmt, ## __VA_ARGS__)
+#define DPRINTF(fmt, ...) do { } while (0)
+
+
+
 /*
  * Input/Output GPIO pins:
  * 32x PIO device
@@ -88,7 +93,7 @@ typedef struct PIOState {
 void at91_pio_set_pin(void *opaque, int pin, int level)
 {
-    printf("In at91_pio_set_pin, opaque=%p, pin=%d, level=%d\n", opaque, pin, level);
+    DPRINTF("In at91_pio_set_pin, opaque=%p, pin=%d, level=%d\n", opaque, pin, level);
     PIOState *s = opaque;
     int mask = 1 << (pin % PIO_PINS);
     int input_set = pin / PIO_PINS;
@@ -98,7 +103,7 @@ void at91_pio_set_pin(void *opaque, int pin, int level)
     if (input_set == 0) {
         /* PIO pin -> Peripheral / IO */
-        printf("In at91_pio_set_pin, s->osr=%08x, s->psr=%08x, mask=%08x\n",s->osr, s->psr, mask);
+        DPRINTF("In at91_pio_set_pin, s->osr=%08x, s->psr=%08x, mask=%08x\n",s->osr, s->psr, mask);
         /* Skip input if output mode is enabled for the pin */
         if (s->osr & mask)
@@ -111,7 +116,7 @@ void at91_pio_set_pin(void *opaque, int pin, int level)
             if (level == -1) {
                 s->unknown_state |= mask;
             } else if (level) {
-                printf("In at91_pio_set_pin, setting level\n");
+                DPRINTF("In at91_pio_set_pin, setting level\n");
                 s->unknown_state &= ~mask;
                 s->pdsr |= mask;
             }
@@ -122,7 +127,7 @@ void at91_pio_set_pin(void *opaque, int pin, int level)
         } else {
             qemu_set_irq(s->out[PIO_PINS + (output_set * PIO_PINS)], level);
         }
-        printf("In at91_pio_set_pin, s->pdsr=%08x\n",s->pdsr);
+        DPRINTF("In at91_pio_set_pin, s->pdsr=%08x\n",s->pdsr);
     } else {
         /* Peripheral -> PIO pin */
@@ -148,7 +153,7 @@ static uint32_t at91_pio_mem_read(void *opaque, target_phys_addr_t offset)
     case PIO_ODSR:
         return s->odsr;
     case PIO_PDSR:
-        printf("In at91_pio_mem_read, reading PDSR, s->pdsr=%08x, s->unknown_state=%08x, retval=%08x\n",
+        DPRINTF("In at91_pio_mem_read, reading PDSR, s->pdsr=%08x, s->unknown_state=%08x, retval=%08x\n",
         s->pdsr, s->unknown_state, 
             (s->pdsr & ~s->unknown_state) |
             (s->ppusr & s->unknown_state));
@@ -181,9 +186,11 @@ static void at91_pio_mem_write(void *opaque, target_phys_addr_t offset,
     PIOState *s = opaque;
     int i;
-    printf("Writing PIO: offset=0x%08lx, value=0x%08x\n",offset,value);
+    DPRINTF("Writing PIO: offset=0x%08lx, value=0x%08x\n",offset,value);
     offset &= PIO_SIZE - 1;
+
+    uint32_t prev;
     switch (offset) {
     case PIO_PER:
         s->psr |= value;
@@ -204,21 +211,29 @@ static void at91_pio_mem_write(void *opaque, target_phys_addr_t offset,
         s->ifsr &= ~value;
         break;
     case PIO_SODR:
+        prev = s->odsr;
         s->odsr |= value;
         for (i = 0; i < PIO_PINS; i++)
             if (value & (1 << i) & s->osr)
             {
                 qemu_set_irq(s->out[i], 1);
-                printf("Pin %d set\n",i);
+                if(prev != s->odsr)
+                {
+                  printf("Pin %d set\n",i);
+                }
             }
         break;
     case PIO_CODR:
+        prev = s->odsr;
         s->odsr &= ~value;
         for (i = 0; i < PIO_PINS; i++)
             if (value & (1 << i) & s->osr)
             {
                 qemu_set_irq(s->out[i], 0);
-                printf("Pin %d reset\n",i);
+                if(prev != s->odsr)
+                {
+                  printf("Pin %d reset\n",i);
+                }
             }
         break;
     case PIO_ODSR:
@@ -338,7 +353,7 @@ int at91_io_cnt = 0;
 static void at91_pio_init(SysBusDevice *dev)
 {
-    printf("at91_pio_init called\n");
+    DPRINTF("at91_pio_init called\n");
     PIOState *s = FROM_SYSBUS(typeof (*s), dev);
     at91_io_state[at91_io_cnt++] = s;
     int pio_regs;