Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Jun 2012 04:59:01 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r236990 - in head/sys/arm: mv s3c2xx0 sa11x0
Message-ID:  <201206130459.q5D4x198096802@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Wed Jun 13 04:59:00 2012
New Revision: 236990
URL: http://svn.freebsd.org/changeset/base/236990

Log:
  Trim trailing whitespace...

Modified:
  head/sys/arm/mv/mv_machdep.c
  head/sys/arm/mv/mvwin.h
  head/sys/arm/s3c2xx0/s3c2410reg.h
  head/sys/arm/s3c2xx0/s3c2440reg.h
  head/sys/arm/s3c2xx0/s3c24x0.c
  head/sys/arm/s3c2xx0/s3c24x0_machdep.c
  head/sys/arm/s3c2xx0/s3c24x0reg.h
  head/sys/arm/sa11x0/assabet_machdep.c
  head/sys/arm/sa11x0/sa11x0.c
  head/sys/arm/sa11x0/sa11x0_gpioreg.h
  head/sys/arm/sa11x0/sa11x0_io_asm.S
  head/sys/arm/sa11x0/sa11x0_irq.S
  head/sys/arm/sa11x0/sa11x0_ost.c
  head/sys/arm/sa11x0/sa11x0_ostreg.h
  head/sys/arm/sa11x0/sa11x0_var.h
  head/sys/arm/sa11x0/uart_dev_sa1110.c

Modified: head/sys/arm/mv/mv_machdep.c
==============================================================================
--- head/sys/arm/mv/mv_machdep.c	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/mv/mv_machdep.c	Wed Jun 13 04:59:00 2012	(r236990)
@@ -285,7 +285,7 @@ physmap_init(void)
 		    availmem_regions[i].mr_start + availmem_regions[i].mr_size,
 		    availmem_regions[i].mr_size);
 
-		/* 
+		/*
 		 * We should not map the page at PA 0x0000000, the VM can't
 		 * handle it, as pmap_extract() == 0 means failure.
 		 */

Modified: head/sys/arm/mv/mvwin.h
==============================================================================
--- head/sys/arm/mv/mvwin.h	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/mv/mvwin.h	Wed Jun 13 04:59:00 2012	(r236990)
@@ -46,7 +46,7 @@
 #define MV_PCIE_IO_PHYS_BASE	(MV_PHYS_BASE + MV_SIZE)
 #define MV_PCIE_IO_BASE		MV_PCIE_IO_PHYS_BASE
 #define MV_PCIE_IO_SIZE		(1024 * 1024)
-#define MV_PCI_IO_PHYS_BASE	(MV_PCIE_IO_PHYS_BASE + MV_PCIE_IO_SIZE) 
+#define MV_PCI_IO_PHYS_BASE	(MV_PCIE_IO_PHYS_BASE + MV_PCIE_IO_SIZE)
 #define MV_PCI_IO_BASE		MV_PCI_IO_PHYS_BASE
 #define MV_PCI_IO_SIZE		(1024 * 1024)
 

Modified: head/sys/arm/s3c2xx0/s3c2410reg.h
==============================================================================
--- head/sys/arm/s3c2xx0/s3c2410reg.h	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/s3c2xx0/s3c2410reg.h	Wed Jun 13 04:59:00 2012	(r236990)
@@ -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_

Modified: head/sys/arm/s3c2xx0/s3c2440reg.h
==============================================================================
--- head/sys/arm/s3c2xx0/s3c2440reg.h	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/s3c2xx0/s3c2440reg.h	Wed Jun 13 04:59:00 2012	(r236990)
@@ -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_

Modified: head/sys/arm/s3c2xx0/s3c24x0.c
==============================================================================
--- head/sys/arm/s3c2xx0/s3c24x0.c	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/s3c2xx0/s3c24x0.c	Wed Jun 13 04:59:00 2012	(r236990)
@@ -283,7 +283,7 @@ s3c24x0_config_intr(device_t dev, int ir
 	    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, dev
 				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);
 	}
 }

Modified: head/sys/arm/s3c2xx0/s3c24x0_machdep.c
==============================================================================
--- head/sys/arm/s3c2xx0/s3c24x0_machdep.c	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/s3c2xx0/s3c24x0_machdep.c	Wed Jun 13 04:59:00 2012	(r236990)
@@ -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_
 		_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,

Modified: head/sys/arm/s3c2xx0/s3c24x0reg.h
==============================================================================
--- head/sys/arm/s3c2xx0/s3c24x0reg.h	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/s3c2xx0/s3c24x0reg.h	Wed Jun 13 04:59:00 2012	(r236990)
@@ -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)

Modified: head/sys/arm/sa11x0/assabet_machdep.c
==============================================================================
--- head/sys/arm/sa11x0/assabet_machdep.c	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/sa11x0/assabet_machdep.c	Wed Jun 13 04:59:00 2012	(r236990)
@@ -40,7 +40,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
  */
@@ -257,7 +257,7 @@ initarm(struct arm_boot_params *abp)
 			kernel_pt_table[loop].pv_pa = freemempos +
 			    (loop % (PAGE_SIZE / L2_TABLE_SIZE_REAL)) *
 			    L2_TABLE_SIZE_REAL;
-			kernel_pt_table[loop].pv_va = 
+			kernel_pt_table[loop].pv_va =
 			    kernel_pt_table[loop].pv_pa;
 		}
 	}
@@ -343,7 +343,7 @@ initarm(struct arm_boot_params *abp)
 	    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
 	/* Map the statically mapped devices. */
 	pmap_devmap_bootstrap(l1pagetable, assabet_devmap);
-	pmap_map_chunk(l1pagetable, sa1_cache_clean_addr, 0xf0000000, 
+	pmap_map_chunk(l1pagetable, sa1_cache_clean_addr, 0xf0000000,
 	    CPU_SA110_CACHE_CLEAN_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
 
 	data_abort_handler_address = (u_int)data_abort_handler;

Modified: head/sys/arm/sa11x0/sa11x0.c
==============================================================================
--- head/sys/arm/sa11x0/sa11x0.c	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/sa11x0/sa11x0.c	Wed Jun 13 04:59:00 2012	(r236990)
@@ -88,12 +88,12 @@ struct sa11x0_softc *sa11x0_softc; /* Th
 
 static int
 sa1110_setup_intr(device_t dev, device_t child,
-        struct resource *ires,  int flags, driver_filter_t *filt, 
+        struct resource *ires,  int flags, driver_filter_t *filt,
 	driver_intr_t *intr, void *arg, void **cookiep)
 {
 	int saved_cpsr;
 	
-	if (flags & INTR_TYPE_TTY) 
+	if (flags & INTR_TYPE_TTY)
 		rman_set_start(ires, 15);
 	else if (flags & INTR_TYPE_CLK) {
 		if (rman_get_start(ires) == 0)
@@ -101,10 +101,10 @@ sa1110_setup_intr(device_t dev, device_t
 		else
 			rman_set_start(ires, 27);
 	}
-	saved_cpsr = SetCPSR(I32_bit, I32_bit);                 
+	saved_cpsr = SetCPSR(I32_bit, I32_bit);
 
 	SetCPSR(I32_bit, saved_cpsr & I32_bit);
-	BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, 
+	BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt,
 	    intr, arg, cookiep);
 	return (0);
 }

Modified: head/sys/arm/sa11x0/sa11x0_gpioreg.h
==============================================================================
--- head/sys/arm/sa11x0/sa11x0_gpioreg.h	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/sa11x0/sa11x0_gpioreg.h	Wed Jun 13 04:59:00 2012	(r236990)
@@ -32,7 +32,7 @@
  */
 
 /*
- * SA-11x0 GPIO Register 
+ * SA-11x0 GPIO Register
  */
 
 #define SAGPIO_NPORTS	8

Modified: head/sys/arm/sa11x0/sa11x0_io_asm.S
==============================================================================
--- head/sys/arm/sa11x0/sa11x0_io_asm.S	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/sa11x0/sa11x0_io_asm.S	Wed Jun 13 04:59:00 2012	(r236990)
@@ -208,7 +208,7 @@ ENTRY(sa11x0_bs_rr_2)
 	movle	pc, lr
 
 sa11x0_bs_rr_2_loop:
-	ldrh	r1, [r0], #0x0002  
+	ldrh	r1, [r0], #0x0002
 	strh	r1, [r3], #0x0002
         subs    r2, r2, #0x00000001
 	bgt	sa11x0_bs_rr_2_loop
@@ -222,7 +222,7 @@ sa11x0_bs_rr_2_loop:
 ENTRY(sa11x0_bs_wr_2)
 	add	r0, r1, r2
 	ldr	r2, [sp, #0]
-	cmp	r2, #0x00000000  
+	cmp	r2, #0x00000000
 	movle	pc, lr
 
 sa11x0_bs_wr_2_loop:

Modified: head/sys/arm/sa11x0/sa11x0_irq.S
==============================================================================
--- head/sys/arm/sa11x0/sa11x0_irq.S	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/sa11x0/sa11x0_irq.S	Wed Jun 13 04:59:00 2012	(r236990)
@@ -120,7 +120,7 @@ ENTRY(sa11x0_activateirqs)
 	mov	pc, lr
 
 	.global _C_LABEL(intrnames), _C_LABEL(sintrnames)
-_C_LABEL(intrnames): 
+_C_LABEL(intrnames):
 _C_LABEL(sintrnames):
 	.int	0
 

Modified: head/sys/arm/sa11x0/sa11x0_ost.c
==============================================================================
--- head/sys/arm/sa11x0/sa11x0_ost.c	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/sa11x0/sa11x0_ost.c	Wed Jun 13 04:59:00 2012	(r236990)
@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/frame.h>
 
-#include <arm/sa11x0/sa11x0_reg.h> 
+#include <arm/sa11x0/sa11x0_reg.h>
 #include <arm/sa11x0/sa11x0_var.h>
 #include <arm/sa11x0/sa11x0_ostreg.h>
 
@@ -127,7 +127,7 @@ saost_attach(device_t dev)
 
 	saost_sc = sc;
 
-	if(bus_space_map(sa->sc_iot, sc->sc_baseaddr, 8, 0, 
+	if(bus_space_map(sa->sc_iot, sc->sc_baseaddr, 8, 0,
 			&sc->sc_ioh))
 		panic("%s: Cannot map registers", device_get_name(dev));
 

Modified: head/sys/arm/sa11x0/sa11x0_ostreg.h
==============================================================================
--- head/sys/arm/sa11x0/sa11x0_ostreg.h	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/sa11x0/sa11x0_ostreg.h	Wed Jun 13 04:59:00 2012	(r236990)
@@ -32,7 +32,7 @@
  */
 
 /*
- * SA-11x0 OS Timer Register 
+ * SA-11x0 OS Timer Register
  */
 
 /* OS Timer Match Register */

Modified: head/sys/arm/sa11x0/sa11x0_var.h
==============================================================================
--- head/sys/arm/sa11x0/sa11x0_var.h	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/sa11x0/sa11x0_var.h	Wed Jun 13 04:59:00 2012	(r236990)
@@ -58,7 +58,7 @@ typedef void *sa11x0_chipset_tag_t;
 
 extern struct bus_space sa11x0_bs_tag;
 
-void *sa11x0_intr_establish(sa11x0_chipset_tag_t, int, int, int, 
+void *sa11x0_intr_establish(sa11x0_chipset_tag_t, int, int, int,
 			    int (*)(void *), void *);
 void sa11x0_intr_disestablish(sa11x0_chipset_tag_t, void *);
 

Modified: head/sys/arm/sa11x0/uart_dev_sa1110.c
==============================================================================
--- head/sys/arm/sa11x0/uart_dev_sa1110.c	Wed Jun 13 04:52:19 2012	(r236989)
+++ head/sys/arm/sa11x0/uart_dev_sa1110.c	Wed Jun 13 04:59:00 2012	(r236990)
@@ -179,12 +179,12 @@ sa1110_bus_transmit(struct uart_softc *s
 
 	while (!(uart_getreg(&sc->sc_bas, SACOM_CR3) & CR3_TIE))
 		uart_setreg(&sc->sc_bas, SACOM_CR3,
-		    uart_getreg(&sc->sc_bas, SACOM_CR3) | CR3_TIE);    
+		    uart_getreg(&sc->sc_bas, SACOM_CR3) | CR3_TIE);
 #endif
 
 	sc->sc_txbusy = 1;
 	uart_setreg(&sc->sc_bas, SACOM_CR3, uart_getreg(&sc->sc_bas, SACOM_CR3)
-	    | CR3_TIE);    
+	    | CR3_TIE);
 	for (i = 0; i < sc->sc_txdatasz; i++) {
 		while (!(uart_getreg(&sc->sc_bas, SACOM_SR1) & SR1_TNF));
 
@@ -252,7 +252,7 @@ sa1110_bus_ipend(struct uart_softc *sc)
 			ipend |= SER_INT_RXREADY;
 		mask &= ~CR3_RIE;
 	}
-	uart_setreg(&sc->sc_bas, SACOM_CR3, CR3_RXE | mask); 
+	uart_setreg(&sc->sc_bas, SACOM_CR3, CR3_RXE | mask);
 	return (ipend);
 }
 static int



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206130459.q5D4x198096802>