[Mspsim-commit] SF.net SVN: mspsim:[382] mspsim/se/sics/mspsim

[<jo...@us...>]

Revision: 382
          http://mspsim.svn.sourceforge.net/mspsim/?rev=382&view=rev
Author:   joxe
Date:     2008-10-28 09:33:52 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
removed filter on VREG_OFF when setting CCA pin

Modified Paths:
--------------
    mspsim/se/sics/mspsim/chip/CC2420.java
    mspsim/se/sics/mspsim/core/Loggable.java

Modified: mspsim/se/sics/mspsim/chip/CC2420.java
===================================================================
--- mspsim/se/sics/mspsim/chip/CC2420.java	2008-10-28 07:59:36 UTC (rev 381)
+++ mspsim/se/sics/mspsim/chip/CC2420.java	2008-10-28 09:33:52 UTC (rev 382)
@@ -976,13 +976,11 @@
   }
 
   private void setCCAPin(boolean cca) {
-    if (stateMachine != RadioState.VREG_OFF) {
-      if (DEBUG) log("Setting CCA to: " + cca);
-      if( (registers[REG_IOCFG0] & CCA_POLARITY) == CCA_POLARITY)
-        ccaPort.setPinState(ccaPin, cca ? 0 : 1);
-      else
-        ccaPort.setPinState(ccaPin, cca ? 1 : 0);
-    }
+    if (DEBUG) log("Setting CCA to: " + cca);
+    if( (registers[REG_IOCFG0] & CCA_POLARITY) == CCA_POLARITY)
+      ccaPort.setPinState(ccaPin, cca ? 0 : 1);
+    else
+      ccaPort.setPinState(ccaPin, cca ? 1 : 0);
   }
 
   private void setFIFOP(boolean fifop) {

Modified: mspsim/se/sics/mspsim/core/Loggable.java
===================================================================
--- mspsim/se/sics/mspsim/core/Loggable.java	2008-10-28 07:59:36 UTC (rev 381)
+++ mspsim/se/sics/mspsim/core/Loggable.java	2008-10-28 09:33:52 UTC (rev 382)
@@ -1,8 +1,43 @@
+/**
+ * Copyright (c) 2007, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of MSPSim.
+ * 
+ */
 package se.sics.mspsim.core;
-
 import java.io.PrintStream;
 
+/**
+ * @author joakime
+ *
+ */
 public interface Loggable {
+
   public void setLogStream(PrintStream out);
   public void clearLogStream();
-}
+  
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.