From 30bc7ce06c4fc2e8eb76007d9de2716a2bc5541f Mon Sep 17 00:00:00 2001
From: Niclas Finne <nfi@sics.se>
Date: Fri, 25 May 2012 17:55:22 +0200
Subject: [PATCH] Disabled debug output

---
 se/sics/mspsim/config/MSP430f5437Config.java | 9 +++------
 se/sics/mspsim/core/IOPort.java              | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/se/sics/mspsim/config/MSP430f5437Config.java b/se/sics/mspsim/config/MSP430f5437Config.java
index bb57263..196f900 100644
--- a/se/sics/mspsim/config/MSP430f5437Config.java
+++ b/se/sics/mspsim/config/MSP430f5437Config.java
@@ -36,16 +36,13 @@
 package se.sics.mspsim.config;
 
 import java.util.ArrayList;
-
 import se.sics.mspsim.core.GenericUSCI;
 import se.sics.mspsim.core.IOPort;
 import se.sics.mspsim.core.IOUnit;
 import se.sics.mspsim.core.MSP430Config;
 import se.sics.mspsim.core.MSP430Core;
-import se.sics.mspsim.core.Multiplier;
 import se.sics.mspsim.core.Multiplier32;
 import se.sics.mspsim.core.Timer;
-import se.sics.mspsim.core.USCI;
 import se.sics.mspsim.util.Utils;
 
 public class MSP430f5437Config extends MSP430Config {
@@ -54,7 +51,7 @@ public class MSP430f5437Config extends MSP430Config {
     // - positions of all timers (A0, A1, B)
     // - memory configuration
     // - 
-    String portConfig[] = {
+    private static final String portConfig[] = {
             "P1=200,IN 00,OUT 02,DIR 04,REN 06,DS 08,SEL 0A,IV_L 0E,IV_H 0F,IES 18,IE 1A,IFG 1C",
             "P2=200,IN 01,OUT 03,DIR 05,REN 07,DS 09,SEL 0B,IV_L 1E,IV_H 1F,IES 19,IE 1B,IFG 1D",
             "P3=220,IN 00,OUT 02,DIR 04,REN 06,DS 08,SEL 0A",
@@ -118,7 +115,7 @@ public class MSP430f5437Config extends MSP430Config {
             for (int a = 0; a < 0x20; a++) {
                 cpu.setIO(a + uartConfig[i].offset, usci, false);
             }
-            System.out.println("Adding IOUnit USCI: " + usci.getName());
+//            System.out.println("Adding IOUnit USCI: " + usci.getName());
             ioUnits.add(usci);
         }
         
@@ -137,4 +134,4 @@ public class MSP430f5437Config extends MSP430Config {
         return Utils.hex20(addr);
     }
 
-}
\ No newline at end of file
+}
diff --git a/se/sics/mspsim/core/IOPort.java b/se/sics/mspsim/core/IOPort.java
index 7624940..9fe4251 100644
--- a/se/sics/mspsim/core/IOPort.java
+++ b/se/sics/mspsim/core/IOPort.java
@@ -132,11 +132,11 @@ public class IOPort extends IOUnit {
         this(cpu, port, interrupt, memory, offset);
         this.portMap = portMap;
         
-        System.out.println("Port " + port + " interrupt vector: " + interrupt);
+//        System.out.println("Port " + port + " interrupt vector: " + interrupt);
         /* register all the registers from the port-map */
         for (int i = 0; i < portMap.length; i++) {
             if (portMap[i] != null) {
-                System.out.println("  P" + port + portMap[i] + " at " + Utils.hex16(offset + i));
+//                System.out.println("  P" + port + portMap[i] + " at " + Utils.hex16(offset + i));
                 cpu.setIO(offset + i, this, false);
             }
         }