Message

Reply | Reply all

Date Prev | Date Next | Thread Prev | Thread Next Date Index | Thread Index

From: cvs at opencores.org<cvs@o...>
Date: Mon Jun 30 23:10:41 CEST 2008
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/08/06 30:23:10

Modified: jop/java/target/src/app/oebb Main.java State.java
Log:
BG V 2.17


Revision Changes Path
1.37 jop/java/target/src/app/oebb/Main.java

http://www.opencores.org/cvsweb.shtml/jop/java/target/src/app/oebb/Main.java.diff?r1=1.36&r2=1.37

(In the diff below, changes in quantity of whitespace are not shown.)

Index: Main.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/app/oebb/Main.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- Main.java 26 Jun 2008 18:43:43 -0000 1.36
+++ Main.java 30 Jun 2008 21:10:40 -0000 1.37
@@ -62,7 +62,7 @@

// SW version
public static final int VER_MAJ = 2;
- public static final int VER_MIN = 16;
+ public static final int VER_MIN = 17;

private static final int LOG_PRIO = 1;
private static final int LOG_PERIOD = 1000000;
@@ -76,8 +76,6 @@
private static final int DISPLAY_PERIOD = 5000;
private static final int WD_PRIO = 5;
private static final int WD_PERIOD = 25000;
-// private static final int COMM_PRIO = 6;
-// private static final int COMM_PERIOD = 100000;
private static final int STATE_PRIO = 6;
private static final int STATE_PERIOD = 100000;
private static final int NET_PRIO = 7;
@@ -235,11 +233,6 @@
// to find a Strecke
new Strecke(STRECKE_PRIO, STRECKE_PERIOD);

-// //
-// // create Communication thread
-// //
-// Comm.init(Flash.getId(), COMM_PRIO, COMM_PERIOD, ipLink);
-
//
// Crate state object and the periodic thread.
state = new State(ipLink);



1.14 jop/java/target/src/app/oebb/State.java

http://www.opencores.org/cvsweb.shtml/jop/java/target/src/app/oebb/State.java.diff?r1=1.13&r2=1.14

(In the diff below, changes in quantity of whitespace are not shown.)

Index: State.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/app/oebb/State.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- State.java 16 Jun 2008 08:17:50 -0000 1.13
+++ State.java 30 Jun 2008 21:10:40 -0000 1.14
@@ -343,8 +343,8 @@

// FWR
if ((cmd & CFLAG_FWR)!=0) {
- Logic.state = Logic.WIDERRUF;
if (!fwrQuitPending) {
+ Logic.state = Logic.WIDERRUF;
// we cannot ack it, reset the flag
cmdAck &= ~CFLAG_FWR;
}
@@ -355,8 +355,8 @@

// NOTHALT
if ((cmd & CFLAG_NOT)!=0) {
- Logic.state = Logic.NOTHALT;
if (!nothaltQuitPending) {
+ Logic.state = Logic.NOTHALT;
// we cannot ack it, reset the flag
cmdAck &= ~CFLAG_NOT;
}