Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5508] trunk/net/src
|
From: <cr...@us...> - 2009-05-23 12:51:07
|
Revision: 5508
http://jnode.svn.sourceforge.net/jnode/?rev=5508&view=rev
Author: crawley
Date: 2009-05-23 12:37:28 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Fixing compiler warnings
Modified Paths:
--------------
trunk/net/src/driver/org/jnode/driver/net/NetDeviceEvent.java
trunk/net/src/driver/org/jnode/driver/net/NetworkException.java
trunk/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xCore.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Buffer.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java
trunk/net/src/driver/org/jnode/driver/net/prism2/Prism2Core.java
trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineCore.java
trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineRing.java
trunk/net/src/net/org/jnode/net/InvalidLayerException.java
trunk/net/src/net/org/jnode/net/LayerAlreadyRegisteredException.java
trunk/net/src/net/org/jnode/net/NetPermission.java
trunk/net/src/net/org/jnode/net/NoSuchProtocolException.java
trunk/net/src/net/org/jnode/net/ipv4/tftp/TFTPClient.java
trunk/net/src/net/org/jnode/net/ipv4/udp/PlainUDPDatagramSocketImpl.java
trunk/net/src/net/org/jnode/net/ipv4/udp/UDPDatagramSocketImpl.java
trunk/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2OutputStream.java
Modified: trunk/net/src/driver/org/jnode/driver/net/NetDeviceEvent.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/NetDeviceEvent.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/driver/org/jnode/driver/net/NetDeviceEvent.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -31,6 +31,8 @@
*/
public abstract class NetDeviceEvent extends EventObject {
+ private static final long serialVersionUID = 1L;
+
/**
* Identification of the event
*/
Modified: trunk/net/src/driver/org/jnode/driver/net/NetworkException.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/NetworkException.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/driver/org/jnode/driver/net/NetworkException.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -27,6 +27,8 @@
*/
public class NetworkException extends SocketException {
+ private static final long serialVersionUID = 1L;
+
/**
*
*/
Modified: trunk/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xCore.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xCore.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xCore.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -156,6 +156,7 @@
*/
}
+ @SuppressWarnings("unused")
private void powerUpDevice() {
setReg8(REG_CFG9346, CFG9346_WE);
setReg8(REG_CONFIG1, 0);
@@ -232,6 +233,7 @@
log.debug("Ethernet card: Autoload incomplete");
}
+ @SuppressWarnings("unused")
private byte[] i2bsLoHi(int _i) {
int shiftL = 24, shiftH = shiftL;
@@ -559,8 +561,10 @@
final SocketBuffer skbuf = null; // rxRing.getPacket(pktLen);
try {
- if (skbuf.getSize() > 0)
+ // FIXME ... this always throws an NPE since skbuf is null
+ if (skbuf.getSize() > 0) {
driver.onReceive(skbuf);
+ }
} catch (NetworkException e) {
e.printStackTrace(); // To change body of catch statement
// use Options | File
Modified: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Buffer.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Buffer.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Buffer.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -23,7 +23,6 @@
import org.apache.log4j.Logger;
import org.jnode.driver.net.NetworkException;
import org.jnode.net.SocketBuffer;
-import org.jnode.net.ethernet.EthernetConstants;
import org.jnode.system.ResourceManager;
import org.jnode.util.NumberUtils;
@@ -32,10 +31,10 @@
*/
public class EEPRO100Buffer implements EEPRO100Constants {
//--- Constants
- private static final int FRAME_SIZE = EthernetConstants.ETH_FRAME_LEN;
- private static final int PKT_BUF_SZ = 1536;
- private static final int DATA_BUFFER_SIZE = 1536;
- private static final int PacketReceived = 0xc000;
+// private static final int FRAME_SIZE = EthernetConstants.ETH_FRAME_LEN;
+// private static final int PKT_BUF_SZ = 1536;
+// private static final int DATA_BUFFER_SIZE = 1536;
+// private static final int PacketReceived = 0xc000;
//---
protected final Logger log = Logger.getLogger(getClass());
@@ -49,23 +48,24 @@
private int curRx;
private int dirtyRx;
public EEPRO100RxFD[] rxRing = new EEPRO100RxFD[RX_RING_SIZE];
- private EEPRO100RxFD[] rxPackets = new EEPRO100RxFD[128];
- private int rx_packets;
- private int rxErrors;
- private EEPRO100RxFD last_rxf;
- private int rxPacketIndex;
- private int lastRxTime;
+// private EEPRO100RxFD[] rxPackets = new EEPRO100RxFD[128];
+// private int rx_packets;
+// private int rxErrors;
+// private EEPRO100RxFD last_rxf;
+// private int rxPacketIndex;
+// private int lastRxTime;
// --- Tx Variables
private int txThreshold = 0x01200000;
private int curTx;
private int dirtyTx;
public EEPRO100TxFD[] txRing = new EEPRO100TxFD[TX_RING_SIZE];
+ @SuppressWarnings("unused")
private EEPRO100TxFD lastCmd;
- private int lastCmdTime;
+// private int lastCmdTime;
// --- Others variables
- private int jiffies;
+// private int jiffies;
public EEPRO100Buffer(EEPRO100Registers regs, ResourceManager rm) {
this.regs = regs;
@@ -191,7 +191,6 @@
// the "ownership" bits last.
// Prevent interrupts from changing the Tx ring from underneath us.
- int flags;
/* Calculate the Tx descriptor entry. */
int txEntry = getCurTx() & TX_RING_SIZE - 1;
txRing[txEntry].setStatus(0);
@@ -203,7 +202,7 @@
txRing[txEntry].setDescriptorAddress(txRing[txEntry].getBufferAddress() + 16);
// The data region is always in one buffer descriptor.
txRing[txEntry].setCount(getTxThreshold());
- EEPRO100TxFD lastCmd0 = lastCmd;
+// EEPRO100TxFD lastCmd0 = lastCmd;
lastCmd = txRing[txEntry];
EEPRO100Utils.waitForCmdDone(regs);
regs.setReg8(SCBCmd, CUResume);
Modified: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -101,9 +101,13 @@
*/
private EEPRO100Buffer buffers;
+ @SuppressWarnings("unused")
private int phy[];
+ @SuppressWarnings("unused")
private int eeReadCmd;
+ @SuppressWarnings("unused")
private int eeSize;
+ @SuppressWarnings("unused")
private int eeAddress;
/**
Modified: trunk/net/src/driver/org/jnode/driver/net/prism2/Prism2Core.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/prism2/Prism2Core.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/driver/org/jnode/driver/net/prism2/Prism2Core.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -117,6 +117,7 @@
/**
* Current link status
*/
+ @SuppressWarnings("unused")
private LinkStatus linkStatus = NOTCONNECTED;
/**
@@ -344,6 +345,7 @@
* @return The 32-bit value.
* @throws DriverException
*/
+ @SuppressWarnings("unused")
private final int getConfig32(RecordID rid) throws DriverException {
final byte[] arr = new byte[4];
getConfig(rid, arr, 0, 4);
@@ -476,6 +478,7 @@
* @param value
* @throws DriverException
*/
+ @SuppressWarnings("unused")
private final void setConfig32(RecordID rid, int value) throws DriverException {
final byte[] arr = new byte[4];
LittleEndian.setInt32(arr, 0, value);
Modified: trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineCore.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineCore.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineCore.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -576,9 +576,7 @@
void probe() {
int options = -1;
- int did_version = 0; /* Already printed version info. */
int i;
- int timeout;
int FDXFlag;
int byMIIvalue, LineSpeed, MIICRbak;
@@ -719,6 +717,7 @@
return io.inPortWord(ioBase + reg);
}
+ @SuppressWarnings("unused")
private int getReg32(int reg) {
return io.inPortDword(ioBase + reg);
}
Modified: trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineRing.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineRing.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineRing.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -27,13 +27,14 @@
*/
abstract class ViaRhineRing<T extends ViaRhineDesc> {
final int RING_SIZE;
- ViaRhineDesc[] ring;
+ T[] ring;
int ringAddr;
int current;
+ @SuppressWarnings("unchecked")
ViaRhineRing(ResourceManager rm, int size) {
this.RING_SIZE = size;
- ring = new ViaRhineDesc[RING_SIZE];
+ ring = (T[]) new ViaRhineDesc[RING_SIZE];
for (int i = 0; i < RING_SIZE; i++) {
ring[i] = createDescr(rm);
if (i == 0)
@@ -46,7 +47,7 @@
ring[RING_SIZE - 1].setNextDescAddr(ringAddr);
}
- abstract ViaRhineDesc createDescr(ResourceManager rm);
+ abstract T createDescr(ResourceManager rm);
T currentDesc() {
return (T) ring[current];
Modified: trunk/net/src/net/org/jnode/net/InvalidLayerException.java
===================================================================
--- trunk/net/src/net/org/jnode/net/InvalidLayerException.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/net/org/jnode/net/InvalidLayerException.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -27,6 +27,8 @@
*/
public class InvalidLayerException extends SocketException {
+ private static final long serialVersionUID = 1L;
+
/**
*
*/
Modified: trunk/net/src/net/org/jnode/net/LayerAlreadyRegisteredException.java
===================================================================
--- trunk/net/src/net/org/jnode/net/LayerAlreadyRegisteredException.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/net/org/jnode/net/LayerAlreadyRegisteredException.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -27,6 +27,8 @@
*/
public class LayerAlreadyRegisteredException extends SocketException {
+ private static final long serialVersionUID = 1L;
+
/**
*
*/
Modified: trunk/net/src/net/org/jnode/net/NetPermission.java
===================================================================
--- trunk/net/src/net/org/jnode/net/NetPermission.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/net/org/jnode/net/NetPermission.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -28,6 +28,8 @@
*/
public class NetPermission extends BasicPermission {
+ private static final long serialVersionUID = 1L;
+
/**
* @param name
*/
Modified: trunk/net/src/net/org/jnode/net/NoSuchProtocolException.java
===================================================================
--- trunk/net/src/net/org/jnode/net/NoSuchProtocolException.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/net/org/jnode/net/NoSuchProtocolException.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -27,6 +27,8 @@
*/
public class NoSuchProtocolException extends SocketException {
+ private static final long serialVersionUID = 1L;
+
/**
*
*/
Modified: trunk/net/src/net/org/jnode/net/ipv4/tftp/TFTPClient.java
===================================================================
--- trunk/net/src/net/org/jnode/net/ipv4/tftp/TFTPClient.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/net/org/jnode/net/ipv4/tftp/TFTPClient.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -59,7 +59,6 @@
this.out = out;
}
- @SuppressWarnings("deprecation")
public void run(Reader in) throws IOException {
// FIXME ... figure out to how to use JNode command argument parsing
// (and completion) for our little TFTP interactive command syntax.
Modified: trunk/net/src/net/org/jnode/net/ipv4/udp/PlainUDPDatagramSocketImpl.java
===================================================================
--- trunk/net/src/net/org/jnode/net/ipv4/udp/PlainUDPDatagramSocketImpl.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/net/org/jnode/net/ipv4/udp/PlainUDPDatagramSocketImpl.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -135,7 +135,7 @@
return udp.getTimeToLive0();
}
- private final Object SEND_LOCK = new Object();
+ // private final Object SEND_LOCK = new Object();
@Override
protected void send(DatagramPacket packet) throws IOException {
Modified: trunk/net/src/net/org/jnode/net/ipv4/udp/UDPDatagramSocketImpl.java
===================================================================
--- trunk/net/src/net/org/jnode/net/ipv4/udp/UDPDatagramSocketImpl.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/net/org/jnode/net/ipv4/udp/UDPDatagramSocketImpl.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -69,7 +69,6 @@
/**
* @see java.net.DatagramSocketImpl#getTTL()
*/
- @SuppressWarnings("deprecation")
protected byte getTTL() throws IOException {
// TODO Auto-generated method stub
return 0;
@@ -115,7 +114,6 @@
/**
* @see java.net.DatagramSocketImpl#setTTL(byte)
*/
- @SuppressWarnings("deprecation")
protected void setTTL(byte ttl) throws IOException {
// TODO Auto-generated method stub
Modified: trunk/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2OutputStream.java
===================================================================
--- trunk/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2OutputStream.java 2009-05-23 10:18:01 UTC (rev 5507)
+++ trunk/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2OutputStream.java 2009-05-23 12:37:28 UTC (rev 5508)
@@ -48,6 +48,7 @@
private NFS2Client nfsClient;
private String mountDirectory;
private byte[] fileHandle;
+ @SuppressWarnings("unused")
private FileAttribute fileAttribute;
private long fileOffset;
private byte[] buffer;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
