|
Message
From: cvs at opencores.org<cvs@o...>
Date: Wed Jan 24 20:33:03 CET 2007
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/07/01 24:20:33 Modified: jop/java/target/src/common/ejip CS8900.java
Log:
use LinkLayer.ip
Revision Changes Path
1.5 jop/java/target/src/common/ejip/CS8900.java
http://www.opencores.org/cvsweb.shtml/jop/java/target/src/common/ejip/CS8900.java.diff?r1=1.4&r2=1.5
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CS8900.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/common/ejip/CS8900.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- CS8900.java 15 Jan 2007 01:35:17 -0000 1.4
+++ CS8900.java 24 Jan 2007 19:33:02 -0000 1.5
@@ -54,12 +54,12 @@
*/
private static boolean txFree; // ready for next transmit
- static int[] eth; // own ethernet address
+ // FIXME: schould be pacakge - change it when jtcpip is moved
+ // to ejip
+ public static int[] eth; // own ethernet address
private static int mac_low, mac_mid, mac_hi;
- static int ip; // ip address for the interface
-
private static int tx_packets;
// private static int tx_bytes;
@@ -527,7 +527,6 @@
mac_mid = mac[2] << 8 | mac[3];
mac_low = mac[4] << 8 | mac[5];
- ip = ipaddr;
tx_packets = 0;
// tx_bytes = 0;
@@ -538,6 +537,7 @@
rx_dropped = 0;
single = new CS8900();
+ single.ip = ipaddr;
single.reset();
@@ -997,7 +997,7 @@
//
int i = p.llh[6]; // type field of ethernet header
if (i == ETH_ARP) { // ARP type
- Arp.receive(p, eth, ip);
+ Arp.receive(p, eth, single.ip);
} else if (i == ETH_IP) { // IP type
p.setStatus(Packet.RCV); // inform upper layer
|
 |
Browse
