Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys KNF. Remove extra spaces. No functional change.
details: https://anonhg.NetBSD.org/src/rev/6b5f720b6524
branches: trunk
changeset: 346322:6b5f720b6524
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Thu Jul 07 06:55:38 2016 +0000
description:
KNF. Remove extra spaces. No functional change.
diffstat:
sys/arch/sgimips/ioc/oiocsc.c | 6 +-
sys/arch/sgimips/sgimips/arcemu.h | 4 +-
sys/arch/shark/isa/clock.c | 6 +-
sys/arch/shark/ofw/ofw.c | 12 +-
sys/arch/shark/shark/i8042reg.h | 4 +-
sys/arch/shark/shark/ns87307.c | 80 ++++++------
sys/arch/shark/shark/opms.c | 26 +-
sys/arch/shark/shark/profile.c | 10 +-
sys/arch/shark/shark/scr.c | 140 ++++++++++----------
sys/arch/shark/shark/sequoia.c | 54 ++++----
sys/arch/shark/shark/shark_machdep.c | 6 +-
sys/arch/shark/stand/ofwboot/boot.c | 4 +-
sys/arch/sparc/include/pci_machdep.h | 4 +-
sys/arch/sparc64/dev/ffb.c | 12 +-
sys/arch/sparc64/dev/fhc.c | 6 +-
sys/arch/sparc64/dev/gfb.c | 6 +-
sys/arch/sparc64/dev/psm.c | 8 +-
sys/arch/sparc64/dev/sbus.c | 8 +-
sys/arch/sparc64/dev/tda.c | 6 +-
sys/arch/sparc64/include/bus_defs.h | 4 +-
sys/arch/sparc64/include/pci_machdep.h | 4 +-
sys/arch/sparc64/sparc64/cache.c | 6 +-
sys/arch/sparc64/sparc64/clock.c | 8 +-
sys/arch/sparc64/sparc64/compat_16_machdep.c | 6 +-
sys/arch/sparc64/sparc64/machdep.c | 8 +-
sys/arch/sparc64/sparc64/ofw_machdep.c | 8 +-
sys/arch/sparc64/sparc64/pmap.c | 8 +-
sys/arch/sparc64/sparc64/sunos32_machdep.c | 6 +-
sys/arch/sparc64/sparc64/sunos_machdep.c | 6 +-
sys/arch/sparc64/sparc64/trap.c | 18 +-
sys/arch/sun2/dev/zsvar.h | 4 +-
sys/arch/sun2/sun2/mbio.c | 6 +-
sys/arch/sun2/sun2/mbmem.c | 6 +-
sys/arch/sun2/sun2/obio.c | 6 +-
sys/arch/sun2/sun2/obmem.c | 6 +-
sys/arch/sun2/sun2/tod.c | 6 +-
sys/arch/sun3/dev/if_ie.c | 6 +-
sys/arch/sun68k/sun68k/bus.c | 8 +-
sys/arch/usermode/usermode/pmap.c | 8 +-
sys/arch/vax/boot/boot/consio.c | 4 +-
sys/arch/vax/mba/hp.c | 6 +-
sys/arch/vax/uba/qv.c | 62 ++++----
sys/arch/vax/uba/qvaux.c | 46 +++---
sys/arch/vax/vax/cfl.c | 6 +-
sys/arch/vax/vax/compat_13_machdep.c | 8 +-
sys/arch/vax/vax/crl.c | 6 +-
sys/arch/vax/vax/ctu.c | 6 +-
sys/arch/vax/vax/gencons.c | 8 +-
sys/arch/vax/vax/ka750.c | 6 +-
sys/arch/vax/vax/ka780.c | 6 +-
sys/arch/vax/vax/sgmap.c | 6 +-
sys/arch/vax/vax/trap.c | 6 +-
sys/arch/vax/vsa/asc_vsbus.c | 6 +-
sys/arch/vax/vsa/smg.c | 6 +-
sys/arch/vax/vsa/spx.c | 8 +-
sys/arch/vax/vsa/vsbus.c | 8 +-
sys/arch/x68k/dev/bmd.c | 6 +-
sys/arch/x86/include/intr.h | 4 +-
sys/arch/x86/pci/pci_ranges.c | 8 +-
sys/arch/x86/x86/coretemp.c | 6 +-
sys/arch/x86/x86/cpu.c | 6 +-
sys/arch/x86/x86/ipmi.c | 12 +-
sys/arch/x86/x86/mpacpi.c | 8 +-
sys/arch/x86/x86/syscall.c | 6 +-
sys/arch/xen/include/intr.h | 4 +-
sys/arch/xen/include/xen-public/arch-x86/xen-mca.h | 4 +-
sys/arch/xen/include/xen-public/domctl.h | 4 +-
sys/arch/xen/include/xen-public/io/blkif.h | 4 +-
sys/arch/xen/include/xen-public/physdev.h | 4 +-
sys/arch/xen/include/xen-public/sysctl.h | 10 +-
sys/arch/xen/include/xen.h | 6 +-
sys/arch/xen/include/xenio.h | 10 +-
sys/arch/xen/x86/cpu.c | 8 +-
sys/arch/xen/x86/xen_ipi.c | 6 +-
sys/arch/xen/xen/balloon.c | 6 +-
sys/arch/xen/xen/pciback.c | 6 +-
sys/arch/xen/xen/xen_debug.c | 10 +-
sys/arch/xen/xen/xenevt.c | 6 +-
sys/arch/xen/xenbus/xenbus_comms.c | 8 +-
sys/arch/xen/xenbus/xenbus_dev.c | 10 +-
sys/arch/xen/xenbus/xenbus_probe.c | 14 +-
sys/arch/zaurus/dev/zaudiovar.h | 4 +-
sys/arch/zaurus/zaurus/machdep.c | 12 +-
sys/coda/coda_psdev.c | 6 +-
sys/dev/acpi/sony_acpi.c | 13 +-
sys/dev/bluetooth/btmagic.c | 10 +-
sys/dev/cardbus/if_ex_cardbus.c | 11 +-
sys/dev/cardbus/if_fxp_cardbus.c | 10 +-
sys/dev/cardbus/if_rtw_cardbus.c | 8 +-
sys/dev/cardbus/ohci_cardbus.c | 7 +-
sys/dev/cardbus/uhci_cardbus.c | 7 +-
sys/dev/cgd.c | 13 +-
sys/dev/ic/adw.c | 11 +-
sys/dev/ic/aic6915.c | 67 +++++----
sys/dev/ic/cac.c | 7 +-
sys/dev/ic/dpt.c | 10 +-
sys/dev/ic/mlx.c | 53 ++++---
sys/dev/ic/opl.c | 8 +-
sys/dev/ic/smc91cxx.c | 7 +-
sys/dev/isa/adv_isa.c | 7 +-
sys/dev/midi.c | 6 +-
sys/dev/mii/acphy.c | 7 +-
sys/dev/mii/bmtphy.c | 7 +-
sys/dev/mii/ciphy.c | 7 +-
sys/dev/mii/dmphy.c | 7 +-
sys/dev/mii/exphy.c | 7 +-
sys/dev/mii/glxtphy.c | 7 +-
sys/dev/mii/gphyter.c | 7 +-
sys/dev/mii/icsphy.c | 7 +-
sys/dev/mii/igphy.c | 7 +-
sys/dev/mii/ihphy.c | 7 +-
sys/dev/mii/ikphy.c | 7 +-
sys/dev/mii/inphy.c | 7 +-
sys/dev/mii/iophy.c | 7 +-
sys/dev/mii/lxtphy.c | 7 +-
sys/dev/mii/makphy.c | 7 +-
sys/dev/mii/micphy.c | 7 +-
sys/dev/mii/nsphy.c | 7 +-
sys/dev/mii/nsphyter.c | 7 +-
sys/dev/mii/pnaphy.c | 7 +-
sys/dev/mii/qsphy.c | 7 +-
sys/dev/mii/rlphy.c | 7 +-
sys/dev/mii/sqphy.c | 10 +-
sys/dev/mii/tqphy.c | 7 +-
sys/dev/mii/ukphy.c | 7 +-
sys/dev/mii/urlphy.c | 7 +-
sys/dev/pad/pad.c | 11 +-
sys/dev/pci/aac_pci.c | 7 +-
sys/dev/pci/amr.c | 64 +++++----
sys/dev/pci/auich.c | 22 +-
sys/dev/pci/auixp.c | 7 +-
sys/dev/pci/autri.c | 7 +-
sys/dev/pci/bktr/bktr_os.c | 7 +-
sys/dev/pci/cmpci.c | 6 +-
sys/dev/pci/cs4280.c | 7 +-
sys/dev/pci/cs4281.c | 16 +-
sys/dev/pci/cy_pci.c | 7 +-
sys/dev/pci/cz.c | 13 +-
sys/dev/pci/eap.c | 8 +-
sys/dev/pci/emuxki.c | 10 +-
sys/dev/pci/esm.c | 10 +-
sys/dev/pci/eso.c | 7 +-
sys/dev/pci/fwohci_pci.c | 12 +-
sys/dev/pci/genfb_pci.c | 13 +-
sys/dev/pci/hdaudio_pci.c | 20 +-
sys/dev/pci/ichsmb.c | 7 +-
sys/dev/pci/if_bwi_pci.c | 10 +-
sys/dev/pci/if_dge.c | 7 +-
sys/dev/pci/if_esh_pci.c | 12 +-
sys/dev/pci/if_mtd_pci.c | 11 +-
sys/dev/pci/if_sf_pci.c | 10 +-
sys/dev/pci/if_sip.c | 20 +-
sys/dev/pci/if_ste.c | 44 +++--
sys/dev/pci/if_stge.c | 13 +-
sys/dev/pci/if_ti.c | 23 +-
sys/dev/pci/if_tl.c | 11 +-
sys/dev/pci/if_tlp_pci.c | 7 +-
sys/dev/pci/if_vr.c | 19 +-
sys/dev/pci/isp_pci.c | 22 +-
sys/dev/pci/ld_virtio.c | 7 +-
sys/dev/pci/mly.c | 10 +-
sys/dev/pci/mpt_pci.c | 10 +-
sys/dev/pci/pccbb.c | 22 ++-
sys/dev/pci/pciide_common.c | 25 ++-
sys/dev/pci/puc.c | 12 +-
sys/dev/pci/rtsx_pci.c | 8 +-
sys/dev/pci/trm.c | 8 +-
sys/dev/pci/twa.c | 92 +++++++------
sys/dev/pci/twe.c | 7 +-
sys/dev/pci/ubsec.c | 91 ++++++++-----
sys/dev/pci/vga_pci.c | 10 +-
sys/dev/pci/viomb.c | 21 +-
sys/dev/pci/virtio.c | 18 +-
sys/dev/pci/weasel_pci.c | 42 ++++--
sys/dev/pcmcia/esp_pcmcia.c | 7 +-
sys/dev/pcmcia/if_cs_pcmcia.c | 7 +-
sys/dev/pcmcia/if_ep_pcmcia.c | 8 +-
sys/dev/pcmcia/if_mbe_pcmcia.c | 14 +-
sys/dev/pcmcia/if_ray.c | 121 +++++++++++-------
sys/dev/pcmcia/if_sm_pcmcia.c | 10 +-
sys/dev/pcmcia/if_wi_pcmcia.c | 13 +-
sys/dev/usb/if_aue.c | 7 +-
sys/dev/usb/if_kue.c | 7 +-
sys/dev/usb/if_rum.c | 7 +-
sys/dev/usb/if_udav.c | 28 ++-
sys/dev/usb/if_upl.c | 21 +-
sys/dev/usb/if_ural.c | 21 +-
sys/dev/usb/if_url.c | 18 +-
sys/dev/usb/if_zyd.c | 7 +-
sys/dev/usb/moscom.c | 10 +-
sys/dev/usb/pseye.c | 10 +-
sys/dev/usb/slurm.c | 7 +-
sys/dev/usb/stuirda.c | 18 +-
sys/dev/usb/uark.c | 8 +-
sys/dev/usb/uaudio.c | 10 +-
sys/dev/usb/ubsa.c | 10 +-
sys/dev/usb/ubt.c | 21 +-
sys/dev/usb/uchcom.c | 10 +-
sys/dev/usb/ucycom.c | 23 +-
sys/dev/usb/udsbr.c | 10 +-
sys/dev/usb/udsir.c | 7 +-
sys/dev/usb/uftdi.c | 10 +-
sys/dev/usb/ugen.c | 21 +-
sys/dev/usb/ugensa.c | 10 +-
sys/dev/usb/uhid.c | 21 +-
sys/dev/usb/uhidev.c | 10 +-
sys/dev/usb/uhso.c | 42 +++--
sys/dev/usb/uipaq.c | 23 +-
sys/dev/usb/uirda.c | 10 +-
sys/dev/usb/ukyopon.c | 15 +-
sys/dev/usb/ulpt.c | 21 +-
sys/dev/usb/umass.c | 40 +++--
sys/dev/usb/umcs.c | 10 +-
sys/dev/usb/umct.c | 10 +-
sys/dev/usb/umidi.c | 38 +++--
sys/dev/usb/umodem.c | 12 +-
sys/dev/usb/umodem_common.c | 10 +-
sys/dev/usb/uplcom.c | 23 +-
sys/dev/usb/urio.c | 21 +-
sys/dev/usb/uscanner.c | 10 +-
sys/dev/usb/uslsa.c | 22 +-
sys/dev/usb/usscanner.c | 35 ++---
sys/dev/usb/ustir.c | 10 +-
sys/dev/usb/utoppy.c | 68 +++++----
sys/dev/usb/uvideo.c | 10 +-
sys/dev/usb/uvisor.c | 7 +-
sys/dev/usb/uvscom.c | 12 +-
sys/dev/wscons/wsdisplay.c | 10 +-
sys/dev/wscons/wsmux.c | 14 +-
sys/fs/efs/efs_dinode.h | 6 +-
sys/fs/efs/efs_dir.h | 6 +-
sys/fs/efs/efs_vfsops.c | 8 +-
sys/fs/efs/efs_vnops.c | 16 +-
sys/fs/nfs/common/nfs_fha.h | 6 +-
sys/fs/nfs/common/nfsm_subs.h | 24 +-
sys/fs/nfs/nlm/nlm.h | 6 +-
sys/fs/nilfs/nilfs_vfsops.c | 6 +-
sys/fs/puffs/puffs_msgif.c | 6 +-
sys/fs/puffs/puffs_sys.h | 4 +-
sys/fs/puffs/puffs_vnops.c | 8 +-
sys/fs/udf/udf_vfsops.c | 6 +-
sys/kern/init_main.c | 6 +-
sys/kern/kern_core.c | 6 +-
sys/kern/kern_ctf.c | 4 +-
sys/kern/kern_exec.c | 6 +-
sys/kern/kern_ksyms.c | 6 +-
sys/kern/kern_ktrace.c | 18 +-
sys/kern/kern_module.c | 6 +-
sys/kern/kern_mutex.c | 8 +-
sys/kern/kern_pmf.c | 6 +-
sys/kern/kern_runq.c | 6 +-
sys/kern/kern_time.c | 8 +-
sys/kern/subr_kobj.c | 6 +-
sys/kern/subr_vmem.c | 6 +-
sys/kern/sys_aio.c | 6 +-
sys/kern/sys_sched.c | 8 +-
sys/kern/sys_socket.c | 6 +-
sys/kern/tty.c | 8 +-
sys/kern/uipc_syscalls.c | 6 +-
sys/kern/vfs_cache.c | 6 +-
sys/kern/vfs_mount.c | 6 +-
sys/kern/vfs_vnode.c | 6 +-
sys/lib/libkern/libkern.h | 4 +-
sys/net/if_mpls.c | 6 +-
sys/net/if_pppoe.c | 7 +-
sys/net/route.c | 6 +-
sys/net80211/ieee80211_output.c | 6 +-
sys/net80211/ieee80211_proto.c | 30 ++--
sys/net80211/ieee80211_rssadapt.c | 6 +-
sys/netinet/accf_data.c | 6 +-
sys/netinet/dccp_tcplike.h | 6 +-
sys/netinet/dccp_tfrc.c | 26 +-
sys/netinet/dccp_tfrc.h | 12 +-
sys/netinet/dccp_usrreq.c | 38 ++--
sys/netinet/dccp_var.h | 10 +-
sys/netipsec/ipsec6.h | 4 +-
sys/netipsec/ipsec_netbsd.c | 8 +-
sys/nfs/nfs_boot.c | 6 +-
sys/opencrypto/crypto.c | 8 +-
sys/opencrypto/cryptodev.c | 16 +-
sys/opencrypto/cryptodev.h | 6 +-
sys/rump/dev/lib/libpci/pci_user.h | 2 +-
sys/rump/dev/lib/libpci/rumpdev_bus_space.c | 8 +-
sys/rump/librump/rumpkern/klock.c | 6 +-
sys/rump/librump/rumpvfs/rumpblk.c | 6 +-
sys/rump/librump/rumpvfs/rumpfs.c | 6 +-
sys/rump/net/lib/libshmif/if_shmem.c | 6 +-
sys/sys/mount.h | 4 +-
sys/sys/sdt.h | 2 +-
sys/sys/time.h | 4 +-
sys/sys/timepps.h | 4 +-
sys/sys/wait.h | 4 +-
sys/ufs/ffs/ffs_quota2.c | 6 +-
sys/ufs/lfs/lfs_vfsops.c | 6 +-
sys/ufs/lfs/ulfs_extattr.c | 18 +-
sys/ufs/lfs/ulfs_quota2.c | 6 +-
sys/ufs/ufs/ufs_extattr.c | 18 +-
sys/uvm/pmap/pmap.c | 6 +-
sys/uvm/pmap/pmap.h | 4 +-
sys/uvm/uvm_map.c | 6 +-
300 files changed, 1935 insertions(+), 1857 deletions(-)
diffs (truncated from 13300 to 300 lines):
diff -r be29f3582a74 -r 6b5f720b6524 sys/arch/sgimips/ioc/oiocsc.c
--- a/sys/arch/sgimips/ioc/oiocsc.c Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sgimips/ioc/oiocsc.c Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: oiocsc.c,v 1.2 2011/07/01 18:53:47 dyoung Exp $ */
+/* $NetBSD: oiocsc.c,v 1.3 2016/07/07 06:55:38 msaitoh Exp $ */
/*
* Copyright (c) 2009 Stephen M. Rumble
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oiocsc.c,v 1.2 2011/07/01 18:53:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oiocsc.c,v 1.3 2016/07/07 06:55:38 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -124,7 +124,7 @@
oiocsc_attach(device_t parent, device_t self, void *aux)
{
struct oiocsc_softc *osc = device_private(self);
- struct wd33c93_softc *sc = &osc->sc_wd33c93;
+ struct wd33c93_softc *sc = &osc->sc_wd33c93;
struct oioc_attach_args *oa = aux;
int err;
diff -r be29f3582a74 -r 6b5f720b6524 sys/arch/sgimips/sgimips/arcemu.h
--- a/sys/arch/sgimips/sgimips/arcemu.h Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/sgimips/sgimips/arcemu.h Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arcemu.h,v 1.12 2011/02/20 07:59:51 matt Exp $ */
+/* $NetBSD: arcemu.h,v 1.13 2016/07/07 06:55:38 msaitoh Exp $ */
/*
* Copyright (c) 2004 Steve Rumble
@@ -54,7 +54,7 @@
static void * arcemu_GetPeer(void *);
static void * arcemu_GetChild(void *);
static const char *
- arcemu_GetEnvironmentVariable(const char *);
+ arcemu_GetEnvironmentVariable(const char *);
static void * arcemu_ip6_GetMemoryDescriptor(void *mem);
static void * arcemu_ip12_GetMemoryDescriptor(void *mem);
diff -r be29f3582a74 -r 6b5f720b6524 sys/arch/shark/isa/clock.c
--- a/sys/arch/shark/isa/clock.c Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/shark/isa/clock.c Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.16 2007/10/17 19:57:09 garbled Exp $ */
+/* $NetBSD: clock.c,v 1.17 2016/07/07 06:55:38 msaitoh Exp $ */
/*
* Copyright 1997
@@ -154,7 +154,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.16 2007/10/17 19:57:09 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.17 2016/07/07 06:55:38 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -349,7 +349,7 @@
/* check to see if the high-availability timer needs to be unwedged */
if (++hatUnwedgeCtr >= (hz / HAT_MIN_FREQ)) {
hatUnwedgeCtr = 0;
- hatUnwedge();
+ hatUnwedge();
}
#ifdef TESTHAT
diff -r be29f3582a74 -r 6b5f720b6524 sys/arch/shark/ofw/ofw.c
--- a/sys/arch/shark/ofw/ofw.c Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/shark/ofw/ofw.c Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw.c,v 1.64 2015/10/17 16:34:43 jmcneill Exp $ */
+/* $NetBSD: ofw.c,v 1.65 2016/07/07 06:55:38 msaitoh Exp $ */
/*
* Copyright 1997
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.64 2015/10/17 16:34:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.65 2016/07/07 06:55:38 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -138,7 +138,7 @@
paddr_t msgbufphys;
/* for storage allocation, used to be local to ofw_construct_proc0_addrspace */
-static vaddr_t virt_freeptr;
+static vaddr_t virt_freeptr;
int ofw_callbacks = 0; /* debugging counter */
@@ -705,7 +705,7 @@
shark_isa_dma_nranges = nOFdmaranges;
#endif
- for (rangeidx = 0, dr = OFdmaranges; rangeidx < nOFdmaranges;
+ for (rangeidx = 0, dr = OFdmaranges; rangeidx < nOFdmaranges;
++rangeidx, ++dr) {
dr->start = of_decode_int((unsigned char *)&dr->start);
dr->size = of_decode_int((unsigned char *)&dr->size);
@@ -795,7 +795,7 @@
/* physmem, physical_start, physical_end */
physmem = 0;
- for (totalcnt = 0, mp = OFphysmem; totalcnt < nOFphysmem;
+ for (totalcnt = 0, mp = OFphysmem; totalcnt < nOFphysmem;
totalcnt++, mp++) {
#ifdef OLDPRINTFS
printf("physmem: %x, %x\n", mp->start, mp->size);
@@ -1828,7 +1828,7 @@
newSize = (*ppLeftover)->size - size; /* reduce size */
/* move pointer */
*ppLeftover = (PLEFTOVER)(((vaddr_t)*ppLeftover)
- + size);
+ + size);
(*ppLeftover)->pNext = pLeft;
(*ppLeftover)->size = newSize;
}
diff -r be29f3582a74 -r 6b5f720b6524 sys/arch/shark/shark/i8042reg.h
--- a/sys/arch/shark/shark/i8042reg.h Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/shark/shark/i8042reg.h Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: i8042reg.h,v 1.5 2009/03/14 14:46:07 dsl Exp $ */
+/* $NetBSD: i8042reg.h,v 1.6 2016/07/07 06:55:38 msaitoh Exp $ */
/*
* Copyright 1997
@@ -140,7 +140,7 @@
** Forward routine declarations
*/
extern void i8042_flush(bus_space_tag_t,
- bus_space_handle_t);
+ bus_space_handle_t);
extern int i8042_cmd(bus_space_tag_t,
bus_space_handle_t,
u_char,
diff -r be29f3582a74 -r 6b5f720b6524 sys/arch/shark/shark/ns87307.c
--- a/sys/arch/shark/shark/ns87307.c Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/shark/shark/ns87307.c Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ns87307.c,v 1.6 2011/07/19 15:07:43 dyoung Exp $ */
+/* $NetBSD: ns87307.c,v 1.7 2016/07/07 06:55:38 msaitoh Exp $ */
/*
* Copyright 1997
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ns87307.c,v 1.6 2011/07/19 15:07:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ns87307.c,v 1.7 2016/07/07 06:55:38 msaitoh Exp $");
#include "opt_ddb.h"
@@ -122,7 +122,7 @@
u_int irqNum )
{
u_int configured = false;
- bus_space_handle_t ioh;
+ bus_space_handle_t ioh;
if (!(bus_space_map( iot, CONNSIOADDR, NSIO_NPORTS, 0 , &ioh )))
@@ -133,7 +133,7 @@
NSIO_CONFIG_KBCDATA( iot, ioh, kbdBase );
NSIO_CONFIG_KBCCMD(iot, ioh, kbdBase+4);
NSIO_WRITE_REG( iot, ioh, NSIO_KBC_CFG, 0x80 );
- NSIO_ACTIVATE_DEV( iot, ioh );
+ NSIO_ACTIVATE_DEV( iot, ioh );
NSIO_CONFIG_KBCDEBUG( iot, ioh );
/* unmap the space so can probe later
@@ -189,7 +189,7 @@
u_int irqNum )
{
u_int configured;
- bus_space_handle_t ioh;
+ bus_space_handle_t ioh;
configured = false; /* be a pessimist */
@@ -198,7 +198,7 @@
/* Now do the mouse logical device IRQ settup.
*/
NSIO_SELECT_DEV( iot, ioh, NSIO_DEV_MOUSE );
- NSIO_DEACTIVATE_DEV( iot, ioh );
+ NSIO_DEACTIVATE_DEV( iot, ioh );
NSIO_CONFIG_IRQ( iot, ioh, irqNum, NSIO_IRQ_LEVEL | NSIO_IRQ_HIGH);
NSIO_ACTIVATE_DEV( iot, ioh );
NSIO_CONFIG_DEBUG( iot, ioh );
@@ -255,7 +255,7 @@
u_int irqNum )
{
u_int configured = false;
- bus_space_handle_t ioh;
+ bus_space_handle_t ioh;
u_char value;
@@ -278,7 +278,7 @@
NSIO_CONFIG_IRQ( iot, ioh, irqNum,value);
/* activate the device */
- NSIO_ACTIVATE_DEV( iot, ioh );
+ NSIO_ACTIVATE_DEV( iot, ioh );
/* unmap the space so can probe later */
@@ -331,36 +331,36 @@
void nsioConfigPrint(bus_space_tag_t nsioIot,
bus_space_handle_t nsioIoh )
{
- u_char dev;
- u_char activate;
- u_char iorange;
- u_char iobaseh;
- u_char iobasel;
- u_char irq;
- u_char irqType;
- u_char dma1;
- u_char dma2;
- u_char reg0;
-
- NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_LOGDEV, dev );
- NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_ACTIVATE, activate );
- NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IORNGCHK, iorange );
- NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IOBASEH, iobaseh );
- NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IOBASEL, iobasel );
- NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IRQ, irq );
- NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IRQTYPE, irqType );
- NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_DMA1, dma1 );
- NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_DMA2, dma2 );
- NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_REG0, reg0 );
-
- printf("nsio config for logical device %d\n", dev );
- printf("activate: %x\n",activate);
- printf("iorange: %x\n",iorange);
- printf("iobase: %x\n",(iobaseh << 8) | iobasel);
- printf("irq: %x\n",irq);
- printf("irqtype: %x\n",irqType);
- printf("dma1: %x\n",dma1);
- printf("dma2: %x\n",dma2) ;
- printf("reg0: %x\n",reg0);
-}
+ u_char dev;
+ u_char activate;
+ u_char iorange;
+ u_char iobaseh;
+ u_char iobasel;
+ u_char irq;
+ u_char irqType;
+ u_char dma1;
+ u_char dma2;
+ u_char reg0;
+
+ NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_LOGDEV, dev );
+ NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_ACTIVATE, activate );
+ NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IORNGCHK, iorange );
+ NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IOBASEH, iobaseh );
+ NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IOBASEL, iobasel );
+ NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IRQ, irq );
+ NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_IRQTYPE, irqType );
+ NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_DMA1, dma1 );
+ NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_DMA2, dma2 );
+ NSIO_READ_REG( nsioIot, nsioIoh, NSIO_CFG_REG0, reg0 );
+
+ printf("nsio config for logical device %d\n", dev );
+ printf("activate: %x\n",activate);
+ printf("iorange: %x\n",iorange);
+ printf("iobase: %x\n",(iobaseh << 8) | iobasel);
+ printf("irq: %x\n",irq);
+ printf("irqtype: %x\n",irqType);
+ printf("dma1: %x\n",dma1);
+ printf("dma2: %x\n",dma2) ;
+ printf("reg0: %x\n",reg0);
+}
//#endif
diff -r be29f3582a74 -r 6b5f720b6524 sys/arch/shark/shark/opms.c
--- a/sys/arch/shark/shark/opms.c Thu Jul 07 06:54:26 2016 +0000
+++ b/sys/arch/shark/shark/opms.c Thu Jul 07 06:55:38 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: opms.c,v 1.27 2014/10/18 08:33:26 snj Exp $ */
+/* $NetBSD: opms.c,v 1.28 2016/07/07 06:55:38 msaitoh Exp $ */
/*
* Copyright 1997
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.27 2014/10/18 08:33:26 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.28 2016/07/07 06:55:38 msaitoh Exp $");
Home |
Main Index |
Thread Index |
Old Index