Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove stray white spaces.

Browse Source
This commit is contained in:
Ralf Corsepius
2004-04-15 13:53:12 +00:00
parent 9532e55573
commit 1f788a3e28
6 changed files with 93 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
c/src/lib/libbsp/i960/rxgen960/include/rxgen960_config.h
View File

@@ -1,32 +1,32 @@
/* /*
* PMC901 specific configuration values * PMC901 specific configuration values
* *
* $Id$ * $Id$
*/ */
#ifndef __PMC901_CONFIG__ #ifndef __PMC901_CONFIG__
#define __PMC901_CONFIG__ #define __PMC901_CONFIG__
/* The following define the PMC960 bus regions */ /* The following define the PMC960 bus regions */
/* Bus configuration */ /* Bus configuration */
#define RP_CONFIG_REGS I960RP_BUS_WIDTH(32) #define RP_CONFIG_REGS I960RP_BUS_WIDTH(32)
#define FLASH I960RP_BUS_WIDTH(8) #define FLASH I960RP_BUS_WIDTH(8)
#define DRAM I960RP_BUS_WIDTH(32) #define DRAM I960RP_BUS_WIDTH(32)
#define UART_LED I960RP_BUS_WIDTH(8) #define UART_LED I960RP_BUS_WIDTH(8)
#define DEFAULT I960RP_BUS_WIDTH(32) #define DEFAULT I960RP_BUS_WIDTH(32)
/* Region Configuration */ /* Region Configuration */
#define REGION_0_CONFIG RP_CONFIG_REGS #define REGION_0_CONFIG RP_CONFIG_REGS
#define REGION_2_CONFIG DEFAULT #define REGION_2_CONFIG DEFAULT
#define REGION_4_CONFIG DEFAULT #define REGION_4_CONFIG DEFAULT
#define REGION_6_CONFIG DEFAULT #define REGION_6_CONFIG DEFAULT
#define REGION_8_CONFIG DEFAULT #define REGION_8_CONFIG DEFAULT
#define REGION_A_CONFIG DRAM #define REGION_A_CONFIG DRAM
#define REGION_C_CONFIG UART_LED #define REGION_C_CONFIG UART_LED
#define REGION_E_CONFIG DEFAULT #define REGION_E_CONFIG DEFAULT
/* #define REGION_BOOT_CONFIG (FLASH | I960RP_ZBYTE_ORDER)*/ /* #define REGION_BOOT_CONFIG (FLASH | I960RP_ZBYTE_ORDER)*/
#define REGION_BOOT_CONFIG (DRAM) #define REGION_BOOT_CONFIG (DRAM)
/* #define DRAM_BASE 0xfed00000 */ /* #define DRAM_BASE 0xfed00000 */
#define DRAM_BASE 0xa0000000 #define DRAM_BASE 0xa0000000
#endif #endif

12
c/src/lib/libbsp/m68k/gen68302/network/network.c
View File

@@ -306,7 +306,7 @@ m302Enet_retire_tx_bd (struct scc_softc *sc)
BUF_STAT_UNDERRUN)) { BUF_STAT_UNDERRUN)) {
int j; int j;
if (status & BUF_STAT_LATE_COLLISION) if (status & BUF_STAT_LATE_COLLISION)
sc->txLateCollision++; sc->txLateCollision++;
if (status & BUF_STAT_RETRY_LIMIT) if (status & BUF_STAT_RETRY_LIMIT)
@@ -582,7 +582,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m)
if (nm == NULL) { if (nm == NULL) {
sc->txCoalesceFailed++; sc->txCoalesceFailed++;
m_freem (m); m_freem (m);
return; return;
} }
MCLGET (nm, M_DONTWAIT); MCLGET (nm, M_DONTWAIT);
@@ -590,7 +590,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m)
sc->txCoalesceFailed++; sc->txCoalesceFailed++;
m_freem (m); m_freem (m);
m_free (nm); m_free (nm);
return; return;
} }
nm->m_pkthdr = m->m_pkthdr; nm->m_pkthdr = m->m_pkthdr;
@@ -655,7 +655,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m)
rtems_interrupt_disable (level); rtems_interrupt_disable (level);
M68en302imp_intr_mask |= INTR_MASK_BIT_TFIEN | INTR_MASK_BIT_TXIEN; M68en302imp_intr_mask |= INTR_MASK_BIT_TFIEN | INTR_MASK_BIT_TXIEN;
rtems_interrupt_enable (level); rtems_interrupt_enable (level);
rtems_bsdnet_event_receive (INTERRUPT_EVENT, rtems_bsdnet_event_receive (INTERRUPT_EVENT,
RTEMS_WAIT|RTEMS_EVENT_ANY, RTEMS_WAIT|RTEMS_EVENT_ANY,
RTEMS_NO_TIMEOUT, RTEMS_NO_TIMEOUT,
@@ -760,7 +760,7 @@ scc_start (struct ifnet *ifp)
rtems_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); rtems_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT);
ifp->if_flags |= IFF_OACTIVE; ifp->if_flags |= IFF_OACTIVE;
} }
/* /*
* Initialize and start the device * Initialize and start the device
*/ */
@@ -777,7 +777,7 @@ scc_init (void *arg)
*/ */
m302Enet_initialize_hardware (sc); m302Enet_initialize_hardware (sc);
sc->txDaemonTid = rtems_bsdnet_newproc ("SCtx", 4096, scc_txDaemon, sc); sc->txDaemonTid = rtems_bsdnet_newproc ("SCtx", 4096, scc_txDaemon, sc);
sc->rxDaemonTid = rtems_bsdnet_newproc ("SCrx", 4096, scc_rxDaemon, sc); sc->rxDaemonTid = rtems_bsdnet_newproc ("SCrx", 4096, scc_rxDaemon, sc);

90
c/src/lib/libbsp/powerpc/ppcn_60x/nvram/stk11c68.h
View File

@@ -1,46 +1,46 @@
/* /*
* COPYRIGHT (c) 1998 by Radstone Technology * COPYRIGHT (c) 1998 by Radstone Technology
* *
* *
* THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY * 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 * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTY OF FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK * 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. * 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 * You are hereby granted permission to use, copy, modify, and distribute
* this file, provided that this notice, plus the above copyright notice * this file, provided that this notice, plus the above copyright notice
* and disclaimer, appears in all copies. Radstone Technology will provide * and disclaimer, appears in all copies. Radstone Technology will provide
* no support for this code. * no support for this code.
* *
*/ */
/* /*
* Definitions for the stk11C68 NvRAM * Definitions for the stk11C68 NvRAM
*/ */
#ifndef _STK11C68_H #ifndef _STK11C68_H
#define _STK11C68_H #define _STK11C68_H
#include "prepnvr.h" #include "prepnvr.h"
/* /*
* STK11C68 definitions * STK11C68 definitions
*/ */
#define STK11C68_NVSIZE 8192 #define STK11C68_NVSIZE 8192
#define STK11C68_GESIZE (STK11C68_NVSIZE-CONFSIZE-OSAREASIZE-sizeof(HEADER)) #define STK11C68_GESIZE (STK11C68_NVSIZE-CONFSIZE-OSAREASIZE-sizeof(HEADER))
#define STK11C68_BASE (PSTK11C68_NVRAM_MAP)((uint8_t*)PCI_MEM_BASE+0x00800000) #define STK11C68_BASE (PSTK11C68_NVRAM_MAP)((uint8_t*)PCI_MEM_BASE+0x00800000)
/* /*
* STK11C88 definitions * STK11C88 definitions
*/ */
#define STK11C88_NVSIZE 0x8000-sizeof(MK48T18_CMOS_MAP) #define STK11C88_NVSIZE 0x8000-sizeof(MK48T18_CMOS_MAP)
/* Here is the whole map of the STK11C68 NVRAM */ /* Here is the whole map of the STK11C68 NVRAM */
typedef struct _STK11C68_NVRAM_MAP { typedef struct _STK11C68_NVRAM_MAP {
HEADER Header; HEADER Header;
uint8_t GEArea[STK11C68_GESIZE]; uint8_t GEArea[STK11C68_GESIZE];
uint8_t OSArea[OSAREASIZE]; uint8_t OSArea[OSAREASIZE];
uint8_t ConfigArea[CONFSIZE]; uint8_t ConfigArea[CONFSIZE];
} STK11C68_NVRAM_MAP, *PSTK11C68_NVRAM_MAP; } STK11C68_NVRAM_MAP, *PSTK11C68_NVRAM_MAP;
#endif /* _STK11C68_H */ #endif /* _STK11C68_H */

3
c/src/librdbg/src/i386/any/remdeb_f.x
View File

@@ -54,6 +54,3 @@ struct xdr_regs
%#define TARGET_PROC_TYPE 0 %#define TARGET_PROC_TYPE 0
#endif #endif

1
c/src/librdbg/src/powerpc/new_exception_processing/remdeb_f.x
View File

@@ -73,4 +73,3 @@ struct xdr_regs
%#define TARGET_PROC_TYPE 3 %#define TARGET_PROC_TYPE 3
#endif #endif

20
cpukit/libnetworking/net/if_ppp.c
View File

@@ -306,7 +306,7 @@ static rtems_task ppp_txdaemon(rtems_task_argument arg)
sc->sc_outlen = (short )0; sc->sc_outlen = (short )0;
sc->sc_outoff = (short )0; sc->sc_outoff = (short )0;
sc->sc_outfcslen = (short )0; sc->sc_outfcslen = (short )0;
/* printf("Start Transmit Packet..\n"); */ /* printf("Start Transmit Packet..\n"); */
/* loop over all mbufs in chain */ /* loop over all mbufs in chain */
@@ -325,17 +325,17 @@ static rtems_task ppp_txdaemon(rtems_task_argument arg)
if(m->m_len){ if(m->m_len){
sc->sc_outfcs = pppfcs(sc->sc_outfcs, mtod(m, u_char *), 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(( m->m_next != NULL ) && ( m->m_next->m_len == 0 )) {
if(mf){ if(mf){
printf(" if_ppp.c : MBUF Error !!!!\n"); printf(" if_ppp.c : MBUF Error !!!!\n");
} }
else{ else{
mf = m->m_next; mf = m->m_next;
m->m_next = NULL; m->m_next = NULL;
} }
} }
#ifdef LALL_X #ifdef LALL_X
/* check next packet to see if it is empty */ /* check next packet to see if it is empty */
while (( m->m_next != NULL ) && ( m->m_next->m_len == 0 )) { 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(); rtems_bsdnet_semaphore_obtain();
m_freem(mf); m_freem(mf);
rtems_bsdnet_semaphore_release(); rtems_bsdnet_semaphore_release();
} }
} }
} }
} }