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/ppcn_60x | |
parent | 2004-04-20 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
download | rtems-6128a4aa5e791ed4e0a655bfd346a52d92da7883.tar.bz2 |
Remove stray white spaces.
Diffstat (limited to '')
27 files changed, 292 insertions, 292 deletions
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/clock/clock.c b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/clock.c index e08be577a8..5015453a00 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/clock/clock.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/clock.c @@ -43,11 +43,11 @@ uint32_t Clock_Decrementer_value; rtems_isr_entry Old_ticker; void Clock_exit( void ); - + /* * These are set by clock driver during its init */ - + rtems_device_major_number rtems_clock_major = ~0; rtems_device_minor_number rtems_clock_minor; @@ -139,11 +139,11 @@ void Install_clock( void Clock_exit( void ) { - /* nothing to do */; + /* nothing to do */; /* do not restore old vector */ } - + /* * Clock_initialize * @@ -170,17 +170,17 @@ rtems_device_driver Clock_initialize( (BSP_Configuration.microseconds_per_tick/1000); Install_clock((rtems_isr_entry)Clock_isr); - + /* * make major/minor avail to others such as shared memory driver */ - + rtems_clock_major = major; rtems_clock_minor = minor; - + return RTEMS_SUCCESSFUL; } - + /* * Clock_control * @@ -205,15 +205,15 @@ rtems_device_driver Clock_control( { uint32_t isrlevel; rtems_libio_ioctl_args_t *args = pargp; - + if (args == 0) goto done; - + /* * This is hokey, but until we get a defined interface * to do this, it will just be this simple... */ - + if (args->command == rtems_build_name('I', 'S', 'R', ' ')) { Clock_isr( CLOCK_VECTOR, pargp ); @@ -224,7 +224,7 @@ rtems_device_driver Clock_control( (void) set_vector( args->buffer, CLOCK_VECTOR, 1 ); rtems_interrupt_enable( isrlevel ); } - + done: return RTEMS_SUCCESSFUL; } diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/config.c b/c/src/lib/libbsp/powerpc/ppcn_60x/console/config.c index 0e755266e5..1aace346a9 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/config.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/config.c @@ -429,7 +429,7 @@ static boolean config_PMX1553_probe(int minor) * Disable special register set and lock Enhanced Feature Register */ outport_byte(&pNS16550Write->LineControl, 0); - + /* * The PMX1553 currently uses a 16 MHz clock rather than the * 7.3728 MHz clock described in the ST16C654 data sheet. When diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/console.c b/c/src/lib/libbsp/powerpc/ppcn_60x/console/console.c index bfa9b7b4ea..54b167efc5 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/console.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/console.c @@ -44,7 +44,7 @@ console_data Console_Port_Data[NUM_CONSOLE_PORTS]; unsigned long Console_Port_Count; rtems_device_minor_number Console_Port_Minor; - + /* PAGE * * console_open @@ -82,9 +82,9 @@ rtems_device_driver console_open( Callbacks.pollRead = c->deviceRead; Callbacks.write = c->deviceWrite; Callbacks.setAttributes = c->deviceSetAttributes; - Callbacks.stopRemoteTx = + Callbacks.stopRemoteTx = Console_Port_Tbl[minor].pDeviceFlow->deviceStopRemoteTx; - Callbacks.startRemoteTx = + Callbacks.startRemoteTx = Console_Port_Tbl[minor].pDeviceFlow->deviceStartRemoteTx; Callbacks.outputUsesInterrupts = c->deviceOutputUsesInterrupts; status = rtems_termios_open ( major, minor, arg, &Callbacks); @@ -94,7 +94,7 @@ rtems_device_driver console_open( * Patch in flow control routines */ /* XXX */ -#if 0 +#if 0 if((status==RTEMS_SUCCESSFUL) && (Console_Port_Tbl[minor].pDeviceFlow)) { @@ -132,7 +132,7 @@ rtems_device_driver console_open( return status; } - + rtems_device_driver console_close( rtems_device_major_number major, rtems_device_minor_number minor, @@ -150,7 +150,7 @@ rtems_device_driver console_close( return rtems_termios_close (arg); } - + rtems_device_driver console_read( rtems_device_major_number major, rtems_device_minor_number minor, @@ -159,7 +159,7 @@ rtems_device_driver console_read( { return rtems_termios_read (arg); } - + rtems_device_driver console_write( rtems_device_major_number major, rtems_device_minor_number minor, @@ -168,7 +168,7 @@ rtems_device_driver console_write( { return rtems_termios_write (arg); } - + rtems_device_driver console_control( rtems_device_major_number major, rtems_device_minor_number minor, @@ -224,7 +224,7 @@ rtems_device_driver console_initialize( */ rtems_fatal_error_occurred(RTEMS_IO_ERROR); } - + Console_Port_Minor=minor; /* @@ -296,7 +296,7 @@ void DEBUG_puts( rtems_interrupt_disable(Irql); - for ( s = string ; *s ; s++ ) + for ( s = string ; *s ; s++ ) { Console_Port_Tbl[Console_Port_Minor].pDeviceFns-> deviceWritePolled(Console_Port_Minor, *s); @@ -329,7 +329,7 @@ DEBUG_puth( uint32_t Irql; rtems_interrupt_disable(Irql); - + Console_Port_Tbl[Console_Port_Minor].pDeviceFns-> deviceWritePolled(Console_Port_Minor, '0'); Console_Port_Tbl[Console_Port_Minor].pDeviceFns-> diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/debugio.c b/c/src/lib/libbsp/powerpc/ppcn_60x/console/debugio.c index bc4f97a69d..6b3234ef06 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/debugio.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/debugio.c @@ -38,7 +38,7 @@ extern console_data Console_Port_Data[]; extern rtems_device_minor_number Console_Port_Minor; - + /* PAGE * * DEBUG_puts @@ -95,7 +95,7 @@ void DEBUG_puth( unsigned long i,d; uint32_t Irql; void (*poll)(int minor, char cChar); - + poll = Console_Port_Tbl[Console_Port_Minor].pDeviceFns->deviceWritePolled; rtems_interrupt_disable(Irql); diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/i8042.c b/c/src/lib/libbsp/powerpc/ppcn_60x/console/i8042.c index 93ca26aced..b148c0f389 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/i8042.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/i8042.c @@ -94,7 +94,7 @@ static volatile Ring_buffer_t KbdInputBuffer; * to polled mode as required for command processing */ void i8042_polled_on( - int minor + int minor ) { #if CONSOLE_USE_INTERRUPTS @@ -103,7 +103,7 @@ void i8042_polled_on( } void i8042_polled_off( - int minor + int minor ) { #if CONSOLE_USE_INTERRUPTS @@ -856,7 +856,7 @@ static void i8042_scan_code( } } - /* + /* * If we got a character then queue it */ if(cChar) @@ -944,13 +944,13 @@ void i8042_init(int minor) /* PAGE * - * i8042_inbyte_nonblocking_polled + * i8042_inbyte_nonblocking_polled * * Console Termios polling input entry point. */ -int i8042_inbyte_nonblocking_polled( - int minor +int i8042_inbyte_nonblocking_polled( + int minor ) { uint8_t ucScan; diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/i8042_p.h b/c/src/lib/libbsp/powerpc/ppcn_60x/console/i8042_p.h index 57273fbe7f..544b4ef944 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/i8042_p.h +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/i8042_p.h @@ -73,7 +73,7 @@ extern "C" { #define KBD_CMD_ENABLE 0xf4 /* Clears Buffer and Starts Scanning. */ #define KBD_CMD_DISABLE 0xf5 /* reset to power up */ -#define KBD_CMD_SET_DEFAULT 0xf6 +#define KBD_CMD_SET_DEFAULT 0xf6 #define KBD_CMD_SET_ALL_TLMTIC 0xf7 /* Set all keys telematic */ #define KBD_CMD_SET_ALL_MKBR 0xf8 /* Set all keys Make /Break */ #define KBD_CMD_SET_ALL_MAKE 0xf9 /* Set all keys Make only */ diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/vga.c b/c/src/lib/libbsp/powerpc/ppcn_60x/console/vga.c index 9e67cc6541..ca93acb48d 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/vga.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/vga.c @@ -75,10 +75,10 @@ static uint8_t cursCol = 0; /* Current cursor column. */ /*-------------------------------------------------------------------------+ | Function: setHardwareCursorPos -| Description: Set hardware video cursor at given offset into video RAM. +| Description: Set hardware video cursor at given offset into video RAM. | Global Variables: None. | Arguments: videoCursor - Offset into video memory. -| Returns: Nothing. +| Returns: Nothing. +--------------------------------------------------------------------------*/ static inline void setHardwareCursorPos(uint16_t videoCursor) @@ -91,10 +91,10 @@ setHardwareCursorPos(uint16_t videoCursor) /*-------------------------------------------------------------------------+ | Function: updateVideoRamPtr | Description: Updates value of global variable "videoRamPtr" based on -| current window's cursor position. +| current window's cursor position. | Global Variables: videoRamPtr, cursRow, cursCol. | Arguments: None. -| Returns: Nothing. +| Returns: Nothing. +--------------------------------------------------------------------------*/ static inline void updateVideoRamPtr(void) @@ -108,7 +108,7 @@ updateVideoRamPtr(void) | Description: Scrolls display up n lines. | Global Variables: None. | Arguments: lines - number of lines to scroll. -| Returns: Nothing. +| Returns: Nothing. +--------------------------------------------------------------------------*/ static void scrollUp(uint8_t lines) @@ -130,7 +130,7 @@ scrollUp(uint8_t lines) blankCount = lines * videoCols; nonBlankCount = DISPLAY_CELL_COUNT - blankCount; ptrSrc = videoRam + blankCount; - ptrDst = videoRam; + ptrDst = videoRam; while(nonBlankCount--) { @@ -139,7 +139,7 @@ scrollUp(uint8_t lines) } else { - /* + /* * Clear the whole display. */ blankCount = DISPLAY_CELL_COUNT; @@ -159,7 +159,7 @@ scrollUp(uint8_t lines) | Description: Print printable character to display. | Global Variables: videoRamPtr, cursRow, cursCol. | Arguments: c - character to write to display. -| Returns: Nothing. +| Returns: Nothing. +--------------------------------------------------------------------------*/ static void printCHAR(char c) @@ -184,7 +184,7 @@ printCHAR(char c) | Description: Print BS (BackSpace - '\b') character to display. | Global Variables: videoRamPtr, cursRow, cursCol. | Arguments: None. -| Returns: Nothing. +| Returns: Nothing. +--------------------------------------------------------------------------*/ static inline void printBS(void) @@ -214,7 +214,7 @@ printBS(void) | Description: Print HT (Horizontal Tab - '\t') character to display. | Global Variables: cursCol. | Arguments: None. -| Returns: Nothing. +| Returns: Nothing. +--------------------------------------------------------------------------*/ static inline void printHT(void) @@ -232,7 +232,7 @@ printHT(void) | Description: Print LF (Line Feed - '\n') character to display. | Global Variables: cursRow. | Arguments: None. -| Returns: Nothing. +| Returns: Nothing. +--------------------------------------------------------------------------*/ static inline void printLF(void) @@ -252,7 +252,7 @@ printLF(void) | Description: Print CR (Carriage Return - '\r') to display. | Global Variables: cursCol. | Arguments: None. -| Returns: Nothing. +| Returns: Nothing. +--------------------------------------------------------------------------*/ static inline void printCR(void) @@ -266,7 +266,7 @@ printCR(void) */ void vga_write( - int minor, + int minor, char cChar) { switch (cChar) @@ -291,15 +291,15 @@ vga_write( setHardwareCursorPos(videoRamPtr - videoRam); } /* vga_write */ -/* +/* * vga_write_support * * Console Termios output entry point. * */ int vga_write_support( - int minor, - const char *buf, + int minor, + const char *buf, int len ) { diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/vga_p.h b/c/src/lib/libbsp/powerpc/ppcn_60x/console/vga_p.h index 3ab6cbc2ba..8541951bd0 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/vga_p.h +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/vga_p.h @@ -53,13 +53,13 @@ extern boolean vga_probe(int minor); extern void vga_init(int minor); extern void vga_write( - int minor, + int minor, char cChar ); extern int vga_write_support( - int minor, - const char *buf, + int minor, + const char *buf, int len ); diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/z85c30cfg.c b/c/src/lib/libbsp/powerpc/ppcn_60x/console/z85c30cfg.c index 4aeafe3939..5072a91b29 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/z85c30cfg.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/z85c30cfg.c @@ -28,7 +28,7 @@ #include <rtems.h> #include <bsp.h> -/* +/* * Read_85c30_register * * Read a Z85c30 register @@ -64,7 +64,7 @@ void Write_85c30_register( outport_byte(ulCtrlPort, ucData); } -/* +/* * Read_85c30_data * * Read a Z85c30 data register diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h b/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h index f423e8dea7..412d76ace0 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h @@ -42,7 +42,7 @@ extern "C" { #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 #define CONFIGURE_INTERRUPT_STACK_MEMORY (32 * 1024) - + /* Define processor identification. */ #define MPC601 1 @@ -157,8 +157,8 @@ extern "C" { /* * 8259 IRQ definations. */ -#define PPCN_60X_IRQ_SYS_TIMER (PPCN_60X_8259_IRQ_BASE + 0) -#define PPCN_60X_IRQ_KBD (PPCN_60X_8259_IRQ_BASE + 1) +#define PPCN_60X_IRQ_SYS_TIMER (PPCN_60X_8259_IRQ_BASE + 0) +#define PPCN_60X_IRQ_KBD (PPCN_60X_8259_IRQ_BASE + 1) #define PPCN_60X_IRQ_COM2 (PPCN_60X_8259_IRQ_BASE + 3) #define PPCN_60X_IRQ_COM1 (PPCN_60X_8259_IRQ_BASE + 4) #define PPCN_60X_IRQ_CIO (PPCN_60X_8259_IRQ_BASE + 5) @@ -343,7 +343,7 @@ void InitializeNvRAM(void); #define BSP_TIMER_LEAST_VALID 1 /* Don't trust a value lower than this */ /* - * Convert decrement value to tenths of microsecnds (used by + * Convert decrement value to tenths of microsecnds (used by * shared timer driver). * * + There are 4 bus cycles per click @@ -404,19 +404,19 @@ void InitializeNvRAM(void); /* * Device Driver Table Entries */ - + /* * NOTE: Use the standard Console driver entry */ - + /* * NOTE: Use the standard Clock driver entry */ - + /* * How many libio files we want */ - + #define BSP_LIBIO_MAX_FDS 20 /* functions */ @@ -436,13 +436,13 @@ rtems_isr_entry set_vector( /* returns old vector */ */ rtems_isr bsp_stub_handler( rtems_vector_number trap -); +); rtems_isr bsp_spurious_handler( rtems_vector_number trap ); void bsp_spurious_initialize(); -/* +/* * genvec.c */ void set_EE_vector( diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/include/extisrdrv.h b/c/src/lib/libbsp/powerpc/ppcn_60x/include/extisrdrv.h index 32d0e7562c..3ed86b3564 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/include/extisrdrv.h +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/include/extisrdrv.h @@ -20,7 +20,7 @@ extern rtems_device_minor_number rtems_externalISR_minor; #define EXTISR_DRIVER_TABLE_ENTRY \ { ExternalISR_initialize, NULL, NULL, NULL, NULL, ExternalISR_control } - + rtems_device_driver ExternalISR_initialize( rtems_device_major_number, rtems_device_minor_number, diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.c b/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.c index 2ad0b8e02a..c09bf2a1d5 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.c @@ -39,7 +39,7 @@ * The number of transmit buffer descriptors has to be quite large * since a single frame often uses four or more buffer descriptors. * - * Set the number of Tx and Rx buffers, using Log_2(# buffers). + * Set the number of Tx and Rx buffers, using Log_2(# buffers). */ #define LANCE_LOG2_TX_BUFFERS 4 #define LANCE_LOG2_RX_BUFFERS 4 @@ -76,11 +76,11 @@ #define RD_CSR32(dp, index, value) \ PCNET_IO_WR32(dp, rap, index); \ PCNET_IO_RD32(dp, rdp, value) - + #define WR_CSR32(dp, index, value) \ PCNET_IO_WR32(dp, rap, index); \ PCNET_IO_WR32(dp, rdp, value) - + #define RD_BCR32(dp, index, value) \ PCNET_IO_WR32(dp, rap, index); \ PCNET_IO_RD32(dp, bdp, value) @@ -363,21 +363,21 @@ amd79c970_initialize_hardware (int instance, int broadcastFlag) } /* - * Set the receive descriptor ring length + * Set the receive descriptor ring length */ dp->initBlk.ib_rlen=RX_RING_LEN_BITS; /* - * Set the receive descriptor ring address + * Set the receive descriptor ring address */ dp->initBlk.ib_rdra=Swap32((uint32_t)&dp->rxBdBase[0]+ PCI_SYS_MEM_BASE); /* - * Set the transmit descriptor ring length + * Set the transmit descriptor ring length */ dp->initBlk.ib_tlen=TX_RING_LEN_BITS; /* - * Set the tranmit descriptor ring address + * Set the tranmit descriptor ring address */ dp->initBlk.ib_tdra=Swap32((uint32_t)&dp->txBdBase[0]+ PCI_SYS_MEM_BASE); @@ -386,7 +386,7 @@ amd79c970_initialize_hardware (int instance, int broadcastFlag) { dp->initBlk.ib_padr[i]=dp->iface->hwaddr[i]; } - + /* * Ensure that we are in DWIO mode */ @@ -405,13 +405,13 @@ amd79c970_initialize_hardware (int instance, int broadcastFlag) ulInitClkPCIAddr=(uint32_t)&dp->initBlk+PCI_SYS_MEM_BASE; /* - * CSR2 must contain the high order 16 bits of the first word in - * the initialization block + * CSR2 must contain the high order 16 bits of the first word in + * the initialization block */ WR_CSR32(dp, CSR2, (ulInitClkPCIAddr >> 16) & 0xffff); /* - * CSR1 must contain the low order 16 bits of the first word in - * the initialization block + * CSR1 must contain the low order 16 bits of the first word in + * the initialization block */ WR_CSR32(dp, CSR1, (ulInitClkPCIAddr & 0xffff)); @@ -752,7 +752,7 @@ amd79c970_rx (int dev, void *p1, void *p2) /* * Give the network code a chance to digest the - * packet. This guards against a flurry of + * packet. This guards against a flurry of * incoming packets (usually an ARP storm) from * using up all the available memory. */ @@ -876,7 +876,7 @@ amd79c970_show (struct iface *iface) * Following arguments are optional, but if present, must appear in * the following order: * Following arguments are optional, but if Ethernet address is - * specified, Internet address must also be specified. + * specified, Internet address must also be specified. * ###.###.###.### -- IP address * ##:##:##:##:##:## -- Ethernet address */ @@ -946,7 +946,7 @@ rtems_ka9q_driver_attach (int argc, char *argv[], void *p) * Set receive buffer descriptor count */ dp->rxBdCount=RX_RING_SIZE; - + /* * Set transmit buffer descriptor count */ diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.h b/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.h index f600611418..8f81ebf568 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.h +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/network/amd79c970.h @@ -17,7 +17,7 @@ #define _PCNET_H /* - * IO space structure for the AMD79C970 device + * IO space structure for the AMD79C970 device */ typedef volatile struct pc_net @@ -69,10 +69,10 @@ typedef struct pc_net_eeprom { } pc_net_eeprom_t; /* - * PCnet-PCI Single Chip Ethernet Controller for PCI Local Bus + * PCnet-PCI Single Chip Ethernet Controller for PCI Local Bus */ /* - * Register and bit definitions + * Register and bit definitions */ #define CSR0 0 @@ -104,7 +104,7 @@ typedef struct pc_net_eeprom { #define APROM2 0x08 /* - * CSR0: Bit definitions + * CSR0: Bit definitions */ #define CSR0_ERR 0x8000 /* error summary */ #define CSR0_BABL 0x4000 /* babble error */ @@ -181,10 +181,10 @@ typedef struct pc_net_eeprom { #define CSR80_XMTFW16 (0<<8) /* fifo level to stop dma */ #define CSR80_XMTFW32 (1<<8) #define CSR80_XMTFW64 (2<<8) -/* must also clear csr4 CSR4_DMAPLUS: */ +/* must also clear csr4 CSR4_DMAPLUS: */ #define CSR80_DMATC(x) ((x)&0xff) /* max transfers per burst. deflt 16 */ /* - * must also set csr4 CSR4_TIMER: + * must also set csr4 CSR4_TIMER: */ #define CSR82_DMABAT(x) ((x)&0xffff) /* max burst time nanosecs*100 */ @@ -198,12 +198,12 @@ typedef struct pc_net_eeprom { #define BCR19_PVALID 0x8000 /* aprom (eeprom) read checksum ok */ /* - * initial setting of csr0 + * initial setting of csr0 */ #define CSR0_IVALUE (CSR0_IDON | CSR0_IENA | CSR0_STRT | CSR0_INIT) /* - * our setting of csr3 + * our setting of csr3 */ #define CSR3_VALUE (CSR3_ACON | CSR3_BSWP) @@ -226,7 +226,7 @@ typedef volatile struct initblk { * The bytes must be swapped within the word, so that, for example, * the address 8:0:20:1:25:5a is written in the order * 0 8 1 20 5a 25 - * For PCI970 that is long word swapped: so no swapping needed, since + * For PCI970 that is long word swapped: so no swapping needed, since * the bus will swap. */ uint8_t ib_padr[8]; /* physical address */ @@ -237,11 +237,11 @@ typedef volatile struct initblk { /* - * bits in mode register: allows alteration of the chips operating parameters + * bits in mode register: allows alteration of the chips operating parameters */ #define IBM_PROM 0x8000 /* promiscuous mode */ /* - * mode is also in cr15 + * mode is also in cr15 */ #define MODE_DRCVBC 0x4000 /* disable receive broadcast */ #define MODE_DRCVPA 0x2000 /* disable receive physical address */ @@ -259,15 +259,15 @@ typedef volatile struct initblk { #define IBM_DTX 0x0002 /* disable transmitter */ #define IBM_DRX 0x0001 /* disable receiver */ -/* +/* * Buffer Management is accomplished through message descriptors organized * in ring structures in main memory. There are two rings allocated for the - * device: a receive ring and a transmit ring. The following defines the + * device: a receive ring and a transmit ring. The following defines the * structure of the descriptor rings. */ /* - * Receive List type definition + * Receive List type definition * * This essentially consists of 4, 32 bit LE words. In the following the * fields are ordered so that they map correctly in BE mode, however each @@ -277,7 +277,7 @@ typedef volatile struct initblk { typedef volatile struct rmde { uint32_t rmde_addr; /* buf addr */ - uint16_t rmde_bcnt; + uint16_t rmde_bcnt; uint16_t rmde_flags; uint16_t rmde_mcnt; @@ -288,7 +288,7 @@ typedef volatile struct rmde { /* - * bits in the flags field + * bits in the flags field */ #define RFLG_OWN 0x8000 /* ownership bit, 1==LANCE */ #define RFLG_ERR 0x4000 /* error summary */ @@ -300,19 +300,19 @@ typedef volatile struct rmde { #define RFLG_ENP 0x0100 /* end of packet */ /* - * bits in the buffer byte count field + * bits in the buffer byte count field */ #define RBCNT_ONES 0xf000 /* must be ones */ #define RBCNT_BCNT 0x0fff /* buf byte count, in 2's compl */ /* - * bits in the message byte count field + * bits in the message byte count field */ #define RMCNT_RES 0xf000 /* reserved, read as zeros */ #define RMCNT_BCNT 0x0fff /* message byte count */ /* - * Transmit List type definition + * Transmit List type definition * * This essentially consists of 4, 32 bit LE words. In the following the * fields are ordered so that they map correctly in BE mode, however each @@ -321,7 +321,7 @@ typedef volatile struct rmde { typedef volatile struct tmde { uint32_t tmde_addr; /* buf addr */ - uint16_t tmde_bcnt; + uint16_t tmde_bcnt; uint16_t tmde_status; /* misc error and status bits */ uint32_t tmde_error; @@ -330,7 +330,7 @@ typedef volatile struct tmde { } tmde_t; /* - * bits in the status field + * bits in the status field */ #define TST_OWN 0x8000 /* ownership bit, 1==LANCE */ #define TST_ERR 0x4000 /* error summary */ @@ -342,18 +342,18 @@ typedef volatile struct tmde { #define TST_ENP 0x0100 /* end of packet */ /* - * setting of status field when packet is to be transmitted + * setting of status field when packet is to be transmitted */ #define TST_XMIT (TST_STP | TST_ENP | TST_OWN) /* - * bits in the buffer byte count field + * bits in the buffer byte count field */ #define TBCNT_ONES 0xf000 /* must be ones */ #define TBCNT_BCNT 0x0fff /* buf byte count, in 2's compl */ /* - * bits in the error field + * bits in the error field */ #define TERR_BUFF 0x8000 /* buffer error */ #define TERR_UFLO 0x4000 /* underflow error */ @@ -368,7 +368,7 @@ typedef volatile struct tmde { */ /* - * receive errors + * receive errors */ #define ERR_FRAM 0 /* framing error */ #define ERR_OFLO 1 /* overflow error */ @@ -376,7 +376,7 @@ typedef volatile struct tmde { #define ERR_RBUFF 3 /* receive buffer error */ /* - * transmit errors + * transmit errors */ #define ERR_MORE 4 /* more than one retry */ #define ERR_ONE 5 /* one retry */ @@ -388,7 +388,7 @@ typedef volatile struct tmde { #define ERR_RTRY 11 /* retry error, >16 retries */ /* - * errors reported in csr0 + * errors reported in csr0 */ #define ERR_BABL 12 /* transmitter timeout error */ #define ERR_MISS 13 /* missed packet */ @@ -400,7 +400,7 @@ typedef volatile struct tmde { #define NHARD_ERRORS 18 /* error types used in diagnostic */ /* - * other statistics + * other statistics */ #define ERR_TTOUT 18 /* transmit timeouts */ #define ERR_ITOUT 19 /* init timeouts */ @@ -412,7 +412,7 @@ typedef volatile struct tmde { #define NUM_ERRORS 24 /* number of errors types */ /* - * Bit definitions for BCR19 + * Bit definitions for BCR19 */ #define prom_EDI (uint16_t)0x0001 #define prom_EDO (uint16_t)0x0001 diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/mk48t18.h b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/mk48t18.h index 958fd5a557..10bfb872a5 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/mk48t18.h +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/mk48t18.h @@ -31,7 +31,7 @@ * The CRC's are computed with x**16+x**12+x**5 + 1 polynomial * The clock is kept in 24 hour BCD mode and should be set to UT(GMT) */ - + typedef struct _MK48T18_CMOS_MAP { uint8_t SystemDependentArea2[8]; uint8_t FeatureByte0[1]; diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/nvram.c b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/nvram.c index 790542f155..146ae4567c 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/nvram.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/nvram.c @@ -33,7 +33,7 @@ void ); typedef -uint8_t +uint8_t (*PNVRAMREAD) ( uint32_t ulOffset diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/prepnvr.h b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/prepnvr.h index cf55a4525d..058cf7b45a 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/prepnvr.h +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/prepnvr.h @@ -1,29 +1,29 @@ /* Structure map for NVRAM on PowerPC Reference Platform */ - + /* Revision 1 changes (8/25/94): - Power Management (RESTART_BLOCK struct) - Normal added to PM_MODE - OSIRQMask (HEADER struct) */ - + /* All fields are either character/byte strings which are valid either endian or they are big-endian numbers. - + There are a number of Date and Time fields which are in RTC format, big-endian. These are stored in UT (GMT). - + For enum's: if given in hex then they are bit significant, i.e. only one bit is on for each enum. */ - + #ifndef _NVRAM_ #define _NVRAM_ #define VERSION 1 #define REVISION 0 - + #define OSAREASIZE 1024 /* size of OSArea space */ #define CONFSIZE 512 /* guess at size of Configuration space */ - + typedef struct _SECURITY { unsigned long BootErrCnt; /* Count of boot password errors */ unsigned long ConfigErrCnt; /* Count of config password errors */ @@ -35,7 +35,7 @@ typedef struct _SECURITY { unsigned long ConfigSetDT[2]; /* Date&Time from RTC of last set of pw */ unsigned char Serial[16]; /* Box serial number */ } SECURITY; - + typedef enum _OS_ID { Unknown = 0, Firmware = 1, @@ -50,41 +50,41 @@ typedef enum _OS_ID { Low_End_Client = 10, SCO = 11 } OS_ID; - + typedef struct _ERROR_LOG { unsigned char ErrorLogEntry[40]; /* To be architected */ } ERROR_LOG; - + /*---Revision 1: Change the following struct:---*/ typedef struct _RESUME_BLOCK { /* Hibernation Resume Device will be an environment variable */ unsigned long CheckSum; /* Checksum of RESUME_BLOCK */ volatile unsigned long BootStatus; - + void * ResumeAddr; /* For Suspend Resume */ void * SaveAreaAddr; /* For Suspend Resume */ unsigned long SaveAreaLength; /* For Suspend Resume */ - + unsigned long HibResumeImageRBA; /* RBA (512B blocks) of compressed OS memory image to be loaded by FW on Resume from hibernation */ unsigned long HibResumeImageRBACount; /* Size of image in 512B blocks*/ unsigned long Reserved; } RESUME_BLOCK; - + typedef enum _OSAREA_USAGE { Empty = 0, Used = 1 } OSAREA_USAGE; - + typedef enum _PM_MODE { Suspend = 0x80, /* Part of state is in memory */ Hibernate = 0x40, /* Nothing in memory - state saved elsewhere */ /* Revision 1: Normal added (actually was already here) */ Normal = 0x00 /* No power management in effect */ } PMMode; - + typedef struct _HEADER { unsigned short Size; /* NVRAM size in K(1024) */ unsigned char Version; /* Structure map different */ @@ -100,28 +100,28 @@ typedef struct _HEADER { RESUME_BLOCK ResumeBlock; SECURITY Security; ERROR_LOG ErrorLog[2]; - + /* Global Environment information */ void * GEAddress; unsigned long GELength; /* Date&Time from RTC of last change to Global Environment */ unsigned long GELastWriteDT[2]; - + /* Configuration information */ void * ConfigAddress; unsigned long ConfigLength; /* Date&Time from RTC of last change to Configuration */ unsigned long ConfigLastWriteDT[2]; unsigned long ConfigCount; /* Count of entries in Configuration */ - + /* OS dependent temp area */ void * OSAreaAddress; unsigned long OSAreaLength; /* Date&Time from RTC of last change to OSAreaArea */ unsigned long OSAreaLastWriteDT[2]; - + /* Revision 1: add this mask - function tbd */ /*unsigned short OSIRQMask; OS to FW IRQ Mask - "I've used this one" */ } HEADER, *PHEADER; - + #endif /* ndef _NVRAM_ */ diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/start/start.S b/c/src/lib/libbsp/powerpc/ppcn_60x/start/start.S index 8761450bd6..05d463c2ee 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/start/start.S +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/start/start.S @@ -75,7 +75,7 @@ _start: ori r3,r3 ,H0_60X_ICE #endif mtspr HID0,r3 - + /* clear bss */ lis r6,__bss_start@h ori r6,r6,__bss_start@l diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/bspstart.c b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/bspstart.c index 5e34429c09..ca313e001b 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/bspstart.c @@ -27,7 +27,7 @@ * the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. * - * $Id: + * $Id: */ #include <string.h> @@ -61,7 +61,7 @@ static unsigned long ulBusSpeed[] = { * The original table from the application and our copy of it with * some changes. */ - + extern rtems_configuration_table Configuration; rtems_configuration_table BSP_Configuration; @@ -142,13 +142,13 @@ void bsp_std_close( void ) close(stdout_fd); close(stderr_fd); } - + /* * bsp_predriver_hook * * Before drivers are setup. - */ + */ void bsp_predriver_hook(void) { /* bsp_spurious_initialize; ??*/ @@ -266,7 +266,7 @@ void bsp_start( void ) * of work space from the last physical address on the CPU board. */ - work_space_start = + work_space_start = (unsigned char *)ulMemorySize - BSP_Configuration.work_space_size; if ( work_space_start <= (unsigned char *)&end ) { @@ -282,7 +282,7 @@ void bsp_start( void ) Cpu_table.exceptions_in_RAM = TRUE; Cpu_table.pretasking_hook = bsp_pretasking_hook; /* init libc, etc. */ - Cpu_table.predriver_hook = bsp_predriver_hook; + Cpu_table.predriver_hook = bsp_predriver_hook; Cpu_table.postdriver_hook = bsp_postdriver_hook; Cpu_table.do_zero_of_workspace = TRUE; Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/genpvec.c b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/genpvec.c index a7a6f3dacc..98348b1020 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/genpvec.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/genpvec.c @@ -32,8 +32,8 @@ #include <rtems/chain.h> #include <assert.h> -/* - * Proto types for this file +/* + * Proto types for this file */ rtems_isr external_exception_ISR ( @@ -49,8 +49,8 @@ rtems_isr external_exception_ISR ( uint8_t ucMaster8259Mask; uint8_t ucSlave8259Mask; -/* - * Structure to for one of possible multiple interrupt handlers for +/* + * Structure to for one of possible multiple interrupt handlers for * a given interrupt. */ typedef struct @@ -65,7 +65,7 @@ typedef struct * handlers at a later time. */ EE_ISR_Type ISR_Nodes [NUM_LIRQ_HANDLERS]; - uint16_t Nodes_Used; + uint16_t Nodes_Used; Chain_Control ISR_Array [NUM_LIRQ]; void initialize_external_exception_vector() @@ -139,7 +139,7 @@ void initialize_external_exception_vector() ELCRM_INT5_LVL); break; } - + case SYS_TYPE_PPC2: case SYS_TYPE_PPC2a: case SYS_TYPE_PPC4: @@ -158,18 +158,18 @@ void initialize_external_exception_vector() } } - /* - * Install external_exception_ISR () as the handler for + /* + * Install external_exception_ISR () as the handler for * the General Purpose Interrupt. */ - status = rtems_interrupt_catch( external_exception_ISR, + status = rtems_interrupt_catch( external_exception_ISR, PPC_IRQ_EXTERNAL, (rtems_isr_entry *) &previous_isr ); } /* - * This routine installs one of multiple ISRs for the general purpose + * This routine installs one of multiple ISRs for the general purpose * inerrupt. */ void set_EE_vector( @@ -200,7 +200,7 @@ void set_EE_vector( * Doing things in this order makes them more atomic */ - Nodes_Used++; + Nodes_Used++; index = Nodes_Used - 1; @@ -215,13 +215,13 @@ void set_EE_vector( En_Ext_Interrupt(vector); } -/* +/* * This interrupt service routine is called for an External Exception. */ rtems_isr external_exception_ISR ( rtems_vector_number vector /* IN */ ) -{ +{ uint16_t index; uint8_t ucISr; EE_ISR_Type *node; diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/setvec.c b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/setvec.c index 240d4577c0..435da9dc02 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/setvec.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/setvec.c @@ -19,7 +19,7 @@ * the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. * - * $Id: + * $Id: */ #include <rtems.h> @@ -27,8 +27,8 @@ /* - * This routine installs vector number vector. - * + * This routine installs vector number vector. + * */ rtems_isr_entry set_vector( /* returns old vector */ rtems_isr_entry handler, /* isr routine */ @@ -39,7 +39,7 @@ rtems_isr_entry set_vector( /* returns old vector */ rtems_isr_entry previous_isr; rtems_status_code status; - /* + /* * vectors greater than PPC_IRQ_LAST are handled by the General purpose * interupt handler. (8259) */ diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/spurious.c b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/spurious.c index 3ead7a7892..6a1a427a0f 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/spurious.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/spurious.c @@ -1,12 +1,12 @@ /* * PPCn_60x Spurious Trap Handler * - * This is just enough of a trap handler to let us know what + * This is just enough of a trap handler to let us know what * the likely source of the trap was. * * Based upon the SPARC ERC32 version which was developed as - * part of the port of RTEMS to the ERC32 implementation - * of the SPARC by On-Line Applications Research Corporation (OAR) + * part of the port of RTEMS to the ERC32 implementation + * of the SPARC by On-Line Applications Research Corporation (OAR) * under contract to the European Space Agency (ESA). * * COPYRIGHT (c) 1995. European Space Agency. @@ -41,7 +41,7 @@ rtems_isr bsp_spurious_handler( DEBUG_puts( "Spurious Trap" ); - + switch ( trap ) { case PPC_IRQ_SYSTEM_RESET: DEBUG_puts( "System reset" ); @@ -88,7 +88,7 @@ rtems_isr bsp_spurious_handler( #if defined(ppc403) || defined(ppc405) case PPC_IRQ_CRIT : - DEBUG_puts( "Critical Error "); + DEBUG_puts( "Critical Error "); break; case PPC_IRQ_PIT: DEBUG_puts( "Prog. Interval Timer " ); @@ -104,13 +104,13 @@ rtems_isr bsp_spurious_handler( break; #elif defined(ppc601) -#error "Please fill in names. " +#error "Please fill in names. " case PPC_IRQ_TRACE : DEBUG_puts( "0x02000" ); break; #elif defined(ppc603) -#error "Please fill in names. " +#error "Please fill in names. " case PPC_IRQ_TRANS_MISS : DEBUG_puts( "0x1000" ); break; @@ -145,7 +145,7 @@ rtems_isr bsp_spurious_handler( break; #elif defined(mpc604) -#error "Please fill in names. " +#error "Please fill in names. " case PPC_IRQ_ADDR_BRK: DEBUG_puts( "0x1300" ); break; @@ -184,7 +184,7 @@ void bsp_spurious_initialize() * trap 0 which we will use as a shutdown. */ - set_vector( bsp_spurious_handler, trap, 1 ); + set_vector( bsp_spurious_handler, trap, 1 ); } set_vector( bsp_stub_handler, PPC_IRQ_DECREMENTER, 1 ); diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/swap.c b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/swap.c index 5ea1c39b0c..68072fe502 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/swap.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/swap.c @@ -37,7 +37,7 @@ inline unsigned int Swap32( "rlwimi %0,%1,24,16,23;" "rlwimi %0,%1,8,8,15;" "rlwimi %0,%1,24,0,7;" : - + "=&r" ((ulSwapped)) : "r" ((ulValue)) ); diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/timer/timer.c b/c/src/lib/libbsp/powerpc/ppcn_60x/timer/timer.c index 9d82edb0da..8b38bf11b6 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/timer/timer.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/timer/timer.c @@ -26,7 +26,7 @@ uint64_t Timer_driver_Start_time; rtems_boolean Timer_driver_Find_average_overhead; /* - * Timer_initialize + * Timer_initialize */ void Timer_initialize() { diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/cmos.h b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/cmos.h index 6df03f6cbd..1d544133bc 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/cmos.h +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/cmos.h @@ -17,7 +17,7 @@ /* CMOS is the 64 bytes of RAM in the DS1385 chip */ /* The CRC's are computed with x**16+x**12+x**5 + 1 polynomial */ /* The clock is kept in 24 hour BCD mode and should be set to UT(GMT) */ - + #ifndef _CMOS_ #define _CMOS_ @@ -65,7 +65,7 @@ /* Define Control Register D structure. */ #define DS1385_REGD_VALID 0x80 - + typedef struct _CMOS_MAP { volatile uint8_t DateAndTime[14]; @@ -91,5 +91,5 @@ typedef struct _CMOS_MAP { attribute = lock */ uint8_t ConfigCrc[2]; /* CRC on ConfigPW */ } CMOS_MAP, *PCMOS_MAP; - + #endif /* _CMOS_ */ diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/tod.c b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/tod.c index 7872747a6a..2b2c03392f 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/tod.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/tod.c @@ -88,7 +88,7 @@ static rtems_id semRTC; /* * This only works for the Gregorian calendar - i.e. after 1752 (in the UK) */ -uint8_t +uint8_t GregorianDay(rtems_time_of_day *pTOD) { boolean isLeap; @@ -164,7 +164,7 @@ Return Value: return; } -uint8_t +uint8_t DsReadRawClockRegister ( uint8_t Register ) @@ -233,7 +233,7 @@ Return Value: return; } -uint8_t +uint8_t DsReadClockRegister ( uint8_t Register ) diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/universe.c b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/universe.c index 19a53ce56a..ca0d048450 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/universe.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/universe.c @@ -100,9 +100,9 @@ typedef struct { uint32_t V6_STATID; /* Offset 0x0338 */ uint32_t V7_STATID; /* Offset 0x033C */ uint32_t Buf_Offset_0x0340[ 0x30 ]; /* Offset 0x0340 */ - uint32_t MAST_CTL; /* Offset 0x0400 */ - uint32_t MISC_CTL; /* Offset 0x0404 */ - uint32_t MISC_STAT; /* Offset 0x0408 */ + uint32_t MAST_CTL; /* Offset 0x0400 */ + uint32_t MISC_CTL; /* Offset 0x0404 */ + uint32_t MISC_STAT; /* Offset 0x0408 */ uint32_t USER_AM; /* Offset 0x040C */ uint32_t Buf_Offset_0x0410[ 0x2bc ];/* Offset 0x0410 */ uint32_t VSI0_CTL; /* Offset 0x0F00 */ @@ -146,7 +146,7 @@ volatile Universe_Memory *UNIVERSE; void PCI_bus_write( volatile uint32_t * _addr, /* IN */ uint32_t _data /* IN */ -) +) { outport_32(_addr, _data); } @@ -156,7 +156,7 @@ uint32_t PCI_bus_read( ) { uint32_t data; - + inport_32(_addr, data); return data; } @@ -179,14 +179,14 @@ void InitializeUniverse() { uint32_t pci_id; uint32_t universe_temp_value; - + /* - * Verify the UNIVERSE CHIP ID + * Verify the UNIVERSE CHIP ID */ (void)PCIConfigRead32(0,4,0,PCI_CONFIG_VENDOR_LOW, &pci_id); - /* - * compare to known ID + /* + * compare to known ID */ if (pci_id != 0x000010e3 ){ DEBUG_puts ("Invalid PPCN_60X_UNIVERSE_CHIP_ID: "); @@ -205,16 +205,16 @@ void InitializeUniverse() PCI_ENABLE_MEMORY_SPACE | PCI_ENABLE_BUS_MASTER); - /* + /* * Turn off the sysfail by setting SYSFAIL bit to 1 on the VCSR_CLR register */ - PCI_bus_write( &UNIVERSE->VCSR_CLR, 0x40000000 ); + PCI_bus_write( &UNIVERSE->VCSR_CLR, 0x40000000 ); #if 0 /* * Set VMEbus Slave Image 0 Base Address to 0x04000000 on VSI0_BS register. */ - PCI_bus_write( &UNIVERSE->VSI0_BS, 0x04000000 ); + PCI_bus_write( &UNIVERSE->VSI0_BS, 0x04000000 ); /* * Set VMEbus Slave Image 0 Bound Address to 0x05000000 on VSI0_BD register. @@ -222,7 +222,7 @@ void InitializeUniverse() PCI_bus_write( &UNIVERSE->VSI0_BD, 0x05000000 ); /* - * VMEbus Slave Image 0 Translation Offset to 0x7C000000 on VSI0_TO + * VMEbus Slave Image 0 Translation Offset to 0x7C000000 on VSI0_TO * register. Map the VME base address 0x4000000 to local memory address 0x0 */ PCI_bus_write( &UNIVERSE->VSI0_TO, 0x7C000000 ); @@ -231,12 +231,12 @@ void InitializeUniverse() * Set the VMEbus Slave Image 0 Control register with write posted, * read prefetch and AM code set for program, data, supervisor and user mode */ - PCI_bus_write( &UNIVERSE->VSI0_CTL, 0xE0F20000 ); + PCI_bus_write( &UNIVERSE->VSI0_CTL, 0xE0F20000 ); #endif /* * Set the VMEbus Master Control register with retry forever, 256 bytes - * posted write transfer count, VMEbus request level 3, RWD, PCI 32 bytes + * posted write transfer count, VMEbus request level 3, RWD, PCI 32 bytes * aligned burst size and PCI bus number to be zero */ PCI_bus_write( &UNIVERSE->MAST_CTL, 0x01C00000 ); @@ -245,9 +245,9 @@ void InitializeUniverse() * VMEbus DMA Transfer Control register with 32 bit VMEbus Maximum Data * width, A32 VMEbus Address Space, AM code to be data, none-privilleged, * single and BLT cycles on VME bus and 64-bit PCI Bus Transactions enable - PCI_bus_write( &UNIVERSE->DCTL, 0x00820180 ); + PCI_bus_write( &UNIVERSE->DCTL, 0x00820180 ); */ - + PCI_bus_write( &UNIVERSE->LSI0_CTL, 0x80700040 ); PCI_bus_write( &UNIVERSE->LSI0_BS, 0x04000000 ); PCI_bus_write( &UNIVERSE->LSI0_BD, 0x05000000 ); @@ -257,44 +257,44 @@ void InitializeUniverse() #if 0 /* * Set the PCI Slave Image 0 Control register with posted write enable, - * 32 bit data width, A32 VMEbus address base, AM code to be data, - * none-privilleged, single and BLT cycles on VME bus with PCI + * 32 bit data width, A32 VMEbus address base, AM code to be data, + * none-privilleged, single and BLT cycles on VME bus with PCI * bus memory space. - PCI_bus_write( &UNIVERSE->LSI0_CTL, 0xC0820100 ); + PCI_bus_write( &UNIVERSE->LSI0_CTL, 0xC0820100 ); */ - PCI_bus_write( &UNIVERSE->LSI0_CTL, 0x80700040 ); + PCI_bus_write( &UNIVERSE->LSI0_CTL, 0x80700040 ); /* - * Set the PCI Slave Image 0 Base Address to be + * Set the PCI Slave Image 0 Base Address to be * 0x0 on LSI0_BS register. */ PCI_bus_write( &UNIVERSE->LSI0_BS, 0x00FF0000 ); /* - * Set the PCI Slave Image 0 Bound Address to be + * Set the PCI Slave Image 0 Bound Address to be * 0xFFFFF000 on VSI0_BD register. */ - PCI_bus_write( &UNIVERSE->LSI0_BD, 0x00FFF000 ); + PCI_bus_write( &UNIVERSE->LSI0_BD, 0x00FFF000 ); /* - * Set the PCI Slave Image 0 Translation Offset to be + * Set the PCI Slave Image 0 Translation Offset to be * 0x0 on VSI0_TO register. - * Note: If the actual VME address is bigger than 0x40000000, we need + * Note: If the actual VME address is bigger than 0x40000000, we need * to set the PCI Slave Image 0 Translation Offset = 0x40000000 - * register. - * i.e. if actual VME ADRR = 0x50000000, then we - * need to subtract it by 0x40000000 and set + * register. + * i.e. if actual VME ADRR = 0x50000000, then we + * need to subtract it by 0x40000000 and set * the LSI0_T0 register to be 0x40000000 and then * perform a PCI data access by adding 0xC0000000 to * 0x10000000 -- which is came form the result of - * (0x50000000 - 0x40000000). + * (0x50000000 - 0x40000000). */ - PCI_bus_write( &UNIVERSE->LSI0_TO, 0x0 ); + PCI_bus_write( &UNIVERSE->LSI0_TO, 0x0 ); #endif - /* + /* * Remove the Universe from VMEbus BI-Mode (bus-isolation). Once out of - * BI-Mode VMEbus accesses can be made. + * BI-Mode VMEbus accesses can be made. */ universe_temp_value = PCI_bus_read( &UNIVERSE->MISC_CTL ); @@ -309,22 +309,22 @@ void InitializeUniverse() * Slave Image 0 registers. */ void set_vme_base_address ( - uint32_t base_address + uint32_t base_address ) -{ +{ volatile uint32_t temp; /* * Calculate the current size of the Slave VME image 0 */ - temp = ( PCI_bus_read( &UNIVERSE->VSI0_BD) & 0xFFFFF000) - + temp = ( PCI_bus_read( &UNIVERSE->VSI0_BD) & 0xFFFFF000) - ( PCI_bus_read( &UNIVERSE->VSI0_BS) & 0xFFFFF000); /* - * Set the VMEbus Slave Image 0 Base Address to be + * Set the VMEbus Slave Image 0 Base Address to be * the specifed base address on VSI0_BS register. */ - PCI_bus_write( &UNIVERSE->VSI0_BS, (base_address & 0xFFFFF000) ); + PCI_bus_write( &UNIVERSE->VSI0_BS, (base_address & 0xFFFFF000) ); /* * Update the VMEbus Slave Image 0 Bound Address. @@ -342,7 +342,7 @@ void set_vme_base_address ( * Gets the VME base address */ uint32_t get_vme_base_address () -{ +{ volatile uint32_t temp; temp = PCI_bus_read( &UNIVERSE->VSI0_BS ); @@ -364,15 +364,15 @@ uint32_t get_vme_slave_size() * Note: The maximum size is up to 24 M bytes. (00000000 - 017FFFFF) */ void set_vme_slave_size (uint32_t size) -{ +{ volatile uint32_t temp; - if (size<0) + if (size<0) size = 0; - - if (size > 0x17FFFFF) + + if (size > 0x17FFFFF) size = 0x17FFFFF; - + /* * Read the VME slave image base address */ @@ -424,20 +424,20 @@ void put_vme( uint16_t *vme_ptr, uint16_t value ) -{ +{ if (vme_ptr > (uint16_t*)0x3EFFFFFF) { - /* + /* * LSI0_TO register to 0x3EFFF000 if it had not been updated already */ if (( PCI_bus_read( &UNIVERSE->LSI0_TO) & 0xFFFFF000) != 0x3EFFF000) PCI_bus_write( &UNIVERSE->LSI0_TO, 0x3EFFF000 ); - - *(uint16_t*) (((uint32_t)vme_ptr - 0x3EFFF000) + + + *(uint16_t*) (((uint32_t)vme_ptr - 0x3EFFF000) + PPCN_60X_PCI_MEM_BASE) = value; } else - *(uint16_t*)((uint32_t)vme_ptr + + *(uint16_t*)((uint32_t)vme_ptr + PPCN_60X_PCI_MEM_BASE) = value; } #endif diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/vectors.S b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/vectors.S index cd7b737314..2f30978143 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/vectors.S +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/vectors.S @@ -17,7 +17,7 @@ */ /* vectors.s 1.1 - 95/12/04 * - * This file contains the assembly code for the PowerPC + * This file contains the assembly code for the PowerPC * interrupt veneers for RTEMS. * */ @@ -116,58 +116,58 @@ PUBLIC_VAR (__vectors) SYM (__vectors): - + #if PPCN_60X_USE_DINK - .org reset_vector - file_base + .org reset_vector - file_base /* This is where the DINK soft reset handler is located */ - ba 0xfff00180 - - .org mach_vector - file_base + ba 0xfff00180 + + .org mach_vector - file_base ba 0xfff00200 - - .org prot_vector - file_base + + .org prot_vector - file_base ba 0xfff00300 - - .org isi_vector - file_base + + .org isi_vector - file_base ba 0xfff00400 - - .org ext_vector - file_base + + .org ext_vector - file_base rfi - - .org align_vector - file_base - ba 0xfff00600 - - .org prog_vector - file_base - ba 0xfff00700 - - .org float_vector - file_base + + .org align_vector - file_base + ba 0xfff00600 + + .org prog_vector - file_base + ba 0xfff00700 + + .org float_vector - file_base ba 0xfff00800 - .org dec_vector - file_base + .org dec_vector - file_base rfi - - .org sys_vector - file_base - ba 0xfff00C00 - - .org trace_vector - file_base - ba 0xfff00d00 - - .org itm_vector - file_base - ba 0xfff01000 - - .org dltm_vector - file_base - ba 0xfff01100 - - .org dstm_vector - file_base - ba 0xfff01200 - - .org addr_vector - file_base - ba 0xfff01300 - - .org sysmgmt_vector - file_base - ba 0xfff01400 + + .org sys_vector - file_base + ba 0xfff00C00 + + .org trace_vector - file_base + ba 0xfff00d00 + + .org itm_vector - file_base + ba 0xfff01000 + + .org dltm_vector - file_base + ba 0xfff01100 + + .org dstm_vector - file_base + ba 0xfff01200 + + .org addr_vector - file_base + ba 0xfff01300 + + .org sysmgmt_vector - file_base + ba 0xfff01400 #else - .org reset_vector - file_base + .org reset_vector - file_base stwu r1, -(IP_END)(r1) stw r4,IP_4(r1) li r4,1 @@ -198,8 +198,8 @@ waitfortx: lwz r3,IP_3(r1) addi r1,r1,IP_END rfi - - .org mach_vector - file_base + + .org mach_vector - file_base stwu r1, -(IP_END)(r1) stw r4,IP_4(r1) stw r3,IP_3(r1) @@ -215,80 +215,80 @@ waitfortx: dcbst 0,r4 li r4,0x02 b display_exc - - .org prot_vector - file_base + + .org prot_vector - file_base stwu r1, -(IP_END)(r1) stw r4,IP_4(r1) li r4,0x03 b display_exc - - .org isi_vector - file_base + + .org isi_vector - file_base stwu r1, -(IP_END)(r1) stw r4,IP_4(r1) li r4,0x04 b display_exc - - .org ext_vector - file_base + + .org ext_vector - file_base rfi - - .org align_vector - file_base + + .org align_vector - file_base stwu r1, -(IP_END)(r1) stw r4,IP_4(r1) li r4,0x06 b display_exc - - .org prog_vector - file_base + + .org prog_vector - file_base stwu r1, -(IP_END)(r1) stw r4,IP_4(r1) li r4,0x07 b display_exc - .org float_vector - file_base + .org float_vector - file_base stwu r1, -(IP_END)(r1) stw r4,IP_4(r1) li r4,0x08 b display_exc - .org dec_vector - file_base + .org dec_vector - file_base rfi - - .org sys_vector - file_base + + .org sys_vector - file_base stwu r1, -(IP_END)(r1) stw r4,IP_4(r1) li r4,0x0a b display_exc - - .org trace_vector - file_base + + .org trace_vector - file_base stwu r1, -(IP_END)(r1) stw r4,IP_4(r1) li r4,0x0b b display_exc - - .org itm_vector - file_base + + .org itm_vector - file_base stwu r1, -(IP_END)(r1) stw r4,IP_4(r1) li r4,0x0c b display_exc - - .org dltm_vector - file_base + + .org dltm_vector - file_base stwu r1, -(IP_END)(r1) stw r4,IP_4(r1) li r4,0x0d b display_exc - - .org dstm_vector - file_base + + .org dstm_vector - file_base stwu r1, -(IP_END)(r1) stw r4,IP_4(r1) li r4,0x0e b display_exc - - .org addr_vector - file_base + + .org addr_vector - file_base stwu r1, -(IP_END)(r1) stw r4,IP_4(r1) li r4,0x0f b display_exc - - .org sysmgmt_vector - file_base + + .org sysmgmt_vector - file_base stwu r1, -(IP_END)(r1) stw r4,IP_4(r1) li r4,0x00 |