diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-29 14:53:02 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-29 14:53:02 +0000 |
commit | 32b8506b2409a01d434dd0ab5024c7718852ebcb (patch) | |
tree | 24b3215851217bf05c40cc8a62af4d021019b5d1 /c/src/lib/libbsp/arm/gumstix | |
parent | Whitespace removal. (diff) | |
download | rtems-32b8506b2409a01d434dd0ab5024c7718852ebcb.tar.bz2 |
Whitespace removal.
Diffstat (limited to 'c/src/lib/libbsp/arm/gumstix')
-rwxr-xr-x | c/src/lib/libbsp/arm/gumstix/console/uarts.c | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/gumstix/fb/fb.c | 18 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c | 18 | ||||
-rwxr-xr-x | c/src/lib/libbsp/arm/gumstix/start/start.S | 30 | ||||
-rwxr-xr-x | c/src/lib/libbsp/arm/gumstix/startup/memmap.c | 2 |
5 files changed, 37 insertions, 37 deletions
diff --git a/c/src/lib/libbsp/arm/gumstix/console/uarts.c b/c/src/lib/libbsp/arm/gumstix/console/uarts.c index 2186aa53a0..7feec461c6 100755 --- a/c/src/lib/libbsp/arm/gumstix/console/uarts.c +++ b/c/src/lib/libbsp/arm/gumstix/console/uarts.c @@ -1,11 +1,11 @@ /* * Console driver for GUMSTIX by Yang Xi <hiyangxi@gmail.com> * - * This driver uses the shared console driver in + * This driver uses the shared console driver in * ...../libbsp/shared/console.c * * Copyright (c) 2003 by Cogent Computer Systems - * Written by Jay Monkman <jtm@lopingdog.com> + * Written by Jay Monkman <jtm@lopingdog.com> * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at @@ -34,7 +34,7 @@ console_data Console_Port_Data[NUM_DEVS]; rtems_device_minor_number Console_Port_Minor = 0; extern console_fns ffuart_fns; -/* +/* * There's one item in array for each UART. * * Some of these fields are marked "NOT USED". They are not used diff --git a/c/src/lib/libbsp/arm/gumstix/fb/fb.c b/c/src/lib/libbsp/arm/gumstix/fb/fb.c index 61a37b3bfa..66725b7981 100644 --- a/c/src/lib/libbsp/arm/gumstix/fb/fb.c +++ b/c/src/lib/libbsp/arm/gumstix/fb/fb.c @@ -33,16 +33,16 @@ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; static struct fb_var_screeninfo fb_var = { - .xres = SCREEN_WIDTH, - .yres = SCREEN_HEIGHT, + .xres = SCREEN_WIDTH, + .yres = SCREEN_HEIGHT, .bits_per_pixel = BPP }; static struct fb_fix_screeninfo fb_fix = { - .smem_start = (volatile char *)LCD_DMA_POINTER, - .smem_len = LCD_BUFFER_SIZE, - .type = FB_TYPE_PACKED_PIXELS, + .smem_start = (volatile char *)LCD_DMA_POINTER, + .smem_len = LCD_BUFFER_SIZE, + .type = FB_TYPE_PACKED_PIXELS, .visual = FB_VISUAL_TRUECOLOR, .line_length = SCREEN_WIDTH * (BPP/8) }; @@ -70,7 +70,7 @@ static void enable_fbskyeye(void) LCCR3 |= 4<<24; FDADR0 = LCD_DMA_POINTER - 0x1000; LCCR0 |= LCCR0_ENB; -} +} static void disable_fbskyeye(void) @@ -119,8 +119,8 @@ frame_buffer_open( rtems_device_major_number major, if (pthread_mutex_trylock(&mutex)== 0){ /* restore previous state. for VGA this means return to text mode. * leave out if graphics hardware has been initialized in - * frame_buffer_initialize() - */ + * frame_buffer_initialize() + */ printk( "FBSKYEYE open called.\n" ); enable_fbskyeye(); return RTEMS_SUCCESSFUL; @@ -166,7 +166,7 @@ frame_buffer_write( rtems_device_major_number major, rtems_libio_rw_args_t *rw_args = (rtems_libio_rw_args_t *)arg; rw_args->bytes_moved = ((rw_args->offset + rw_args->count) > fb_fix.smem_len ) ? (fb_fix.smem_len - rw_args->offset) : rw_args->count; memcpy( (void *) (fb_fix.smem_start + rw_args->offset), rw_args->buffer, rw_args->bytes_moved); - return RTEMS_SUCCESSFUL; + return RTEMS_SUCCESSFUL; } static int get_palette( struct fb_cmap *cmap ) diff --git a/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c b/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c index 3a2cf6b5b4..4754e0e67e 100644 --- a/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c +++ b/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c @@ -239,8 +239,8 @@ ne_read_data (struct ne_softc *sc, int addr, int len, unsigned char *p) { unsigned char d; while (len > 0) - { - inport_byte(dport, d); + { + inport_byte(dport, d); *p++ = d; len--; } @@ -309,7 +309,7 @@ ne_check_status (struct ne_softc *sc, int from_irq_handler) if (from_irq_handler) outport_byte(port + IMR, NE_INTERRUPTS); return; - } + } /* Check for transmitted packet. The transmit daemon may now be able to send another packet to the device. */ @@ -346,7 +346,7 @@ ne_check_status (struct ne_softc *sc, int from_irq_handler) } outport_byte (port + CMDR, MSK_PG0 | MSK_STA | MSK_RD2); - + } /* Handle an NE2000 interrupt. */ @@ -399,7 +399,7 @@ ne_interrupt_off (const rtems_irq_connect_data *irq) outport_byte (sc->port + IMR, 0); } -/* +/* *Return whether NE2000 interrupts are on. *If it is eanbled, return 1 */ @@ -581,7 +581,7 @@ ne_rx_daemon (void *arg) reset = 0; /* Read the buffer header */ - startaddr = startpage * NE_PAGE_SIZE; + startaddr = startpage * NE_PAGE_SIZE; ne_read_data(sc, startaddr, sizeof(hdr), (unsigned char *)&hdr); next = hdr.next; @@ -657,7 +657,7 @@ ne_rx_daemon (void *arg) m->m_pkthdr.rcvif = ifp; m->m_nextpkt = 0; - p = mtod (m, unsigned char *); + p = mtod (m, unsigned char *); m->m_len = m->m_pkthdr.len = len - (sizeof(struct ether_header) + 2); toend = NE_STOP_PAGE * NE_PAGE_SIZE - startaddr; @@ -671,7 +671,7 @@ ne_rx_daemon (void *arg) if (len > 0) ne_read_data (sc, startaddr, len, p); - + m->m_data +=2; eh = mtod(m, struct ether_header *); m->m_data += sizeof (struct ether_header); @@ -1185,7 +1185,7 @@ rtems_ne_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach) /* We use 16 as the default IRQ. */ sc->irno = XSCALE_IRQ_NETWORK; - + /*IO prts are mapped to 0X40000600 */ diff --git a/c/src/lib/libbsp/arm/gumstix/start/start.S b/c/src/lib/libbsp/arm/gumstix/start/start.S index 882e213eb8..bb4aa5f654 100755 --- a/c/src/lib/libbsp/arm/gumstix/start/start.S +++ b/c/src/lib/libbsp/arm/gumstix/start/start.S @@ -9,7 +9,7 @@ * $Id$ */ - + /* Some standard definitions...*/ .equ PSR_MODE_USR, 0x10 .equ PSR_MODE_FIQ, 0x11 @@ -26,11 +26,11 @@ .text .globl _start _start: - /* + /* * Since I don't plan to return to the bootloader, * I don't have to save the registers. * - * I'll just set the CPSR for SVC mode, interrupts + * I'll just set the CPSR for SVC mode, interrupts * off, and ARM instructions. */ mov r0, #(PSR_MODE_SVC | PSR_I | PSR_F) @@ -41,11 +41,11 @@ _start: ldr r1, =_bss_end_ ldr r0, =_bss_start_ -_bss_init: +_bss_init: mov r2, #0 cmp r0, r1 strlot r2, [r0], #4 - blo _bss_init /* loop while r0 < r1 */ + blo _bss_init /* loop while r0 < r1 */ /* --- Initialize stack pointer registers */ /* Enter IRQ mode and set up the IRQ stack pointer */ @@ -68,16 +68,16 @@ _bss_init: ldr r1, =_abt_stack_size ldr sp, =_abt_stack add sp, sp, r1 - + /* Set up the SVC stack pointer last and stay in SVC mode */ mov r0, #(PSR_MODE_SVC | PSR_I | PSR_F) /* No interrupts */ msr cpsr, r0 ldr r1, =_svc_stack_size ldr sp, =_svc_stack add sp, sp, r1 - sub sp, sp, #0x64 + sub sp, sp, #0x64 - /* + /* * Initialize the MMU. After we return, the MMU is enabled, * and memory may be remapped. I hope we don't remap this * memory away. @@ -88,9 +88,9 @@ _bss_init: - /* + /* * Initialize the exception vectors. This includes the - * exceptions vectors (0x00000000-0x0000001c), and the + * exceptions vectors (0x00000000-0x0000001c), and the * pointers to the exception handlers (0x00000020-0x0000003c). */ mov r0, #0 @@ -105,7 +105,7 @@ _bss_init: /* Now we are prepared to start the BSP's C code */ bl boot_card - /* + /* * Theoretically, we could return to what started us up, * but we'd have to have saved the registers and stacks. * Instead, we'll just reset. @@ -115,13 +115,13 @@ _bss_init: /* We shouldn't get here. If we do, hang */ _hang: b _hang - -/* + +/* * This is the exception vector table and the pointers to * the functions that handle the exceptions. It's a total * of 16 words (64 bytes) */ -vector_block: +vector_block: ldr pc, Reset_Handler ldr pc, Undefined_Handler ldr pc, SWI_Handler @@ -133,7 +133,7 @@ vector_block: Reset_Handler: b bsp_reset Undefined_Handler: b Undefined_Handler -SWI_Handler: b SWI_Handler +SWI_Handler: b SWI_Handler Prefetch_Handler: b Prefetch_Handler Abort_Handler: b Abort_Handler nop diff --git a/c/src/lib/libbsp/arm/gumstix/startup/memmap.c b/c/src/lib/libbsp/arm/gumstix/startup/memmap.c index f30518735b..fd98b49c17 100755 --- a/c/src/lib/libbsp/arm/gumstix/startup/memmap.c +++ b/c/src/lib/libbsp/arm/gumstix/startup/memmap.c @@ -14,6 +14,6 @@ mmu_sect_map_t mem_map[] = { /* <phys addr> <virt addr> <size> <flags> */ {0x40000000, 0x40000000, 1216, MMU_CACHE_NONE}, /*Map I/O*/ {0xA0000000, 0x00000000, 1, MMU_CACHE_NONE}, /*sram*/ - {0xA0000000, 0xA0000000, 64, MMU_CACHE_WBACK}, /* SDRAM */ + {0xA0000000, 0xA0000000, 64, MMU_CACHE_WBACK}, /* SDRAM */ {0x00000000, 0x00000000, 0, 0} /* The end */ }; |