Message

Reply | Reply all

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

From: cvs at opencores.org<cvs@o...>
Date: Tue Jul 22 21:48:46 CEST 2008
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/08/07 22:21:48

Modified: jop/java/target/src/app/oebb Logic.java Main.java State.java
Log:
work around for Chary's issue with the reset


Revision Changes Path
1.33 jop/java/target/src/app/oebb/Logic.java

http://www.opencores.org/cvsweb.shtml/jop/java/target/src/app/oebb/Logic.java.diff?r1=1.32&r2=1.33

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

Index: Logic.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/app/oebb/Logic.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- Logic.java 13 Jul 2008 14:07:45 -0000 1.32
+++ Logic.java 22 Jul 2008 19:48:46 -0000 1.33
@@ -1287,6 +1287,9 @@
int tim = Timer.getTimeoutSec(10);
while (!Timer.timeout(tim)) {
loop();
+ if (State.forceReset) {
+ break;
+ }
}
// wait for reset
Main.reset = true;



1.40 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.39&r2=1.40

(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.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- Main.java 13 Jul 2008 14:07:45 -0000 1.39
+++ Main.java 22 Jul 2008 19:48:46 -0000 1.40
@@ -62,7 +62,7 @@

// SW version
public static final int VER_MAJ = 2;
- public static final int VER_MIN = 19;
+ public static final int VER_MIN = 20;

private static final int LOG_PRIO = 1;
private static final int LOG_PERIOD = 1000000;



1.17 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.16&r2=1.17

(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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- State.java 13 Jul 2008 14:07:45 -0000 1.16
+++ State.java 22 Jul 2008 19:48:46 -0000 1.17
@@ -152,6 +152,11 @@
* Ignore flag is set
*/
static boolean ignore;
+
+ /**
+ * Do the reset as we got back a message after ABM
+ */
+ static boolean forceReset;
// reset not yet used - we have a reset function in Logic.
// /**
// * RESET timer
@@ -324,8 +329,6 @@


if (cmd!=cmdAck) {
- // TODO check a cmd change
-
// send the ack
requestSend();
}
@@ -347,6 +350,13 @@
if ((cmd & CFLAG_ABM)!=0) {
Logic.state = Logic.ABGEMELDET;
}
+ // Hack for Charlys Abmelden issue:
+ // don't reset the ABM flag when reset is pending
+ if ((cmd & CFLAG_ABM)==0 && Logic.state==Logic.ABGEMELDET) { + cmdAck |= CFLAG_ABM; + forceReset = true; + } + // Angemeldet if ((cmd & CFLAG_ANMOK)!=0) {