trim trailing spaces that have accumulated over the years (these files

served as the basis for too many other platforms).

9 files changed, 26 insertions, 26 deletions

diff --git a/sys/arm/xscale/i8134x/crb_machdep.c b/sys/arm/xscale/i8134x/crb_machdep.c
index 7d49d40..8567b17 100644
--- a/sys/arm/xscale/i8134x/crb_machdep.c
+++ b/sys/arm/xscale/i8134x/crb_machdep.c
@@ -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
  */
@@ -162,7 +162,7 @@ static const struct pmap_devmap iq81342_devmap[] = {
 		    VM_PROT_READ|VM_PROT_WRITE,
 		    PTE_NOCACHE,
 	    },
-	    {	    
+	    {	
 		    0,
 		    0,
 		    0,
@@ -189,8 +189,8 @@ initarm(struct arm_boot_params *abp)
 	vm_offset_t lastaddr;
 	uint32_t memsize, memstart;
 
+	lastaddr = parse_boot_param(abp);
 	set_cpufuncs();
-	lastaddr = fake_preload_metadata();
 	pcpu_init(pcpup, 0, sizeof(struct pcpu));
 	PCPU_SET(curthread, &thread0);
 
@@ -219,7 +219,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 + 0xc0000000;
 		}
 	}
@@ -278,7 +278,7 @@ initarm(struct arm_boot_params *abp)
 	   (((uint32_t)(lastaddr) - KERNBASE - 0x200000) + L1_S_SIZE) & ~(L1_S_SIZE - 1),
 	    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
 	freemem_after = ((int)lastaddr + PAGE_SIZE) & ~(PAGE_SIZE - 1);
-	afterkern = round_page(((vm_offset_t)lastaddr + L1_S_SIZE) & ~(L1_S_SIZE 
+	afterkern = round_page(((vm_offset_t)lastaddr + L1_S_SIZE) & ~(L1_S_SIZE
 	    - 1));
 	for (i = 0; i < KERNEL_PT_AFKERNEL_NUM; i++) {
 		pmap_link_l2pt(l1pagetable, afterkern + i * 0x00100000,
@@ -291,7 +291,7 @@ initarm(struct arm_boot_params *abp)
 		arm_add_smallalloc_pages((void *)(freemem_after),
 		    (void*)(freemem_after + PAGE_SIZE),
 		    afterkern - (freemem_after + PAGE_SIZE), 0);
-		    
+		
 	}
 #endif
 
@@ -319,7 +319,7 @@ initarm(struct arm_boot_params *abp)
 	 * of the stack memory.
 	 */
 
-				   
+				
 	set_stackptr(PSR_IRQ32_MODE,
 	    irqstack.pv_va + IRQ_STACK_SIZE * PAGE_SIZE);
 	set_stackptr(PSR_ABT32_MODE,
@@ -365,7 +365,7 @@ initarm(struct arm_boot_params *abp)
 	dump_avail[2] = 0;
 	dump_avail[3] = 0;
 					
-	pmap_bootstrap(pmap_curmaxkvaddr, 
+	pmap_bootstrap(pmap_curmaxkvaddr,
 	    0xd0000000, &kernel_l1pt);
 	msgbufp = (void*)msgbufpv.pv_va;
 	msgbufinit(msgbufp, msgbufsize);
diff --git a/sys/arm/xscale/i8134x/i81342.c b/sys/arm/xscale/i8134x/i81342.c
index 44ec3fd..2bfab78 100644
--- a/sys/arm/xscale/i8134x/i81342.c
+++ b/sys/arm/xscale/i8134x/i81342.c
@@ -425,8 +425,8 @@ i81342_alloc_resource(device_t dev, device_t child, int type, int *rid,
 }
 
 static int
-i81342_setup_intr(device_t dev, device_t child, struct resource *ires, 
-    int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, 
+i81342_setup_intr(device_t dev, device_t child, struct resource *ires,
+    int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg,
     void **cookiep)
 {
 	int error;
diff --git a/sys/arm/xscale/i8134x/i81342_mcu.c b/sys/arm/xscale/i8134x/i81342_mcu.c
index 045fe96..7a3d2bf 100644
--- a/sys/arm/xscale/i8134x/i81342_mcu.c
+++ b/sys/arm/xscale/i8134x/i81342_mcu.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <arm/xscale/i8134x/i81342var.h>
 
 void
-i81342_sdram_bounds(bus_space_tag_t bt, bus_space_handle_t bh, 
+i81342_sdram_bounds(bus_space_tag_t bt, bus_space_handle_t bh,
     vm_paddr_t *start, vm_size_t *size)
 {
 	uint32_t reg;
diff --git a/sys/arm/xscale/i8134x/i81342_pci.c b/sys/arm/xscale/i8134x/i81342_pci.c
index 17cc7cd..8bbcdba 100644
--- a/sys/arm/xscale/i8134x/i81342_pci.c
+++ b/sys/arm/xscale/i8134x/i81342_pci.c
@@ -180,7 +180,7 @@ i81342_pci_attach(device_t dev)
 	sc->sc_io_rman.rm_type = RMAN_ARRAY;
 	sc->sc_io_rman.rm_descr = "I81342 PCI I/O Ports";
 	if (rman_init(&sc->sc_io_rman) != 0 ||
-		rman_manage_region(&sc->sc_io_rman, 
+		rman_manage_region(&sc->sc_io_rman,
 		sc->sc_is_atux ? IOP34X_PCIX_OIOBAR_VADDR :
 		IOP34X_PCIE_OIOBAR_VADDR,
 		(sc->sc_is_atux ? IOP34X_PCIX_OIOBAR_VADDR :
@@ -190,7 +190,7 @@ i81342_pci_attach(device_t dev)
 	sc->sc_mem_rman.rm_type = RMAN_ARRAY;
 	sc->sc_mem_rman.rm_descr = "I81342 PCI Memory";
 	if (rman_init(&sc->sc_mem_rman) != 0 ||
-	    rman_manage_region(&sc->sc_mem_rman, 
+	    rman_manage_region(&sc->sc_mem_rman,
 	    0, 0xffffffff) != 0) {
 		panic("i81342_pci_attach: failed to set up memory rman");
 	}
@@ -198,12 +198,12 @@ i81342_pci_attach(device_t dev)
 	sc->sc_irq_rman.rm_descr = "i81342 PCI IRQs";
 	if (sc->sc_is_atux) {
 		if (rman_init(&sc->sc_irq_rman) != 0 ||
-		    rman_manage_region(&sc->sc_irq_rman, ICU_INT_XINT0, 
+		    rman_manage_region(&sc->sc_irq_rman, ICU_INT_XINT0,
 		    ICU_INT_XINT3) != 0)
 			panic("i83142_pci_attach: failed to set up IRQ rman");
 	} else {
 		if (rman_init(&sc->sc_irq_rman) != 0 ||
-		    rman_manage_region(&sc->sc_irq_rman, ICU_INT_ATUE_MA, 
+		    rman_manage_region(&sc->sc_irq_rman, ICU_INT_ATUE_MA,
 		    ICU_INT_ATUE_MD) != 0)
 			panic("i81342_pci_attach: failed to set up IRQ rman");
 
@@ -242,7 +242,7 @@ i81342_pci_conf_setup(struct i81342_pci_softc *sc, int bus, int slot, int func,
 			*addr = (1 << (slot + 16)) | (slot << 11) |
 			    (func << 8) | reg;
 		else
-			*addr = (bus << 16) | (slot << 11) | (func << 11) | 
+			*addr = (bus << 16) | (slot << 11) | (func << 11) |
 			    reg | 1;
 	} else {
 		*addr = (bus << 24) | (slot << 19) | (func << 16) | reg;
@@ -297,7 +297,7 @@ i81342_pci_read_config(device_t dev, u_int bus, u_int slot, u_int func,
 }
 
 static void
-i81342_pci_write_config(device_t dev, u_int bus, u_int slot, u_int func, 
+i81342_pci_write_config(device_t dev, u_int bus, u_int slot, u_int func,
     u_int reg, u_int32_t data, int bytes)
 {
 	struct i81342_pci_softc *sc = device_get_softc(dev);
@@ -372,7 +372,7 @@ i81342_pci_alloc_resource(device_t bus, device_t child, int type, int *rid,
 				rman_release_resource(rv);
 				return (NULL);
 			}
-		} 
+		}
 	}
 	return (rv);
 
diff --git a/sys/arm/xscale/i8134x/i81342_space.c b/sys/arm/xscale/i8134x/i81342_space.c
index 50865f17..5b08ef6 100644
--- a/sys/arm/xscale/i8134x/i81342_space.c
+++ b/sys/arm/xscale/i8134x/i81342_space.c
@@ -260,7 +260,7 @@ i81342_io_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
 	panic("i81342_io_bs_alloc(): not implemented");
 }
 
-void    
+void
 i81342_io_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
 {
 
@@ -337,7 +337,7 @@ i81342_mem_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
 	panic("i81342_mem_bs_alloc(): not implemented");
 }
 
-void    
+void
 i81342_mem_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
 {
 
diff --git a/sys/arm/xscale/i8134x/i81342reg.h b/sys/arm/xscale/i8134x/i81342reg.h
index 5001d96..c342970 100644
--- a/sys/arm/xscale/i8134x/i81342reg.h
+++ b/sys/arm/xscale/i8134x/i81342reg.h
@@ -29,7 +29,7 @@
 #ifndef I83142_REG_H_
 #define I83142_REG_H_
 /* Physical Memory Map */
-/* 
+/*
  * 0x000000000 - 0x07FFFFFFF SDRAM
  * 0x090100000 - 0x0901FFFFF ATUe Outbound IO Window
  * 0x0F0000000 - 0x0F1FFFFFF Flash
@@ -62,7 +62,7 @@
 
 #define	IOP34X_ADMA_IE		(1 << 0) /* Interrupt enable */
 #define IOP34X_ADMA_TR		(1 << 1) /* Transfert Direction */
-/* 
+/*
  *               Source                   Destination
  *  00         Host I/O Interface	Local Memory
  *  01         Local Memory             Host I/O Interface
diff --git a/sys/arm/xscale/i8134x/iq81342_7seg.c b/sys/arm/xscale/i8134x/iq81342_7seg.c
index cc0d871..4fda641 100644
--- a/sys/arm/xscale/i8134x/iq81342_7seg.c
+++ b/sys/arm/xscale/i8134x/iq81342_7seg.c
@@ -207,7 +207,7 @@ static const uint8_t digitmap[] = {
 	~(SEG_D|SEG_E),
 };
 
-static uint8_t 
+static uint8_t
 iq81342_7seg_xlate(char c)
 {
 	uint8_t rv;
@@ -337,7 +337,7 @@ static const uint8_t snakemap[][2] = {
 
 static SYSCTL_NODE(_hw, OID_AUTO, sevenseg, CTLFLAG_RD, 0, "7 seg");
 static int freq = 20;
-SYSCTL_INT(_hw_sevenseg, OID_AUTO, freq, CTLFLAG_RW, &freq, 0, 
+SYSCTL_INT(_hw_sevenseg, OID_AUTO, freq, CTLFLAG_RW, &freq, 0,
     "7 Seg update frequency");
 static void
 iq81342_7seg_snake(void)
diff --git a/sys/arm/xscale/i8134x/obio.c b/sys/arm/xscale/i8134x/obio.c
index 534f0e7..b8bccce 100644
--- a/sys/arm/xscale/i8134x/obio.c
+++ b/sys/arm/xscale/i8134x/obio.c
@@ -127,7 +127,7 @@ obio_alloc_resource(device_t bus, device_t child, int type, int *rid,
 
 
 	rv = rman_reserve_resource(rm, start, end, count, flags, child);
-	if (rv == NULL) 
+	if (rv == NULL)
 		return (NULL);
 	if (type == SYS_RES_IRQ)
 		return (rv);
diff --git a/sys/arm/xscale/i8134x/uart_cpu_i81342.c b/sys/arm/xscale/i8134x/uart_cpu_i81342.c
index 02e7050..2cb2902 100644
--- a/sys/arm/xscale/i8134x/uart_cpu_i81342.c
+++ b/sys/arm/xscale/i8134x/uart_cpu_i81342.c
@@ -55,7 +55,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
 	di->ops = uart_getops(&uart_ns8250_class);
 	di->bas.chan = 0;
 	di->bas.bst = &obio_bs_tag;
-	di->bas.regshft = 2; 
+	di->bas.regshft = 2;
 	di->bas.rclk = 33334000;
 	di->baudrate = 115200;
 	di->databits = 8;