diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-21 10:43:04 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-21 10:43:04 +0000 |
commit | 6128a4aa5e791ed4e0a655bfd346a52d92da7883 (patch) | |
tree | af53ca3f67ce405b6fbc6c98399c8e0c87e01a9e /c/src/lib/libbsp/powerpc/mpc8260ads | |
parent | 2004-04-20 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
download | rtems-6128a4aa5e791ed4e0a655bfd346a52d92da7883.tar.bz2 |
Remove stray white spaces.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/mpc8260ads')
15 files changed, 204 insertions, 204 deletions
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/clock/p_clock.c b/c/src/lib/libbsp/powerpc/mpc8260ads/clock/p_clock.c index 7416a21231..4e92c97e5b 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/clock/p_clock.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/clock/p_clock.c @@ -28,7 +28,7 @@ static rtems_irq_connect_data clockIrqData = {BSP_PERIODIC_TIMER, (rtems_irq_enable)clockOn, (rtems_irq_disable)clockOff, (rtems_irq_is_enabled)clockIsOn}; - + int BSP_get_clock_irq_level() { /* diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c b/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c index 0f64818fbd..29243f4783 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c @@ -45,7 +45,7 @@ * Interrupt-driven I/O requires termios. * * TESTS: - * + * * TO RUN THE TESTS, USE POLLED I/O WITHOUT TERMIOS SUPPORT. Some tests * play with the interrupt masks and turn off I/O. Those tests will hang * when interrupt-driven I/O is used. Other tests, such as cdtest, do I/O @@ -55,16 +55,16 @@ * should all be fixed to work with interrupt-driven I/O and to * produce output in the expected sequence. Obviously, the termios test * requires termios support in the driver. - * + * * Set CONSOLE_MINOR to the appropriate device minor number in the * config file. This allows the RTEMS application console to be different * from the EPPBug debug console or the GDB port. - * + * * This driver handles all five available serial ports: it distinguishes * the sub-devices using minor device numbers. It is not possible to have * other protocols running on the other ports when this driver is used as * currently written. - * + * * Based on code (alloc860.c in eth_comm port) by * Jay Monkman (jmonkman@frasca.com), * Copyright (C) 1998 by Frasca International, Inc. @@ -153,7 +153,7 @@ static rtems_status_code do_poll_read( * Output characters through polled I/O. Returns only once every character has * been sent. * - * CR is transmitted AFTER a LF on output. + * CR is transmitted AFTER a LF on output. * * Input parameters: * major - ignored. Should be the major number for this driver. @@ -198,8 +198,8 @@ static rtems_status_code do_poll_write( static void _BSP_output_char( char c ) { char cr = '\r'; - - /* + + /* * Can't rely on console_initialize having been called before this function * is used, so it may fail unless output is done through EPPC-Bug. */ @@ -208,7 +208,7 @@ static void _BSP_output_char( char c ) PRINTK_WRITE( PRINTK_MINOR, &c, 1 ); if( c == '\n' ) PRINTK_WRITE( PRINTK_MINOR, &cr, 1 ); - + } @@ -231,7 +231,7 @@ rtems_device_driver console_initialize( { rtems_status_code status; rtems_device_minor_number console_minor; - + /* * Set up TERMIOS if needed */ @@ -244,12 +244,12 @@ rtems_device_driver console_initialize( #else rtems_termios_initialize (); #endif /* UARTS_USE_TERMIOS */ - + /* * Do common initialization. */ m8xx_uart_initialize(); - + /* * Do device-specific initialization */ @@ -290,7 +290,7 @@ rtems_device_driver console_initialize( status = rtems_io_register_name ("/dev/tty2", major, SCC3_MINOR); if (status != RTEMS_SUCCESSFUL) rtems_fatal_error_occurred (status); - + status = rtems_io_register_name ("/dev/tty3", major, SCC4_MINOR); if (status != RTEMS_SUCCESSFUL) rtems_fatal_error_occurred (status); @@ -309,7 +309,7 @@ rtems_device_driver console_initialize( rtems_fatal_error_occurred (status); chmod("/dev/console",0666); chown("/dev/console",2,0); - + return RTEMS_SUCCESSFUL; } @@ -351,12 +351,12 @@ rtems_device_driver console_open( 0 /* outputUsesInterrupts */ }; #endif - + #endif - + rtems_status_code sc; - - if ( minor > NUM_PORTS-1 ) + + if ( minor > NUM_PORTS-1 ) return RTEMS_INVALID_NUMBER; @@ -375,7 +375,7 @@ rtems_device_driver console_open( #endif /* UARTS_USE_TERMIOS != 1 */ return sc; - + } @@ -453,7 +453,7 @@ rtems_device_driver console_control( rtems_device_minor_number minor, void *arg ) -{ +{ if ( minor > NUM_PORTS-1 ) return RTEMS_INVALID_NUMBER; diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h b/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h index 0ee4d6de38..0ddbb8eb33 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h @@ -123,7 +123,7 @@ extern rtems_configuration_table BSP_Configuration; /* * NOTE: Use the standard Console driver entry */ - + /* * NOTE: Use the standard Clock driver entry */ diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c index 17fddf21a1..7de64a8884 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c @@ -16,7 +16,7 @@ * * $Id$ */ - + #include <bsp.h> #include <bsp/irq.h> #include <rtems.h> @@ -146,7 +146,7 @@ static m82xxIrqMasks_t SIU_MaskBit[BSP_CPM_IRQ_NUMBER] = void dump_irq_masks(void ) { int i; - for( i=0; i<BSP_CPM_IRQ_NUMBER;i++ ) + for( i=0; i<BSP_CPM_IRQ_NUMBER;i++ ) { printk( "%04d: %08X %08X\n", i, @@ -172,9 +172,9 @@ static void compute_SIU_IvectMask_from_prio () * correspond to the priorities defined * for the SIU in irq_init.c. */ - + int i,j; - + for( i=0; i<BSP_CPM_IRQ_NUMBER; i++ ) { for( j=0;j<BSP_CPM_IRQ_NUMBER; j++ ) @@ -182,9 +182,9 @@ static void compute_SIU_IvectMask_from_prio () { SIU_MaskBit[i].priority_h |= SIU_MaskBit[j].mask_h; SIU_MaskBit[i].priority_l |= SIU_MaskBit[j].mask_l; - } + } } - + } /* @@ -217,10 +217,10 @@ int BSP_irq_enable_at_cpm(const rtems_irq_symbolic_name irqLine) int BSP_irq_disable_at_cpm(const rtems_irq_symbolic_name irqLine) { int cpm_irq_index; - + if (!is_cpm_irq(irqLine)) return 1; - + cpm_irq_index = ((int) (irqLine) - BSP_CPM_IRQ_LOWEST_OFFSET); m8260.simr_h &= ~(SIU_MaskBit[cpm_irq_index].mask_h); @@ -233,10 +233,10 @@ int BSP_irq_disable_at_cpm(const rtems_irq_symbolic_name irqLine) int BSP_irq_enabled_at_cpm(const rtems_irq_symbolic_name irqLine) { int cpm_irq_index; - + if (!is_cpm_irq(irqLine)) return 0; - + cpm_irq_index = ((int) (irqLine) - BSP_CPM_IRQ_LOWEST_OFFSET); return ((m8260.simr_h & SIU_MaskBit[cpm_irq_index].mask_h) || @@ -274,7 +274,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) * store the data provided by user */ rtems_hdl_tbl[irq->name] = *irq; - + if (is_cpm_irq(irq->name)) { /* * Enable interrupt at PIC level @@ -317,7 +317,7 @@ int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* irq) int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) { unsigned int level; - + if (!isValidInterrupt(irq->name)) { return 0; } @@ -332,32 +332,32 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) return 0; } _CPU_ISR_Disable(level); - + if (is_cpm_irq(irq->name)) { /* * disable interrupt at PIC level */ BSP_irq_disable_at_cpm (irq->name); } - + if (is_processor_irq(irq->name)) { /* * disable exception at processor level */ - } - + } + /* * Disable interrupt on device */ irq->off(irq); - + /* * restore the default irq value */ rtems_hdl_tbl[irq->name] = default_rtems_entry; - + _CPU_ISR_Enable(level); - + return 1; } @@ -378,7 +378,7 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config) /* Fill in priority masks */ compute_SIU_IvectMask_from_prio(); - + _CPU_ISR_Disable(level); /* * start with CPM IRQ @@ -458,14 +458,14 @@ void C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum) */ #ifdef DISPATCH_HANDLER_STAT loopCounter = 0; -#endif +#endif while (1) { if( ((m8260.sipnr_h & m8260.simr_h) | (m8260.sipnr_l & m8260.simr_l)) == 0 ) { #ifdef DISPATCH_HANDLER_STAT if (loopCounter > maxLoop) maxLoop = loopCounter; -#endif +#endif break; } @@ -495,11 +495,11 @@ void C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum) /* disable exceptions again */ _CPU_MSR_SET(msr); - + /* restore interrupt masks */ m8260.simr_h = old_simr_h; m8260.simr_l = old_simr_l; - + } #ifdef DISPATCH_HANDLER_STAT ++ loopCounter; @@ -507,8 +507,8 @@ void C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum) } } - - + + void _ThreadProcessSignalsFromIrq (BSP_Exception_frame* ctx) { /* diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h index 451d4e0894..d01dcc1e47 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.h @@ -83,7 +83,7 @@ typedef enum { * * The MPC8260 User Manual seems shot through with inconsistencies * about this whole area. - */ + */ /* * Some CPM IRQ symbolic name definition @@ -153,7 +153,7 @@ typedef enum { }rtems_irq_symbolic_name; -#define CPM_INTERRUPT +#define CPM_INTERRUPT /* @@ -183,9 +183,9 @@ typedef struct __rtems_irq_connect_data__ { * It is usually called immediately AFTER connecting the interrupt handler. * RTEMS may well need such a function when restoring normal interrupt * processing after a debug session. - * + * */ - rtems_irq_enable on; + rtems_irq_enable on; /* * function for disabling interrupts at device level (ONLY!). * The code will disable it at SIU and CPM level. RATIONALE : anyway @@ -221,7 +221,7 @@ typedef struct { rtems_irq_symbolic_name irqBase; /* * software priorities associated with interrupts. - * if irqPrio [i] > intrPrio [j] it means that + * if irqPrio [i] > intrPrio [j] it means that * interrupt handler hdl connected for interrupt name i * will not be interrupted by the handler connected for interrupt j * The interrupt source will be physically masked at i8259 level. @@ -300,7 +300,7 @@ int BSP_irq_enabled_at_cpm (const rtems_irq_symbolic_name irqLine); * 4) perform rescheduling when necessary, * 5) restore the C scratch registers... * 6) restore initial execution flow - * + * */ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data*); /* @@ -344,7 +344,7 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config); * (Re) get info on current RTEMS interrupt management. */ int BSP_rtems_irq_mngt_get(rtems_irq_global_settings**); - + extern void BSP_rtems_irq_mng_init(unsigned cpuId); #ifdef __cplusplus diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_asm.S b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_asm.S index a0d7d02510..64f0176109 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_asm.S +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_asm.S @@ -1,5 +1,5 @@ /* - * This file contains the assembly code for the PowerPC + * This file contains the assembly code for the PowerPC * IRQ veneers for RTEMS. * * The license and distribution terms for this file may be @@ -14,7 +14,7 @@ * * $Id$ */ - + #include <bsp/vectors.h> #include <rtems/score/cpuopts.h> /* for PPC_HAS_FPU */ #include <rtems/score/cpu.h> @@ -24,13 +24,13 @@ #define SYNC \ sync; \ isync - + .text - .p2align 5 - - + .p2align 5 + + PUBLIC_VAR(decrementer_exception_vector_prolog_code) - + SYM (decrementer_exception_vector_prolog_code): /* @@ -42,11 +42,11 @@ SYM (decrementer_exception_vector_prolog_code): ba shared_raw_irq_code_entry PUBLIC_VAR (decrementer_exception_vector_prolog_code_size) - + decrementer_exception_vector_prolog_code_size = . - decrementer_exception_vector_prolog_code PUBLIC_VAR(external_exception_vector_prolog_code) - + SYM (external_exception_vector_prolog_code): /* * let room for exception frame @@ -57,12 +57,12 @@ SYM (external_exception_vector_prolog_code): ba shared_raw_irq_code_entry PUBLIC_VAR (external_exception_vector_prolog_code_size) - + external_exception_vector_prolog_code_size = . - external_exception_vector_prolog_code PUBLIC_VAR(shared_raw_irq_code_entry) PUBLIC_VAR(C_dispatch_irq_handler) - + .p2align 5 SYM (shared_raw_irq_code_entry): /* @@ -73,7 +73,7 @@ SYM (shared_raw_irq_code_entry): * R4 : vector number */ /* - * Save SRR0/SRR1 As soon As possible as it is the minimal needed + * Save SRR0/SRR1 As soon As possible as it is the minimal needed * to reenable exception processing */ stw r0, GPR0_OFFSET(r1) @@ -100,7 +100,7 @@ SYM (shared_raw_irq_code_entry): #endif mtmsr r3 SYNC - + /* * Push C scratch registers on the current stack. It may * actually be the thread stack or the interrupt stack. @@ -122,7 +122,7 @@ SYM (shared_raw_irq_code_entry): mfctr r6 mfxer r7 mflr r8 - + stw r5, EXC_CR_OFFSET(r1) stw r6, EXC_CTR_OFFSET(r1) stw r7, EXC_XER_OFFSET(r1) @@ -148,23 +148,23 @@ SYM (shared_raw_irq_code_entry): /* mfspr r2, SPRG0 */ addis r6, 0, _ISR_Nest_level@ha lwz r2, _ISR_Nest_level@l( r6 ) - + /* * Check if stack switch is necessary */ cmpwi r2,0 bne nested mfspr r1, SPRG1 - -nested: - /* + +nested: + /* * Start Incrementing nesting level in R2 */ addi r2,r2,1 - + addis r6, 0, _ISR_Nest_level@ha stw r2, _ISR_Nest_level@l( r6 ) - + /* * Start Incrementing _Thread_Dispatch_disable_level R4 = _Thread_Dispatch_disable_level */ @@ -173,7 +173,7 @@ nested: * store new nesting level in SPRG0 */ /* mtspr SPRG0, r2 */ - + addi r6, r6, 1 mfmsr r5 /* @@ -183,40 +183,40 @@ nested: /* * We are now running on the interrupt stack. External and decrementer * exceptions are still disabled. I see no purpose trying to optimize - * further assembler code. + * further assembler code. */ /* * Call C exception handler for decrementer Interrupt frame is passed just * in case... */ - + addi r3, r14, 0x8 bl C_dispatch_irq_handler /* C_dispatch_irq_handler(cpu_interrupt_frame* r3, vector r4) */ /* - * start decrementing nesting level. Note : do not test result against 0 + * start decrementing nesting level. Note : do not test result against 0 * value as an easy exit condition because if interrupt nesting level > 1 * then _Thread_Dispatch_disable_level > 1 */ /* mfspr r2, SPRG0 */ - + addis r6, 0, _ISR_Nest_level@ha lwz r2, _ISR_Nest_level@l( r6 ) - + /* * start decrementing _Thread_Dispatch_disable_level */ lwz r3,_Thread_Dispatch_disable_level@l(r15) addi r2, r2, -1 /* Continue decrementing nesting level */ addi r3, r3, -1 /* Continue decrementing _Thread_Dispatch_disable_level */ - - stw r2, _ISR_Nest_level@l( r6 ) + + stw r2, _ISR_Nest_level@l( r6 ) /* mtspr SPRG0, r2 */ /* End decrementing nesting level */ - + stw r3,_Thread_Dispatch_disable_level@l(r15) /* End decrementing _Thread_Dispatch_disable_level */ cmpwi r3, 0 /* - * switch back to original stack (done here just optimize registers + * switch back to original stack (done here just optimize registers * contention. Could have been done before...) */ addi r1, r14, 0 @@ -224,14 +224,14 @@ nested: /* * Here we are running again on the thread system stack. * We have interrupt nesting level = _Thread_Dispatch_disable_level = 0. - * Interrupt are still disabled. Time to check if scheduler request to + * Interrupt are still disabled. Time to check if scheduler request to * do something with the current thread... */ addis r4, 0, _Context_Switch_necessary@ha lwz r5, _Context_Switch_necessary@l(r4) cmpwi r5, 0 bne switch - + addis r6, 0, _ISR_Signals_to_thread_executing@ha lwz r7, _ISR_Signals_to_thread_executing@l(r6) cmpwi r7, 0 @@ -244,7 +244,7 @@ nested: */ stmw r16, GPR16_OFFSET(r1) addi r3, r1, 0x8 - + /* * compute SP at exception entry */ @@ -257,7 +257,7 @@ nested: * Call High Level signal handling code */ bl _ThreadProcessSignalsFromIrq - + /* * start restoring exception like frame @@ -266,16 +266,16 @@ nested: lwz r30, EXC_XER_OFFSET(r1) lwz r29, EXC_CR_OFFSET(r1) lwz r28, EXC_LR_OFFSET(r1) - + mtctr r31 mtxer r30 mtcr r29 mtlr r28 - - + + lmw r4, GPR4_OFFSET(r1) - + lwz r2, GPR2_OFFSET(r1) lwz r0, GPR0_OFFSET(r1) @@ -289,21 +289,21 @@ nested: /* * Restore rfi related settings */ - + lwz r3, SRR1_FRAME_OFFSET(r1) mtsrr1 r3 lwz r3, SRR0_FRAME_OFFSET(r1) mtsrr0 r3 - + lwz r3, GPR3_OFFSET(r1) addi r1,r1, EXCEPTION_FRAME_END SYNC rfi - + switch: bl SYM (_Thread_Dispatch) - -easy_exit: + +easy_exit: /* * start restoring interrupt frame */ @@ -311,7 +311,7 @@ easy_exit: lwz r4, EXC_XER_OFFSET(r1) lwz r5, EXC_CR_OFFSET(r1) lwz r6, EXC_LR_OFFSET(r1) - + mtctr r3 mtxer r4 mtcr r5 @@ -337,11 +337,11 @@ easy_exit: xori r3, r3, MSR_RI /*| MSR_IR | MSR_DR*/ mtmsr r3 SYNC - + /* * Restore rfi related settings */ - + lwz r4, SRR1_FRAME_OFFSET(r1) lwz r2, SRR0_FRAME_OFFSET(r1) lwz r3, GPR3_OFFSET(r1) diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_init.c b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_init.c index d2ca9b2005..b0f8324ae7 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_init.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq_init.c @@ -74,7 +74,7 @@ static rtems_irq_prio irqPrioTable[BSP_CPM_IRQ_NUMBER]={ }; -/* +/* * Initialize CPM interrupt management */ void @@ -99,7 +99,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId) { rtems_raw_except_connect_data vectorDesc; int i; - + BSP_CPM_irq_init(); /* * Initialize Rtems management interrupt table @@ -126,7 +126,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId) */ BSP_panic("Unable to initialize RTEMS interrupt Management!!! System locked\n"); } - + /* * We must connect the raw irq handler for the two * expected interrupt sources : decrementer and external interrupts. @@ -148,7 +148,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId) if (!mpc8xx_set_exception (&vectorDesc)) { BSP_panic("Unable to initialize RTEMS external raw exception\n"); } -#ifdef TRACE_IRQ_INIT +#ifdef TRACE_IRQ_INIT printk("RTEMS IRQ management is now operationnal\n"); #endif } diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c b/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c index 424bb5b5bc..64a4ee3d7d 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c @@ -104,7 +104,7 @@ hdlc_output(ifp, m0, dst, rt0) struct mbuf *mcopy = (struct mbuf *)0; /* register struct ether_header *eh; */ int off, len = m->m_pkthdr.len; - + /* printk( "hdlc output" ); */ /* struct arpcom *ac = (struct arpcom *)ifp; */ @@ -175,8 +175,8 @@ hdlc_output(ifp, m0, dst, rt0) if (m == 0) senderr(ENOBUFS); - -#if 0 + +#if 0 eh = mtod(m, struct ether_header *); (void)memcpy(&eh->ether_type, &type, sizeof(eh->ether_type)); @@ -199,7 +199,7 @@ hdlc_output(ifp, m0, dst, rt0) if ((ifp->if_flags & IFF_OACTIVE) == 0) (*ifp->if_start)(ifp); splx(s); - + ifp->if_obytes += len /*+ sizeof (struct ether_header)*/; if (m->m_flags & M_MCAST) ifp->if_omcasts++; @@ -223,21 +223,21 @@ hdlc_input(ifp, m) { register struct ifqueue *inq; int s; - + struct ether_header eh; - + if ((ifp->if_flags & IFF_UP) == 0) { m_freem(m); return; } ifp->if_ibytes += m->m_pkthdr.len; -/* +/* if (memcmp((caddr_t)etherbroadcastaddr, (caddr_t)eh->ether_dhost, sizeof(etherbroadcastaddr)) == 0) m->m_flags |= M_BCAST; else if (eh->ether_dhost[0] & 1) m->m_flags |= M_MCAST; -*/ +*/ if (m->m_flags & (M_BCAST|M_MCAST)) ifp->if_imcasts++; @@ -285,11 +285,11 @@ hdlc_ifattach(ifp) sdl->sdl_family == AF_LINK) { sdl->sdl_type = IFT_ETHER; sdl->sdl_alen = ifp->if_addrlen; -/* +/* memcpy(LLADDR(sdl), (caddr_t)((struct arpcom *)ifp)->ac_enaddr, ifp->if_addrlen); -*/ +*/ break; } } @@ -309,7 +309,7 @@ hdlc_ioctl(struct ifnet *ifp, int command, caddr_t data) ifp->if_flags |= IFF_UP; switch (ifa->ifa_addr->sa_family) { -#if 0 +#if 0 #ifdef INET case AF_INET: ifp->if_init(ifp->if_softc); /* before arpwhohas */ @@ -329,11 +329,11 @@ hdlc_ioctl(struct ifnet *ifp, int command, caddr_t data) struct sockaddr *sa; sa = (struct sockaddr *) & ifr->ifr_data; -/* +/* memcpy((caddr_t) sa->sa_data, ((struct arpcom *)ifp->if_softc)->ac_enaddr, ETHER_ADDR_LEN); -*/ +*/ } break; diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c b/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c index ce8e51564e..9de8b0ff26 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c @@ -250,13 +250,13 @@ m8260_scc_initialize_hardware (struct m8260_hdlc_struct *sc) /* * Allocate mbuf pointers */ - sc->rxMbuf = malloc (sc->rxBdCount * sizeof *sc->rxMbuf, + sc->rxMbuf = malloc (sc->rxBdCount * sizeof *sc->rxMbuf, M_MBUF, M_NOWAIT); - sc->txMbuf = malloc (sc->txBdCount * sizeof *sc->txMbuf, + sc->txMbuf = malloc (sc->txBdCount * sizeof *sc->txMbuf, M_MBUF, M_NOWAIT); if (!sc->rxMbuf || !sc->txMbuf) rtems_panic ("No memory for mbuf pointers"); - + /* * Set receiver and transmitter buffer descriptor bases */ @@ -265,7 +265,7 @@ m8260_scc_initialize_hardware (struct m8260_hdlc_struct *sc) m8260.scc3p.rbase = (char *)sc->rxBdBase - (char *)&m8260; m8260.scc3p.tbase = (char *)sc->txBdBase - (char *)&m8260; - + /* * Send "Init parameters" command */ @@ -277,7 +277,7 @@ m8260_scc_initialize_hardware (struct m8260_hdlc_struct *sc) */ m8260.scc3p.rfcr = M8260_RFCR_MOT | M8260_RFCR_60X_BUS; m8260.scc3p.tfcr = M8260_TFCR_MOT | M8260_TFCR_60X_BUS; - + /* * Set maximum receive buffer length */ @@ -394,7 +394,7 @@ m8260Enet_retire_tx_bd (struct m8260_hdlc_struct *sc) int i; int nRetired; struct mbuf *m, *n; - + i = sc->txBdTail; nRetired = 0; while ((sc->txBdActiveCount != 0) @@ -409,7 +409,7 @@ m8260Enet_retire_tx_bd (struct m8260_hdlc_struct *sc) */ if( status & M8260_BD_UNDERRUN ) { hdlc_driver[0].txUnderrun++; - + /* * Restart the transmitter */ @@ -451,7 +451,7 @@ scc_rxDaemon (void *arg) uint16_t status; m8260BufferDescriptor_t *rxBd; int rxBdIndex; - + /* * Allocate space for incoming packets and start reception */ @@ -479,7 +479,7 @@ scc_rxDaemon (void *arg) rxBdIndex = 0; for (;;) { rxBd = sc->rxBdBase + rxBdIndex; - + /* * Wait for packet if there's not one ready */ @@ -506,7 +506,7 @@ scc_rxDaemon (void *arg) m8260.scc3.sccm |= M8260_SCCE_RXF; /* printk( "Rxdwait "); */ - + rtems_bsdnet_event_receive (INTERRUPT_EVENT, RTEMS_WAIT|RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, @@ -515,7 +515,7 @@ scc_rxDaemon (void *arg) /* printk( "Rxd " ); */ } } - + /* * Check that packet is valid */ @@ -577,13 +577,13 @@ scc_rxDaemon (void *arg) if (status & M8260_BD_CARRIER_LOST) sc->rxLostCarrier++; } - + /* * Reenable the buffer descriptor */ rxBd->status = (status & (M8260_BD_WRAP | M8260_BD_INTERRUPT)) | M8260_BD_EMPTY; - + /* * Move to next buffer descriptor */ @@ -601,12 +601,12 @@ scc_sendpacket (struct ifnet *ifp, struct mbuf *m) struct mbuf *l = NULL; uint16_t status; int nAdded; - + /* * Free up buffer descriptors */ m8260Enet_retire_tx_bd (sc); - + /* * Set up the transmit buffer descriptors. * No need to pad out short packets since the @@ -630,7 +630,7 @@ scc_sendpacket (struct ifnet *ifp, struct mbuf *m) * Clear old events */ m8260.scc3.scce = M8260_SCCE_TX | M8260_SCCE_TXE; - + /* * Wait for buffer descriptor to become available. * Note that the buffer descriptors are checked @@ -646,7 +646,7 @@ scc_sendpacket (struct ifnet *ifp, struct mbuf *m) m8260Enet_retire_tx_bd (sc); while ((sc->txBdActiveCount + nAdded) == sc->txBdCount) { rtems_event_set events; - + /* * Unmask TX (buffer transmitted) event */ @@ -659,13 +659,13 @@ scc_sendpacket (struct ifnet *ifp, struct mbuf *m) m8260Enet_retire_tx_bd (sc); } } - + /* * Don't set the READY flag till the * whole packet has been readied. */ status = nAdded ? M8260_BD_READY : 0; - + /* * FIXME: Why not deal with empty mbufs at at higher level? * The IP fragmentation routine in ip_output @@ -715,7 +715,7 @@ scc_sendpacket (struct ifnet *ifp, struct mbuf *m) if (l != NULL) l->m_next = m; } - + /* * Set the transmit buffer status. * Break out of the loop if this mbuf is the last in the frame. @@ -745,13 +745,13 @@ scc_txDaemon (void *arg) struct ifnet *ifp = &sc->ac_if; struct mbuf *m; rtems_event_set events; - + for (;;) { /* * Wait for packet */ rtems_bsdnet_event_receive (START_TRANSMIT_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, RTEMS_NO_TIMEOUT, &events); - + /* * Send packets till queue is empty */ @@ -780,7 +780,7 @@ static void m8260_hdlc_start (struct ifnet *ifp) { struct m8260_hdlc_struct *sc = ifp->if_softc; - + rtems_event_send (sc->txDaemonTid, START_TRANSMIT_EVENT); ifp->if_flags |= IFF_OACTIVE; } @@ -793,22 +793,22 @@ scc_init (void *arg) { struct m8260_hdlc_struct *sc = arg; struct ifnet *ifp = &sc->ac_if; - + if (sc->txDaemonTid == 0) { - + /* * Set up SCC hardware */ m8260_scc_initialize_hardware (sc); - + /* * Start driver tasks */ sc->txDaemonTid = rtems_bsdnet_newproc ("SCtx", 4096, scc_txDaemon, sc); sc->rxDaemonTid = rtems_bsdnet_newproc ("SCrx", 4096, scc_rxDaemon, sc); - + } - + #if 0 /* * Set flags appropriately @@ -823,7 +823,7 @@ scc_init (void *arg) * Tell the world that we're running. */ ifp->if_flags |= IFF_RUNNING; - + /* * Enable receiver and transmitter */ @@ -839,9 +839,9 @@ static void scc_stop (struct m8260_hdlc_struct *sc) { struct ifnet *ifp = &sc->ac_if; - + ifp->if_flags &= ~IFF_RUNNING; - + /* * Shut down receiver and transmitter */ @@ -862,7 +862,7 @@ hdlc_stats (struct m8260_hdlc_struct *sc) printf (" Overrun:%-8lu", sc->rxOverrun); printf (" No Carrier:%-8lu\n", sc->rxLostCarrier); printf (" Discarded:%-8lu\n", (unsigned long)m8260.scc3p.un.hdlc.disfc); - + printf (" Tx Interrupts:%-8lu", sc->txInterrupts); printf (" No Carrier:%-8lu", sc->txLostCarrier); printf (" Underrun:%-8lu\n", sc->txUnderrun); @@ -877,37 +877,37 @@ scc_ioctl (struct ifnet *ifp, int command, caddr_t data) { struct m8260_hdlc_struct *sc = ifp->if_softc; int error = 0; - + switch (command) { case SIOCGIFADDR: case SIOCSIFADDR: hdlc_ioctl (ifp, command, data); break; - + case SIOCSIFFLAGS: switch (ifp->if_flags & (IFF_UP | IFF_RUNNING)) { case IFF_RUNNING: scc_stop (sc); break; - + case IFF_UP: scc_init (sc); break; - + case IFF_UP | IFF_RUNNING: scc_stop (sc); scc_init (sc); break; - + default: break; } break; - + case SIO_RTEMS_SHOW_STATS: hdlc_stats (sc); break; - + /* * FIXME: All sorts of multicast commands need to be added here! */ @@ -930,7 +930,7 @@ rtems_scc3_driver_attach (struct rtems_bsdnet_ifconfig *config) struct ifnet *ifp; int mtu; int i; - + /* * Find a free driver */ @@ -976,7 +976,7 @@ rtems_scc3_driver_attach (struct rtems_bsdnet_ifconfig *config) else sc->txBdCount = TX_BUF_COUNT * TX_BD_PER_BUF; sc->acceptBroadcast = !config->ignore_broadcast; - + /* * Set up network interface values */ @@ -991,7 +991,7 @@ rtems_scc3_driver_attach (struct rtems_bsdnet_ifconfig *config) ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | /*IFF_PROMISC |*/ IFF_NOARP; if (ifp->if_snd.ifq_maxlen == 0) ifp->if_snd.ifq_maxlen = ifqmaxlen; - + /* * Attach the interface */ diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S b/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S index 021454fa0b..241e60212a 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S @@ -42,23 +42,23 @@ */ - .section ".entry" /* This might have to be the first thing in the + .section ".entry" /* This might have to be the first thing in the * text section. At one time, it had to be * first, but I don't believe it is true * any more. */ PUBLIC_VAR (start) SYM(start): bl .startup -base_addr: +base_addr: /* * Parameters from linker */ -toc_pointer: +toc_pointer: .long s.got -bss_length: +bss_length: .long bss.size -bss_addr: +bss_addr: .long bss.start PUBLIC_VAR (data_length ) @@ -80,7 +80,7 @@ text_length: /* - * Initialization code + * Initialization code */ .startup: /* Get start address */ @@ -104,15 +104,15 @@ text_length: -#ifdef ENABLE_CACHE +#ifdef ENABLE_CACHE /* Enable caches */ mfspr r5, 1008 ori r5, r5, 0x8000 isync mtspr 1008, r5 - + /* Leave D-cache disabled for now */ -#if 0 +#if 0 ori r5, r5, 0x4000 sync mtspr 1008, r5 @@ -128,7 +128,7 @@ text_length: *-------------------------------------------------- */ lis r13, 0x0050 /* set nap mode and DPM */ - or r5, r5, r13 + or r5, r5, r13 mtspr 1008, r5 /*-------------------------------------------------- @@ -155,11 +155,11 @@ text_length: /* clear argc and argv */ xor r3, r3, r3 xor r4, r4, r4 - + .extern SYM (boot_card) bl SYM (boot_card) /* call the first C routine */ - + /* we don't expect to return from boot_card but if we do */ /* wait here for watchdog to kick us into hard reset */ diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c index 9f35b9eaca..1aba24a0fd 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c @@ -180,11 +180,11 @@ extern void m8260_console_reserve_resources(rtems_configuration_table *); * not yet initialized. * */ - + void bsp_pretasking_hook(void) { - /* + /* * These are assigned addresses in the linkcmds file for the BSP. This * approach is better than having these defined as manifest constants and * compiled into the kernel, but it is still not ideal when dealing with @@ -200,16 +200,16 @@ bsp_pretasking_hook(void) bsp_libc_init( &_HeapStart, &_HeapEnd - &_HeapStart, 0 ); - + #ifdef STACK_CHECKER_ON /* * Initialize the stack bounds checker * We can either turn it on here or from the app. */ - + Stack_check_Initialize(); #endif - + #ifdef RTEMS_DEBUG rtems_debug_enable( RTEMS_DEBUG_ALL_MASK ); #endif @@ -266,7 +266,7 @@ void bsp_start(void) /* mmu_init(); */ - + /* * Enable instruction and data caches. Do not force writethrough mode. */ diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/cpuinit.c b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/cpuinit.c index 8c5ff89d4b..28d7790fc6 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/cpuinit.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/cpuinit.c @@ -1,8 +1,8 @@ -/* - * cpuinit.c - this file contains functions for initializing the CPU +/* + * cpuinit.c - this file contains functions for initializing the CPU * * Written by Jay Monkman (jmonkman@frasca.com) - * + * * $Id$ */ @@ -24,14 +24,14 @@ void cpu_init(void) #if 0 register unsigned long t1, t2; - /* Let's clear MSR[IR] and MSR[DR] */ + /* Let's clear MSR[IR] and MSR[DR] */ t2 = PPC_MSR_IR | PPC_MSR_DR; __asm__ volatile ( "mfmsr %0\n" "andc %0, %0, %1\n" "mtmsr %0\n" :"=r"(t1), "=r"(t2): "1"(t2)); - + t1 = M8xx_CACHE_CMD_UNLOCK; /* PUT_DC_CST(t1); */ PUT_IC_CST(t1); diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.S b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.S index b60307ad3c..e22b8c247c 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.S +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.S @@ -2,26 +2,26 @@ * (c) 1999, Eric Valette valette@crf.canon.fr * * - * This file contains the assembly code for the PowerPC + * This file contains the assembly code for the PowerPC * exception veneers for RTEMS. * * $Id$ */ - + #include <rtems/asm.h> #include <rtems/score/cpu.h> #include <bsp/vectors.h> - + #define SYNC \ sync; \ isync - + .text - .p2align 5 - + .p2align 5 + PUBLIC_VAR(default_exception_vector_code_prolog) SYM (default_exception_vector_code_prolog): /* @@ -34,7 +34,7 @@ SYM (default_exception_vector_code_prolog): stw r2, EXC_LR_OFFSET(r1) bl 0f 0: /* - * r3 = exception vector entry point + * r3 = exception vector entry point * (256 * vector number) + few instructions */ mflr r3 @@ -43,13 +43,13 @@ SYM (default_exception_vector_code_prolog): */ srwi r3,r3,8 ba push_normalized_frame - + PUBLIC_VAR (default_exception_vector_code_prolog_size) - + default_exception_vector_code_prolog_size= . - default_exception_vector_code_prolog - + .p2align 5 -PUBLIC_VAR (push_normalized_frame) +PUBLIC_VAR (push_normalized_frame) SYM (push_normalized_frame): stw r3, EXCEPTION_NUMBER_OFFSET(r1) stw r0, GPR0_OFFSET(r1) @@ -63,7 +63,7 @@ SYM (push_normalized_frame): * Saved a few line above : R0 * * Manual says that "stmw" instruction may be slower than - * series of individual "stw" but who cares about performance + * series of individual "stw" but who cares about performance * for the DEFAULT exception handler? */ stmw r4, GPR4_OFFSET(r1) /* save R4->R31 */ @@ -90,7 +90,7 @@ SYM (push_normalized_frame): ori r3,r3, MSR_RI /*| MSR_IR | MSR_DR*/ mtmsr r3 SYNC - + /* * Call C exception handler */ @@ -128,16 +128,16 @@ SYM (push_normalized_frame): xori r3, r3, MSR_RI /*| MSR_IR | MSR_DR*/ mtmsr r3 SYNC - + /* * Restore rfi related settings */ - + lwz r3, SRR1_FRAME_OFFSET(r1) mtsrr1 r3 lwz r3, SRR0_FRAME_OFFSET(r1) mtsrr0 r3 - + lwz r3, GPR3_OFFSET(r1) addi r1,r1, EXCEPTION_FRAME_END SYNC diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.h b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.h index fc841f0fa2..43fb7ecedf 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.h +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors.h @@ -1,4 +1,4 @@ -/* +/* * vectors.h Exception frame related contant and API. * * This include file describe the data structure and the functions implemented @@ -16,10 +16,10 @@ #define LIBBSP_POWERPC_MBX8XX_VECTORS_H /* - * The callee (high level exception code written in C) + * The callee (high level exception code written in C) * will store the Link Registers (return address) at entry r1 + 4 !!!. * So let room for it!!!. - */ + */ #define LINK_REGISTER_CALLEE_UPDATE_ROOM 4 #define SRR0_FRAME_OFFSET 8 #define SRR1_FRAME_OFFSET 12 @@ -81,7 +81,7 @@ extern int default_exception_vector_code_prolog_size; * zero, it performs more or less like memmove. No copy is performed if * source and destination addresses are equal. However the caches * are synchronized. Note that the size is always rounded up to the - * next mutiple of 4. + * next mutiple of 4. */ extern void * codemove(void *, const void *, unsigned int, unsigned long); extern void initialize_exceptions(); diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors_init.c b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors_init.c index 21863706a5..f77648c63a 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors_init.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors_init.c @@ -1,4 +1,4 @@ -/* +/* * vectors_init.c Exception hanlding initialisation (and generic handler). * * This include file describe the data structure and the functions implemented @@ -69,7 +69,7 @@ void C_exception_handler(BSP_Exception_frame* excPtr) if (excPtr->_EXC_number == ASM_DEC_VECTOR) recoverable = 1; if (excPtr->_EXC_number == ASM_SYS_VECTOR) -#ifdef TEST_RAW_EXCEPTION_CODE +#ifdef TEST_RAW_EXCEPTION_CODE recoverable = 1; #else recoverable = 0; |