[Jnode-svn-commits] SF.net SVN: jnode:[5895] trunk/net/src/driver/org/jnode/driver/net/eepro100

[<ga...@us...>]

Revision: 5895
          http://jnode.svn.sourceforge.net/jnode/?rev=5895&view=rev
Author:   galatnm
Date:     2012-03-28 14:33:09 +0000 (Wed, 28 Mar 2012)
Log Message:
-----------
Network code clean-up.

Modified Paths:
--------------
    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/eepro100/EEPRO100TxFD.java

Modified: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Buffer.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Buffer.java	2012-03-28 14:03:32 UTC (rev 5894)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Buffer.java	2012-03-28 14:33:09 UTC (rev 5895)
@@ -30,11 +30,6 @@
  * @author flesire
  */
 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;
 
     //---
     protected final Logger log = Logger.getLogger(getClass());
@@ -48,12 +43,6 @@
     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;
 
     // --- Tx Variables
     private int txThreshold = 0x01200000;
@@ -62,11 +51,7 @@
     public EEPRO100TxFD[] txRing = new EEPRO100TxFD[TX_RING_SIZE];
     @SuppressWarnings("unused")
     private EEPRO100TxFD lastCmd;
-//    private int lastCmdTime;
 
-    // --- Others variables
-//    private int jiffies;
-
     public EEPRO100Buffer(EEPRO100Registers regs, ResourceManager rm) {
         this.regs = regs;
         this.rm = rm;

Modified: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java	2012-03-28 14:03:32 UTC (rev 5894)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java	2012-03-28 14:33:09 UTC (rev 5895)
@@ -392,10 +392,9 @@
         regs.setReg16(SCBeeprom, EE_ENB | EE_SHIFT_CLK);
         eepromDelay(2);
         do {
-            // FIXME ... what is this craziness??
-            short dataVal =
-                    new Integer(((cmd & (1 << cmdLength)) == 0) ? EE_WRITE_0 : EE_WRITE_1)
-                            .shortValue();
+            int dataVal;
+            int test = cmd & 1 << cmdLength;
+            dataVal = (test == 0) ? EE_WRITE_0 : EE_WRITE_1;
             regs.setReg16(SCBeeprom, dataVal);
             eepromDelay(2);
             regs.setReg16(SCBeeprom, dataVal | EE_SHIFT_CLK);
@@ -413,10 +412,8 @@
      * @param delay
      */
     final void systemDelay(int delay) {
-        // SystemResource.getTimer().udelay(4);
         int i = 100;
-        while (i-- > 0)
-            ;
+        while (i-- > 0);
     }
 
     // --- MD IO METHODS
@@ -464,15 +461,14 @@
     }
  
     public void setupInterrupt() {
-        int bogusCount = 20;
-        int status;
 
         if ((buffers.getCurRx() - buffers.getDirtyRx()) > 15) {
             log.debug("curRx > dirtyRx " + buffers.getCurRx() + ' ' + buffers.getDirtyRx());
         }
 
+        int bogusCount = 20;
         do {
-            status = regs.getReg16(SCBStatus);
+            int status = regs.getReg16(SCBStatus);
             regs.setReg16(SCBStatus, status & IntrAllNormal);
             if ((status & IntrAllNormal) == 0)
                 break;
@@ -480,8 +476,7 @@
                 // buffers.rx(driver);
 
                 if ((status & (IntrCmdDone | IntrCmdIdle | IntrDrvrIntr)) != 0) {
-                    int dirtyTx0;
-                    dirtyTx0 = buffers.getDirtyTx();
+                    int dirtyTx0 = buffers.getDirtyTx();
                     while ((buffers.getCurTx() - dirtyTx0) > 0) {
                         int entry = dirtyTx0 & (TX_RING_SIZE - 1);
                         status = buffers.txRing[entry].getStatus();
@@ -520,7 +515,6 @@
                          * The ring is no longer full, clear tbusy.
                          */
                         txFull = false;
-                        // netif_resume_tx_queue(dev);
                     }
                 }
             if ((status & IntrRxSuspend) != 0) {
@@ -537,8 +531,6 @@
 
         } while (true);
         log.debug(flags.getName() + " : End handleInterrupt");
-        return;
-
     }
 
     // --- Accessors ---

Modified: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100TxFD.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100TxFD.java	2012-03-28 14:03:32 UTC (rev 5894)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100TxFD.java	2012-03-28 14:33:09 UTC (rev 5895)
@@ -64,17 +64,15 @@
         this.mem = rm.asMemoryResource(data);
 
         final Address memAddr = mem.getAddress();
-        // int addr = Address.as32bit(memAddr);
-        int offset = 0;
 
-        this.firstDPDOffset = offset;
+        this.firstDPDOffset = 0;
         this.firstDPDAddress = memAddr.add(firstDPDOffset);
     }
 
     /**
      * Initialize this ring to its default (empty) state
      */
-    public void initialize(SocketBuffer src) throws IllegalArgumentException {
+    public void initialize(SocketBuffer src) {
         // Setup the DPD
 
         // Copy the data from the buffer

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.