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/shared | |
parent | 2009-11-30 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-ac7af4a359cc51bc06e1bf0ed3314744972b8395.tar.bz2 |
Whitespace removal.
Diffstat (limited to '')
34 files changed, 239 insertions, 239 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c index 7b508ce0f6..7bb34102fd 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c @@ -770,7 +770,7 @@ void pci_read_bases(struct pci_dev *dev, unsigned int howmany) #ifdef PCI_DEBUG printk(" readbase bus %d, (%04x:%04x), base %08x, size %08x, type %d\n", - r->dev->bus->number, + r->dev->bus->number, r->dev->vendor, r->dev->device, r->base, @@ -1190,15 +1190,15 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus ) #endif #ifdef WRITE_BRIDGE_ENABLE - pcibios_write_config_word(pdev->bus->number, - pdev->devfn, - PCI_BRIDGE_CONTROL, + pcibios_write_config_word(pdev->bus->number, + pdev->devfn, + PCI_BRIDGE_CONTROL, (uint16_t)( 0 )); - pcibios_write_config_word(pdev->bus->number, - pdev->devfn, - PCI_COMMAND, - (uint16_t)( PCI_COMMAND_IO | + pcibios_write_config_word(pdev->bus->number, + pdev->devfn, + PCI_COMMAND, + (uint16_t)( PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER )); #endif diff --git a/c/src/lib/libbsp/powerpc/shared/clock/clock.c b/c/src/lib/libbsp/powerpc/shared/clock/clock.c index 740972fa76..54efc46298 100644 --- a/c/src/lib/libbsp/powerpc/shared/clock/clock.c +++ b/c/src/lib/libbsp/powerpc/shared/clock/clock.c @@ -161,7 +161,7 @@ rtems_device_driver Clock_initialize( rtems_device_major_number major, rtems_dev /* * Set default ticker. - * + * * The function rtems_clock_tick() returns a status code. This value * will be discarded since the RTEMS documentation claims that it is * always successful. diff --git a/c/src/lib/libbsp/powerpc/shared/console/bspreset.c b/c/src/lib/libbsp/powerpc/shared/console/bspreset.c index a6d0f52a2a..706121d6b6 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/bspreset.c +++ b/c/src/lib/libbsp/powerpc/shared/console/bspreset.c @@ -16,7 +16,7 @@ void bsp_reset(void) printk("Printing a stack trace for your convenience :-)\n"); CPU_print_stack(); /* shutdown and reboot */ - + #if defined(mvme2100) *(unsigned char*)0xffe00000 |= 0x80; #else diff --git a/c/src/lib/libbsp/powerpc/shared/console/console.c b/c/src/lib/libbsp/powerpc/shared/console/console.c index 58d590a002..9345461f5a 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/console.c +++ b/c/src/lib/libbsp/powerpc/shared/console/console.c @@ -74,7 +74,7 @@ static int conSetAttr(int minor, const struct termios *); typedef struct TtySTblRec_ { char *name; rtems_irq_hdl isr; -} TtySTblRec, *TtySTbl; +} TtySTblRec, *TtySTbl; static TtySTblRec ttyS[]={ { "/dev/ttyS0", @@ -197,7 +197,7 @@ rtems_device_driver console_open( rtems_status_code status; static rtems_termios_callbacks cb = #if defined(USE_POLLED_IO) - { + { NULL, /* firstOpen */ NULL, /* lastClose */ NULL, /* pollRead */ @@ -208,7 +208,7 @@ rtems_device_driver console_open( TERMIOS_POLLED /* outputUsesInterrupts */ }; #else - { + { console_first_open, /* firstOpen */ console_last_close, /* lastClose */ #if ( TERMIOS_OUTPUT_MODE == TERMIOS_TASK_DRIVEN ) diff --git a/c/src/lib/libbsp/powerpc/shared/console/uart.c b/c/src/lib/libbsp/powerpc/shared/console/uart.c index dd63c6781b..3e89701666 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/uart.c +++ b/c/src/lib/libbsp/powerpc/shared/console/uart.c @@ -142,7 +142,7 @@ BSP_uart_init(int uart, int baud, int hwFlow) /* Sanity check */ SANITY_CHECK(uart); - + /* Make sure any printk activity drains before * re-initializing. */ @@ -756,7 +756,7 @@ BSP_uart_termios_isr_com(int uart) /* * XXX - Note that this can now be one isr with the uart - * passed as the parameter. + * passed as the parameter. */ void BSP_uart_termios_isr_com1(void *unused) diff --git a/c/src/lib/libbsp/powerpc/shared/flash/flash.c b/c/src/lib/libbsp/powerpc/shared/flash/flash.c index 02558dccb0..687c533489 100644 --- a/c/src/lib/libbsp/powerpc/shared/flash/flash.c +++ b/c/src/lib/libbsp/powerpc/shared/flash/flash.c @@ -28,19 +28,19 @@ * and other combinations are untested. */ -/* +/* * Authorship * ---------- * This software was created by * Till Straumann <strauman@slac.stanford.edu>, 2005-2007, * Stanford Linear Accelerator Center, Stanford University. - * + * * Acknowledgement of sponsorship * ------------------------------ * The 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, @@ -49,18 +49,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 @@ -69,9 +69,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 - */ + */ #ifndef TESTING #include <rtems.h> #include <bsp/flashPgm.h> @@ -331,7 +331,7 @@ bail: * This is not really clean since (until we implement CFI) * we already need to know what kind of device it is to * be able to read its ID... - * + * * NOTES: - device switched back to array mode on exit. * - 'addr' must be 32-bit aligned. */ @@ -390,7 +390,7 @@ struct devdesc *dd; /* Scan address range for flash devices and compute total size * of bank. - * + * * RETURNS: size in bytes. */ STATIC uint32_t @@ -573,7 +573,7 @@ uint32_t a,e; if ( quiet < 2 ) { printf("ERASING "); fflush(stdout); } - + if ( (i = BSP_flashErase(bank, a, e-a, quiet ? quiet : 1)) ) return i; @@ -719,7 +719,7 @@ int f; if ( quiet < 2 ) { f = flip(f); } - + a += b->fblksz; size -= b->fblksz; } @@ -787,7 +787,7 @@ unsigned f = 0; perror("Opening file"); return -1; } - + if ( sz ) break; diff --git a/c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h b/c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h index 3b49ff172c..aae35966e5 100644 --- a/c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h +++ b/c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h @@ -92,11 +92,11 @@ BSP_flashErase(int bank, uint32_t offset, uint32_t size, int quiet); * not block-aligned then adjacent data are preserved provided that * the relevant chunks of the destination are blank (erased). * - * | <neighbour> fffffff | + * | <neighbour> fffffff | * ^--- destination ----- ^ * | : block boundary * f : blank/erased pieces - * + * * (If the start of the destination region up to the next block boundary * is blank then '<neighbour>'-data is preserved. The end of the * destination is treated the same way.) @@ -162,19 +162,19 @@ BSP_flashBlockSize(int bank); } #endif -/* +/* * Authorship * ---------- * This software was created by * Till Straumann <strauman@slac.stanford.edu>, 2005-2007, * Stanford Linear Accelerator Center, Stanford University. - * + * * Acknowledgement of sponsorship * ------------------------------ * The 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, @@ -183,18 +183,18 @@ BSP_flashBlockSize(int bank); * 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 @@ -203,8 +203,8 @@ BSP_flashBlockSize(int bank); * 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 - */ + */ #endif diff --git a/c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h b/c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h index 55d0bf1333..c035a08ef2 100644 --- a/c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h +++ b/c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h @@ -10,10 +10,10 @@ /* DO NOT INCLUDE THIS HEADER FROM APPLICATION CODE */ /* - * Glue interface -- to be used only internally by BSP + * Glue interface -- to be used only internally by BSP * and chip drivers: * - BSP provides info about what chip drivers to use - * as well as 'wiring' info (how many devices are + * as well as 'wiring' info (how many devices are * operated in parallel etc). * - Chip drivers provide low-level 'methods' / 'ops' * for performing basic operations which are used @@ -40,19 +40,19 @@ * width to make it more generic. */ -/* +/* * Authorship * ---------- * This software was created by * Till Straumann <strauman@slac.stanford.edu>, 2005-2007, * Stanford Linear Accelerator Center, Stanford University. - * + * * Acknowledgement of sponsorship * ------------------------------ * The 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, @@ -61,18 +61,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 @@ -81,9 +81,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 - */ + */ #include <stdint.h> @@ -185,7 +185,7 @@ struct vendesc { /* array of supported devices; * the 'ops' specified below * are used to access these devices - */ + */ struct devdesc *known_devs; /* access methods for talking to * devices associated with this @@ -202,14 +202,14 @@ struct flash_bank_ops { /* Read vendor/device ID; Return 0 on success, nonzero if unable to read id */ int (*get_id)(struct bankdesc *b, uint32_t addr, uint32_t *pVendorId, uint32_t *pDeviceId); /* Unlock block holding 'addr'ess - * + * * NOTES: - device switched back to array mode on exit. * - 'addr' must be 32-bit aligned. */ void (*unlock_block)(struct bankdesc *b, uint32_t addr); /* Lock block holding 'addr'ess - * + * * NOTES: - device switched back to array mode on exit. * - 'addr' must be 32-bit aligned. */ @@ -255,9 +255,9 @@ struct flash_bank_ops { struct flash_bsp_ops { /* Return descriptor for bank # 'bank' or NULL (invalid arg) */ struct bankdesc *(*bankcheck)(int bank, int quiet); -/* set (enbl:1), clear (enbl:0) or query (enbl:-1) +/* set (enbl:1), clear (enbl:0) or query (enbl:-1) * on-board write protection. - * + * * RETURNS 0 on success, nonzero on error. */ int (*flash_wp)(int bank, int enbl); diff --git a/c/src/lib/libbsp/powerpc/shared/flash/intelFlash.c b/c/src/lib/libbsp/powerpc/shared/flash/intelFlash.c index c0685b32f0..a2059a029a 100644 --- a/c/src/lib/libbsp/powerpc/shared/flash/intelFlash.c +++ b/c/src/lib/libbsp/powerpc/shared/flash/intelFlash.c @@ -10,19 +10,19 @@ * mode (width=2). */ -/* +/* * Authorship * ---------- * This software was created by * Till Straumann <strauman@slac.stanford.edu>, 2005-2007, * Stanford Linear Accelerator Center, Stanford University. - * + * * Acknowledgement of sponsorship * ------------------------------ * The 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, @@ -31,18 +31,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 @@ -51,9 +51,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 - */ + */ #ifdef TESTING #define TIMEOUT_US 100000 @@ -176,7 +176,7 @@ struct vendesc BSP_flash_vendor_intel[] = /********* Helper Subroutines ******************/ -/* Basic low-level access routine for writing a command to the +/* Basic low-level access routine for writing a command to the * internal state machine. * * Flash is slow, so who cares if these access routines @@ -351,7 +351,7 @@ int i; } /* Unlock block holding 'addr'ess - * + * * NOTES: - device switched back to array mode on exit. * - 'addr' must be 32-bit aligned. */ @@ -368,7 +368,7 @@ flash_unlock_block_intel(struct bankdesc *b, uint32_t addr) } /* Lock block holding 'addr'ess - * + * * NOTES: - device switched back to array mode on exit. * - 'addr' must be 32-bit aligned. */ @@ -428,7 +428,7 @@ union { /* Query device for basic information verifying that we talk * to a 'known'/'supported' device. - * + * * NOTES: - device switched back to array mode on exit. * - 'addr' must be 32-bit aligned. */ diff --git a/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c b/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c index b538e666a8..332d35a191 100644 --- a/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c +++ b/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c @@ -10,19 +10,19 @@ * and in 16-bit mode (width=2). */ -/* +/* * Authorship * ---------- * This software was created by * Till Straumann <strauman@slac.stanford.edu>, 2005-2007, * Stanford Linear Accelerator Center, Stanford University. - * + * * Acknowledgement of sponsorship * ------------------------------ * The 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, @@ -31,18 +31,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 @@ -51,9 +51,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 - */ + */ #include <rtems.h> #include <stdio.h> @@ -420,18 +420,18 @@ rtems_interval p,i; } return -1; } - + STATIC void flash_print_stat_s160(struct bankdesc *b, uint32_t sta, int verbose) { fprintf(stderr,"Flash Spansion 160 error %"PRIi32"\n", sta); } - + STATIC uint32_t flash_write_line_s160(struct bankdesc *b, uint32_t a, char *s, uint32_t N) { uint32_t sta, nxt, j, v; -union bconv buf; +union bconv buf; if ( 0 == N ) return -11; diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c index a33e331228..bbde96213a 100644 --- a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c +++ b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c @@ -274,11 +274,11 @@ void BSP_rtems_irq_mng_init(unsigned cpuId) */ openpic_init(1, mvme2100_openpic_initpolarities, mvme2100_openpic_initsenses, 16, 16, BSP_bus_frequency); #else -#ifdef TRACE_IRQ_INIT +#ifdef TRACE_IRQ_INIT printk("Going to initialize raven interrupt controller (openpic compliant)\n"); #endif openpic_init(1, mcp750_openpic_initpolarities, mcp750_openpic_initsenses, 0, 0, 0); -#ifdef TRACE_IRQ_INIT +#ifdef TRACE_IRQ_INIT printk("Going to initialize the PCI/ISA bridge IRQ related setting (VIA 82C586)\n"); #endif if ( currentBoard == MESQUITE ) { @@ -330,8 +330,8 @@ void BSP_rtems_irq_mng_init(unsigned cpuId) */ 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 operational\n"); #endif } diff --git a/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c b/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c index 63d0d82f1b..e726343d80 100644 --- a/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c +++ b/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c @@ -111,7 +111,7 @@ BSP_enable_irq_at_pic(const rtems_irq_number name) BSP_irq_enable_at_i8259s ((int) name - BSP_ISA_IRQ_LOWEST_OFFSET); } #endif - + if (is_pci_irq(name)) { /* * Enable interrupt at OPENPIC level diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c b/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c index a8f6b29929..03c5e03527 100644 --- a/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c +++ b/c/src/lib/libbsp/powerpc/shared/motorola/motorola.c @@ -113,12 +113,12 @@ static struct _int_map mtx603_intmap[] = { static struct _int_map mvme23xx_intmap[] = { /* Raven Hostbridge; has int_pin == 0 - {0, 0, 0, {{0, {-1,-1,-1,-1}}, + {0, 0, 0, {{0, {-1,-1,-1,-1}}, NULL_PINMAP}}, */ /* Winbond PCI/ISA 83c553; has int_pin == 0 - {0, 11, 0, {{0, {-1,-1,-1,-1}}, + {0, 11, 0, {{0, {-1,-1,-1,-1}}, NULL_PINMAP}}, */ @@ -156,12 +156,12 @@ static struct _int_map mvme23xx_intmap[] = { static struct _int_map mvme24xx_intmap[] = { /* Raven Hostbridge; has int_pin == 0 - {0, 0, 0, {{0, {-1,-1,-1,-1}}, + {0, 0, 0, {{0, {-1,-1,-1,-1}}, NULL_PINMAP}}, */ /* Winbond PCI/ISA 83c553; has int_pin == 0 - {0, 11, 0, {{0, {-1,-1,-1,-1}}, + {0, 11, 0, {{0, {-1,-1,-1,-1}}, NULL_PINMAP}}, */ @@ -195,12 +195,12 @@ static struct _int_map mvme24xx_intmap[] = { static struct _int_map mvme27xx_intmap[] = { /* Raven Hostbridge; has int_pin == 0 */ - {0, 0, 0, {{0, {-1,-1,-1,-1}}, + {0, 0, 0, {{0, {-1,-1,-1,-1}}, NULL_PINMAP}}, /* Winbond PCI/ISA 83c553; has int_pin == 0 */ - {0, 11, 0, {{0, {-1,-1,-1,-1}}, + {0, 11, 0, {{0, {-1,-1,-1,-1}}, NULL_PINMAP}}, {0, 13, PCI_FIXUP_OPT_OVERRIDE_NAME, @@ -369,11 +369,11 @@ motorolaBoard getMotorolaBoard(void) for (entry = 0; mot_boards[entry].cpu_type != 0; entry++) { if ((mot_boards[entry].cpu_type & 0xff) != cpu_type) continue; - + if ((mot_boards[entry].proc_type != PPC_UNKNOWN) && (mot_boards[entry].proc_type != proc_type)) /* - * IMD: processor type does not match + * IMD: processor type does not match * (here we distinguish a MVME2300 and a MVME2400) */ continue; diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/vpd.c b/c/src/lib/libbsp/powerpc/shared/motorola/vpd.c index e61b9a1bd2..b4cba3f3eb 100644 --- a/c/src/lib/libbsp/powerpc/shared/motorola/vpd.c +++ b/c/src/lib/libbsp/powerpc/shared/motorola/vpd.c @@ -8,19 +8,19 @@ VPD = "MOTOROLA" , { field } field = type, length, { data } */ -/* +/* * Authorship * ---------- * This software ('beatnik' RTEMS BSP for MVME6100 and MVME5500) was * created by Till Straumann <strauman@slac.stanford.edu>, 2005-2007, * Stanford Linear Accelerator Center, Stanford University. - * + * * Acknowledgement of sponsorship * ------------------------------ * The 'beatnik' BSP 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, @@ -29,18 +29,18 @@ field = type, length, { data } * 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 @@ -49,9 +49,9 @@ field = type, length, { data } * 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 - */ + */ #include <rtems.h> #include <string.h> @@ -97,7 +97,7 @@ uint8_t fp[2]; fp[0] = early_fp>>8; fp[1] = early_fp; write_bytes(dev,fp,2); - + start(d); addr(d, BSP_VPD_I2C_ADDR, I2C_READ); rval = d->ops->read_bytes(d, buf, len); @@ -119,7 +119,7 @@ int got, rval = 0; if ( (got = read_bytes(fd, buf+rval, len)) <= 0 ) return -1; len -= got; - rval+= got; + rval+= got; } return rval; } @@ -148,7 +148,7 @@ static int (*stop)(int fd); /* init(dev); * - * Hangs - probably would need a delay here - just leave motload settings + * Hangs - probably would need a delay here - just leave motload settings */ read_bytes = early_read; @@ -267,7 +267,7 @@ L2 Cache Configuration : FF FF FF FF FF FF FF FF VPD Revision : 00 03 00 00 L3 Cache Configuration : 01 01 07 02 03 00 00 00 : 01 00 - + diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/vpd.h b/c/src/lib/libbsp/powerpc/shared/motorola/vpd.h index 30fc20bf2e..61b633f38a 100644 --- a/c/src/lib/libbsp/powerpc/shared/motorola/vpd.h +++ b/c/src/lib/libbsp/powerpc/shared/motorola/vpd.h @@ -30,7 +30,7 @@ typedef enum { L2CacheConfig = 0x0e, /* binary */ VPDRevision = 0x0f, /* binary (4bytes) */ L3CacheConfig = 0x19, /* binary */ - End = 0xff + End = 0xff } VpdKey; typedef struct { @@ -43,7 +43,7 @@ typedef struct { #define VPD_END { key:End, } - + /* Scan the VPD EEPROM for a number of fields * @@ -96,19 +96,19 @@ BSP_vpdRetrieveKey(VpdKey k, void *buf, int buflen, int instance); } #endif -/* +/* * Authorship * ---------- * This software ('beatnik' RTEMS BSP for MVME6100 and MVME5500) was * created by Till Straumann <strauman@slac.stanford.edu>, 2005-2007, * Stanford Linear Accelerator Center, Stanford University. - * + * * Acknowledgement of sponsorship * ------------------------------ * The 'beatnik' BSP 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, @@ -117,18 +117,18 @@ BSP_vpdRetrieveKey(VpdKey k, void *buf, int buflen, int instance); * 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 @@ -137,8 +137,8 @@ BSP_vpdRetrieveKey(VpdKey k, void *buf, int buflen, int instance); * 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 - */ + */ #endif diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c index b5688c168f..a9fe3b2e4f 100644 --- a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c +++ b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c @@ -315,7 +315,7 @@ void openpic_init(int main_pic, unsigned char *polarities, unsigned char *senses /* round to nearest integer: * round(Bus_freq/33000000) = floor( 2*(Bus_freq/33e6) + 1 ) / 2 - */ + */ ratio = epic_freq / 16500000 + 1; ratio >>= 2; /* EICR value is half actual divisor */ if ( 0==ratio ) diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h index 7a9764857b..14d306e204 100644 --- a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h +++ b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h @@ -336,7 +336,7 @@ extern unsigned openpic_set_eoi_delay(unsigned tb_cycles); * and 'level sensitive', respectively. * NOTE: if you do pass arrays then their size must either * match the number of sources read from the device or - * that value must be overridden by specifying + * that value must be overridden by specifying * a non-zero 'num_sources' parameter. * * Nonzero 'epic_freq' activates the EOI delay if the EPIC is diff --git a/c/src/lib/libbsp/powerpc/shared/pci/generic_clear_hberrs.c b/c/src/lib/libbsp/powerpc/shared/pci/generic_clear_hberrs.c index febe7601d0..eb297dca45 100644 --- a/c/src/lib/libbsp/powerpc/shared/pci/generic_clear_hberrs.c +++ b/c/src/lib/libbsp/powerpc/shared/pci/generic_clear_hberrs.c @@ -56,7 +56,7 @@ int count; if ( !PCI_STATUS_OK(pcistat) ) { printk("Unable to clear PCI errors: still 0x%04x after 10 attempts\n", pcistat); } - + rval &= PCI_ERR_BITS; /* Some VME bridges (Tsi148) don't propagate VME bus errors to PCI status reg. */ diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pci.c b/c/src/lib/libbsp/powerpc/shared/pci/pci.c index 973f5d7bb8..99b3ef5a99 100644 --- a/c/src/lib/libbsp/powerpc/shared/pci/pci.c +++ b/c/src/lib/libbsp/powerpc/shared/pci/pci.c @@ -323,7 +323,7 @@ static int test_intname( } } - if( _nopin ) + if( _nopin ) { printk("pci : Device %d:0x%02x:%d supplied a bogus interrupt_pin %d\n", pbus, pslot, pfun, int_pin ); return -1; diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c b/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c index d8d8ef3eb1..d4c6018fb4 100644 --- a/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c +++ b/c/src/lib/libbsp/powerpc/shared/pci/pcifinddevice.c @@ -5,19 +5,19 @@ * $Id$ */ -/* +/* * Authorship * ---------- * This software was created by * Till Straumann <strauman@slac.stanford.edu>, 2001, * 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, @@ -26,18 +26,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 @@ -46,9 +46,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 - */ + */ #define PCI_INVALID_VENDORDEVICEID 0xffffffff #define PCI_MULTI_FUNCTION 0x80 @@ -111,7 +111,7 @@ fd_arg a; void *h; a.vid = vendorid; a.did = deviceid; - a.inst = instance; + a.inst = instance; if ( (h = BSP_pciScan(0, find_dev_cb, (void*)&a)) ) { *pbus = PCIB_DEVSIG_BUS( a.inst ); @@ -128,7 +128,7 @@ dump_dev_cb( int dev, int fun, void *uarg -) +) { uint16_t vi,di; uint16_t cd,st; diff --git a/c/src/lib/libbsp/powerpc/shared/start/preload.S b/c/src/lib/libbsp/powerpc/shared/start/preload.S index 9da4b1ca7d..eda0ac0618 100644 --- a/c/src/lib/libbsp/powerpc/shared/start/preload.S +++ b/c/src/lib/libbsp/powerpc/shared/start/preload.S @@ -12,11 +12,11 @@ * * The SMON firmware is unable to load the RTEMS image below * 0x2000 (I believe their stack is growing below 0x1000). - * + * * The code provided by this file is responsible for the performing * the following steps: * - * 1) Save commandline parameters to an area that is + * 1) Save commandline parameters to an area that is * a) not covered by the downloaded image * b) will not be overwritten by the moved image * nor the final BSS segment (rtems clears BSS @@ -29,7 +29,7 @@ * data (such as its stack). * 3) Flush the cache to make sure the relocated image is actually * in memory. - * 4) setup RTEMS environment (initial register values), most + * 4) setup RTEMS environment (initial register values), most * notably an initial STACK. The initial stack may be small and * is used by RTEMS only at a very early stage. * A safe place for the stack seems to be the 00..0x7f area. @@ -111,7 +111,7 @@ here: /* at this point the register contents are * R3: command line start * R4: R3 + command line length - * R5: address we are running from / loaded to + * R5: address we are running from / loaded to * R27: image end */ @@ -162,7 +162,7 @@ leaveparms: li r16, 0x80 cmpw r5, r16 /* 'from' must be > 0x80 */ blt panic - + 1: /* store some arbitrary, nonzero stuff in 0..0x7c */ stwu r16,-4(r16) cmpwi r16,0 @@ -176,7 +176,7 @@ leaveparms: #else li r16,CACHE_LINE_SIZE #endif - + lis r3,preload@h ori r3,r3,preload@l mr r4,r5 /* from-addr */ @@ -187,7 +187,7 @@ leaveparms: */ lis r0,return_here@h ori r0,r0,return_here@l - mtlr r0 + mtlr r0 b domove /* move the preloader itself */ return_here: /* now we move the entire rest of the image */ diff --git a/c/src/lib/libbsp/powerpc/shared/start/start.S b/c/src/lib/libbsp/powerpc/shared/start/start.S index de7d097f49..6c7a35bf4b 100644 --- a/c/src/lib/libbsp/powerpc/shared/start/start.S +++ b/c/src/lib/libbsp/powerpc/shared/start/start.S @@ -71,7 +71,7 @@ __rtems_entry_point: */ lis r11,KERNELBASE@h /* set up BAT registers for 604 */ - ori r11,r11,0x1ffe + ori r11,r11,0x1ffe li r8,2 /* R/W access */ isync mtspr DBAT0L,r8 /* N.B. 6xx (not 601) have valid */ @@ -115,7 +115,7 @@ enter_C_code: li r0, (CPU_STACK_ALIGNMENT-1) andc r1, r9, r0 /* - * We are now in a environment that is totally independent from + * We are now in a environment that is totally independent from * bootloader setup. */ /* pass result of 'save_boot_params' to 'boot_card' in R3 */ diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c b/c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c index f30bf44261..bf8e9e4103 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c @@ -50,7 +50,7 @@ void bsp_get_work_area( * you are allocating the Work Area in a new BSP. */ #ifdef BSP_GET_WORK_AREA_DEBUG - { + { void *sp = __builtin_frame_address(0); void *end = *work_area_start + *work_area_size; printk( diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c index bfab28aa31..991abcd66f 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c @@ -121,11 +121,11 @@ char * save_boot_params( #if defined(mvme2100) unsigned int EUMBBAR; -/* +/* * Return the current value of the Embedded Utilities Memory Block Base Address * Register (EUMBBAR) as read from the processor configuration register using * Processor Address Map B (CHRP). - */ + */ unsigned int get_eumbbar(void) { out_le32( (uint32_t*)0xfec00000, 0x80000078 ); return in_le32( (uint32_t*)0xfee00000 ); @@ -154,7 +154,7 @@ void bsp_start( void ) /* * Get CPU identification dynamically. Note that the get_ppc_cpu_type() - * function store the result in global variables so that it can be used + * function store the result in global variables so that it can be used * later... */ myCpu = get_ppc_cpu_type(); @@ -186,7 +186,7 @@ void bsp_start( void ) #if defined(mvme2100) /* Need 0xfec00000 mapped for this */ - EUMBBAR = get_eumbbar(); + EUMBBAR = get_eumbbar(); #endif /* @@ -358,7 +358,7 @@ void bsp_start( void ) #endif BSP_pgtbl_activate(pt); /* finally, switch off DBAT3 */ - setdbat(3, 0, 0, 0, 0); + setdbat(3, 0, 0, 0, 0); } #if defined(DEBUG_BATS) diff --git a/c/src/lib/libbsp/powerpc/shared/startup/panic.c b/c/src/lib/libbsp/powerpc/shared/startup/panic.c index 86c1675c2e..45e449c9f9 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/panic.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/panic.c @@ -27,39 +27,39 @@ void BSP_panic(char *s) char *score_status_text(rtems_status_code sc) { switch (sc) { - case INTERNAL_ERROR_NO_CONFIGURATION_TABLE: + case INTERNAL_ERROR_NO_CONFIGURATION_TABLE: return "INTERNAL_ERROR_NO_CONFIGURATION_TABLE"; - case INTERNAL_ERROR_NO_CPU_TABLE: + case INTERNAL_ERROR_NO_CPU_TABLE: return "INTERNAL_ERROR_NO_CPU_TABLE"; - case INTERNAL_ERROR_INVALID_WORKSPACE_ADDRESS: + case INTERNAL_ERROR_INVALID_WORKSPACE_ADDRESS: return "INTERNAL_ERROR_INVALID_WORKSPACE_ADDRESS"; - case INTERNAL_ERROR_TOO_LITTLE_WORKSPACE: + case INTERNAL_ERROR_TOO_LITTLE_WORKSPACE: return "INTERNAL_ERROR_TOO_LITTLE_WORKSPACE"; - case INTERNAL_ERROR_WORKSPACE_ALLOCATION: + case INTERNAL_ERROR_WORKSPACE_ALLOCATION: return "INTERNAL_ERROR_WORKSPACE_ALLOCATION"; - case INTERNAL_ERROR_INTERRUPT_STACK_TOO_SMALL: + case INTERNAL_ERROR_INTERRUPT_STACK_TOO_SMALL: return "INTERNAL_ERROR_INTERRUPT_STACK_TOO_SMALL"; - case INTERNAL_ERROR_THREAD_EXITTED: + case INTERNAL_ERROR_THREAD_EXITTED: return "INTERNAL_ERROR_THREAD_EXITTED"; - case INTERNAL_ERROR_INCONSISTENT_MP_INFORMATION: + case INTERNAL_ERROR_INCONSISTENT_MP_INFORMATION: return "INTERNAL_ERROR_INCONSISTENT_MP_INFORMATION"; - case INTERNAL_ERROR_INVALID_NODE: + case INTERNAL_ERROR_INVALID_NODE: return "INTERNAL_ERROR_INVALID_NODE"; - case INTERNAL_ERROR_NO_MPCI: + case INTERNAL_ERROR_NO_MPCI: return "INTERNAL_ERROR_NO_MPCI"; - case INTERNAL_ERROR_BAD_PACKET: + case INTERNAL_ERROR_BAD_PACKET: return "INTERNAL_ERROR_BAD_PACKET"; - case INTERNAL_ERROR_OUT_OF_PACKETS: + case INTERNAL_ERROR_OUT_OF_PACKETS: return "INTERNAL_ERROR_OUT_OF_PACKETS"; - case INTERNAL_ERROR_OUT_OF_GLOBAL_OBJECTS: + case INTERNAL_ERROR_OUT_OF_GLOBAL_OBJECTS: return "INTERNAL_ERROR_OUT_OF_GLOBAL_OBJECTS"; - case INTERNAL_ERROR_OUT_OF_PROXIES: + case INTERNAL_ERROR_OUT_OF_PROXIES: return "INTERNAL_ERROR_OUT_OF_PROXIES"; - case INTERNAL_ERROR_INVALID_GLOBAL_ID: + case INTERNAL_ERROR_INVALID_GLOBAL_ID: return "INTERNAL_ERROR_INVALID_GLOBAL_ID"; - case INTERNAL_ERROR_BAD_STACK_HOOK: + case INTERNAL_ERROR_BAD_STACK_HOOK: return "INTERNAL_ERROR_BAD_STACK_HOOK"; - case INTERNAL_ERROR_BAD_ATTRIBUTES: + case INTERNAL_ERROR_BAD_ATTRIBUTES: return "INTERNAL_ERROR_BAD_ATTRIBUTES"; case 18: /* not in header (yet) :-( */ return "INTERNAL_ERROR_CALLED_FROM_WRONG_ENVIRONMENT"; diff --git a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_activate.c b/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_activate.c index 5448e8d050..ed06fe26b9 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_activate.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_activate.c @@ -9,19 +9,19 @@ * default activation procedure. */ -/* +/* * Authorship * ---------- * This software was created by * Till Straumann <strauman@slac.stanford.edu>, 4/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, @@ -30,18 +30,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 @@ -50,9 +50,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 - */ + */ void BSP_pgtbl_activate(Triv121PgTbl) __attribute__ (( weak, alias("__BSP_default_pgtbl_activate") )); diff --git a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c b/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c index 73f210c2b5..6e5c4bf886 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c @@ -18,19 +18,19 @@ * *pmemsize by the size of the page table. */ -/* +/* * Authorship * ---------- * This software was created by * Till Straumann <strauman@slac.stanford.edu>, 4/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, @@ -39,18 +39,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 @@ -59,9 +59,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 - */ + */ Triv121PgTbl BSP_pgtbl_setup(unsigned int *) __attribute__ (( weak, alias("__BSP_default_pgtbl_setup") )); diff --git a/c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c b/c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c index 5e9906ff36..f90d9bc06e 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c @@ -4,19 +4,19 @@ #include <libcpu/cpuIdent.h> #include <rtems/bspIo.h> -/* +/* * Authorship * ---------- * This software was created by * Till Straumann <strauman@slac.stanford.edu>, 2005, * 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,14 +45,14 @@ * 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 - */ + */ /* Simple memory probing routine - * - * - call from MMU-disabled section to avoid having to + * + * - call from MMU-disabled section to avoid having to * set up mappings. * NOTE: this implies WIMG = 0011 * - call AFTER image is at its destination and PRIOR @@ -134,8 +134,8 @@ register uint32_t v, x; return -1; case PPC_750: printk("CPU_lockUnlockCaches(): Can't lock L2 on a mpc750, sorry :-(\n"); return -2; /* cannot lock L2 :-( */ - case PPC_7455: - case PPC_7457: + case PPC_7455: + case PPC_7457: v = _read_L3CR(); x = 1<<(31-9); v = doLock ? v | x : v & ~x; @@ -158,7 +158,7 @@ register uint32_t v, x; case PPC_604e: break; } - + v = _read_HID0(); x = 1<<(31-19); v = doLock ? v | x : v & ~x; diff --git a/c/src/lib/libbsp/powerpc/shared/startup/sbrk.c b/c/src/lib/libbsp/powerpc/shared/startup/sbrk.c index 2c51d6f6f5..a4e78dd67a 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/sbrk.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/sbrk.c @@ -8,13 +8,13 @@ * 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, @@ -23,18 +23,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 @@ -43,9 +43,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 - */ + */ /* * Hack around the 32bit powerpc 32M problem: diff --git a/c/src/lib/libbsp/powerpc/shared/uboot_dump_bdinfo.c b/c/src/lib/libbsp/powerpc/shared/uboot_dump_bdinfo.c index 0cb160df4d..a50a98f3cc 100644 --- a/c/src/lib/libbsp/powerpc/shared/uboot_dump_bdinfo.c +++ b/c/src/lib/libbsp/powerpc/shared/uboot_dump_bdinfo.c @@ -27,7 +27,7 @@ /* * Dump U-Boot Board Information Structure - * + * * u - pointer to information structure */ void dumpUBootBDInfo( @@ -78,7 +78,7 @@ void dumpUBootBDInfo( u->bi_pcifreq #endif ); - + } #endif diff --git a/c/src/lib/libbsp/powerpc/shared/uboot_getenv.c b/c/src/lib/libbsp/powerpc/shared/uboot_getenv.c index 9fb5875c62..e57b0d1f8d 100644 --- a/c/src/lib/libbsp/powerpc/shared/uboot_getenv.c +++ b/c/src/lib/libbsp/powerpc/shared/uboot_getenv.c @@ -28,7 +28,7 @@ static int bsp_uboot_environ_check_crc(void) unsigned long crc; unsigned long max; - for (max=0 ; max <= 0x20000 ; max+=4 ) { + for (max=0 ; max <= 0x20000 ; max+=4 ) { crc = crc32( 0, NULL, 0 ); crc = crc32( crc, &uboot_environment[4], max); printk( "crc=0x%08lx need %0x max=%d\n", crc, @@ -49,7 +49,7 @@ const char *bsp_uboot_getenv( return NULL; for ( i=4 ; i<uboot_environment_size ; i++ ) { - memset( lhs, '\0', sizeof(lhs) ); + memset( lhs, '\0', sizeof(lhs) ); for( j=0 ; uboot_environment[i] != '=' && j<sizeof(lhs) ; i++, j++ ) { lhs[j] = uboot_environment[i]; } diff --git a/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h b/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h index 9447fce4b7..963fb90453 100644 --- a/c/src/lib/libbsp/powerpc/shared/vme/VMEConfig.h +++ b/c/src/lib/libbsp/powerpc/shared/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 diff --git a/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c b/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c index 84c22c462f..591e676598 100644 --- a/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c +++ b/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c @@ -45,19 +45,19 @@ * This file is named 'vme_universe.c' for historical reasons. */ -/* +/* * Authorship * ---------- * This software was created by * Till Straumann <strauman@slac.stanford.edu>, 9/2005, * 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, @@ -66,18 +66,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 @@ -86,9 +86,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 - */ + */ typedef struct { int (*xlate_adrs)(int, int, unsigned long, unsigned long, unsigned long *); int (*install_isr)(unsigned long, BSP_VME_ISR_t, void *); @@ -305,7 +305,7 @@ VMEDmaListClass pc; pci_addr, vme_addr, n_bytes); - + } return BSP_VMEDmaListDescriptorSetupTool(d, attr_mask, xfer_mode, pci_addr, vme_addr, n_bytes); @@ -344,7 +344,7 @@ void *carg; BSP_disableVME_int_lvl(vec); return 0; } - + if ( cb ) { if ( BSP_installVME_isr(vec, (BSP_VME_ISR_t)cb, usr_arg) ) return -4; @@ -426,7 +426,7 @@ int err; /* This feature is only supported by the Universe driver (not Tsi148) */ #if defined(BSP_PCI_VME_DRIVER_DOES_EOI) && defined(BSP_PIC_DO_EOI) -#ifdef _VME_DRIVER_TSI148 +#ifdef _VME_DRIVER_TSI148 #error "BSP_PCI_VME_DRIVER_DOES_EOI/BSP_PIC_DO_EOI feature can only be used with vmeUniverse" #endif if ( vmeUniverse0PciIrqLine < 0 ) diff --git a/c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c b/c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c index 05f1d6ed3e..b7c91333c9 100644 --- a/c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c +++ b/c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c @@ -4,19 +4,19 @@ * is independent of the bridge driver/chip */ -/* +/* * Authorship * ---------- * This software was created by * Till Straumann <strauman@slac.stanford.edu>, 3/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 - */ + */ #include <bsp.h> #include <bsp/VME.h> |