|
Message
From: cvs at opencores.org<cvs@o...>
Date: Wed Jan 24 19:37:02 CET 2007
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/07/01 24:19:37 Modified: jop/java/target/src/common/ejip2/jtcpip/test TestConnectSingleThread.java TestListenRtThread.java TestListenSingleThread.java Log: use local eth and ip Revision Changes Path 1.4 jop/java/target/src/common/ejip2/jtcpip/test/TestConnectSingleThread.java http://www.opencores.org/cvsweb.shtml/jop/java/target/src/common/ejip2/jtcpip/test/TestConnectSingleThread.java.diff?r1=1.3&r2=1.4 (In the diff below, changes in quantity of whitespace are not shown.) Index: TestConnectSingleThread.java =================================================================== RCS file: /cvsroot/martin/jop/java/target/src/common/ejip2/jtcpip/test/TestConnectSingleThread.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- TestConnectSingleThread.java 24 Jan 2007 12:47:39 -0000 1.3 +++ TestConnectSingleThread.java 24 Jan 2007 18:37:01 -0000 1.4 @@ -34,6 +34,7 @@ import java.io.IOException; import util.Dbg; +import ejip2.CS8900; import ejip2.LinkLayer; import ejip2.Net; import ejip2.jtcpip.JtcpipException; @@ -62,7 +63,9 @@ // init. stuff Dbg.initSerWait(); - ipLink = Net.init("192.168.0.123", "00:01:02:03:04:05"); + int[] eth = {0x00, 0x05, 0x02, 0x03, 0x04, 0x07}; + ipLink = CS8900.init(eth , (192 << 24) + (168 << 16) + (0 << 8) + 123); + Net.linkLayer = ipLink; nwlt = NwLoopThread.createInstance(ipLink); ejip2.jtcpip.UDPConnection.init(); ejip2.jtcpip.TCPConnection.init(); 1.4 jop/java/target/src/common/ejip2/jtcpip/test/TestListenRtThread.java http://www.opencores.org/cvsweb.shtml/jop/java/target/src/common/ejip2/jtcpip/test/TestListenRtThread.java.diff?r1=1.3&r2=1.4 (In the diff below, changes in quantity of whitespace are not shown.) Index: TestListenRtThread.java =================================================================== RCS file: /cvsroot/martin/jop/java/target/src/common/ejip2/jtcpip/test/TestListenRtThread.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- TestListenRtThread.java 24 Jan 2007 01:03:24 -0000 1.3 +++ TestListenRtThread.java 24 Jan 2007 18:37:01 -0000 1.4 @@ -39,6 +39,7 @@ import java.io.IOException; +import ejip2.CS8900; import ejip2.LinkLayer; import ejip2.Net; import ejip2.jtcpip.NwLoopRtThread; @@ -63,7 +64,9 @@ Dbg.initSerWait(); // initialize jop to use ip and mac - ipLink = Net.init("129.168.0.123", "05:01:02:03:04:05"); + int[] eth = {0x00, 0x05, 0x02, 0x03, 0x04, 0x07}; + ipLink = CS8900.init(eth , (192 << 24) + (168 << 16) + (0 << 8) + 123); + Net.linkLayer = ipLink; nwlt = NwLoopRtThread.createInstance(ipLink); ejip2.jtcpip.UDPConnection.init(); ejip2.jtcpip.TCPConnection.init(); 1.4 jop/java/target/src/common/ejip2/jtcpip/test/TestListenSingleThread.java http://www.opencores.org/cvsweb.shtml/jop/java/target/src/common/ejip2/jtcpip/test/TestListenSingleThread.java.diff?r1=1.3&r2=1.4 (In the diff below, changes in quantity of whitespace are not shown.) Index: TestListenSingleThread.java =================================================================== RCS file: /cvsroot/martin/jop/java/target/src/common/ejip2/jtcpip/test/TestListenSingleThread.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- TestListenSingleThread.java 24 Jan 2007 01:03:24 -0000 1.3 +++ TestListenSingleThread.java 24 Jan 2007 18:37:01 -0000 1.4 @@ -40,6 +40,7 @@ import java.io.IOException; import util.Dbg; +import ejip2.CS8900; import ejip2.LinkLayer; import ejip2.Net;
import ejip2.jtcpip.NwLoopThread;
@@ -60,7 +61,9 @@
// init stuff
Dbg.initSerWait();
Dbg.wr("Main2");
- ipLink = Net.init("129.168.0.123", "05:01:02:03:04:05");
+ int[] eth = {0x00, 0x05, 0x02, 0x03, 0x04, 0x07};
+ ipLink = CS8900.init(eth , (192 << 24) + (168 << 16) + (0 << 8) + 123);
+ Net.linkLayer = ipLink;
nwlt = NwLoopThread.createInstance(ipLink);
ejip2.jtcpip.UDPConnection.init();
ejip2.jtcpip.TCPConnection.init();
|
 |