Author: imp
Date: Wed Jun 13 04:38:09 2012
New Revision: 236987
URL: http://svn.freebsd.org/changeset/base/236987
Log:
trim trailing spaces that have accumulated over the years (these files
served as the basis for too many other platforms).
Modified:
head/sys/arm/xscale/i80321/ep80219_machdep.c
head/sys/arm/xscale/i80321/i80321.c
head/sys/arm/xscale/i80321/i80321_aau.c
head/sys/arm/xscale/i80321/i80321_dma.c
head/sys/arm/xscale/i80321/i80321_intr.h
head/sys/arm/xscale/i80321/i80321_pci.c
head/sys/arm/xscale/i80321/i80321_space.c
head/sys/arm/xscale/i80321/i80321_timer.c
head/sys/arm/xscale/i80321/i80321reg.h
head/sys/arm/xscale/i80321/iq31244_7seg.c
head/sys/arm/xscale/i80321/iq31244_machdep.c
head/sys/arm/xscale/i80321/iq80321.c
head/sys/arm/xscale/i80321/obio.c
head/sys/arm/xscale/i8134x/crb_machdep.c
head/sys/arm/xscale/i8134x/i81342.c
head/sys/arm/xscale/i8134x/i81342_mcu.c
head/sys/arm/xscale/i8134x/i81342_pci.c
head/sys/arm/xscale/i8134x/i81342_space.c
head/sys/arm/xscale/i8134x/i81342reg.h
head/sys/arm/xscale/i8134x/iq81342_7seg.c
head/sys/arm/xscale/i8134x/obio.c
head/sys/arm/xscale/i8134x/uart_cpu_i81342.c
head/sys/arm/xscale/ixp425/avila_ata.c
head/sys/arm/xscale/ixp425/avila_gpio.c
head/sys/arm/xscale/ixp425/avila_machdep.c
head/sys/arm/xscale/ixp425/cambria_exp_space.c
head/sys/arm/xscale/ixp425/if_npe.c
head/sys/arm/xscale/ixp425/if_npereg.h
head/sys/arm/xscale/ixp425/ixp425.c
head/sys/arm/xscale/ixp425/ixp425_iic.c
head/sys/arm/xscale/ixp425/ixp425_npe.c
head/sys/arm/xscale/ixp425/ixp425_npereg.h
head/sys/arm/xscale/ixp425/ixp425_pci.c
head/sys/arm/xscale/ixp425/ixp425_pci_space.c
head/sys/arm/xscale/ixp425/ixp425_qmgr.c
head/sys/arm/xscale/ixp425/ixp425_qmgr.h
head/sys/arm/xscale/ixp425/ixp425reg.h
head/sys/arm/xscale/pxa/if_smc_smi.c
head/sys/arm/xscale/pxa/pxa_machdep.c
head/sys/arm/xscale/pxa/pxareg.h
Modified: head/sys/arm/xscale/i80321/ep80219_machdep.c
==============================================================================
--- head/sys/arm/xscale/i80321/ep80219_machdep.c Wed Jun 13 03:41:42
2012 (r236986)
+++ head/sys/arm/xscale/i80321/ep80219_machdep.c Wed Jun 13 04:38:09
2012 (r236987)
@@ -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
*/
@@ -142,7 +142,7 @@ struct pv_addr minidataclean;
/* Static device mappings. */
static const struct pmap_devmap ep80219_devmap[] = {
- /*
+ /*
* Map the on-board devices VA == PA so that we can access them
* with the MMU on or off.
*/
@@ -150,7 +150,7 @@ static const struct pmap_devmap ep80219_
IQ80321_OBIO_BASE,
IQ80321_OBIO_BASE,
IQ80321_OBIO_SIZE,
- VM_PROT_READ|VM_PROT_WRITE,
+ VM_PROT_READ|VM_PROT_WRITE,
PTE_NOCACHE,
},
{
@@ -159,7 +159,7 @@ static const struct pmap_devmap ep80219_
VERDE_OUT_XLATE_IO_WIN_SIZE,
VM_PROT_READ|VM_PROT_WRITE,
PTE_NOCACHE,
- },
+ },
{
IQ80321_80321_VBASE,
VERDE_PMMR_BASE,
@@ -192,8 +192,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);
@@ -222,7 +222,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 + 0x20000000;
}
}
@@ -291,13 +291,13 @@ 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,
&kernel_pt_table[KERNEL_PT_AFKERNEL
+ i]);
}
- pmap_map_entry(l1pagetable, afterkern, minidataclean.pv_pa,
+ pmap_map_entry(l1pagetable, afterkern, minidataclean.pv_pa,
VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
@@ -306,7 +306,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
@@ -338,7 +338,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,
@@ -386,7 +386,7 @@ initarm(struct arm_boot_params *abp)
dump_avail[1] = 0xa0000000 + memsize;
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);
Modified: head/sys/arm/xscale/i80321/i80321.c
==============================================================================
--- head/sys/arm/xscale/i80321/i80321.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i80321/i80321.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -225,9 +225,9 @@ i80321_attach(struct i80321_softc *sc)
static __inline uint32_t
i80321_iintsrc_read(void)
-{
- uint32_t iintsrc;
-
+{
+ uint32_t iintsrc;
+
__asm __volatile("mrc p6, 0, %0, c8, c0, 0"
: "=r" (iintsrc));
Modified: head/sys/arm/xscale/i80321/i80321_aau.c
==============================================================================
--- head/sys/arm/xscale/i80321/i80321_aau.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i80321/i80321_aau.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -111,14 +111,14 @@ i80321_aau_attach(device_t dev)
mtx_init(&softc->mtx, "AAU mtx", NULL, MTX_SPIN);
softc->sc_st = sc->sc_st;
- if (bus_space_subregion(softc->sc_st, sc->sc_sh, VERDE_AAU_BASE,
+ if (bus_space_subregion(softc->sc_st, sc->sc_sh, VERDE_AAU_BASE,
VERDE_AAU_SIZE, &softc->sc_aau_sh) != 0)
panic("%s: unable to subregion AAU registers",
device_get_name(dev));
if (bus_dma_tag_create(NULL, sizeof(i80321_aaudesc_t), 0,
- BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL,
+ BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL,
AAU_RING_SIZE * sizeof(i80321_aaudesc_t),
- 1, sizeof(i80321_aaudesc_t), BUS_DMA_ALLOCNOW, busdma_lock_mutex,
+ 1, sizeof(i80321_aaudesc_t), BUS_DMA_ALLOCNOW, busdma_lock_mutex,
&Giant, &softc->dmatag))
panic("Couldn't create a dma tag");
if (bus_dmamem_alloc(softc->dmatag, (void **)&aaudescs,
@@ -186,7 +186,7 @@ aau_bzero(void *dst, int len, int flags)
desc->next_desc = 0;
desc->count = len;
desc->descr_ctrl = 2 << 1 | 1 << 31; /* Fill, enable dest write
*/
- bus_dmamap_sync(sc->dmatag, sc->aauring[0].map,
+ bus_dmamap_sync(sc->dmatag, sc->aauring[0].map,
BUS_DMASYNC_PREWRITE);
} else {
test_virt_addr(dst, len);
@@ -218,8 +218,8 @@ aau_bzero(void *dst, int len, int flags)
if (tmplen <= 0 && descnb > 0) {
sc->aauring[descnb - 1].desc->next_desc
= 0;
- bus_dmamap_sync(sc->dmatag,
- sc->aauring[descnb - 1].map,
+ bus_dmamap_sync(sc->dmatag,
+ sc->aauring[descnb - 1].map,
BUS_DMASYNC_PREWRITE);
}
continue;
@@ -241,15 +241,15 @@ aau_bzero(void *dst, int len, int flags)
if (tmplen > 0) {
desc->next_desc = sc->aauring[descnb + 1].
phys_addr;
- bus_dmamap_sync(sc->dmatag,
- sc->aauring[descnb].map,
+ bus_dmamap_sync(sc->dmatag,
+ sc->aauring[descnb].map,
BUS_DMASYNC_PREWRITE);
desc = sc->aauring[descnb + 1].desc;
descnb++;
} else {
desc->next_desc = 0;
- bus_dmamap_sync(sc->dmatag,
- sc->aauring[descnb].map,
+ bus_dmamap_sync(sc->dmatag,
+ sc->aauring[descnb].map,
BUS_DMASYNC_PREWRITE);
}
Modified: head/sys/arm/xscale/i80321/i80321_dma.c
==============================================================================
--- head/sys/arm/xscale/i80321/i80321_dma.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i80321/i80321_dma.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -115,13 +115,13 @@ i80321_dma_attach(device_t dev)
mtx_init(&softc->mtx, "DMA engine mtx", NULL, MTX_SPIN);
softc->sc_st = sc->sc_st;
if (bus_space_subregion(softc->sc_st, sc->sc_sh, unit == 0 ?
- VERDE_DMA_BASE0 : VERDE_DMA_BASE1, VERDE_DMA_SIZE,
+ VERDE_DMA_BASE0 : VERDE_DMA_BASE1, VERDE_DMA_SIZE,
&softc->sc_dma_sh) != 0)
panic("%s: unable to subregion DMA registers",
device_get_name(dev));
if (bus_dma_tag_create(NULL, sizeof(i80321_dmadesc_t),
- 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL,
- DMA_RING_SIZE * sizeof(i80321_dmadesc_t), 1,
+ 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL,
+ DMA_RING_SIZE * sizeof(i80321_dmadesc_t), 1,
sizeof(i80321_dmadesc_t), BUS_DMA_ALLOCNOW, busdma_lock_mutex,
&Giant, &softc->dmatag))
panic("Couldn't create a dma tag");
@@ -131,7 +131,7 @@ i80321_dma_attach(device_t dev)
panic("Couldn't alloc dma memory");
for (int i = 0; i < DMA_RING_SIZE; i++) {
if (i > 0)
- if (bus_dmamap_create(softc->dmatag, 0,
+ if (bus_dmamap_create(softc->dmatag, 0,
&softc->dmaring[i].map))
panic("Couldn't alloc dmamap");
softc->dmaring[i].desc = &dmadescs[i];
@@ -213,11 +213,11 @@ dma_memcpy(void *dst, void *src, int len
desc->local_addr = (vm_paddr_t)dst;
desc->count = len;
desc->descr_ctrl = 1 << 6; /* Local memory to local memory. */
- bus_dmamap_sync(sc->dmatag,
- sc->dmaring[0].map,
+ bus_dmamap_sync(sc->dmatag,
+ sc->dmaring[0].map,
BUS_DMASYNC_PREWRITE);
} else {
- if (!virt_addr_is_valid(dst, len, 1, !(flags & DST_IS_USER)) ||
+ if (!virt_addr_is_valid(dst, len, 1, !(flags & DST_IS_USER)) ||
!virt_addr_is_valid(src, len, 0, !(flags & SRC_IS_USER))) {
mtx_lock_spin(&sc->mtx);
sc->flags &= ~BUSY;
@@ -275,8 +275,8 @@ dma_memcpy(void *dst, void *src, int len
if (tmplen <= 0 && descnb > 0) {
sc->dmaring[descnb - 1].desc->next_desc
= 0;
- bus_dmamap_sync(sc->dmatag,
- sc->dmaring[descnb - 1].map,
+ bus_dmamap_sync(sc->dmatag,
+ sc->dmaring[descnb - 1].map,
BUS_DMASYNC_PREWRITE);
}
continue;
@@ -301,8 +301,8 @@ dma_memcpy(void *dst, void *src, int len
if (tmplen > 0) {
desc->next_desc = sc->dmaring[descnb + 1].
phys_addr;
- bus_dmamap_sync(sc->dmatag,
- sc->dmaring[descnb].map,
+ bus_dmamap_sync(sc->dmatag,
+ sc->dmaring[descnb].map,
BUS_DMASYNC_PREWRITE);
desc = sc->dmaring[descnb + 1].desc;
descnb++;
Modified: head/sys/arm/xscale/i80321/i80321_intr.h
==============================================================================
--- head/sys/arm/xscale/i80321/i80321_intr.h Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i80321/i80321_intr.h Wed Jun 13 04:38:09 2012
(r236987)
@@ -33,7 +33,7 @@
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* $FreeBSD$
*
*/
Modified: head/sys/arm/xscale/i80321/i80321_pci.c
==============================================================================
--- head/sys/arm/xscale/i80321/i80321_pci.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i80321/i80321_pci.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -79,7 +79,7 @@ static int
i80321_pci_attach(device_t dev)
{
- uint32_t busno;
+ uint32_t busno;
struct i80321_pci_softc *sc = device_get_softc(dev);
sc->sc_st = i80321_softc->sc_st;
@@ -100,16 +100,16 @@ i80321_pci_attach(device_t dev)
sc->sc_io_rman.rm_type = RMAN_ARRAY;
sc->sc_io_rman.rm_descr = "I80321 PCI I/O Ports";
if (rman_init(&sc->sc_io_rman) != 0 ||
- rman_manage_region(&sc->sc_io_rman,
- sc->sc_io,
- sc->sc_io +
+ rman_manage_region(&sc->sc_io_rman,
+ sc->sc_io,
+ sc->sc_io +
VERDE_OUT_XLATE_IO_WIN_SIZE) != 0) {
panic("i80321_pci_probe: failed to set up I/O rman");
}
sc->sc_mem_rman.rm_type = RMAN_ARRAY;
sc->sc_mem_rman.rm_descr = "I80321 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, VERDE_OUT_XLATE_MEM_WIN_SIZE) != 0) {
panic("i80321_pci_probe: failed to set up memory rman");
}
@@ -325,7 +325,7 @@ i80321_pci_alloc_resource(device_t bus,
rman_release_resource(rv);
return (NULL);
}
- }
+ }
}
return (rv);
}
@@ -340,7 +340,7 @@ i80321_pci_activate_resource(device_t bu
if (type == SYS_RES_MEMORY) {
error = bus_space_map(rman_get_bustag(r),
rman_get_bushandle(r), rman_get_size(r), 0, &p);
- if (error)
+ if (error)
return (error);
rman_set_bushandle(r, p);
@@ -350,8 +350,8 @@ i80321_pci_activate_resource(device_t bu
static int
i80321_pci_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)
+ struct resource *ires, int flags, driver_filter_t *filt,
+ driver_intr_t *intr, void *arg, void **cookiep)
{
return (BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags,
filt, intr, arg, cookiep));
Modified: head/sys/arm/xscale/i80321/i80321_space.c
==============================================================================
--- head/sys/arm/xscale/i80321/i80321_space.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i80321/i80321_space.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -279,7 +279,7 @@ i80321_io_bs_alloc(void *t, bus_addr_t r
panic("i80321_io_bs_alloc(): not implemented");
}
-void
+void
i80321_io_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
@@ -299,7 +299,7 @@ i80321_mem_bs_map(void *t, bus_addr_t bp
endpa = round_page(bpa + size);
*bshp = (vm_offset_t)pmap_mapdev(pa, endpa - pa);
-
+
return (0);
}
@@ -324,7 +324,7 @@ i80321_mem_bs_alloc(void *t, bus_addr_t
panic("i80321_mem_bs_alloc(): not implemented");
}
-void
+void
i80321_mem_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
Modified: head/sys/arm/xscale/i80321/i80321_timer.c
==============================================================================
--- head/sys/arm/xscale/i80321/i80321_timer.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i80321/i80321_timer.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
#include <arm/xscale/i80321/i80321var.h>
#ifdef CPU_XSCALE_81342
-#define ICU_INT_TIMER0 (8) /* XXX: Can't include i81342reg.h because
+#define ICU_INT_TIMER0 (8) /* XXX: Can't include i81342reg.h because
definitions overrides the ones from i80321reg.h
*/
#endif
@@ -79,7 +79,7 @@ static unsigned i80321_timer_get_timecou
static uint32_t counts_per_hz;
-#if defined(XSCALE_DISABLE_CCNT) || defined(CPU_XSCALE_81342)
+#if defined(XSCALE_DISABLE_CCNT) || defined(CPU_XSCALE_81342)
static uint32_t offset;
static uint32_t last = -1;
#endif
@@ -383,17 +383,17 @@ cpu_initclocks(void)
oldirqstate = disable_interrupts(I32_bit);
- irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
+ irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
#ifdef CPU_XSCALE_81342
ICU_INT_TIMER0, ICU_INT_TIMER0,
#else
- ICU_INT_TMR0, ICU_INT_TMR0,
+ ICU_INT_TMR0, ICU_INT_TMR0,
#endif
1, RF_ACTIVE);
if (!irq)
panic("Unable to setup the clock irq handler.\n");
else
- bus_setup_intr(dev, irq, INTR_TYPE_CLK, clockhandler, NULL,
+ bus_setup_intr(dev, irq, INTR_TYPE_CLK, clockhandler, NULL,
NULL, &ihl);
tmr0_write(0); /* stop timer */
tisr_write(TISR_TMR0); /* clear interrupt */
Modified: head/sys/arm/xscale/i80321/i80321reg.h
==============================================================================
--- head/sys/arm/xscale/i80321/i80321reg.h Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i80321/i80321reg.h Wed Jun 13 04:38:09 2012
(r236987)
@@ -38,8 +38,8 @@
*
*/
-#ifndef _ARM_XSCALE_I80321REG_H_
-#define _ARM_XSCALE_I80321REG_H_
+#ifndef _ARM_XSCALE_I80321REG_H_
+#define _ARM_XSCALE_I80321REG_H_
/*
* Register definitions for the Intel 80321 (``Verde'') I/O processor,
@@ -102,7 +102,7 @@
#if defined(CPU_XSCALE_80321)
#define VERDE_AAU_BASE 0x0800
#define VERDE_AAU_SIZE 0x0100
-#endif
+#endif
#define VERDE_I2C_BASE 0x1680
#define VERDE_I2C_BASE0 (VERDE_I2C_BASE + 0x00)
Modified: head/sys/arm/xscale/i80321/iq31244_7seg.c
==============================================================================
--- head/sys/arm/xscale/i80321/iq31244_7seg.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i80321/iq31244_7seg.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -206,7 +206,7 @@ static const uint8_t digitmap[] = {
SEG_D|SEG_E,
};
-static uint8_t
+static uint8_t
iq80321_7seg_xlate(char c)
{
uint8_t rv;
@@ -336,7 +336,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
iq31244_7seg_snake(void)
Modified: head/sys/arm/xscale/i80321/iq31244_machdep.c
==============================================================================
--- head/sys/arm/xscale/i80321/iq31244_machdep.c Wed Jun 13 03:41:42
2012 (r236986)
+++ head/sys/arm/xscale/i80321/iq31244_machdep.c Wed Jun 13 04:38:09
2012 (r236987)
@@ -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
*/
@@ -140,7 +140,7 @@ struct pv_addr minidataclean;
#define IQ80321_OBIO_SIZE 0x00100000UL
/* Static device mappings. */
static const struct pmap_devmap iq80321_devmap[] = {
- /*
+ /*
* Map the on-board devices VA == PA so that we can access them
* with the MMU on or off.
*/
@@ -148,7 +148,7 @@ static const struct pmap_devmap iq80321_
IQ80321_OBIO_BASE,
IQ80321_OBIO_BASE,
IQ80321_OBIO_SIZE,
- VM_PROT_READ|VM_PROT_WRITE,
+ VM_PROT_READ|VM_PROT_WRITE,
PTE_NOCACHE,
},
{
@@ -158,7 +158,7 @@ static const struct pmap_devmap iq80321_
VM_PROT_READ|VM_PROT_WRITE,
PTE_NOCACHE,
},
-
+
{
IQ80321_80321_VBASE,
VERDE_PMMR_BASE,
@@ -193,8 +193,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);
@@ -223,7 +223,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 + 0x20000000;
}
}
@@ -290,13 +290,13 @@ 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,
&kernel_pt_table[KERNEL_PT_AFKERNEL + i]);
}
- pmap_map_entry(l1pagetable, afterkern, minidataclean.pv_pa,
+ pmap_map_entry(l1pagetable, afterkern, minidataclean.pv_pa,
VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
@@ -305,7 +305,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
@@ -337,7 +337,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,
@@ -393,7 +393,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);
Modified: head/sys/arm/xscale/i80321/iq80321.c
==============================================================================
--- head/sys/arm/xscale/i80321/iq80321.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i80321/iq80321.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -324,7 +324,7 @@ arm_unmask_irq(uintptr_t nb)
void
cpu_reset()
-{
+{
(void) disable_interrupts(I32_bit|F32_bit);
*(__volatile uint32_t *)(IQ80321_80321_VBASE + VERDE_ATU_BASE +
ATU_PCSR) = PCSR_RIB | PCSR_RPB;
@@ -351,7 +351,7 @@ iq80321_alloc_resource(device_t dev, dev
static int
iq80321_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 error;
Modified: head/sys/arm/xscale/i80321/obio.c
==============================================================================
--- head/sys/arm/xscale/i80321/obio.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i80321/obio.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -120,7 +120,7 @@ obio_alloc_resource(device_t bus, device
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);
Modified: head/sys/arm/xscale/i8134x/crb_machdep.c
==============================================================================
--- head/sys/arm/xscale/i8134x/crb_machdep.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i8134x/crb_machdep.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -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_
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);
Modified: head/sys/arm/xscale/i8134x/i81342.c
==============================================================================
--- head/sys/arm/xscale/i8134x/i81342.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i8134x/i81342.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -425,8 +425,8 @@ i81342_alloc_resource(device_t dev, devi
}
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;
Modified: head/sys/arm/xscale/i8134x/i81342_mcu.c
==============================================================================
--- head/sys/arm/xscale/i8134x/i81342_mcu.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i8134x/i81342_mcu.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -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;
Modified: head/sys/arm/xscale/i8134x/i81342_pci.c
==============================================================================
--- head/sys/arm/xscale/i8134x/i81342_pci.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i8134x/i81342_pci.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -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_
*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_i
}
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,
rman_release_resource(rv);
return (NULL);
}
- }
+ }
}
return (rv);
Modified: head/sys/arm/xscale/i8134x/i81342_space.c
==============================================================================
--- head/sys/arm/xscale/i8134x/i81342_space.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i8134x/i81342_space.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -260,7 +260,7 @@ i81342_io_bs_alloc(void *t, bus_addr_t r
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
panic("i81342_mem_bs_alloc(): not implemented");
}
-void
+void
i81342_mem_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
Modified: head/sys/arm/xscale/i8134x/i81342reg.h
==============================================================================
--- head/sys/arm/xscale/i8134x/i81342reg.h Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i8134x/i81342reg.h Wed Jun 13 04:38:09 2012
(r236987)
@@ -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
Modified: head/sys/arm/xscale/i8134x/iq81342_7seg.c
==============================================================================
--- head/sys/arm/xscale/i8134x/iq81342_7seg.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i8134x/iq81342_7seg.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -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)
Modified: head/sys/arm/xscale/i8134x/obio.c
==============================================================================
--- head/sys/arm/xscale/i8134x/obio.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/i8134x/obio.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -127,7 +127,7 @@ obio_alloc_resource(device_t bus, device
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);
Modified: head/sys/arm/xscale/i8134x/uart_cpu_i81342.c
==============================================================================
--- head/sys/arm/xscale/i8134x/uart_cpu_i81342.c Wed Jun 13 03:41:42
2012 (r236986)
+++ head/sys/arm/xscale/i8134x/uart_cpu_i81342.c Wed Jun 13 04:38:09
2012 (r236987)
@@ -55,7 +55,7 @@ uart_cpu_getdev(int devtype, struct uart
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;
Modified: head/sys/arm/xscale/ixp425/avila_ata.c
==============================================================================
--- head/sys/arm/xscale/ixp425/avila_ata.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/ixp425/avila_ata.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -304,7 +304,7 @@ ata_avila_release_resource(device_t dev,
}
static int
-ata_avila_setup_intr(device_t dev, device_t child, struct resource *irq,
+ata_avila_setup_intr(device_t dev, device_t child, struct resource *irq,
int flags, driver_filter_t *filt,
driver_intr_t *function, void *argument, void **cookiep)
{
Modified: head/sys/arm/xscale/ixp425/avila_gpio.c
==============================================================================
--- head/sys/arm/xscale/ixp425/avila_gpio.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/ixp425/avila_gpio.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -102,7 +102,7 @@ static struct avila_gpio_pin avila_gpio_
/*
* Helpers
*/
-static void avila_gpio_pin_configure(struct avila_gpio_softc *sc,
+static void avila_gpio_pin_configure(struct avila_gpio_softc *sc,
struct gpio_pin *pin, uint32_t flags);
static int avila_gpio_pin_flags(struct avila_gpio_softc *sc, uint32_t pin);
Modified: head/sys/arm/xscale/ixp425/avila_machdep.c
==============================================================================
--- head/sys/arm/xscale/ixp425/avila_machdep.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/ixp425/avila_machdep.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -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
*/
@@ -238,8 +238,8 @@ initarm(struct arm_boot_params *abp)
vm_offset_t lastaddr;
uint32_t memsize;
+ lastaddr = parse_boot_param(abp);
set_cpufuncs(); /* NB: sets cputype */
- lastaddr = fake_preload_metadata();
pcpu_init(pcpup, 0, sizeof(struct pcpu));
PCPU_SET(curthread, &thread0);
@@ -283,7 +283,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 +
(KERNVIRTADDR - KERNPHYSADDR);
}
@@ -364,7 +364,7 @@ initarm(struct arm_boot_params *abp)
pmap_link_l2pt(l1pagetable, afterkern + i * 0x00100000,
&kernel_pt_table[KERNEL_PT_AFKERNEL + i]);
}
- pmap_map_entry(l1pagetable, afterkern, minidataclean.pv_pa,
+ pmap_map_entry(l1pagetable, afterkern, minidataclean.pv_pa,
VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
#ifdef ARM_USE_SMALL_ALLOC
@@ -372,7 +372,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
Modified: head/sys/arm/xscale/ixp425/cambria_exp_space.c
==============================================================================
--- head/sys/arm/xscale/ixp425/cambria_exp_space.c Wed Jun 13 03:41:42
2012 (r236986)
+++ head/sys/arm/xscale/ixp425/cambria_exp_space.c Wed Jun 13 04:38:09
2012 (r236987)
@@ -249,7 +249,7 @@ cambria_exp_bus_init(struct ixp425_softc
cs3 = EXP_BUS_READ_4(sc, EXP_TIMING_CS3_OFFSET);
/* XXX force slowest possible timings and byte mode */
EXP_BUS_WRITE_4(sc, EXP_TIMING_CS3_OFFSET,
- cs3 | (EXP_T1|EXP_T2|EXP_T3|EXP_T4|EXP_T5) |
+ cs3 | (EXP_T1|EXP_T2|EXP_T3|EXP_T4|EXP_T5) |
EXP_BYTE_EN | EXP_WR_EN | EXP_BYTE_RD16 | EXP_CS_EN);
/* XXX force GPIO 3+4 for GPS+RS485 uarts */
Modified: head/sys/arm/xscale/ixp425/if_npe.c
==============================================================================
--- head/sys/arm/xscale/ixp425/if_npe.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/ixp425/if_npe.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -89,8 +89,8 @@ __FBSDID("$FreeBSD$");
#include "miibus_if.h"
-/*
- * XXX: For the main bus dma tag. Can go away if the new method to get the
+/*
+ * XXX: For the main bus dma tag. Can go away if the new method to get the
* dma tag from the parent got MFC'd into RELENG_6.
*/
extern struct ixp425_softc *ixp425_softc;
@@ -302,7 +302,7 @@ npe_probe(device_t dev)
int unit = device_get_unit(dev);
int npeid;
- if (unit > 2 ||
+ if (unit > 2 ||
(ixp4xx_read_feature_bits() &
(unit == 0 ? EXP_FCTRL_ETH0 : EXP_FCTRL_ETH1)) == 0)
return EINVAL;
@@ -496,7 +496,7 @@ npe_dma_setup(struct npe_softc *sc, stru
}
/* DMA tag and map for the NPE buffers */
- error = bus_dma_tag_create(ixp425_softc->sc_dmat, sizeof(uint32_t), 0,
+ error = bus_dma_tag_create(ixp425_softc->sc_dmat, sizeof(uint32_t), 0,
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
nbuf * sizeof(struct npehwbuf), 1,
nbuf * sizeof(struct npehwbuf), 0,
@@ -1445,7 +1445,7 @@ npestop(struct npe_softc *sc)
/*
* The MAC core rx/tx disable may leave the MAC hardware in an
- * unpredictable state. A hw reset is executed before resetting
+ * unpredictable state. A hw reset is executed before resetting
* all the MAC parameters to a known value.
*/
WR4(sc, NPE_MAC_CORE_CNTRL, NPE_CORE_RESET);
Modified: head/sys/arm/xscale/ixp425/if_npereg.h
==============================================================================
--- head/sys/arm/xscale/ixp425/if_npereg.h Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/ixp425/if_npereg.h Wed Jun 13 04:38:09 2012
(r236987)
@@ -32,7 +32,7 @@
/*
* Copyright (c) 2001-2005, Intel Corporation.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -44,8 +44,8 @@
* 3. Neither the name of the Intel Corporation nor the names of its
contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
- *
+ *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -253,19 +253,19 @@ struct npestats {
/* NB: shorthands for mii bus mdio routines */
#define NPE_MAC_MDIO_CMD NPE_MAC_MDIO_CMD_1
#define NPE_MAC_MDIO_STS NPE_MAC_MDIO_STS_1
-
+
#define NPE_MII_GO (1<<31)
#define NPE_MII_WRITE (1<<26)
-#define NPE_MII_TIMEOUT_10TH_SECS 5
+#define NPE_MII_TIMEOUT_10TH_SECS 5
#define NPE_MII_10TH_SEC_IN_MILLIS 100
#define NPE_MII_READ_FAIL (1<<31)
-
+
#define NPE_MII_PHY_DEF_DELAY 300 /* max delay before link up, etc. */
#define NPE_MII_PHY_NO_DELAY 0x0 /* do not delay */
#define NPE_MII_PHY_NULL 0xff /* PHY is not present */
#define NPE_MII_PHY_DEF_ADDR 0x0 /* default PHY's logical address */
-/* Register definition */
+/* Register definition */
#define NPE_MII_CTRL_REG 0x0 /* Control Register */
#define NPE_MII_STAT_REG 0x1 /* Status Register */
#define NPE_MII_PHY_ID1_REG 0x2 /* PHY identifier 1 Register */
Modified: head/sys/arm/xscale/ixp425/ixp425.c
==============================================================================
--- head/sys/arm/xscale/ixp425/ixp425.c Wed Jun 13 03:41:42 2012
(r236986)
+++ head/sys/arm/xscale/ixp425/ixp425.c Wed Jun 13 04:38:09 2012
(r236987)
@@ -177,7 +177,7 @@ ixp425_set_gpio(struct ixp425_softc *sc,
gpiotr | GPIO_TYPE(pin, type));
/* configure gpio line as an input */
- GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOER,
+ GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOER,
GPIO_CONF_READ_4(sc, IXP425_GPIO_GPOER) | (1<<pin));
IXP4XX_GPIO_UNLOCK();
}
@@ -330,7 +330,7 @@ ixp425_attach(device_t dev)
cambria_exp_bus_init(sc);
if (bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT,
- BUS_SPACE_MAXADDR, NULL, NULL, 0xffffffff, 0xff, 0xffffffff, 0,
+ BUS_SPACE_MAXADDR, NULL, NULL, 0xffffffff, 0xff, 0xffffffff, 0,
NULL, NULL, &sc->sc_dmat))
panic("%s: failed to create dma tag", __func__);
@@ -534,7 +534,7 @@ ixp425_alloc_resource(device_t dev, devi
device_printf(child,
"%s: assign 0x%lx:0x%lx%s\n",
__func__, start, end - start,
- vtrans->isa4x ? " A4X" :
+ vtrans->isa4x ? " A4X" :
vtrans->isslow ? " SLOW" : "");
}
} else
@@ -602,7 +602,7 @@ ixp425_activate_resource(device_t dev, d
static int
ixp425_deactivate_resource(device_t bus, device_t child, int type, int rid,
- struct resource *r)
+ struct resource *r)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
