summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-04-15 13:53:12 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-04-15 13:53:12 +0000
commit1f788a3e28a0a362c67367bce9bdc1d875974296 (patch)
treed1f175247577c1b1c05316b8dd723fdfcb1957a7
parentRemove stray white spaces. (diff)
downloadrtems-1f788a3e28a0a362c67367bce9bdc1d875974296.tar.bz2
Remove stray white spaces.
Diffstat (limited to '')
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/include/rxgen960_config.h64
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/network/network.c12
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/nvram/stk11c68.h90
-rw-r--r--c/src/librdbg/src/i386/any/remdeb_f.x3
-rw-r--r--c/src/librdbg/src/powerpc/new_exception_processing/remdeb_f.x1
-rw-r--r--cpukit/libnetworking/net/if_ppp.c20
6 files changed, 93 insertions, 97 deletions
diff --git a/c/src/lib/libbsp/i960/rxgen960/include/rxgen960_config.h b/c/src/lib/libbsp/i960/rxgen960/include/rxgen960_config.h
index e637fa7bf0..e0969dfd89 100644
--- a/c/src/lib/libbsp/i960/rxgen960/include/rxgen960_config.h
+++ b/c/src/lib/libbsp/i960/rxgen960/include/rxgen960_config.h
@@ -1,32 +1,32 @@
-/*
- * PMC901 specific configuration values
- *
- * $Id$
- */
-
-#ifndef __PMC901_CONFIG__
-#define __PMC901_CONFIG__
-/* The following define the PMC960 bus regions */
-/* Bus configuration */
-#define RP_CONFIG_REGS I960RP_BUS_WIDTH(32)
-#define FLASH I960RP_BUS_WIDTH(8)
-#define DRAM I960RP_BUS_WIDTH(32)
-#define UART_LED I960RP_BUS_WIDTH(8)
-#define DEFAULT I960RP_BUS_WIDTH(32)
-
-/* Region Configuration */
-#define REGION_0_CONFIG RP_CONFIG_REGS
-#define REGION_2_CONFIG DEFAULT
-#define REGION_4_CONFIG DEFAULT
-#define REGION_6_CONFIG DEFAULT
-#define REGION_8_CONFIG DEFAULT
-#define REGION_A_CONFIG DRAM
-#define REGION_C_CONFIG UART_LED
-#define REGION_E_CONFIG DEFAULT
-/* #define REGION_BOOT_CONFIG (FLASH | I960RP_ZBYTE_ORDER)*/
-#define REGION_BOOT_CONFIG (DRAM)
-
-/* #define DRAM_BASE 0xfed00000 */
-#define DRAM_BASE 0xa0000000
-
-#endif
+/*
+ * PMC901 specific configuration values
+ *
+ * $Id$
+ */
+
+#ifndef __PMC901_CONFIG__
+#define __PMC901_CONFIG__
+/* The following define the PMC960 bus regions */
+/* Bus configuration */
+#define RP_CONFIG_REGS I960RP_BUS_WIDTH(32)
+#define FLASH I960RP_BUS_WIDTH(8)
+#define DRAM I960RP_BUS_WIDTH(32)
+#define UART_LED I960RP_BUS_WIDTH(8)
+#define DEFAULT I960RP_BUS_WIDTH(32)
+
+/* Region Configuration */
+#define REGION_0_CONFIG RP_CONFIG_REGS
+#define REGION_2_CONFIG DEFAULT
+#define REGION_4_CONFIG DEFAULT
+#define REGION_6_CONFIG DEFAULT
+#define REGION_8_CONFIG DEFAULT
+#define REGION_A_CONFIG DRAM
+#define REGION_C_CONFIG UART_LED
+#define REGION_E_CONFIG DEFAULT
+/* #define REGION_BOOT_CONFIG (FLASH | I960RP_ZBYTE_ORDER)*/
+#define REGION_BOOT_CONFIG (DRAM)
+
+/* #define DRAM_BASE 0xfed00000 */
+#define DRAM_BASE 0xa0000000
+
+#endif
diff --git a/c/src/lib/libbsp/m68k/gen68302/network/network.c b/c/src/lib/libbsp/m68k/gen68302/network/network.c
index a08e5efc2a..7252f2f15d 100644
--- a/c/src/lib/libbsp/m68k/gen68302/network/network.c
+++ b/c/src/lib/libbsp/m68k/gen68302/network/network.c
@@ -306,7 +306,7 @@ m302Enet_retire_tx_bd (struct scc_softc *sc)
BUF_STAT_UNDERRUN)) {
int j;
-
+
if (status & BUF_STAT_LATE_COLLISION)
sc->txLateCollision++;
if (status & BUF_STAT_RETRY_LIMIT)
@@ -582,7 +582,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m)
if (nm == NULL) {
sc->txCoalesceFailed++;
m_freem (m);
-
+
return;
}
MCLGET (nm, M_DONTWAIT);
@@ -590,7 +590,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m)
sc->txCoalesceFailed++;
m_freem (m);
m_free (nm);
-
+
return;
}
nm->m_pkthdr = m->m_pkthdr;
@@ -655,7 +655,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m)
rtems_interrupt_disable (level);
M68en302imp_intr_mask |= INTR_MASK_BIT_TFIEN | INTR_MASK_BIT_TXIEN;
rtems_interrupt_enable (level);
-
+
rtems_bsdnet_event_receive (INTERRUPT_EVENT,
RTEMS_WAIT|RTEMS_EVENT_ANY,
RTEMS_NO_TIMEOUT,
@@ -760,7 +760,7 @@ scc_start (struct ifnet *ifp)
rtems_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT);
ifp->if_flags |= IFF_OACTIVE;
}
-
+
/*
* Initialize and start the device
*/
@@ -777,7 +777,7 @@ scc_init (void *arg)
*/
m302Enet_initialize_hardware (sc);
-
+
sc->txDaemonTid = rtems_bsdnet_newproc ("SCtx", 4096, scc_txDaemon, sc);
sc->rxDaemonTid = rtems_bsdnet_newproc ("SCrx", 4096, scc_rxDaemon, sc);
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/stk11c68.h b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/stk11c68.h
index 182617f3bc..3225863a5f 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/stk11c68.h
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/stk11c68.h
@@ -1,46 +1,46 @@
-/*
- * COPYRIGHT (c) 1998 by Radstone Technology
- *
- *
- * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
- * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
- * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
- *
- * You are hereby granted permission to use, copy, modify, and distribute
- * this file, provided that this notice, plus the above copyright notice
- * and disclaimer, appears in all copies. Radstone Technology will provide
- * no support for this code.
- *
- */
-
-/*
- * Definitions for the stk11C68 NvRAM
- */
-
-#ifndef _STK11C68_H
-#define _STK11C68_H
-
-#include "prepnvr.h"
-
-/*
- * STK11C68 definitions
- */
-#define STK11C68_NVSIZE 8192
-#define STK11C68_GESIZE (STK11C68_NVSIZE-CONFSIZE-OSAREASIZE-sizeof(HEADER))
-#define STK11C68_BASE (PSTK11C68_NVRAM_MAP)((uint8_t*)PCI_MEM_BASE+0x00800000)
-
-/*
- * STK11C88 definitions
- */
-#define STK11C88_NVSIZE 0x8000-sizeof(MK48T18_CMOS_MAP)
-
-/* Here is the whole map of the STK11C68 NVRAM */
-typedef struct _STK11C68_NVRAM_MAP {
- HEADER Header;
- uint8_t GEArea[STK11C68_GESIZE];
- uint8_t OSArea[OSAREASIZE];
- uint8_t ConfigArea[CONFSIZE];
-} STK11C68_NVRAM_MAP, *PSTK11C68_NVRAM_MAP;
-
+/*
+ * COPYRIGHT (c) 1998 by Radstone Technology
+ *
+ *
+ * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY
+ * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK
+ * AS TO THE QUALITY AND PERFORMANCE OF ALL CODE IN THIS FILE IS WITH YOU.
+ *
+ * You are hereby granted permission to use, copy, modify, and distribute
+ * this file, provided that this notice, plus the above copyright notice
+ * and disclaimer, appears in all copies. Radstone Technology will provide
+ * no support for this code.
+ *
+ */
+
+/*
+ * Definitions for the stk11C68 NvRAM
+ */
+
+#ifndef _STK11C68_H
+#define _STK11C68_H
+
+#include "prepnvr.h"
+
+/*
+ * STK11C68 definitions
+ */
+#define STK11C68_NVSIZE 8192
+#define STK11C68_GESIZE (STK11C68_NVSIZE-CONFSIZE-OSAREASIZE-sizeof(HEADER))
+#define STK11C68_BASE (PSTK11C68_NVRAM_MAP)((uint8_t*)PCI_MEM_BASE+0x00800000)
+
+/*
+ * STK11C88 definitions
+ */
+#define STK11C88_NVSIZE 0x8000-sizeof(MK48T18_CMOS_MAP)
+
+/* Here is the whole map of the STK11C68 NVRAM */
+typedef struct _STK11C68_NVRAM_MAP {
+ HEADER Header;
+ uint8_t GEArea[STK11C68_GESIZE];
+ uint8_t OSArea[OSAREASIZE];
+ uint8_t ConfigArea[CONFSIZE];
+} STK11C68_NVRAM_MAP, *PSTK11C68_NVRAM_MAP;
+
#endif /* _STK11C68_H */
diff --git a/c/src/librdbg/src/i386/any/remdeb_f.x b/c/src/librdbg/src/i386/any/remdeb_f.x
index 01d899fe54..ceaaeaaaa7 100644
--- a/c/src/librdbg/src/i386/any/remdeb_f.x
+++ b/c/src/librdbg/src/i386/any/remdeb_f.x
@@ -54,6 +54,3 @@ struct xdr_regs
%#define TARGET_PROC_TYPE 0
#endif
-
-
-
diff --git a/c/src/librdbg/src/powerpc/new_exception_processing/remdeb_f.x b/c/src/librdbg/src/powerpc/new_exception_processing/remdeb_f.x
index 10cf8dd540..9655d6f90e 100644
--- a/c/src/librdbg/src/powerpc/new_exception_processing/remdeb_f.x
+++ b/c/src/librdbg/src/powerpc/new_exception_processing/remdeb_f.x
@@ -73,4 +73,3 @@ struct xdr_regs
%#define TARGET_PROC_TYPE 3
#endif
-
diff --git a/cpukit/libnetworking/net/if_ppp.c b/cpukit/libnetworking/net/if_ppp.c
index 1edf9c7521..64e5d88459 100644
--- a/cpukit/libnetworking/net/if_ppp.c
+++ b/cpukit/libnetworking/net/if_ppp.c
@@ -306,7 +306,7 @@ static rtems_task ppp_txdaemon(rtems_task_argument arg)
sc->sc_outlen = (short )0;
sc->sc_outoff = (short )0;
sc->sc_outfcslen = (short )0;
-
+
/* printf("Start Transmit Packet..\n"); */
/* loop over all mbufs in chain */
@@ -325,17 +325,17 @@ static rtems_task ppp_txdaemon(rtems_task_argument arg)
if(m->m_len){
sc->sc_outfcs = pppfcs(sc->sc_outfcs, mtod(m, u_char *), m->m_len);
}
-
- if(( m->m_next != NULL ) && ( m->m_next->m_len == 0 )) {
- if(mf){
- printf(" if_ppp.c : MBUF Error !!!!\n");
- }
- else{
+
+ if(( m->m_next != NULL ) && ( m->m_next->m_len == 0 )) {
+ if(mf){
+ printf(" if_ppp.c : MBUF Error !!!!\n");
+ }
+ else{
mf = m->m_next;
- m->m_next = NULL;
+ m->m_next = NULL;
}
}
-
+
#ifdef LALL_X
/* check next packet to see if it is empty */
while (( m->m_next != NULL ) && ( m->m_next->m_len == 0 )) {
@@ -380,7 +380,7 @@ static rtems_task ppp_txdaemon(rtems_task_argument arg)
rtems_bsdnet_semaphore_obtain();
m_freem(mf);
rtems_bsdnet_semaphore_release();
- }
+ }
}
}
}