Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x86/isa cosmetic, spelling, and grammar adjustments



details:   https://anonhg.NetBSD.org/src/rev/2cd973d9f7ce
branches:  trunk
changeset: 777668:2cd973d9f7ce
user:      mbalmer <mbalmer%NetBSD.org@localhost>
date:      Tue Feb 28 20:26:37 2012 +0000

description:
cosmetic, spelling, and grammar adjustments

diffstat:

 sys/arch/x86/isa/isa_machdep.c |  51 ++++++++++++++----------------------------
 1 files changed, 17 insertions(+), 34 deletions(-)

diffs (144 lines):

diff -r 8d087950c61a -r 2cd973d9f7ce sys/arch/x86/isa/isa_machdep.c
--- a/sys/arch/x86/isa/isa_machdep.c    Tue Feb 28 20:26:07 2012 +0000
+++ b/sys/arch/x86/isa/isa_machdep.c    Tue Feb 28 20:26:37 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isa_machdep.c,v 1.31 2011/10/18 23:43:36 dyoung Exp $  */
+/*     $NetBSD: isa_machdep.c,v 1.32 2012/02/28 20:26:37 mbalmer Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.31 2011/10/18 23:43:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.32 2012/02/28 20:26:37 mbalmer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -145,12 +145,10 @@
                        continue;
                isp = ci->ci_isources[i];
                if (isp == NULL) {
-                       /*
-                        * if nothing's using the irq, just return it
-                        */
+                       /* if nothing's using the irq, just return it */
                        *irq = i;
                        mutex_exit(&cpu_lock);
-                       return (0);
+                       return 0;
                }
 
                switch(isp->is_type) {
@@ -175,7 +173,6 @@
                                count = tmp;
                        }
                        break;
-
                case IST_PULSE:
                        /* this just isn't shareable */
                        continue;
@@ -185,30 +182,23 @@
        mutex_exit(&cpu_lock);
 
        if (bestirq == -1)
-               return (1);
+               return 1;
 
        *irq = bestirq;
 
-       return (0);
+       return 0;
 }
 
 const struct evcnt *
 isa_intr_evcnt(isa_chipset_tag_t ic, int irq)
 {
-
        /* XXX for now, no evcnt parent reported */
        return NULL;
 }
 
 void *
-isa_intr_establish(
-    isa_chipset_tag_t ic,
-    int irq,
-    int type,
-    int level,
-    int (*ih_fun)(void *),
-    void *ih_arg
-)
+isa_intr_establish(isa_chipset_tag_t ic, int irq, int type, int level,
+    int (*ih_fun)(void *), void *ih_arg)
 {
        struct pic *pic;
        int pin;
@@ -239,12 +229,11 @@
                        printf("isa_intr_establish: no MP mapping found\n");
        }
 #endif
-       return intr_establish(irq, pic, pin, type, level, ih_fun, ih_arg, false);
+       return intr_establish(irq, pic, pin, type, level, ih_fun, ih_arg,
+           false);
 }
 
-/*
- * Deregister an interrupt handler.
- */
+/* Deregister an interrupt handler. */
 void
 isa_intr_disestablish(isa_chipset_tag_t ic, void *arg)
 {
@@ -257,8 +246,7 @@
 }
 
 void
-isa_attach_hook(device_t parent, device_t self,
-    struct isabus_attach_args *iba)
+isa_attach_hook(device_t parent, device_t self, struct isabus_attach_args *iba)
 {
        extern struct x86_isa_chipset x86_isa_chipset;
        extern int isa_has_been_seen;
@@ -289,20 +277,16 @@
 
 int
 isa_mem_alloc(bus_space_tag_t t, bus_size_t size, bus_size_t align,
-               bus_addr_t boundary, int flags, bus_addr_t *addrp, bus_space_handle_t *bshp)
+    bus_addr_t boundary, int flags, bus_addr_t *addrp, bus_space_handle_t *bshp)
 {
-
-       /*
-        * Allocate physical address space in the ISA hole.
-        */
-       return (bus_space_alloc(t, IOM_BEGIN, IOM_END - 1, size, align,
-           boundary, flags, addrp, bshp));
+       /* Allocate physical address space in the ISA hole. */
+       return bus_space_alloc(t, IOM_BEGIN, IOM_END - 1, size, align,
+           boundary, flags, addrp, bshp);
 }
 
 void
 isa_mem_free(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size)
 {
-
        bus_space_free(t, bsh, size);
 }
 
@@ -343,7 +327,6 @@
 device_t
 device_isa_register(device_t dev, void *aux)
 {
-
        /*
         * Handle network interfaces here, the attachment information is
         * not available driver-independently later.
@@ -360,7 +343,7 @@
                 * passed by the boot ROM.  The ROM should stay usable if
                 * the driver becomes obsolete.  The physical attachment
                 * information (checked below) must be sufficient to
-                * idenfity the device.
+                * identify the device.
                 */
                if (bin->bus == BI_BUS_ISA &&
                    device_is_a(device_parent(dev), "isa")) {



Home | Main Index | Thread Index | Old Index