diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-30 04:37:44 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-30 04:37:44 +0000 |
commit | ac7af4a359cc51bc06e1bf0ed3314744972b8395 (patch) | |
tree | 7c73805f8b66af9b3082fbde80f6eb70edd966ac /c/src/lib/libbsp/powerpc/ep1a | |
parent | 2009-11-30 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-ac7af4a359cc51bc06e1bf0ed3314744972b8395.tar.bz2 |
Whitespace removal.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/ep1a')
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/console/alloc360.c | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/console/config.c | 24 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/console/console.c | 18 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/console/m68360.h | 44 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/console/mc68360_scc.c | 48 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/console/polled_io.c | 142 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.c | 42 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h | 44 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/include/bsp.h | 16 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/irq/irq_init.c | 12 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/pci/no_host_bridge.c | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/start/start.S | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c | 52 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/vme/VMEConfig.h | 22 |
16 files changed, 246 insertions, 246 deletions
diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/alloc360.c b/c/src/lib/libbsp/powerpc/ep1a/console/alloc360.c index 0d1b31b729..57e887fe7d 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/alloc360.c +++ b/c/src/lib/libbsp/powerpc/ep1a/console/alloc360.c @@ -25,15 +25,15 @@ #include <rtems/bspIo.h> -#define DEBUG_PRINT 1 +#define DEBUG_PRINT 1 void M360SetupMemory( M68360_t ptr ){ volatile m360_t *m360; - + m360 = ptr->m360; #if DEBUG_PRINT -printk("m360->mcr:0x%08x Q1_360_SIM_MCR:0x%08x\n", +printk("m360->mcr:0x%08x Q1_360_SIM_MCR:0x%08x\n", (unsigned int)&(m360->mcr), ((unsigned int)m360+Q1_360_SIM_MCR)); #endif ptr->bdregions[0].base = (char *)&m360->dpram1[0]; @@ -93,7 +93,7 @@ M360AllocateBufferDescriptors (M68360_t ptr, int count) continue; } *cp = 0x0; - } + } have = ptr->bdregions[i].size - ptr->bdregions[i].used; if (have >= want) { diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/config.c b/c/src/lib/libbsp/powerpc/ep1a/console/config.c index 9e0a952f8c..a2f390b431 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/config.c +++ b/c/src/lib/libbsp/powerpc/ep1a/console/config.c @@ -1,6 +1,6 @@ /* * This file contains the TTY driver table for the EP1A - * + * * COPYRIGHT (c) 1989-2008. * On-Line Applications Research Corporation (OAR). * @@ -386,47 +386,47 @@ static bool config_68360_scc_base_probe(int minor, unsigned long busNo, unsigned static bool config_68360_scc_base_probe_1( int minor ) { return config_68360_scc_base_probe(minor, 0, 11, 1); } - + static bool config_68360_scc_base_probe_2( int minor ) { return config_68360_scc_base_probe(minor, 0, 11, 2); } - + static bool config_68360_scc_base_probe_3( int minor ) { return config_68360_scc_base_probe( minor, 0, 11, 3); } - + static bool config_68360_scc_base_probe_4( int minor ) { return config_68360_scc_base_probe( minor, 0, 11, 4); } - + static bool config_68360_scc_base_probe_5( int minor ) { return config_68360_scc_base_probe( minor, 0, 16, 1); } - + static bool config_68360_scc_base_probe_6( int minor ) { return config_68360_scc_base_probe( minor, 0, 16, 2); } - + static bool config_68360_scc_base_probe_7( int minor ) { return config_68360_scc_base_probe( minor, 0, 16, 3); } - + static bool config_68360_scc_base_probe_8( int minor ) { return config_68360_scc_base_probe( minor, 0, 16, 4); } - + static bool config_68360_scc_base_probe_9( int minor ) { return config_68360_scc_base_probe( minor, 0, 15, 1); } - + static bool config_68360_scc_base_probe_10( int minor ) { return config_68360_scc_base_probe( minor, 0, 15, 2); } - + static bool config_68360_scc_base_probe_11( int minor ) { return config_68360_scc_base_probe( minor, 0, 15, 3); } - + static bool config_68360_scc_base_probe_12( int minor ) { return config_68360_scc_base_probe( minor, 0, 15, 4); } diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/console.c b/c/src/lib/libbsp/powerpc/ep1a/console/console.c index 6ea68b436d..58da412042 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/console.c +++ b/c/src/lib/libbsp/powerpc/ep1a/console/console.c @@ -1,5 +1,5 @@ /* - * This file contains the TTY driver for the ep1a + * This file contains the TTY driver for the ep1a * * This driver uses the termios pseudo driver. * @@ -32,7 +32,7 @@ console_data Console_Port_Data[NUM_CONSOLE_PORTS]; unsigned long Console_Port_Count; rtems_device_minor_number Console_Port_Minor; - + /* PAGE * * console_open @@ -70,9 +70,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); @@ -102,7 +102,7 @@ rtems_device_driver console_open( return status; } - + rtems_device_driver console_close( rtems_device_major_number major, rtems_device_minor_number minor, @@ -120,7 +120,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, @@ -129,7 +129,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, @@ -138,7 +138,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, @@ -194,7 +194,7 @@ rtems_device_driver console_initialize( */ rtems_fatal_error_occurred(RTEMS_IO_ERROR); } - + Console_Port_Minor=minor; /* diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/m68360.h b/c/src/lib/libbsp/powerpc/ep1a/console/m68360.h index c1077f482e..eee2c69285 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/m68360.h +++ b/c/src/lib/libbsp/powerpc/ep1a/console/m68360.h @@ -1,20 +1,20 @@ /* - * MOTOROLA MC68360 QUAD INTEGRATED COMMUNICATIONS CONTROLLER (QUICC) - * - * HARDWARE DECLARATIONS - * - * - * Submitted By: - * - * W. Eric Norum - * Saskatchewan Accelerator Laboratory - * University of Saskatchewan - * 107 North Road - * Saskatoon, Saskatchewan, CANADA - * S7N 5C6 - * - * eric@skatter.usask.ca - * + * MOTOROLA MC68360 QUAD INTEGRATED COMMUNICATIONS CONTROLLER (QUICC) + * + * HARDWARE DECLARATIONS + * + * + * Submitted By: + * + * W. Eric Norum + * Saskatchewan Accelerator Laboratory + * University of Saskatchewan + * 107 North Road + * Saskatoon, Saskatchewan, CANADA + * S7N 5C6 + * + * eric@skatter.usask.ca + * * * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). @@ -759,7 +759,7 @@ typedef struct m360_ { volatile uint8_t _pad14[0xF0-0xD0]; volatile uint8_t _pad15[0x100-0xF0]; volatile uint8_t _pad16[0x500-0x100]; - + /* * IDMA1 Block */ @@ -777,7 +777,7 @@ typedef struct m360_ { volatile uint8_t csr1; volatile uint8_t _pad21; volatile uint16_t _pad22; - + /* * SDMA Block */ @@ -785,7 +785,7 @@ typedef struct m360_ { volatile uint8_t _pad23; volatile uint16_t sdcr; volatile uint32_t sdar; - + /* * IDMA2 Block */ @@ -802,7 +802,7 @@ typedef struct m360_ { volatile uint8_t _pad28; volatile uint16_t _pad29; volatile uint32_t _pad30; - + /* * CPIC Block */ @@ -826,7 +826,7 @@ typedef struct m360_ { volatile uint16_t pcint; volatile uint16_t _pad32; volatile uint32_t _pad33[5]; - + /* * TIMER Block */ @@ -854,7 +854,7 @@ typedef struct m360_ { volatile uint16_t ter3; volatile uint16_t ter4; volatile uint32_t _pad36[2]; - + /* * CP Block */ diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/mc68360_scc.c b/c/src/lib/libbsp/powerpc/ep1a/console/mc68360_scc.c index 975e9a6104..ede9133864 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/mc68360_scc.c +++ b/c/src/lib/libbsp/powerpc/ep1a/console/mc68360_scc.c @@ -148,10 +148,10 @@ void scc_write32( void mc68360_sccShow_Regs(int minor){ M68360_serial_ports_t ptr; ptr = Console_Port_Tbl[minor].pDeviceParams; - + printk( "scce 0x%08x", &ptr->pSCCR->scce ); printk( " 0x%04x\n", ptr->pSCCR->scce ); - + } #define TX_BUFFER_ADDRESS( _ptr ) \ @@ -212,11 +212,11 @@ mc68360_sccBRGC(int baud, int m360_clock_rate) else data = (33333333 / (baud * 16 * 16) ) - 1; data *= 2; data &= 0x00001ffe ; - + /* really data = 0x010000 | data | ((baud>300)? 0 : 1 ) ; */ data |= ((baud>300)? 0 : 1 ) ; data |= 0x010000 ; - + return data; } @@ -285,7 +285,7 @@ if (length > 1) &data, 1); } - scc_write16( "sccRxBd->status", &chip->port[port].sccRxBd->status, + scc_write16( "sccRxBd->status", &chip->port[port].sccRxBd->status, M360_BD_EMPTY | M360_BD_WRAP | M360_BD_INTERRUPT ); status =scc_read16( "sccRxBd->status", &chip->port[port].sccRxBd->status); } @@ -304,10 +304,10 @@ if (length > 1) scc_write16("sccTxBd->status",&chip->port[port].sccTxBd->status,0); #if 1 rtems_termios_dequeue_characters( - Console_Port_Data[chip->port[port].minor].termios_data, + Console_Port_Data[chip->port[port].minor].termios_data, chip->port[port].sccTxBd->length); #else - mc68360_scc_write_support_int(chip->port[port].minor,"*****", 5); + mc68360_scc_write_support_int(chip->port[port].minor,"*****", 5); #endif } } @@ -378,7 +378,7 @@ uint32_t mc68360_scc_calculate_pbdat( M68360_t chip ) pbdat_data = 0x3; for (i=0; i<4; i++) { minor = chip->port[i].minor; - if mc68360_scc_Is_422( minor ) + if mc68360_scc_Is_422( minor ) pbdat_data |= type422data[i]; } @@ -408,7 +408,7 @@ void mc68360_scc_initialize_interrupts(int minor) ptr = Console_Port_Tbl[minor].pDeviceParams; m360 = ptr->chip->m360; - + #ifdef DEBUG_360 printk("m360 0x%08x baseaddr 0x%08x\n", m360, ptr->chip->board_data->baseaddr); @@ -585,7 +585,7 @@ void mc68360_scc_initialize_interrupts(int minor) scc_write16( "sccRxBd->status", &ptr->sccRxBd->status, 0x0000 ); SYNC(); scc_write16( "sccRxBd->length", &ptr->sccRxBd->length, 0x0000 ); - scc_write16( "sccRxBd->status", &ptr->sccRxBd->status, + scc_write16( "sccRxBd->status", &ptr->sccRxBd->status, M360_BD_EMPTY | M360_BD_WRAP | M360_BD_INTERRUPT ); /* XXX Radstone Example writes RX buffer ptr as two u16's */ scc_write32( "sccRxBd->buffer", &ptr->sccRxBd->buffer, @@ -612,14 +612,14 @@ void mc68360_scc_initialize_interrupts(int minor) scc_write16( "pSCCR->sccm", &ptr->pSCCR->sccm, M360_SCCE_TX | M360_SCCE_RX ); - data = scc_read32("cimr", &m360->cimr); + data = scc_read32("cimr", &m360->cimr); data |= (0x80000000 >> ptr->channel); scc_write32( "cimr", &m360->cimr, data ); SYNC(); scc_write32( "cipr", &m360->cipr, scc_read32( "cipr", &m360->cipr ) ); scc_write32( "pSCCR->gsmr_h", &ptr->pSCCR->gsmr_h, M360_GSMR_RFW ); - scc_write32( "pSCCR->gsmr_l", &ptr->pSCCR->gsmr_l, + scc_write32( "pSCCR->gsmr_l", &ptr->pSCCR->gsmr_l, (M360_GSMR_TDCR_16X | M360_GSMR_RDCR_16X | M360_GSMR_MODE_UART) ); scc_write16( "pSCCR->dsr", &ptr->pSCCR->dsr, 0x7e7e ); @@ -641,12 +641,12 @@ void mc68360_scc_initialize_interrupts(int minor) data = PMCQ1_Read_EPLD(ptr->chip->board_data->baseaddr, PMCQ1_INT_MASK ); data &= (~PMCQ1_INT_MASK_QUICC); - PMCQ1_Write_EPLD(ptr->chip->board_data->baseaddr, PMCQ1_INT_MASK, data ); - + PMCQ1_Write_EPLD(ptr->chip->board_data->baseaddr, PMCQ1_INT_MASK, data ); + data = PMCQ1_Read_EPLD(ptr->chip->board_data->baseaddr, PMCQ1_INT_STATUS ); data &= (~PMCQ1_INT_STATUS_QUICC); PMCQ1_Write_EPLD(ptr->chip->board_data->baseaddr, PMCQ1_INT_STATUS, data ); -#endif +#endif } /* @@ -696,10 +696,10 @@ int mc68360_scc_write_support_int( scc_write16( "sccTxBd->status", &ptr->sccTxBd->status, 0 ); memcpy((void *) ptr->txBuf, buf, len); - scc_write32( "sccTxBd->buffer", &ptr->sccTxBd->buffer, + scc_write32( "sccTxBd->buffer", &ptr->sccTxBd->buffer, TX_BUFFER_ADDRESS(ptr->txBuf) ); scc_write16( "sccTxBd->length", &ptr->sccTxBd->length, len ); - scc_write16( "sccTxBd->status", &ptr->sccTxBd->status, + scc_write16( "sccTxBd->status", &ptr->sccTxBd->status, (M360_BD_READY | M360_BD_WRAP | M360_BD_INTERRUPT) ); rtems_interrupt_enable(Irql); @@ -802,18 +802,18 @@ printk("mc68360_scc_set_attributes\n"); else value |= M360_PSMR_SL_1; /* One stop bit */ - /* Set Parity M360_PSMR_PEN bit should be clear on no parity so - * do nothing in that case + /* Set Parity M360_PSMR_PEN bit should be clear on no parity so + * do nothing in that case */ if (t->c_cflag & PARENB) /* enable parity detection? */ { - value |= M360_PSMR_PEN; + value |= M360_PSMR_PEN; if (t->c_cflag & PARODD){ value |= M360_PSMR_RPM_ODD; /* select odd parity */ - value |= M360_PSMR_TPM_ODD; + value |= M360_PSMR_TPM_ODD; } else { value |= M360_PSMR_RPM_EVEN; /* select even parity */ - value |= M360_PSMR_TPM_EVEN; + value |= M360_PSMR_TPM_EVEN; } } @@ -865,7 +865,7 @@ int mc68360_scc_write_support_polled( int len ) { - printk("mc68360_scc_write_support_polled: minor %d char %c len %d\n", + printk("mc68360_scc_write_support_polled: minor %d char %c len %d\n", minor, buf, len ); return 0; } @@ -955,7 +955,7 @@ int mc68360_scc_create_chip( PPMCQ1BoardData BoardData, uint8_t int_vector ) chip->board_data->slotNo, chip->board_data->funcNo, &mc68360_sccInterruptHandler, - chip + chip ); return RTEMS_SUCCESSFUL; diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c b/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c index 1a75435f37..8237193a7b 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c +++ b/c/src/lib/libbsp/powerpc/ep1a/console/ns16550cfg.c @@ -1,4 +1,4 @@ -/* +/* * This include file contains all console driver definations for the nc16550 * * COPYRIGHT (c) 1989-2008. @@ -14,7 +14,7 @@ #include <rtems.h> #include <bsp.h> #include "console.h" - + typedef struct uart_reg { unsigned char reg; @@ -41,7 +41,7 @@ void Write_ns16550_register( { volatile struct uart_reg *p = (volatile struct uart_reg *)ulCtrlPort; volatile int i; - p[ucRegNum].reg = ucData; + p[ucRegNum].reg = ucData; asm volatile("sync"); asm volatile("isync"); asm volatile("eieio"); diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/polled_io.c b/c/src/lib/libbsp/powerpc/ep1a/console/polled_io.c index 9093456fcf..56015145cb 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/polled_io.c +++ b/c/src/lib/libbsp/powerpc/ep1a/console/polled_io.c @@ -206,34 +206,34 @@ unsigned int keymap_count = 7; */ char func_buf[] = { - '\033', '[', '[', 'A', 0, - '\033', '[', '[', 'B', 0, - '\033', '[', '[', 'C', 0, - '\033', '[', '[', 'D', 0, - '\033', '[', '[', 'E', 0, - '\033', '[', '1', '7', '~', 0, - '\033', '[', '1', '8', '~', 0, - '\033', '[', '1', '9', '~', 0, - '\033', '[', '2', '0', '~', 0, - '\033', '[', '2', '1', '~', 0, - '\033', '[', '2', '3', '~', 0, - '\033', '[', '2', '4', '~', 0, - '\033', '[', '2', '5', '~', 0, - '\033', '[', '2', '6', '~', 0, - '\033', '[', '2', '8', '~', 0, - '\033', '[', '2', '9', '~', 0, - '\033', '[', '3', '1', '~', 0, - '\033', '[', '3', '2', '~', 0, - '\033', '[', '3', '3', '~', 0, - '\033', '[', '3', '4', '~', 0, - '\033', '[', '1', '~', 0, - '\033', '[', '2', '~', 0, - '\033', '[', '3', '~', 0, - '\033', '[', '4', '~', 0, - '\033', '[', '5', '~', 0, - '\033', '[', '6', '~', 0, - '\033', '[', 'M', 0, - '\033', '[', 'P', 0, + '\033', '[', '[', 'A', 0, + '\033', '[', '[', 'B', 0, + '\033', '[', '[', 'C', 0, + '\033', '[', '[', 'D', 0, + '\033', '[', '[', 'E', 0, + '\033', '[', '1', '7', '~', 0, + '\033', '[', '1', '8', '~', 0, + '\033', '[', '1', '9', '~', 0, + '\033', '[', '2', '0', '~', 0, + '\033', '[', '2', '1', '~', 0, + '\033', '[', '2', '3', '~', 0, + '\033', '[', '2', '4', '~', 0, + '\033', '[', '2', '5', '~', 0, + '\033', '[', '2', '6', '~', 0, + '\033', '[', '2', '8', '~', 0, + '\033', '[', '2', '9', '~', 0, + '\033', '[', '3', '1', '~', 0, + '\033', '[', '3', '2', '~', 0, + '\033', '[', '3', '3', '~', 0, + '\033', '[', '3', '4', '~', 0, + '\033', '[', '1', '~', 0, + '\033', '[', '2', '~', 0, + '\033', '[', '3', '~', 0, + '\033', '[', '4', '~', 0, + '\033', '[', '5', '~', 0, + '\033', '[', '6', '~', 0, + '\033', '[', 'M', 0, + '\033', '[', 'P', 0, }; char *funcbufptr = func_buf; @@ -321,7 +321,7 @@ unsigned int accent_table_size = 68; /* These #defines have been copied from drivers/char/pc_keyb.h, by - * Martin Mares (mj@ucw.cz). + * Martin Mares (mj@ucw.cz). * converted to offsets by Till Straumann <strauman@slac.stanford.edu> */ #define KBD_STATUS_REG 0x4 /* Status register (R) */ @@ -386,7 +386,7 @@ SPR_RO(PVR) #endif /* USE_KBD_SUPPORT */ -/* Early messages after mm init but before console init are kept in log +/* Early messages after mm init but before console init are kept in log * buffers. */ #define PAGE_LOG_CHARS (PAGE_SIZE-sizeof(int)-sizeof(u_long)-1) @@ -511,7 +511,7 @@ static void pfree(void* p) --global_index; } #endif - + void log_putc(const u_char c) { console_log *l; @@ -521,11 +521,11 @@ void log_putc(const u_char c) { if (!l) { l=__palloc(sizeof(console_log)); memset(l, 0, sizeof(console_log)); - if (!console_global_data.log) + if (!console_global_data.log) console_global_data.log = l; else { console_log *p; - for (p=console_global_data.log; + for (p=console_global_data.log; p->next; p=p->next); p->next = l; } @@ -536,7 +536,7 @@ void log_putc(const u_char c) { /* This puts is non standard since it does not automatically add a newline * at the end. So it is made private to avoid confusion in other files. */ -static +static void puts(const u_char *s) { char c; @@ -551,10 +551,10 @@ static void flush_log(void) { console_log *p, *next; if (console_global_data.vacuum_sent) { -#ifdef TRACE_FLUSH_LOG - printk("%d characters sent into oblivion before MM init!\n", +#ifdef TRACE_FLUSH_LOG + printk("%d characters sent into oblivion before MM init!\n", console_global_data.vacuum_sent); -#endif +#endif } for(p=console_global_data.log; p; p=next) { puts(p->data); @@ -572,7 +572,7 @@ void serial_putc(const u_char c) while ((INL_CONSOLE_INB(lsr) & LSR_THRE) == 0) ; INL_CONSOLE_OUTB(thr, c); } - + int serial_getc(void) { while ((INL_CONSOLE_INB(lsr) & LSR_DR) == 0) ; @@ -589,16 +589,16 @@ static void scroll(void) { int i; - memcpy ( (u_char *)vidmem, (u_char *)vidmem + console_global_data.cols * 2, + memcpy ( (u_char *)vidmem, (u_char *)vidmem + console_global_data.cols * 2, ( console_global_data.lines - 1 ) * console_global_data.cols * 2 ); - for ( i = ( console_global_data.lines - 1 ) * console_global_data.cols * 2; - i < console_global_data.lines * console_global_data.cols * 2; + for ( i = ( console_global_data.lines - 1 ) * console_global_data.cols * 2; + i < console_global_data.lines * console_global_data.cols * 2; i += 2 ) vidmem[i] = ' '; } /* - * cursor() sets an offset (0-1999) into the 80x25 text area + * cursor() sets an offset (0-1999) into the 80x25 text area */ static void cursor(int x, int y) @@ -610,7 +610,7 @@ cursor(int x, int y) vga_outb(0x15, pos); } -void +void vga_putc(const u_char c) { int x,y; @@ -630,7 +630,7 @@ vga_putc(const u_char c) } else if (c == '\r') { x = 0; } else { - vidmem [ ( x + console_global_data.cols * y ) * 2 ] = c; + vidmem [ ( x + console_global_data.cols * y ) * 2 ] = c; if ( ++x >= console_global_data.cols ) { x = 0; if ( ++y >= console_global_data.lines ) { @@ -767,7 +767,7 @@ static int kbd_get(int ms) { else return data; } - if (--ms < 0) return -1; + if (--ms < 0) return -1; #ifdef __BOOT__ boot_udelay(1000); #else @@ -778,7 +778,7 @@ static int kbd_get(int ms) { static void kbd_put(u_char c, int ms, int port) { while (kbd_inb(KBD_STATUS_REG) & KBD_STAT_IBF) { - if (--ms < 0) return; + if (--ms < 0) return; #ifdef __BOOT__ boot_udelay(1000); #else @@ -802,14 +802,14 @@ int kbdreset(void) /* Enable then reset the KB */ kbd_put(KBD_CCMD_KBD_ENABLE, 10, KBD_CNTL_REG); - + while (1) { kbd_put(KBD_CMD_RESET, 10, KBD_DATA_REG); c = kbd_get(1000); if (c == KBD_REPLY_ACK) break; if (c != KBD_REPLY_RESEND) return 2; } - + if (kbd_get(1000) != KBD_REPLY_POR) return 3; /* Disable the keyboard while setting up the controller */ @@ -818,7 +818,7 @@ int kbdreset(void) /* Enable interrupts and keyboard controller */ kbd_put(KBD_CCMD_WRITE_MODE, 10, KBD_CNTL_REG); - kbd_put(KBD_MODE_KBD_INT | KBD_MODE_SYS | + kbd_put(KBD_MODE_KBD_INT | KBD_MODE_SYS | KBD_MODE_DISABLE_MOUSE | KBD_MODE_KCC, 10, KBD_DATA_REG); @@ -835,30 +835,30 @@ int kbd_tstc(void) } #endif /* USE_KBD_SUPPORT */ -const struct console_io +const struct console_io vacuum_console_functions = { - vacuum_putc, - vacuum_getc, + vacuum_putc, + vacuum_getc, vacuum_tstc }; static const struct console_io log_console_functions = { - log_putc, - vacuum_getc, + log_putc, + vacuum_getc, vacuum_tstc } , serial_console_functions = { - serial_putc, - serial_getc, + serial_putc, + serial_getc, serial_tstc } #if defined(USE_KBD_SUPPORT) && defined(USE_VGA_SUPPORT) , vga_console_functions = { - vga_putc, - kbd_getc, + vga_putc, + kbd_getc, kbd_tstc } #endif @@ -868,7 +868,7 @@ console_io* curIo = (console_io*) &vacuum_console_functions; int select_console(ioType t) { static ioType curType = CONSOLE_VACUUM; - + switch (t) { case CONSOLE_VACUUM : curIo = (console_io*)&vacuum_console_functions; break; case CONSOLE_LOG : curIo = (console_io*)&log_console_functions; break; @@ -911,7 +911,7 @@ int printk(const char *fmt, ...) { int i; /* Should not be a problem with 8kB of stack */ char buf[1024]; - + va_start(args, fmt); i = k_vsprintf(buf, fmt, args); va_end(args); @@ -949,7 +949,7 @@ do { u32 t1, t2, t3; \ "=r" (num), "=&r" (t1), "=&r" (t2), "=&r"(t3), "=&b" (rmd) : \ "0" (num)); \ \ -} while(0); +} while(0); #define SIGN 1 /* unsigned/signed long */ #define LARGE 2 /* use 'ABCDEF' instead of 'abcdef' */ @@ -976,7 +976,7 @@ static char * number(char * str, int size, int type, u64 num) sign = '-'; num = -num; size--; - } + } } i = 0; @@ -990,7 +990,7 @@ static char * number(char * str, int size, int type, u64 num) } tmp[i++] = digits[rem]; } while (num != 0); - + size -= i; if (!(type&(ZEROPAD))) while(size-->0) @@ -1024,14 +1024,14 @@ int k_vsprintf(char *buf, const char *fmt, va_list args) *str++ = *fmt; continue; } - + /* process flags, only 0 padding needed */ flags = 0; if (*++fmt == '0' ) { flags |= ZEROPAD; fmt++; } - + /* get field width */ field_width = -1; if (is_digit(*fmt)) @@ -1094,14 +1094,14 @@ int k_vsprintf(char *buf, const char *fmt, va_list args) --fmt; continue; } - /* This ugly code tries to minimize the number of va_arg() - * since they expand to a lot of code on PPC under the SYSV - * calling conventions (but not with -mcall-aix which has + /* This ugly code tries to minimize the number of va_arg() + * since they expand to a lot of code on PPC under the SYSV + * calling conventions (but not with -mcall-aix which has * other problems). Arguments have at least the size of a * long allocated, and we use this fact to minimize bloat. * (and pointers are assimilated to unsigned long too). */ - if (sizeof(long long) > sizeof(long) && flags & LLONG) + if (sizeof(long long) > sizeof(long) && flags & LLONG) num = va_arg(args, unsigned long long); else { u_long n = va_arg(args, unsigned long); @@ -1111,10 +1111,10 @@ int k_vsprintf(char *buf, const char *fmt, va_list args) else n = (unsigned short) n; } else if (! flags & LONG) { - /* Here the compiler correctly removes this + /* Here the compiler correctly removes this * do nothing code on 32 bit PPC. */ - if (flags & SIGN) + if (flags & SIGN) n = (int) n; else n = (unsigned) n; diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.c b/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.c index 764ab53eb1..4f45af45b8 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.c +++ b/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.c @@ -1,6 +1,6 @@ /* rsPMCQ1.c - Radstone PMCQ1 Common Initialisation Code * - * Copyright 2000 Radstone Technology + * Copyright 2000 Radstone Technology * * THIS FILE IS PROVIDED TO YOU, THE USER, "AS IS", WITHOUT WARRANTY OF ANY * KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE @@ -34,7 +34,7 @@ call rsPMCQ1Init() to perform ba sic initialisation of the PMCQ1's. #include <libcpu/io.h> #include <bsp/irq.h> #include <stdlib.h> -#include <rtems/bspIo.h> +#include <rtems/bspIo.h> #include <bsp/pci.h> #include <bsp.h> #include "rsPMCQ1.h" @@ -103,7 +103,7 @@ int read32( int addr){ void rsPMCQ1_scc_nullFunc(void) {} - + /******************************************************************************* * rsPMCQ1Int - handle a PMCQ1 interrupt * @@ -185,7 +185,7 @@ unsigned int rsPMCQ1MaIntConnect ( for (boardData = pmcq1BoardData; boardData; boardData = boardData->pNext) { - if ((boardData->busNo == busNo) && (boardData->slotNo == slotNo) && + if ((boardData->busNo == busNo) && (boardData->slotNo == slotNo) && (boardData->funcNo == funcNo)) { boardData->maInt = routine; @@ -206,7 +206,7 @@ unsigned int rsPMCQ1MaIntConnect ( return (status); } - + /******************************************************************************* * * rsPMCQ1MaIntDisconnect - disconnect a MiniAce interrupt routine @@ -227,7 +227,7 @@ unsigned int rsPMCQ1MaIntDisconnect( unsigned int status = RTEMS_IO_ERROR; for (boardData = pmcq1BoardData; boardData; boardData = boardData->pNext) { - if ((boardData->busNo == busNo) && (boardData->slotNo == slotNo) && + if ((boardData->busNo == busNo) && (boardData->slotNo == slotNo) && (boardData->funcNo == funcNo)) { boardData->maInt = NULL; @@ -239,7 +239,7 @@ unsigned int rsPMCQ1MaIntDisconnect( return (status); } - + /******************************************************************************* * * rsPMCQ1QuiccIntConnect - connect a Quicc interrupt routine @@ -263,8 +263,8 @@ unsigned int rsPMCQ1QuiccIntConnect( for (boardData = pmcq1BoardData; boardData; boardData = boardData->pNext) { - if ((boardData->busNo == busNo) && (boardData->slotNo == slotNo) && - (boardData->funcNo == funcNo)) + if ((boardData->busNo == busNo) && (boardData->slotNo == slotNo) && + (boardData->funcNo == funcNo)) { boardData->quiccInt = routine; boardData->quiccArg = arg; @@ -274,7 +274,7 @@ unsigned int rsPMCQ1QuiccIntConnect( } return (status); } - + /******************************************************************************* * * rsPMCQ1QuiccIntDisconnect - disconnect a Quicc interrupt routine @@ -294,9 +294,9 @@ unsigned int rsPMCQ1QuiccIntDisconnect( PPMCQ1BoardData boardData; unsigned int status = RTEMS_IO_ERROR; - for (boardData = pmcq1BoardData; boardData; boardData = boardData->pNext) + for (boardData = pmcq1BoardData; boardData; boardData = boardData->pNext) { - if ((boardData->busNo == busNo) && (boardData->slotNo == slotNo) && + if ((boardData->busNo == busNo) && (boardData->slotNo == slotNo) && (boardData->funcNo == funcNo)) { boardData->quiccInt = NULL; @@ -308,8 +308,8 @@ unsigned int rsPMCQ1QuiccIntDisconnect( return (status); } - - + + /******************************************************************************* * * rsPMCQ1Init - initialize the PMCQ1's @@ -363,7 +363,7 @@ unsigned int rsPMCQ1Init(void) eieio(); /* - * Hold QBus in reset for 1ms + * Hold QBus in reset for 1ms */ MsDelay(); @@ -376,7 +376,7 @@ unsigned int rsPMCQ1Init(void) /* If a QUICC is fitted initialise it */ if (PMCQ1_Read_EPLD(baseaddr, PMCQ1_BUILD_OPTION) & PMCQ1_QUICC_FITTED) { -#ifdef DEBUG_360 +#ifdef DEBUG_360 printk(" Found QUICC busNo %d slotNo %d\n", busNo, slotNo); #endif @@ -393,7 +393,7 @@ unsigned int rsPMCQ1Init(void) eieio(); /* Disable the SWT and perform basic initialisation */ - write8(baseaddr+Q1_360_SIM_SYPCR,0); + write8(baseaddr+Q1_360_SIM_SYPCR,0); eieio(); write32(baseaddr+Q1_360_SIM_MCR,0xa0001029); @@ -411,11 +411,11 @@ unsigned int rsPMCQ1Init(void) eieio(); write32(baseaddr+Q1_360_SIM_OR0,0x1ff00000); /*| MEMC_OR_FC*/ eieio(); - write32(baseaddr+Q1_360_SIM_BR0,0); + write32(baseaddr+Q1_360_SIM_BR0,0); eieio(); write32(baseaddr+Q1_360_SIM_OR1,(0x5ff00000 | 0x00000780)); /*| MEMC_OR_FC*/ eieio(); - write32(baseaddr+Q1_360_SIM_BR1,(0x00000040 | 0x00000001 | 0x00200280) ); + write32(baseaddr+Q1_360_SIM_BR1,(0x00000040 | 0x00000001 | 0x00200280) ); eieio(); } @@ -465,7 +465,7 @@ unsigned int rsPMCQ1Init(void) /* * Enable PMCQ1 Interrupts from QSPAN-II */ - + *(unsigned long *)(bridgeaddr + 0x600) = 0x00001000; eieio(); *(unsigned long *)(bridgeaddr + 0x604) |= 0x00001000; @@ -549,7 +549,7 @@ unsigned int rsPMCQ1Commission( unsigned long busNo, unsigned long slotNo ) printk("Error writing byte %d expected 0x%02x got 0x%02x\n", i, rsPMCQ1eeprom[i], (unsigned char)(val >> 8)); status = RTEMS_IO_ERROR; - break; + break; } } } diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h b/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h index bc78217103..3304ed369e 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h +++ b/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h @@ -37,28 +37,28 @@ * PMCQ1 definitions */ -/* - * 360 definitions +/* + * 360 definitions */ #define Q1_360_MBAR 0x0003ff00 /* master base address register */ #define REG_B_OFFSET 0x1000 /* offset to the internal registers */ -#define Q1_360_SIM_MCR (REG_B_OFFSET+0x00) -#define Q1_360_SIM_PEPAR (REG_B_OFFSET+0x16) -#define Q1_360_SIM_SYPCR (REG_B_OFFSET+0x22) -#define Q1_360_SIM_PICR (REG_B_OFFSET+0x26) -#define Q1_360_SIM_PITR (REG_B_OFFSET+0x2A) -#define Q1_360_SIM_GMR (REG_B_OFFSET+0x40) -#define Q1_360_SIM_BR0 (REG_B_OFFSET+0x50) -#define Q1_360_SIM_OR0 (REG_B_OFFSET+0x54) -#define Q1_360_SIM_BR1 (REG_B_OFFSET+0x60) -#define Q1_360_SIM_OR1 (REG_B_OFFSET+0x64) - -#define Q1_360_CPM_ICCR (REG_B_OFFSET+0x500) -#define Q1_360_CPM_SDCR (REG_B_OFFSET+0x51E) -#define Q1_360_CPM_CICR (REG_B_OFFSET+0x540) +#define Q1_360_SIM_MCR (REG_B_OFFSET+0x00) +#define Q1_360_SIM_PEPAR (REG_B_OFFSET+0x16) +#define Q1_360_SIM_SYPCR (REG_B_OFFSET+0x22) +#define Q1_360_SIM_PICR (REG_B_OFFSET+0x26) +#define Q1_360_SIM_PITR (REG_B_OFFSET+0x2A) +#define Q1_360_SIM_GMR (REG_B_OFFSET+0x40) +#define Q1_360_SIM_BR0 (REG_B_OFFSET+0x50) +#define Q1_360_SIM_OR0 (REG_B_OFFSET+0x54) +#define Q1_360_SIM_BR1 (REG_B_OFFSET+0x60) +#define Q1_360_SIM_OR1 (REG_B_OFFSET+0x64) + +#define Q1_360_CPM_ICCR (REG_B_OFFSET+0x500) +#define Q1_360_CPM_SDCR (REG_B_OFFSET+0x51E) +#define Q1_360_CPM_CICR (REG_B_OFFSET+0x540) /* * EPLD offsets @@ -123,9 +123,9 @@ typedef void (*FUNCION_PTR) (int); -typedef struct _PMCQ1BoardData +typedef struct _PMCQ1BoardData { - struct _PMCQ1BoardData *pNext; + struct _PMCQ1BoardData *pNext; unsigned long busNo; unsigned long slotNo; unsigned long funcNo; @@ -143,10 +143,10 @@ extern PPMCQ1BoardData pmcq1BoardData; * Function declarations */ extern unsigned int rsPMCQ1QuiccIntConnect( - unsigned long busNo, - unsigned long slotNo, - unsigned long funcNo, - FUNCION_PTR routine, + unsigned long busNo, + unsigned long slotNo, + unsigned long funcNo, + FUNCION_PTR routine, int arg ); unsigned int rsPMCQ1Init(void); diff --git a/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h b/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h index b51ed74a0f..eafa292676 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h @@ -21,18 +21,18 @@ #include <bsp/vectors.h> /* fundamental addresses for BSP (CHRPxxx and PREPxxx are from libcpu/io.h) */ -#define _IO_BASE CHRP_ISA_IO_BASE +#define _IO_BASE CHRP_ISA_IO_BASE #define _ISA_MEM_BASE CHRP_ISA_MEM_BASE /* address of our ram on the PCI bus */ #define PCI_DRAM_OFFSET CHRP_PCI_DRAM_OFFSET #define PCI_MEM_BASE 0x80000000 -#define PCI_MEM_BASE_ADJUSTMENT 0 +#define PCI_MEM_BASE_ADJUSTMENT 0 /* address of our ram on the PCI bus */ #define PCI_DRAM_OFFSET CHRP_PCI_DRAM_OFFSET /* offset of pci memory as seen from the CPU */ #undef PCI_MEM_BASE -#define PCI_MEM_BASE 0x00000000 +#define PCI_MEM_BASE 0x00000000 /* Override the default values for the following DEFAULT */ #define PCI_CONFIG_ADDR 0xfec00000 /* 0xcf8 */ @@ -67,7 +67,7 @@ #define PMC_SLOT1_PRESENT 0x02 #define PMC_SLOT2_PRESENT 0x01 - + /* BOARD_REVISION_REGISTER1 */ #define ARTWORK_REVISION_MASK 0xf0 #define BUILD_REVISION_MASK 0x0f @@ -105,7 +105,7 @@ * address definitions for several devices * */ -#define UART_OFFSET_1_8245 (0x04500) +#define UART_OFFSET_1_8245 (0x04500) #define UART_OFFSET_2_8245 (0x04600) #define UART_BASE_COM1 0xff800000 #define UART_BASE_COM2 0xff800040 @@ -117,7 +117,7 @@ * 8245 docs. * This is an offset from EUMBBAR */ -#define BSP_OPEN_PIC_BASE_OFFSET 0x40000 +#define BSP_OPEN_PIC_BASE_OFFSET 0x40000 /* BSP_PIC_DO_EOI is optionally used by the 'vmeUniverse' driver * to implement VME IRQ priorities in software. @@ -151,7 +151,7 @@ extern unsigned int EUMBBAR; /* - * Total memory + * Total memory */ extern unsigned int BSP_mem_size; @@ -181,7 +181,7 @@ extern int BSP_disconnect_clock_handler (void); extern int BSP_connect_clock_handler (void); /* - * FLASH + * FLASH */ int BSP_FLASH_Enable_writes( uint32_t area ); int BSP_FLASH_Disable_writes( uint32_t area ); diff --git a/c/src/lib/libbsp/powerpc/ep1a/irq/irq_init.c b/c/src/lib/libbsp/powerpc/ep1a/irq/irq_init.c index cfa39338c7..c5ddbc2ab2 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/irq/irq_init.c +++ b/c/src/lib/libbsp/powerpc/ep1a/irq/irq_init.c @@ -127,7 +127,7 @@ static unsigned char mcp750_openpic_initsenses[] = { 1, /*14 MCP750_INT_PCI_BUS2_INTC */ 1, /*15 MCP750_INT_PCI_BUS2_INTD */ 1, - 1, + 1, 1, 1, 1, @@ -151,9 +151,9 @@ void BSP_rtems_irq_mng_init(unsigned cpuId) /* * First initialize the Interrupt management hardware */ -#ifdef TRACE_IRQ_INIT +#ifdef TRACE_IRQ_INIT printk("Going to initialize openpic compliant device\n"); -#endif +#endif /* FIXME (t.s.): we should probably setup the EOI delay by * passing a non-zero 'epic_freq' argument (frequency of the * EPIC serial interface) but I don't know the value on this @@ -161,7 +161,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId) */ openpic_init(1, mcp750_openpic_initpolarities, mcp750_openpic_initsenses, 0, 16, 0 /* epic_freq */); -#ifdef TRACE_IRQ_INIT +#ifdef TRACE_IRQ_INIT printk("Going to initialize the PCI/ISA bridge IRQ related setting (VIA 82C586)\n"); #endif @@ -191,8 +191,8 @@ printk("Call BSP_rtems_irq_mngt_set\n"); */ BSP_panic("Unable to initialize RTEMS interrupt Management!!! System locked\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/ep1a/irq/openpic_xxx_irq.c b/c/src/lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c index afdf8a1064..ebf4161fce 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c +++ b/c/src/lib/libbsp/powerpc/ep1a/irq/openpic_xxx_irq.c @@ -109,7 +109,7 @@ printk("ERROR BSP_irq_enable_at_i8259s Being Called for %d\n", (int)name); BSP_irq_enable_at_i8259s ((int) name); } #endif - + if (is_pci_irq(name)) { /* * Enable interrupt at OPENPIC level diff --git a/c/src/lib/libbsp/powerpc/ep1a/pci/no_host_bridge.c b/c/src/lib/libbsp/powerpc/ep1a/pci/no_host_bridge.c index 5c3fe4308b..a4cb0d2e3a 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/pci/no_host_bridge.c +++ b/c/src/lib/libbsp/powerpc/ep1a/pci/no_host_bridge.c @@ -8,20 +8,20 @@ * * $Id$ */ - + #include <libcpu/io.h> #include <libcpu/spr.h> - + #include <bsp.h> #include <bsp/pci.h> #include <bsp/consoleIo.h> #include <bsp/residual.h> #include <bsp/openpic.h> - + #include <rtems/bspIo.h> /* - * For the 8240 and the 8245 there is no host bridge the + * For the 8240 and the 8245 there is no host bridge the * Open PIC device is built into the processor chip. */ diff --git a/c/src/lib/libbsp/powerpc/ep1a/start/start.S b/c/src/lib/libbsp/powerpc/ep1a/start/start.S index 1ef8edd125..974739affa 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/start/start.S +++ b/c/src/lib/libbsp/powerpc/ep1a/start/start.S @@ -40,7 +40,7 @@ #warning The call is "void boot_card(const char* cmdline);" #warning You need to pass a NULL. #warning Please check and remove these warnings. - + #include <rtems/asm.h> #include <rtems/score/cpu.h> #include <libcpu/io.h> @@ -73,7 +73,7 @@ __rtems_entry_point: */ li r3,MSR_IR | MSR_DR | MSR_FP mtmsr r3 - + /* XXX - ADD BACK IN CACHING INSTRUCTIONS */ /* clear bss */ diff --git a/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c b/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c index dbf6e5a989..b7db8936bb 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c @@ -88,7 +88,7 @@ uint32_t VME_Slot1 = FALSE; /* * PCI Bus Frequency */ -unsigned int BSP_bus_frequency; +unsigned int BSP_bus_frequency; /* * processor clock frequency @@ -103,25 +103,25 @@ unsigned int BSP_time_base_divisor = 1000; /* XXX - Just a guess */ void BSP_panic(char *s) { printk("%s PANIC %s\n",_RTEMS_version, s); - __asm__ __volatile ("sc"); + __asm__ __volatile ("sc"); } void _BSP_Fatal_error(unsigned int v) { printk("%s PANIC ERROR %x\n",_RTEMS_version, v); - __asm__ __volatile ("sc"); + __asm__ __volatile ("sc"); } - + int BSP_FLASH_Disable_writes( uint32_t area ) { unsigned char data; - + data = *GENERAL_REGISTER1; data |= DISABLE_USER_FLASH; *GENERAL_REGISTER1 = data; - + return RTEMS_SUCCESSFUL; } @@ -130,11 +130,11 @@ int BSP_FLASH_Enable_writes( ) { unsigned char data; - + data = *GENERAL_REGISTER1; data &= (~DISABLE_USER_FLASH); *GENERAL_REGISTER1 = data; - + return RTEMS_SUCCESSFUL; } @@ -143,7 +143,7 @@ void BSP_FLASH_set_page( ) { unsigned char data; - + /* Set the flash page register. */ data = *GENERAL_REGISTER2; data &= ~(BSP_FLASH_PAGE_MASK); @@ -170,7 +170,7 @@ void zero_bss(void) char * save_boot_params(RESIDUAL* r3, void *r4, void* r5, char *additional_boot_options) { -#if 0 +#if 0 residualCopy = *r3; strncpy(loaderParam, additional_boot_options, MAX_LOADER_ADD_PARM); loaderParam[MAX_LOADER_ADD_PARM - 1] ='\0'; @@ -186,14 +186,14 @@ unsigned int get_eumbbar(void) { asm volatile( "lis %0,0xfec0; ori %0,%0,0x0000": "=r" (a) ); asm volatile("sync"); - - asm volatile("lis %0,0x8000; ori %0,%0,0x0078": "=r"(e) ); - asm volatile("stwbrx %0,0x0,%1": "=r"(e): "r"(a)); + + asm volatile("lis %0,0x8000; ori %0,%0,0x0078": "=r"(e) ); + asm volatile("stwbrx %0,0x0,%1": "=r"(e): "r"(a)); asm volatile("sync"); - asm volatile("lis %0,0xfee0; ori %0,%0,0x0000": "=r" (a) ); + asm volatile("lis %0,0xfee0; ori %0,%0,0x0000": "=r" (a) ); asm volatile("sync"); - + asm volatile("lwbrx %0,0x0,%1": "=r" (e): "r" (a)); asm volatile("isync"); return e; @@ -212,12 +212,12 @@ void Read_ep1a_config_registers( ppc_cpu_id_t myCpu ) { value = *BOARD_REVISION_REGISTER2 & HARDWARE_ID_MASK; if ( value == HARDWARE_ID_PPC5_EP1A ) printk(" EP1A "); - else if ( value == HARDWARE_ID_EP1B ) + else if ( value == HARDWARE_ID_EP1B ) printk(" EP1B "); else printk(" Unknown "); - - value = *BOARD_REVISION_REGISTER2&0x1; + + value = *BOARD_REVISION_REGISTER2&0x1; printk("Board ID %08x", value); if(value == 0x0){ VME_Slot1 = TRUE; @@ -293,10 +293,10 @@ void bsp_start( void ) myCpu = get_ppc_cpu_type(); myCpuRevision = get_ppc_cpu_revision(); - EUMBBAR = get_eumbbar(); + EUMBBAR = get_eumbbar(); printk("EUMBBAR 0x%08x\n", EUMBBAR ); - /* + /* * Note this sets BSP_processor_frequency based upon register settings. * It must be done prior to setting up hooks. */ @@ -341,13 +341,13 @@ ShowBATS(); #ifdef SHOW_MORE_INIT_SETTINGS printk("Going to start PCI buses scanning and initialization\n"); -#endif +#endif pci_initialize(); #ifdef SHOW_MORE_INIT_SETTINGS printk("Number of PCI buses found is : %d\n", pci_bus_count()); #endif -#ifdef TEST_RAW_EXCEPTION_CODE +#ifdef TEST_RAW_EXCEPTION_CODE printk("Testing exception handling Part 1\n"); /* @@ -360,17 +360,17 @@ ShowBATS(); */ printk("Testing exception handling Part 2\n"); __asm__ __volatile ("sc"); -#endif +#endif /* * Initalize RTEMS IRQ system */ BSP_rtems_irq_mng_init(0); - + /* Activate the page table mappings only after * initializing interrupts because the irq_mng_init() * routine needs to modify the text - */ + */ if (pt) { #ifdef SHOW_MORE_INIT_SETTINGS printk("Page table setup finished; will activate it NOW...\n"); @@ -394,5 +394,5 @@ ShowBATS(); #ifdef SHOW_MORE_INIT_SETTINGS ShowBATS(); printk("Exit from bspstart\n"); -#endif +#endif } diff --git a/c/src/lib/libbsp/powerpc/ep1a/vme/VMEConfig.h b/c/src/lib/libbsp/powerpc/ep1a/vme/VMEConfig.h index 8492733a2d..2fade79e0c 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/vme/VMEConfig.h +++ b/c/src/lib/libbsp/powerpc/ep1a/vme/VMEConfig.h @@ -4,19 +4,19 @@ /* BSP specific address space configuration parameters */ -/* +/* * Authorship * ---------- * This software was created by * Till Straumann <strauman@slac.stanford.edu>, 2002, * Stanford Linear Accelerator Center, Stanford University. - * + * * Acknowledgement of sponsorship * ------------------------------ * This software was produced by * the Stanford Linear Accelerator Center, Stanford University, * under Contract DE-AC03-76SFO0515 with the Department of Energy. - * + * * Government disclaimer of liability * ---------------------------------- * Neither the United States nor the United States Department of Energy, @@ -25,18 +25,18 @@ * completeness, or usefulness of any data, apparatus, product, or process * disclosed, or represents that its use would not infringe privately owned * rights. - * + * * Stanford disclaimer of liability * -------------------------------- * Stanford University makes no representations or warranties, express or * implied, nor assumes any liability for the use of this software. - * + * * Stanford disclaimer of copyright * -------------------------------- * Stanford University, owner of the copyright, hereby disclaims its * copyright and all other rights in this software. Hence, anyone may - * freely use it for any purpose without restriction. - * + * freely use it for any purpose without restriction. + * * Maintenance of notices * ---------------------- * In the interest of clarity regarding the origin and status of this @@ -45,9 +45,9 @@ * or distributed by the recipient and are to be affixed to any copy of * software made or distributed by the recipient that contains a copy or * derivative of this software. - * + * * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03 - */ + */ /* * The BSP maps VME address ranges into * one BAT. @@ -77,7 +77,7 @@ * at _VME_DRAM_OFFSET */ #undef _VME_DRAM_OFFSET -#define _VME_DRAM_OFFSET 0xc0000000 +#define _VME_DRAM_OFFSET 0xc0000000 #define _VME_DRAM_32_OFFSET1 0x20000000 #define _VME_DRAM_32_OFFSET2 0x20b00000 #define _VME_DRAM_24_OFFSET1 0x00000000 @@ -85,7 +85,7 @@ #define _VME_DRAM_16_OFFSET1 0x00000000 #define _VME_DRAM_16_OFFSET2 0x00008000 -#define _VME_A24_SIZE 0x00100000 +#define _VME_A24_SIZE 0x00100000 #define _VME_A16_SIZE 0x00008000 #undef _VME_CSR_ON_PCI |