Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop trailing whitespace.

This commit is contained in:
uwe 2005-11-16 03:00:23 +00:00
parent 1cb1ba5ffa
commit 8fbe0d8575
18 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/sparc/sparc/auxreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: auxreg.h,v 1.11 2005/11/14 03:30:49 uwe Exp $ */
/* $NetBSD: auxreg.h,v 1.12 2005/11/16 03:00:23 uwe Exp $ */
/*
* Copyright (c) 1992, 1993
@ -57,10 +57,10 @@
#define AUXIO4M_FHD 0x20 /* floppy: high density (unreliable?)*/
#define AUXIO4M_LTE 0x08 /* link-test enable */
/* power up modem in SPARCbook 3GX */
#define AUXIO4M_MMX 0x04 /* Monitor/Mouse MUX; what is it? */
/* power up DBRI in SPARCbook 3GX */
#define AUXIO4M_FTC 0x02 /* floppy: drives Terminal Count pin */
#define AUXIO4M_LED 0x01 /* front panel LED */

4
sys/arch/sparc/sparc/cache.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cache.h,v 1.33 2005/10/25 22:03:43 uwe Exp $ */
/* $NetBSD: cache.h,v 1.34 2005/11/16 03:00:23 uwe Exp $ */
/*
* Copyright (c) 1996
@ -157,7 +157,7 @@ extern u_long dvma_cachealign;
* Routines for dealing with the cache.
*/
void sun4_cache_enable(void);
void ms1_cache_enable(void);
void ms1_cache_enable(void);
void viking_cache_enable(void);
void hypersparc_cache_enable(void);
void swift_cache_enable(void);

12
sys/arch/sparc/sparc/clkctrl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clkctrl.c,v 1.2 2005/11/14 19:11:24 uwe Exp $ */
/* $NetBSD: clkctrl.c,v 1.3 2005/11/16 03:00:23 uwe Exp $ */
/*
* Copyright (c) 2005 Michael Lorenz
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: clkctrl.c,v 1.2 2005/11/14 19:11:24 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: clkctrl.c,v 1.3 2005/11/16 03:00:23 uwe Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -72,7 +72,7 @@ clkctrl_attach(struct device *parent, struct device *self, void *aux)
struct sbus_attach_args *sa = &uoba->uoba_sbus;
bus_space_handle_t bh;
struct cpu_info *cur;
if (clkctrl_reg != NULL) {
aprint_error("unable to attach more than once\n");
return;
@ -87,17 +87,17 @@ clkctrl_attach(struct device *parent, struct device *self, void *aux)
clkctrl_reg = (volatile uint8_t *)bus_space_vaddr(sa->sa_bustag, bh);
#ifdef DEBUG
#ifdef DEBUG
printf(" reg: %x", (uint32_t)clkctrl_reg);
#endif
cur = curcpu();
cur->idlespin = tadpole_cpu_sleep;
printf("\n");
}
/* ARGSUSED */
static void
static void
tadpole_cpu_sleep(struct cpu_info *ci)
{
if (clkctrl_reg == 0)

22
sys/arch/sparc/sparc/db_interface.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: db_interface.c,v 1.66 2005/11/14 03:30:49 uwe Exp $ */
/* $NetBSD: db_interface.c,v 1.67 2005/11/16 03:00:23 uwe Exp $ */
/*
* Mach Operating System
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.66 2005/11/14 03:30:49 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.67 2005/11/16 03:00:23 uwe Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -177,7 +177,7 @@ db_sparc_regop (const struct db_variable *vp, db_expr_t *val, int opcode)
{
db_expr_t *regaddr =
(db_expr_t *)(((uint8_t *)DDB_REGS) + ((size_t)vp->valuep));
switch (opcode) {
case DB_VAR_GET:
*val = *regaddr;
@ -356,7 +356,7 @@ db_proc_cmd(db_expr_t addr, int have_addr, db_expr_t count, const char *modif)
struct proc *p;
l = curlwp;
if (have_addr)
if (have_addr)
l = (struct lwp *) addr;
if (l == NULL) {
@ -374,10 +374,10 @@ db_proc_cmd(db_expr_t addr, int have_addr, db_expr_t count, const char *modif)
p->p_vmspace->vm_map.pmap->pm_ctx,
p->p_vmspace->vm_map.pmap->pm_cpuset);
db_printf("\npmap:%p wchan:%p pri:%d upri:%d\n",
p->p_vmspace->vm_map.pmap,
p->p_vmspace->vm_map.pmap,
l->l_wchan, l->l_priority, l->l_usrpri);
db_printf("maxsaddr:%p ssiz:%d pg or %llxB\n",
p->p_vmspace->vm_maxsaddr, p->p_vmspace->vm_ssize,
p->p_vmspace->vm_maxsaddr, p->p_vmspace->vm_ssize,
(unsigned long long)ctob(p->p_vmspace->vm_ssize));
db_printf("profile timer: %ld sec %ld usec\n",
p->p_stats->p_timer[ITIMER_PROF].it_value.tv_sec,
@ -393,18 +393,18 @@ db_dump_pcb(db_expr_t addr, int have_addr, db_expr_t count, const char *modif)
char bits[64];
int i;
if (have_addr)
if (have_addr)
pcb = (struct pcb *) addr;
else
pcb = curcpu()->curpcb;
db_printf("pcb@%p sp:%p pc:%p psr:%s onfault:%p\nfull windows:\n",
pcb, (void *)(long)pcb->pcb_sp, (void *)(long)pcb->pcb_pc,
pcb, (void *)(long)pcb->pcb_sp, (void *)(long)pcb->pcb_pc,
bitmask_snprintf(pcb->pcb_psr, PSR_BITS, bits, sizeof(bits)),
(void *)pcb->pcb_onfault);
for (i=0; i<pcb->pcb_nsaved; i++) {
db_printf("win %d: at %llx local, in\n", i,
db_printf("win %d: at %llx local, in\n", i,
(unsigned long long)pcb->pcb_rw[i+1].rw_in[6]);
db_printf("%16llx %16llx %16llx %16llx\n",
(unsigned long long)pcb->pcb_rw[i].rw_local[0],
@ -500,7 +500,7 @@ db_cpu_cmd(db_expr_t addr, int have_addr, db_expr_t count, const char *modif)
cpu_debug_dump();
return;
}
if ((addr < 0) || (addr >= sparc_ncpus)) {
db_printf("%ld: CPU out of range\n", addr);
return;

10
sys/arch/sparc/sparc/emul.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: emul.c,v 1.11 2005/11/14 03:30:49 uwe Exp $ */
/* $NetBSD: emul.c,v 1.12 2005/11/16 03:00:23 uwe Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.11 2005/11/14 03:30:49 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.12 2005/11/16 03:00:23 uwe Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -83,7 +83,7 @@ readgpreg(struct trapframe *tf, int i, void *val)
return error;
}
static __inline int
writegpreg(struct trapframe *tf, int i, const void *val)
{
@ -98,7 +98,7 @@ writegpreg(struct trapframe *tf, int i, const void *val)
return error;
}
static __inline int
readfpreg(struct lwp *l, int i, void *val)
@ -108,7 +108,7 @@ readfpreg(struct lwp *l, int i, void *val)
return 0;
}
static __inline int
writefpreg(struct lwp *l, int i, const void *val)
{

8
sys/arch/sparc/sparc/in_cksum.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: in_cksum.c,v 1.16 2005/11/14 19:11:24 uwe Exp $ */
/* $NetBSD: in_cksum.c,v 1.17 2005/11/16 03:00:23 uwe Exp $ */
/*
* Copyright (c) 1995 Matthew R. Green.
@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: in_cksum.c,v 1.16 2005/11/14 19:11:24 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: in_cksum.c,v 1.17 2005/11/16 03:00:23 uwe Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -287,8 +287,8 @@ in4_cksum(struct mbuf *m, uint8_t nxt, int off, int len)
/* pseudo header */
memset(&ipov, 0, sizeof(ipov));
ipov.ih_len = htons(len);
ipov.ih_pr = nxt;
ipov.ih_src = mtod(m, struct ip *)->ip_src;
ipov.ih_pr = nxt;
ipov.ih_src = mtod(m, struct ip *)->ip_src;
ipov.ih_dst = mtod(m, struct ip *)->ip_dst;
w = (u_char *)&ipov;
/* assumes sizeof(ipov) == 20 */

6
sys/arch/sparc/sparc/iommu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iommu.c,v 1.82 2005/11/14 03:30:49 uwe Exp $ */
/* $NetBSD: iommu.c,v 1.83 2005/11/16 03:00:23 uwe Exp $ */
/*
* Copyright (c) 1996
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.82 2005/11/14 03:30:49 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.83 2005/11/16 03:00:23 uwe Exp $");
#include "opt_sparc_arch.h"
@ -175,7 +175,7 @@ iommu_attach(struct device *parent, struct device *self, void *aux)
dmat->_dmamem_unmap = _bus_dmamem_unmap;
dmat->_dmamem_mmap = iommu_dmamem_mmap;
/*
/*
* JS1/OF device tree does not have an iommu node and sbus
* node is directly under root. mainbus_attach detects this
* and calls us with sbus node instead so that we can attach

20
sys/arch/sparc/sparc/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.223 2005/11/14 21:40:25 uwe Exp $ */
/* $NetBSD: locore.s,v 1.224 2005/11/16 03:00:23 uwe Exp $ */
/*
* Copyright (c) 1996 Paul Kranenburg
@ -2122,7 +2122,7 @@ illinst4m:
mov %l0, %psr ! and return from trap
add %l2, 4, %l2
RETT
/*
* fp_exception has to check to see if we are trying to save
@ -2631,7 +2631,7 @@ _ENTRY(_C_LABEL(sparc_interrupt4m))
mov 1, %l4
xor %l3, 0x18, %l7 ! change endianness of the resulting bit mask
ld [%l6 + PCIC_PROC_IPR_REG], %l5 ! get pending interrupts
sll %l4, %l7, %l4 ! hw intr bits are in the upper halfword
sll %l4, %l7, %l4 ! hw intr bits are in the upper halfword
! because the register is little-endian
btst %l4, %l5 ! has pending hw intr at this level?
bnz sparc_interrupt_common
@ -2688,7 +2688,7 @@ sparc_interrupt4m_bogus:
tst %o0 ! if (cold) {
bnz,a 1f ! splhigh();
or %l0, 0xf00, %l0 ! } else
call _C_LABEL(bogusintr) ! strayintr(&intrframe)
add %sp, CCFSZ, %o0
/* all done: restore registers and go return */
@ -2763,7 +2763,7 @@ sparc_interrupt_common:
tst %o0 ! if (cold) {
bnz,a 4f ! splhigh();
or %l0, 0xf00, %l0 ! } else
call _C_LABEL(strayintr) ! strayintr(&intrframe)
add %sp, CCFSZ, %o0
/* all done: restore registers and go return */
@ -5030,21 +5030,21 @@ idle_enter:
call _C_LABEL(uvm_pageidlezero)
nop
ispin:
! check if we're still idle, if so we'll spin in cpu_idlespin()
ld [%l2 + %lo(_C_LABEL(sched_whichqs))], %o3
tst %o3
bnz,a idle_leave
wr %l1, (IPL_SCHED << 8), %psr ! (void) splsched();
ispin2:
sethi %hi(CPUINFO_VA), %o0
ld [%o0 + CPUINFO_IDLESPIN], %o3
tst %o3
bz 1b
nop
call %o3
nop ! CPUINFO_VA is already in %o0
b,a ispin
@ -6656,7 +6656,7 @@ ENTRY(microtime)
andn %o4, %g5, %o4 ! %o4 now contains byte 1 and 3
srl %o4, 8, %o4 ! shift them so they swap positions
sll %g3, 8, %g3
or %g3, %o4, %o4 ! put them back together.
or %g3, %o4, %o4 ! put them back together.
inc -1, %o4 ! timer is 1-based, adjust
!! divide by 25 magic stolen from a gcc output
@ -6665,7 +6665,7 @@ ENTRY(microtime)
rd %y, %o4
srl %o4, 3, %o4
add %o4, %g4, %o4 ! may be bump usec by tick
!!! END ms-IIep specific code
add %o3, %o4, %o3 ! add timer to time.tv_usec

22
sys/arch/sparc/sparc/msiiep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: msiiep.c,v 1.31 2005/09/25 23:14:06 uwe Exp $ */
/* $NetBSD: msiiep.c,v 1.32 2005/11/16 03:00:23 uwe Exp $ */
/*
* Copyright (c) 2001 Valeriy E. Ushakov
@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.31 2005/09/25 23:14:06 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.32 2005/11/16 03:00:23 uwe Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@ -223,7 +223,7 @@ msiiep_attach(struct device *parent, struct device *self, void *aux)
bus_space_handle_t hmid;
struct cpu_info *cur;
uint32_t mid;
aprint_normal("\n");
if (bus_space_map(ma->ma_bustag, MSIIEP_MID_PA, 4, 0, &hmid) == 0) {
@ -236,7 +236,7 @@ msiiep_attach(struct device *parent, struct device *self, void *aux)
cur = curcpu();
cur->idlespin = msiiep_cpu_sleep;
}
/* pass on real mainbus_attach_args */
msa.msa_ma = ma;
@ -250,7 +250,7 @@ msiiep_attach(struct device *parent, struct device *self, void *aux)
}
/* ARGSUSED */
void
void
msiiep_cpu_sleep(struct cpu_info *ci)
{
uint32_t reg;
@ -266,7 +266,7 @@ msiiep_cpu_sleep(struct cpu_info *ci)
*
* Real ms-IIep PCIC driver.
*/
static int
mspcic_match(struct device *parent, struct cfdata *cf, void *aux)
{
@ -310,7 +310,7 @@ mspcic_attach(struct device *parent, struct device *self, void *aux)
mspcic_io_tag.sparc_bus_mmap = mspcic_bus_mmap;
mspcic_io_tag.sparc_intr_establish = mspcic_intr_establish;
mspcic_io_tag.parent = sc->sc_bustag;
mspcic_io_tag.sparc_read_2 = mspcic_bus_read_2;
mspcic_io_tag.sparc_read_4 = mspcic_bus_read_4;
mspcic_io_tag.sparc_read_8 = mspcic_bus_read_8;
@ -437,7 +437,7 @@ mspcic_init_maps(void)
mspcic_read_1(pcic_iosize));
#endif
nmem = nio = 1;
m0 = &mspcic_pci_memmap[nmem];
mspcic_pci_map_from_reg(m0,
mspcic_read_1(pcic_smbar0), mspcic_read_1(pcic_pmbar0),
@ -584,7 +584,7 @@ mspcic_bus_read_4(bus_space_tag_t space, bus_space_handle_t handle,
bus_size_t offset)
{
uint32_t val = *(volatile uint32_t *)(handle + offset);
return le32toh(val);
}
@ -594,13 +594,13 @@ mspcic_bus_read_8(bus_space_tag_t space, bus_space_handle_t handle,
bus_size_t offset)
{
uint64_t val = *(volatile uint64_t *)(handle + offset);
return le64toh(val);
}
static void
mspcic_bus_write_2(bus_space_tag_t space, bus_space_handle_t handle,
mspcic_bus_write_2(bus_space_tag_t space, bus_space_handle_t handle,
bus_size_t offset, uint16_t value)
{

8
sys/arch/sparc/sparc/oclock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: oclock.c,v 1.11 2005/11/14 19:11:24 uwe Exp $ */
/* $NetBSD: oclock.c,v 1.12 2005/11/16 03:00:23 uwe Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: oclock.c,v 1.11 2005/11/14 19:11:24 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: oclock.c,v 1.12 2005/11/16 03:00:23 uwe Exp $");
#include "opt_sparc_arch.h"
@ -146,8 +146,8 @@ oclockattach(struct device *parent, struct device *self, void *aux)
i7_bt = bt;
i7_bh = bh;
/*
* calibrate delay()
/*
* calibrate delay()
*/
ienab_bic(IE_L14 | IE_L10); /* disable all clock intrs */
for (timerblurb = 1; ; timerblurb++) {

10
sys/arch/sparc/sparc/pci_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_machdep.c,v 1.11 2005/09/24 22:30:15 macallan Exp $ */
/* $NetBSD: pci_machdep.c,v 1.12 2005/11/16 03:00:23 uwe Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.11 2005/09/24 22:30:15 macallan Exp $");
__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.12 2005/11/16 03:00:23 uwe Exp $");
#if defined(DEBUG) && !defined(SPARC_PCI_DEBUG)
#define SPARC_PCI_DEBUG
@ -87,7 +87,7 @@ int sparc_pci_debug = 0;
/*
* Footnote 1 in Table 9-1 (p. 129):
*
*
* Three least significant bits of the configuration data space
* access must match those of the configuration address space access.
*/
@ -226,8 +226,8 @@ pci_make_tag(pci_chipset_tag_t pc, int b, int d, int f)
#endif
}
/*
* We only really need the first `reg' property.
/*
* We only really need the first `reg' property.
*
* For simplicity, we'll query the `reg' when we
* need it. Otherwise we could malloc() it, but

6
sys/arch/sparc/sparc/timer.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: timer.c,v 1.20 2005/11/14 19:11:24 uwe Exp $ */
/* $NetBSD: timer.c,v 1.21 2005/11/16 03:00:23 uwe Exp $ */
/*
* Copyright (c) 1992, 1993
@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.20 2005/11/14 19:11:24 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.21 2005/11/16 03:00:23 uwe Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@ -145,7 +145,7 @@ timerattach(volatile int *cntreg, volatile int *limreg)
static int
timermatch_obio(struct device *parent, struct cfdata *cf, void *aux)
{
#if defined(SUN4) || defined(SUN4M)
#if defined(SUN4) || defined(SUN4M)
union obio_attach_args *uoba = aux;
#endif
#if defined(SUN4)

8
sys/arch/sparc/sparc/timer_msiiep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: timer_msiiep.c,v 1.16 2005/09/24 00:35:08 uwe Exp $ */
/* $NetBSD: timer_msiiep.c,v 1.17 2005/11/16 03:00:23 uwe Exp $ */
/*
* Copyright (c) 1992, 1993
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: timer_msiiep.c,v 1.16 2005/09/24 00:35:08 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: timer_msiiep.c,v 1.17 2005/11/16 03:00:23 uwe Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: timer_msiiep.c,v 1.16 2005/09/24 00:35:08 uwe Exp $"
#include <machine/bus.h>
#include <sparc/sparc/msiiepreg.h>
#include <sparc/sparc/msiiepreg.h>
#include <sparc/sparc/msiiepvar.h>
#include <sparc/sparc/timervar.h>
@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: timer_msiiep.c,v 1.16 2005/09/24 00:35:08 uwe Exp $"
static int timermatch_msiiep(struct device *, struct cfdata *, void *);
static void timerattach_msiiep(struct device *, struct device *, void *);
CFATTACH_DECL(timer_msiiep, sizeof(struct device),
CFATTACH_DECL(timer_msiiep, sizeof(struct device),
timermatch_msiiep, timerattach_msiiep, NULL, NULL);

6
sys/arch/sparc/sparc/timer_sun4.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: timer_sun4.c,v 1.12 2004/07/01 10:23:41 pk Exp $ */
/* $NetBSD: timer_sun4.c,v 1.13 2005/11/16 03:00:23 uwe Exp $ */
/*
* Copyright (c) 1992, 1993
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: timer_sun4.c,v 1.12 2004/07/01 10:23:41 pk Exp $");
__KERNEL_RCSID(0, "$NetBSD: timer_sun4.c,v 1.13 2005/11/16 03:00:23 uwe Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@ -177,7 +177,7 @@ void
timerattach_mainbus_4c(struct device *parent, struct device *self, void *aux)
{
struct mainbus_attach_args *ma = aux;
bus_space_handle_t bh;
bus_space_handle_t bh;
/*
* This time we ignore any existing virtual address because

8
sys/arch/sparc/sparc/timer_sun4m.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: timer_sun4m.c,v 1.13 2005/06/16 04:17:50 briggs Exp $ */
/* $NetBSD: timer_sun4m.c,v 1.14 2005/11/16 03:00:23 uwe Exp $ */
/*
* Copyright (c) 1992, 1993
@ -58,14 +58,14 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: timer_sun4m.c,v 1.13 2005/06/16 04:17:50 briggs Exp $");
__KERNEL_RCSID(0, "$NetBSD: timer_sun4m.c,v 1.14 2005/11/16 03:00:23 uwe Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/systm.h>
#include <machine/autoconf.h>
#include <machine/autoconf.h>
#include <machine/bus.h>
#include <sparc/sparc/vaddrs.h>
@ -203,7 +203,7 @@ timerattach_obio_4m(struct device *parent, struct device *self, void *aux)
}
if (cpi == NULL)
continue;
if (sbus_bus_map(sa->sa_bustag,
sa->sa_reg[i].oa_space,
sa->sa_reg[i].oa_base,

6
sys/arch/sparc/sparc/timerreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: timerreg.h,v 1.8 2003/08/07 16:29:46 agc Exp $ */
/* $NetBSD: timerreg.h,v 1.9 2005/11/16 03:00:23 uwe Exp $ */
/*
* Copyright (c) 1992, 1993
@ -108,7 +108,7 @@ struct counter_4m { /* counter that interrupts at ipl 14 */
#define TMR_SHIFT 10 /* shift to obtain microseconds */
#define TMR_MASK 0x1fffff /* 21 bits */
/*
/*
* Compute a limit that causes the timer to fire every n microseconds.
* The Sun4c requires that the timer register be initialized for n+1
* microseconds, while the Sun4m requires it be initialized for n. Thus
@ -116,7 +116,7 @@ struct counter_4m { /* counter that interrupts at ipl 14 */
*
* Note that the manual for the chipset used in the Sun4m suggests that
* the timer be set at n+0.5 microseconds; in practice, this produces
* a 50 ppm clock skew, which means that the 0.5 should not be there...
* a 50 ppm clock skew, which means that the 0.5 should not be there...
*/
#define tmr_ustolim(n) (((n) + 1) << TMR_SHIFT)

6
sys/arch/sparc/sparc/timervar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: timervar.h,v 1.5 2003/08/07 16:29:46 agc Exp $ */
/* $NetBSD: timervar.h,v 1.6 2005/11/16 03:00:23 uwe Exp $ */
/*
* Copyright (c) 1992, 1993
@ -57,8 +57,8 @@ void timer_init_4m(void);
void timerattach_obio_4m(struct device *, struct device *, void *);
#endif /* SUN4M */
/* Imported from clock.c: */
extern int statvar, statmin, statint;
/* Imported from clock.c: */
extern int statvar, statmin, statint;
extern int timerblurb;
extern void (*timer_init)(void);

8
sys/arch/sparc/sparc/vm_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vm_machdep.c,v 1.85 2005/11/14 03:30:50 uwe Exp $ */
/* $NetBSD: vm_machdep.c,v 1.86 2005/11/16 03:00:23 uwe Exp $ */
/*
* Copyright (c) 1996
@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.85 2005/11/14 03:30:50 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.86 2005/11/16 03:00:23 uwe Exp $");
#include "opt_multiprocessor.h"
@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.85 2005/11/14 03:30:50 uwe Exp $");
/*
* Map a user I/O request into kernel virtual address space.
* Note: the pages are already locked by uvm_vslock(), so we
* do not need to pass an access_type to pmap_enter().
* do not need to pass an access_type to pmap_enter().
*/
void
vmapbuf(struct buf *bp, vsize_t len)
@ -166,7 +166,7 @@ cpu_proc_fork(struct proc *p1, struct proc *p2)
/*
* Finish a fork operation, with process l2 nearly set up.
* Copy and update the pcb and trap frame, making the child ready to run.
*
*
* Rig the child's kernel stack so that it will start out in
* proc_trampoline() and call child_return() with l2 as an
* argument. This causes the newly-created child process to go