diff options
Diffstat (limited to 'c/src/lib/libbsp/m68k/gen68360')
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/clock/clock.c | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/console/console.c | 14 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/include/bsp.h | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/network/network.c | 22 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/startup/alloc360.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/startup/init68360.c | 36 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/timer/timer.c | 2 |
8 files changed, 45 insertions, 45 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68360/clock/clock.c b/c/src/lib/libbsp/m68k/gen68360/clock/clock.c index 7ac1d8f728..8959821991 100644 --- a/c/src/lib/libbsp/m68k/gen68360/clock/clock.c +++ b/c/src/lib/libbsp/m68k/gen68360/clock/clock.c @@ -1,4 +1,4 @@ -/* +/* * This routine initializes the MC68360 Periodic Interval Timer * * The PIT has rather poor resolution, but it is easy to set up @@ -77,7 +77,7 @@ static unsigned long nsec; * To reduce the jitter in the calls to RTEMS the * hardware interrupt interval is never greater than * the maximum non-prescaled value from the PIT. - * + * * For a 25 MHz external clock the basic clock rate is * 40 nsec * 128 * 4 = 20.48 usec/tick */ diff --git a/c/src/lib/libbsp/m68k/gen68360/console/console.c b/c/src/lib/libbsp/m68k/gen68360/console/console.c index c20bbfbb17..1cf6aef777 100644 --- a/c/src/lib/libbsp/m68k/gen68360/console/console.c +++ b/c/src/lib/libbsp/m68k/gen68360/console/console.c @@ -168,7 +168,7 @@ smc1Initialize (int major, int minor, void *arg) * Put SMC1 in NMSI mode, connect SMC1 to BRG1 */ m360.simode |= M360_SI_SMC1_BRG1; - + /* * Set up SMC1 parameter RAM common to all protocols */ @@ -180,7 +180,7 @@ smc1Initialize (int major, int minor, void *arg) m360.smc1p.mrblr = RXBUFSIZE; else m360.smc1p.mrblr = 1; - + /* * Set up SMC1 parameter RAM UART-specific parameters */ @@ -188,19 +188,19 @@ smc1Initialize (int major, int minor, void *arg) m360.smc1p.un.uart.brklen = 0; m360.smc1p.un.uart.brkec = 0; m360.smc1p.un.uart.brkcr = 0; - + /* * Set up the Receive Buffer Descriptor */ smcRxBd->status = M360_BD_EMPTY | M360_BD_WRAP | M360_BD_INTERRUPT; smcRxBd->length = 0; smcRxBd->buffer = rxBuf; - + /* * Setup the Transmit Buffer Descriptor */ smcTxBd->status = M360_BD_WRAP; - + /* * Set up SMC1 general and protocol-specific mode registers */ @@ -357,7 +357,7 @@ rtems_device_driver console_open( } return sc; } - + /* * Close the device */ @@ -402,6 +402,6 @@ rtems_device_driver console_control( rtems_device_minor_number minor, void * arg ) -{ +{ return rtems_termios_ioctl (arg); } diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h index 5860548b37..cc5ce7357c 100644 --- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h @@ -45,7 +45,7 @@ extern "C" { /* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ #define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) - + /* * Network driver configuration */ @@ -107,7 +107,7 @@ extern int rtems_scc1_driver_attach (struct rtems_bsdnet_ifconfig *config, int a /* * NOTE: Use the standard Console driver entry */ - + /* * NOTE: Use the standard Clock driver entry */ diff --git a/c/src/lib/libbsp/m68k/gen68360/network/network.c b/c/src/lib/libbsp/m68k/gen68360/network/network.c index 698dd756b5..5c3f67d0f7 100644 --- a/c/src/lib/libbsp/m68k/gen68360/network/network.c +++ b/c/src/lib/libbsp/m68k/gen68360/network/network.c @@ -150,7 +150,7 @@ m360Enet_initialize_hardware (struct scc_softc *sc) m360.papar |= 0x303; m360.padir &= ~0x303; m360.paodr &= ~0x303; - + /* * Configure port C CTS1* and CD1* pins */ @@ -247,7 +247,7 @@ m360Enet_initialize_hardware (struct scc_softc *sc) * Aggressive retry */ m360.scc1p.un.ethernet.p_per = 0; - + /* * Clear individual address hash table */ @@ -377,10 +377,10 @@ m360Enet_retire_tx_bd (struct scc_softc *sc) status = (sc->txBdBase + j)->status; if (status & M360_BD_READY) break; - (sc->txBdBase + j)->status = M360_BD_READY | - (status & (M360_BD_PAD | - M360_BD_WRAP | - M360_BD_INTERRUPT | + (sc->txBdBase + j)->status = M360_BD_READY | + (status & (M360_BD_PAD | + M360_BD_WRAP | + M360_BD_INTERRUPT | M360_BD_LAST | M360_BD_TX_CRC)); if (status & M360_BD_LAST) @@ -393,7 +393,7 @@ m360Enet_retire_tx_bd (struct scc_softc *sc) * Move transmitter back to the first * buffer descriptor in the frame. */ - m360.scc1p._tbptr = m360.scc1p.tbase + + m360.scc1p._tbptr = m360.scc1p.tbase + sc->txBdTail * sizeof (m360BufferDescriptor_t); /* @@ -658,7 +658,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m) MFREE (m, n); m = n; } - + /* * Redo the send with the new mbuf cluster */ @@ -927,7 +927,7 @@ scc_ioctl (struct ifnet *ifp, int command, caddr_t data) case SIO_RTEMS_SHOW_STATS: scc_stats (sc); break; - + /* * FIXME: All sorts of multicast commands need to be added here! */ @@ -957,13 +957,13 @@ rtems_scc1_driver_attach (struct rtems_bsdnet_ifconfig *config, int attaching) printf ("SCC1 driver can not be detached.\n"); return 0; } - + /* * Parse driver name */ if ((unitNumber = rtems_bsdnet_parse_driver_name (config, &unitName)) < 0) return 0; - + /* * Is driver free? */ diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/alloc360.c b/c/src/lib/libbsp/m68k/gen68360/startup/alloc360.c index b305d0cd65..b9a206b851 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/alloc360.c +++ b/c/src/lib/libbsp/m68k/gen68360/startup/alloc360.c @@ -91,6 +91,6 @@ M360AllocateRiscTimers (int count) * descriptors are allocated with appropriate alignment. */ return M360AllocateBufferDescriptors (((count * 4) + - sizeof(m360BufferDescriptor_t) - 1) / + sizeof(m360BufferDescriptor_t) - 1) / sizeof(m360BufferDescriptor_t)); } diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c index 125cd2e81b..daa16fec28 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c @@ -19,7 +19,7 @@ #include <bsp.h> #include <rtems/libio.h> #include <rtems/libcsupport.h> - + /* * The original table from the application and our copy of it with * some changes. @@ -37,7 +37,7 @@ unsigned long _M68K_RamSize; /* * Use the shared implementations of the following routines */ - + void bsp_postdriver_hook(void); void bsp_libc_init( void *, uint32_t, int ); void bsp_pretasking_hook(void); /* m68k version */ @@ -51,7 +51,7 @@ void bsp_pretasking_hook(void); /* m68k version */ void bsp_start( void ) { extern void *_WorkspaceBase; - + /* * _M68k_Ramsize is the amount of RAM on this board and * is set by many m68k BSPs at this point. With this diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c b/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c index 086c7b73f4..14aae8e20e 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c +++ b/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c @@ -112,7 +112,7 @@ void _Init68360 (void) * 70 nsec DRAM * 180 nsec ROM (3 wait states) */ - m360.gmr = M360_GMR_RCNT(23) | M360_GMR_RFEN | + m360.gmr = M360_GMR_RCNT(23) | M360_GMR_RFEN | M360_GMR_RCYC(0) | M360_GMR_PGS(1) | M360_GMR_DPS_32BIT | M360_GMR_NCS | M360_GMR_TSS40; @@ -152,7 +152,7 @@ void _Init68360 (void) for (i = 0; i < 256; ++i) M68Kvec[i] = vbr[i]; m68k_set_vbr (M68Kvec); - + /* * Step 14: More system initialization * SDCR (Serial DMA configuration register) @@ -259,8 +259,8 @@ void _Init68360 (void) /* * Step 11: Remap Chip Select 0 (CS0*), set up GMR */ - m360.gmr = M360_GMR_RCNT(12) | M360_GMR_RFEN | - M360_GMR_RCYC(0) | M360_GMR_PGS(1) | + m360.gmr = M360_GMR_RCNT(12) | M360_GMR_RFEN | + M360_GMR_RCYC(0) | M360_GMR_PGS(1) | M360_GMR_DPS_32BIT | M360_GMR_DWQ | M360_GMR_GAMX; m360.memc[0].br = (unsigned long)&_RomBase | M360_MEMC_BR_WP | @@ -305,7 +305,7 @@ void _Init68360 (void) for (i = 0; i < 256; ++i) M68Kvec[i] = vbr[i]; m68k_set_vbr (M68Kvec); - + /* * Step 14: More system initialization * SDCR (Serial DMA configuration register) @@ -365,7 +365,7 @@ void _Init68360 (void) * Enable bus monitor for external cycles * 1024 clocks for external timeout */ - m360.sypcr = 0xEC; + m360.sypcr = 0xEC; /* * Step 9: Clear parameter RAM and reset communication processor module @@ -374,8 +374,8 @@ void _Init68360 (void) *((long *)((char *)&m360 + 0xC00 + i)) = 0; *((long *)((char *)&m360 + 0xD00 + i)) = 0; *((long *)((char *)&m360 + 0xE00 + i)) = 0; - *((long *)((char *)&m360 + 0xF00 + i)) = 0; - } + *((long *)((char *)&m360 + 0xF00 + i)) = 0; + } M360ExecuteRISC (M360_CR_RST); /* @@ -397,16 +397,16 @@ void _Init68360 (void) /* * Step 11: Set up GMR - * + * */ m360.gmr = 0x0; /* * Step 11a: Remap 512Kx8 flash memory on CS0* - * 2 wait states - * Make it read-only for now + * 2 wait states + * Make it read-only for now */ - m360.memc[0].br = (unsigned long)&_RomBase | M360_MEMC_BR_WP | + m360.memc[0].br = (unsigned long)&_RomBase | M360_MEMC_BR_WP | M360_MEMC_BR_V; m360.memc[0].or = M360_MEMC_OR_WAITS(2) | M360_MEMC_OR_512KB | M360_MEMC_OR_8BIT; @@ -419,10 +419,10 @@ void _Init68360 (void) ramSize = 4 * 1024 * 1024; m360.memc[1].br = (unsigned long)&_RamBase | M360_MEMC_BR_V; m360.memc[1].or = M360_MEMC_OR_WAITS(0) | M360_MEMC_OR_2MB | - M360_MEMC_OR_32BIT; + M360_MEMC_OR_32BIT; m360.memc[2].br = ((unsigned long)&_RamBase + 0x200000) | M360_MEMC_BR_V; m360.memc[2].or = M360_MEMC_OR_WAITS(0) | M360_MEMC_OR_2MB | - M360_MEMC_OR_32BIT; + M360_MEMC_OR_32BIT; /* * Step 13: Copy the exception vector table to system RAM */ @@ -544,9 +544,9 @@ void _Init68360 (void) * startup code may be running in a bootstrap PROM or in * a program downloaded by the bootstrap PROM. */ - m360.gmr = (m360.gmr & 0x001C0000) | M360_GMR_RCNT(23) | - M360_GMR_RFEN | M360_GMR_RCYC(0) | - M360_GMR_DPS_32BIT | M360_GMR_NCS | + m360.gmr = (m360.gmr & 0x001C0000) | M360_GMR_RCNT(23) | + M360_GMR_RFEN | M360_GMR_RCYC(0) | + M360_GMR_DPS_32BIT | M360_GMR_NCS | M360_GMR_GAMX; m360.memc[0].br = (unsigned long)&_RomBase | M360_MEMC_BR_WP | M360_MEMC_BR_V; @@ -617,7 +617,7 @@ void _Init68360 (void) for (i = 0; i < 256; ++i) M68Kvec[i] = vbr[i]; m68k_set_vbr (M68Kvec); - + /* * Step 14: More system initialization * SDCR (Serial DMA configuration register) diff --git a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c b/c/src/lib/libbsp/m68k/gen68360/timer/timer.c index b1c6ceb402..ab81cb8c9b 100644 --- a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c +++ b/c/src/lib/libbsp/m68k/gen68360/timer/timer.c @@ -23,7 +23,7 @@ * * Output parameters: NONE * - * NOTE: It is important that the timer start/stop overhead be + * NOTE: It is important that the timer start/stop overhead be * determined when porting or modifying this code. * * COPYRIGHT (c) 1989-1999. |