Remove duplicate white lines.

2 files changed, 0 insertions, 57 deletions

diff --git a/c/src/lib/libbsp/i386/i386ex/network/network.c b/c/src/lib/libbsp/i386/i386ex/network/network.c
index f15873928d..00c4af76d4 100644
--- a/c/src/lib/libbsp/i386/i386ex/network/network.c
+++ b/c/src/lib/libbsp/i386/i386ex/network/network.c
@@ -14,7 +14,6 @@ void printk_time(void);
 
 #define KERNEL
 
-
 /*
 
   EII: Oct 16 : Version 0.0
@@ -62,12 +61,10 @@ int count_rx = 0;
 #include <rtems/asm.h>
 #include <string.h>
 
-
 /* #include "../misc/utils.h" */
 
 static struct uti596_softc uti596_softc;
 
-
 static    int scbStatus;
 static    struct i596_cmd *pIsrCmd;
 static    struct i596_rfd *pIsrRfd;
@@ -103,7 +100,6 @@ char uti596initSetup[] = {
 
 #define RBUF_SIZE	1520
 
-
 /*
  * Local Routines
  */
@@ -177,8 +173,6 @@ uti596_request_reset(void){
      rtems_panic ("Can't notify resetDaemon: %s\n", rtems_status_text (sc));
 }
 
-
-
 static void uti596_maskOn(const rtems_irq_connect_data* irq)
 {
   /*
@@ -202,7 +196,6 @@ static int uti596_isOn(const rtems_irq_connect_data* irq)
   return BSP_irq_enabled_at_i8259s (irq->name);
 }
 
-
 /***********************************************************************
  *  Function:   uti596initRFA(int num) ( New )
  *
@@ -214,13 +207,11 @@ static int uti596_isOn(const rtems_irq_connect_data* irq)
  *
  ***********************************************************************/
 
-
 int uti596_initRFA(int num)
 {
     struct i596_rfd *pRfd;
     int i = 0;
 
-
 #ifdef DBG_596
     printf ("%s: uti596_initRFA %d.\n", num);
 #endif
@@ -285,7 +276,6 @@ int uti596_initRFA(int num)
     printf ( "Head of RFA is buffer @ %p \n", uti596_softc.pBeginRFA );
 #endif
 
-
     uti596_softc.pSavedRfdQueue =
       uti596_softc.pEndSavedQueue = I596_NULL;   /* initially empty */
 
@@ -309,7 +299,6 @@ void uti596supplyFD(struct i596_rfd * pRfd )
 {
  struct i596_rfd *pLastRfd;
 
-
  UTI_596_ASSERT(pRfd != I596_NULL, "Supplying NULL RFD!\n");
  pRfd -> cmd  = CMD_EOL;
  pRfd -> pRbd = I596_NULL;
@@ -406,7 +395,6 @@ void uti596supplyFD(struct i596_rfd * pRfd )
    uti596_softc.pEndSavedQueue = pRfd;                /* reset end of saved queue */
    uti596_softc.savedCount++;
 
-
    return;
  }
 }
@@ -520,7 +508,6 @@ uti596_reset_hardware(struct uti596_softc *sc)
   rtems_status_code status_code;
   struct i596_cmd *pCmd;
 
-
   printf("uti596_reset_hardware\n");
   pCmd = sc->pCmdHead;  /* This is a tx command for sure (99.99999%)  */
 
@@ -543,7 +530,6 @@ uti596_reset_hardware(struct uti596_softc *sc)
   printf("reset_hardware:change scp address to : %p\n",sc->pScp);
 #endif
 
-
   /* change the scp address */
 #ifdef DBG_RESET
   printf("Change the SCP address\n");
@@ -625,7 +611,6 @@ uti596_reset_hardware(struct uti596_softc *sc)
  *
  ***********************************************************************/
 
-
  void
 uti596_initMem(struct uti596_softc * sc)
 {
@@ -736,7 +721,6 @@ uti596_initMem(struct uti596_softc * sc)
 
 }
 
-
 
 /***********************************************************************
  *  Function:   uti596dump
@@ -751,7 +735,6 @@ uti596dump(char * pDumpArea)
   struct i596_dump dumpCmd;
   int boguscnt = 25000000; /* over a second! */
 
-
 #ifdef DBG_596
 printf("uti596dump:\n");
 #endif
@@ -771,7 +754,6 @@ printf("uti596dump:\n");
 	return 1; /* successful completion */
     }
 
-
 }
 
 /***********************************************************************
@@ -852,7 +834,6 @@ uti596_rxDaemon(void *arg)
 #endif
 	    frames++;
 
-
             /*
 	     * Allocate an mbuf to give to the stack
              * The format of the data portion of the RFD is:
@@ -1044,7 +1025,6 @@ void uti596reset(void)
 
 #endif
 
-
   /* restore the RFA */
 
   /*dumpQ();*/
@@ -1149,8 +1129,6 @@ void uti596reset(void)
 
 #endif
 
-
-
      pCmd->status = 0;
      pCmd->command |= (CMD_EOL | CMD_INTR ); /* all commands last in list & return an interrupt */
 
@@ -1181,7 +1159,6 @@ void uti596reset(void)
      _ISR_Enable(level);
        }
 
-
 #ifdef DBG_596
 	 printf("Scb status & command 0x%x 0x%x\n",
 		uti596_softc.scb.status,
@@ -1398,14 +1375,12 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
     }
   } while( m != NULL && ++bd_count < 16 );
 
-
   /* This should never happen */
   if ( bd_count == 16 ) {
     printf("TX ERROR:Too many mbufs in the packet!!!\n");
     printf("Must coalesce!\n");
   }
 
-
   if ( length < UTI_596_ETH_MIN_SIZE ) {
     pTbd->data = sc->zeroes;       /* add padding to pTbd */
     pTbd->size = UTI_596_ETH_MIN_SIZE - length; /* zeroes have no effect on the CRC */
@@ -1431,7 +1406,6 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
   /* Sending Zero length packet: shouldn't happen */
   if (pTbd->size <= 0) return ;
 
-
 #ifdef DEBUG_INIT_2
   printf("\nTransmitter adds packet\n");
   print_hdr    ( sc->pTxCmd->pTbd->data ); /* print the first part */
@@ -1442,7 +1416,6 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
 	  BREAKPOINT();
 #endif
 
-
   /* add the command to the output command queue */
   uti596addCmd ( (struct i596_cmd *) sc->pTxCmd );
 
@@ -1502,7 +1475,6 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
     m = n;
   }
 
-
 }
 
  /***********************************************************************
@@ -1608,7 +1580,6 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
 	 */
 	}
 
-
  }
 #ifdef DEBUG_INIT
 
@@ -1647,7 +1618,6 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
 
      printf ("frame type %2.2X%2.2X\n", add[12], add[13]);
 
-
  }
  /***********************************************************************
   *  Function:   print_pkt
@@ -1735,7 +1705,6 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
 	 printf("ICMP sequence nbr: %2.2x %2.2x\n", add[40], add[41]);
 	}
 
-
  }
  /***********************************************************************
   *  Function:   print_echo
@@ -1827,7 +1796,6 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
   *
   ***********************************************************************/
 
-
 int uti596_attach(struct rtems_bsdnet_ifconfig * pConfig )
 {
   struct uti596_softc *sc = &uti596_softc;          /* soft config */
@@ -1838,7 +1806,6 @@ int uti596_attach(struct rtems_bsdnet_ifconfig * pConfig )
   printf("attach");
 #endif
 
-
   sc->started = 0; /* The NIC is not started yet */
   sc->ioAddr = IO_ADDR;
 
@@ -1895,7 +1862,6 @@ int uti596_attach(struct rtems_bsdnet_ifconfig * pConfig )
   sc->started = 1;
   sc->pInboundFrameQueue = I596_NULL;
 
-
   ifp->if_ioctl = uti596_ioctl;
   ifp->if_init  = uti596_init;
   ifp->if_start    = uti596_start;
@@ -2221,7 +2187,6 @@ int uti596_attach(struct rtems_bsdnet_ifconfig * pConfig )
    }
  }  /* end if command complete */
 
-
  /* if the receiver has stopped,
   * check if this is a No Resources scenario,
   * Try to add more RFD's ( no RBDs are used )
@@ -2320,7 +2285,6 @@ int uti596_attach(struct rtems_bsdnet_ifconfig * pConfig )
        uti596_softc.savedCount = 0;
      }
 
-
 #ifdef DBG_596_RFD
      printk("The list starts here %p\n",uti596_softc.pBeginRFA );
 #endif
@@ -2363,7 +2327,6 @@ int uti596_attach(struct rtems_bsdnet_ifconfig * pConfig )
 	 printk("Frame @ %x, status: %x, cmd: %x\n",
 		pISR_Rfd, pISR_Rfd->stat, pISR_Rfd->cmd);
 
-
        printk("\nSaved: \n");
        for ( pISR_Rfd = uti596_softc.pSavedRfdQueue;
 	     pISR_Rfd != I596_NULL;
@@ -2396,7 +2359,6 @@ int uti596_attach(struct rtems_bsdnet_ifconfig * pConfig )
  return;
  }
 
-
 /***********************************************************************
  *  Function:   void uti596dequeue
  *
@@ -2424,7 +2386,6 @@ struct i596_rfd * uti596dequeue( struct i596_rfd ** ppQ )
      *ppQ = pRfd->next;      /* advance the queue pointer     */
      pRfd->next = I596_NULL; /* unlink the rfd being returned */
 
-
    _ISR_Enable(level);
    return pRfd;
 }
@@ -2485,7 +2446,6 @@ void uti596append( struct i596_rfd ** ppQ , struct i596_rfd * pRfd )
  *
  ***********************************************************************/
 
-
 /* static */
 void uti596_stop(struct uti596_softc *sc)
 {
@@ -2502,7 +2462,6 @@ void uti596_stop(struct uti596_softc *sc)
 
 }
 
-
 static int
 uti596_ioctl (struct ifnet *ifp, int command, caddr_t data)
 {
@@ -2570,7 +2529,6 @@ uti596_ioctl (struct ifnet *ifp, int command, caddr_t data)
  *
  ***********************************************************************/
 
-
 void
 uti596_stats(struct uti596_softc *sc)
       {
@@ -2669,7 +2627,6 @@ void show_buffers (void)
 	printf("Frame @ %p, status: %2.2x, cmd: %2.2x\n",
 	       pRfd, pRfd->stat, pRfd->cmd);
 
-
       printf("\nSaved: \n");
       for ( pRfd = uti596_softc.pSavedRfdQueue;
 	    pRfd != I596_NULL;
@@ -2683,7 +2640,6 @@ void show_queues(void)
 {
     struct i596_rfd *pRfd;
 
-
       printf("CMD: 0x%x, Status: 0x%x\n",
 	     uti596_softc.scb.command,
 	     uti596_softc.scb.status);
@@ -2707,13 +2663,11 @@ void show_queues(void)
       printf("uti596_softc.pEndRFA: %p\n",uti596_softc.pEndRFA);
 }
 
-
 void uti596_init(void * arg){
 
   struct uti596_softc  *sc = arg;
   struct ifnet *ifp = &sc->arpcom.ac_if;
 
-
   if (sc->txDaemonTid == 0) {
 
     uti596_initialize_hardware(sc);
@@ -2727,7 +2681,6 @@ void uti596_init(void * arg){
     sc->resetDaemonTid = rtems_bsdnet_newproc ("UTrt", 2*4096,
 					       uti596_resetDaemon, sc);
 
-
 #ifdef DBG_INIT
     printf("After attach, status of board = 0x%x\n", sc->scb.status );
 #endif
diff --git a/c/src/lib/libbsp/i386/i386ex/network/uti596.h b/c/src/lib/libbsp/i386/i386ex/network/uti596.h
index 8dc43cf86e..1238d2ea41 100644
--- a/c/src/lib/libbsp/i386/i386ex/network/uti596.h
+++ b/c/src/lib/libbsp/i386/i386ex/network/uti596.h
@@ -55,8 +55,6 @@ struct enet_statistics{
   int   nic_reset_count;      /* The number of times uti596reset() has been called. */
 };
 
-
-
 enum commands {
   CmdNOp           = 0,
   CmdSASetup       = 1,
@@ -68,10 +66,8 @@ enum commands {
   CmdDiagnose      = 7
 };
 
-
 #define UTI596_MUTEX   1
 
-
 #define CMD_EOL		0x8000	/* The last command of the list, stop. */
 #define CMD_SUSP	0x4000	/* Suspend after doing cmd. */
 #define CMD_INTR	0x2000	/* Interrupt after doing cmd. */
@@ -86,7 +82,6 @@ enum commands {
 #define SCB_CUS_SUSPENDED 0x0100
 #define SCB_CUS_ACTIVE    0x0200
 
-
 #define STAT_C		0x8000	/* Set to 1 after execution              */
 #define STAT_B		0x4000	/* 1 : Cmd being executed, 0 : Cmd done. */
 #define STAT_OK		0x2000	/* 1: Command executed ok 0 : Error      */
@@ -101,7 +96,6 @@ enum commands {
 #define STAT_S5         0x0020
 #define STAT_MAX_COLLS  0x000F
 
-
 #define RBD_STAT_P      0x4000  /* prefetch */
 #define RBD_STAT_F      0x4000  /* used */
 
@@ -118,7 +112,6 @@ enum commands {
 #define  RU_NO_RESOURCES 0x0020
 #define  RU_READY        0x0040
 
-
 #define IO_ADDR         0x360
 #define PORT_ADDR       IO_ADDR
 #define CHAN_ATTN       PORT_ADDR + 4
@@ -168,7 +161,6 @@ struct tx_cmd {
     unsigned short pad;
 } ;
 
-
 /*
  * Receive Frame Descriptor
  */
@@ -182,7 +174,6 @@ struct i596_rfd {
     char data [1532 ];
 } ;
 
-
 struct i596_dump {
   struct i596_cmd cmd;
   char * pData;
@@ -227,7 +218,6 @@ struct i596_scb {
     volatile unsigned short t_off;
 };
 
-
 /*
  * Intermediate System Control Block
  */