Message

Reply | Reply all

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

From: cvs at opencores.org<cvs@o...>
Date: Wed Nov 29 17:31:29 CET 2006
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/06/11 29:17:31

Modified: jop/java/target/src/app/oebb BgPpp.java Main.java
Log:
BG V 1.05


Revision Changes Path
1.3 jop/java/target/src/app/oebb/BgPpp.java

http://www.opencores.org/cvsweb.shtml/jop/java/target/src/app/oebb/BgPpp.java.diff?r1=1.2&r2=1.3

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

Index: BgPpp.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/app/oebb/BgPpp.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- BgPpp.java 22 Nov 2006 19:12:31 -0000 1.2
+++ BgPpp.java 29 Nov 2006 16:31:28 -0000 1.3
@@ -67,6 +67,7 @@

private static final int NEG_SEND= 3000; // Period of send negotiation (in ms)
private static final int IP_SEND= 10000; // Send timout for ip for reconnect (in ms)
+ private static final int PPP_HANDLING = 60000; // Timout for the PPP negotiation

private static final int GPRS_TRY_CNT = 3; // After that count connect via GSM

@@ -454,7 +455,7 @@
Led.startModem();
waitSec(1);

- if (connCount>GPRS_TRY_CNT) {
+ if (connCount>GPRS_TRY_CNT && gsm_uid.length()!=0) {
useGSM = true;
}

@@ -535,6 +536,8 @@
lcpAck = false;
ipcpAck = false;

+ int timer = 0;
+
//
// wait for startConnection(...)
//
@@ -557,9 +560,12 @@
pppLoop();

if (state==MODEM_OK) {
+ // start timer for PPP negotiation
+ timer = Timer.getTimeoutMs(PPP_HANDLING);
}

- if (rejCnt > MAX_REJ) {
+ if ((rejCnt > MAX_REJ) ||
+ (Timer.timeout(timer) && state!=CONNECTED)) {
// System.out.print("1");
modemHangUp(); // start over
modemInit();
@@ -576,7 +582,7 @@

if (code == REQ) {
if (checkOptions(LCP)) {
- lcpAck = true;;
+ lcpAck = true;
} else {
++rejCnt;
}



1.18 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.17&r2=1.18

(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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- Main.java 22 Nov 2006 19:12:31 -0000 1.17
+++ Main.java 29 Nov 2006 16:31:29 -0000 1.18
@@ -62,7 +62,7 @@

// SW version
public static final int VER_MAJ = 1;
- public static final int VER_MIN = 4;
+ public static final int VER_MIN = 5;

private static final int STRECKE_PRIO = 1;
private static final int STRECKE_PERIOD = 100000;