diff options
author | imp <imp@FreeBSD.org> | 2012-06-13 04:59:00 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2012-06-13 04:59:00 +0000 |
commit | 57c7689947a798e4fa446103f01ff8a4d25888dc (patch) | |
tree | 4352a081fcd003074b6e33458304b13fd07a43ec /sys/arm/s3c2xx0 | |
parent | 8839854e9395697ca22da00ae9b9ed0f0021e04a (diff) | |
download | FreeBSD-src-57c7689947a798e4fa446103f01ff8a4d25888dc.zip FreeBSD-src-57c7689947a798e4fa446103f01ff8a4d25888dc.tar.gz |
Trim trailing whitespace...
Diffstat (limited to 'sys/arm/s3c2xx0')
-rw-r--r-- | sys/arm/s3c2xx0/s3c2410reg.h | 2 | ||||
-rw-r--r-- | sys/arm/s3c2xx0/s3c2440reg.h | 2 | ||||
-rw-r--r-- | sys/arm/s3c2xx0/s3c24x0.c | 14 | ||||
-rw-r--r-- | sys/arm/s3c2xx0/s3c24x0_machdep.c | 18 | ||||
-rw-r--r-- | sys/arm/s3c2xx0/s3c24x0reg.h | 4 |
5 files changed, 20 insertions, 20 deletions
diff --git a/sys/arm/s3c2xx0/s3c2410reg.h b/sys/arm/s3c2xx0/s3c2410reg.h index 31bb857..89298ea 100644 --- a/sys/arm/s3c2xx0/s3c2410reg.h +++ b/sys/arm/s3c2xx0/s3c2410reg.h @@ -36,7 +36,7 @@ * Samsung S3C2410X processor is ARM920T based integrated CPU * * Reference: - * S3C2410X User's Manual + * S3C2410X User's Manual */ #ifndef _ARM_S3C2XX0_S3C2410REG_H_ #define _ARM_S3C2XX0_S3C2410REG_H_ diff --git a/sys/arm/s3c2xx0/s3c2440reg.h b/sys/arm/s3c2xx0/s3c2440reg.h index 418557d..f3cda60 100644 --- a/sys/arm/s3c2xx0/s3c2440reg.h +++ b/sys/arm/s3c2xx0/s3c2440reg.h @@ -30,7 +30,7 @@ * Samsung S3C2440X processor is ARM920T based integrated CPU * * Reference: - * S3C2440A/S3C2442B User's Manual + * S3C2440A/S3C2442B User's Manual */ #ifndef _ARM_S3C2XX0_S3C2440REG_H_ #define _ARM_S3C2XX0_S3C2440REG_H_ diff --git a/sys/arm/s3c2xx0/s3c24x0.c b/sys/arm/s3c2xx0/s3c24x0.c index 7550cb1..cddd435 100644 --- a/sys/arm/s3c2xx0/s3c24x0.c +++ b/sys/arm/s3c2xx0/s3c24x0.c @@ -283,7 +283,7 @@ s3c24x0_config_intr(device_t dev, int irq, enum intr_trigger trig, s3c2xx0_softc->sc_gpio_ioh, reg, value); return (0); -} +} static struct resource * s3c24x0_alloc_resource(device_t bus, device_t child, int type, int *rid, @@ -356,7 +356,7 @@ s3c24x0_alloc_resource(device_t bus, device_t child, int type, int *rid, rman_release_resource(res); return (NULL); } - } + } break; } @@ -751,19 +751,19 @@ arm_mask_irq(uintptr_t irq) mask = bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTMSK); mask |= (1 << irq); - bus_space_write_4(&s3c2xx0_bs_tag, + bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTMSK, mask); } else if (irq < S3C24X0_EXTIRQ_MIN) { mask = bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK); mask |= (1 << (irq - S3C24X0_SUBIRQ_MIN)); - bus_space_write_4(&s3c2xx0_bs_tag, + bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK, mask); } else { mask = bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_gpio_ioh, GPIO_EINTMASK); mask |= (1 << (irq - S3C24X0_EXTIRQ_MIN)); - bus_space_write_4(&s3c2xx0_bs_tag, + bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, GPIO_EINTMASK, mask); } } @@ -787,13 +787,13 @@ arm_unmask_irq(uintptr_t irq) mask = bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK); mask &= ~(1 << (irq - S3C24X0_SUBIRQ_MIN)); - bus_space_write_4(&s3c2xx0_bs_tag, + bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK, mask); } else { mask = bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_gpio_ioh, GPIO_EINTMASK); mask &= ~(1 << (irq - S3C24X0_EXTIRQ_MIN)); - bus_space_write_4(&s3c2xx0_bs_tag, + bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, GPIO_EINTMASK, mask); } } diff --git a/sys/arm/s3c2xx0/s3c24x0_machdep.c b/sys/arm/s3c2xx0/s3c24x0_machdep.c index 398b53d..6879581 100644 --- a/sys/arm/s3c2xx0/s3c24x0_machdep.c +++ b/sys/arm/s3c2xx0/s3c24x0_machdep.c @@ -38,7 +38,7 @@ * * Machine dependant functions for kernel setup * - * This file needs a lot of work. + * This file needs a lot of work. * * Created : 17/09/94 */ @@ -150,42 +150,42 @@ static const struct pmap_devmap s3c24x0_devmap[] = { _A(S3C24X0_CLKMAN_BASE), _A(S3C24X0_CLKMAN_PA_BASE), _S(S3C24X0_CLKMAN_SIZE), - VM_PROT_READ|VM_PROT_WRITE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, { _A(S3C24X0_GPIO_BASE), _A(S3C24X0_GPIO_PA_BASE), _S(S3C2410_GPIO_SIZE), - VM_PROT_READ|VM_PROT_WRITE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, { _A(S3C24X0_INTCTL_BASE), _A(S3C24X0_INTCTL_PA_BASE), _S(S3C24X0_INTCTL_SIZE), - VM_PROT_READ|VM_PROT_WRITE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, { _A(S3C24X0_TIMER_BASE), _A(S3C24X0_TIMER_PA_BASE), _S(S3C24X0_TIMER_SIZE), - VM_PROT_READ|VM_PROT_WRITE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, { _A(S3C24X0_UART0_BASE), _A(S3C24X0_UART0_PA_BASE), _S(S3C24X0_UART_PA_BASE(3) - S3C24X0_UART0_PA_BASE), - VM_PROT_READ|VM_PROT_WRITE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, { _A(S3C24X0_WDT_BASE), _A(S3C24X0_WDT_PA_BASE), _S(S3C24X0_WDT_SIZE), - VM_PROT_READ|VM_PROT_WRITE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, { @@ -281,7 +281,7 @@ initarm(struct arm_boot_params *abp) kernel_pt_table[loop].pv_va = freemempos - (loop % (PAGE_SIZE / L2_TABLE_SIZE_REAL)) * L2_TABLE_SIZE_REAL; - kernel_pt_table[loop].pv_pa = + kernel_pt_table[loop].pv_pa = kernel_pt_table[loop].pv_va - KERNVIRTADDR + KERNPHYSADDR; } @@ -315,7 +315,7 @@ initarm(struct arm_boot_params *abp) pmap_map_chunk(l1pagetable, KERNBASE, PHYSADDR, (((uint32_t)(lastaddr) - KERNBASE) + PAGE_SIZE) & ~(PAGE_SIZE - 1), VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - afterkern = round_page((lastaddr + L1_S_SIZE) & ~(L1_S_SIZE + afterkern = round_page((lastaddr + L1_S_SIZE) & ~(L1_S_SIZE - 1)); for (i = 0; i < KERNEL_PT_AFKERNEL_NUM; i++) { pmap_link_l2pt(l1pagetable, afterkern + i * L1_S_SIZE, diff --git a/sys/arm/s3c2xx0/s3c24x0reg.h b/sys/arm/s3c2xx0/s3c24x0reg.h index 3e93e6c..e60ce88 100644 --- a/sys/arm/s3c2xx0/s3c24x0reg.h +++ b/sys/arm/s3c2xx0/s3c24x0reg.h @@ -36,7 +36,7 @@ * Samsung S3C2410X/2400 processor is ARM920T based integrated CPU * * Reference: - * S3C2410X User's Manual + * S3C2410X User's Manual * S3C2400 User's Manual */ #ifndef _ARM_S3C2XX0_S3C24X0REG_H_ @@ -691,7 +691,7 @@ #define SPCON_CPOL (1<<2) #define SPCON_IDLELOW_RISING (0|0) #define SPCON_IDLELOW_FALLING (0|SPCON_CPHA) -#define SPCON_IDLEHIGH_FALLING (SPCON_CPOL|0) +#define SPCON_IDLEHIGH_FALLING (SPCON_CPOL|0) #define SPCON_IDLEHIGH_RISING (SPCON_CPOL|SPCON_CPHA) #define SPCON_MSTR (1<<3) #define SPCON_ENSCK (1<<4) |