Module Name: src
Committed By: jakllsch
Date: Tue Feb 28 18:14:47 UTC 2012
Modified Files:
src/sys/arch/x86/pci: pci_machdep.c
Log Message:
cosmetic, spelling, and grammar adjustments
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/x86/pci/pci_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.54 src/sys/arch/x86/pci/pci_machdep.c:1.55
--- src/sys/arch/x86/pci/pci_machdep.c:1.54 Wed Feb 15 16:30:29 2012
+++ src/sys/arch/x86/pci/pci_machdep.c Tue Feb 28 18:14:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.54 2012/02/15 16:30:29 tsutsui Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.55 2012/02/28 18:14:47 jakllsch Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -69,11 +69,11 @@
*
* The configuration method can be hard-coded in the config file by
* using `options PCI_CONF_MODE=N', where `N' is the configuration mode
- * as defined section 3.6.4.1, `Generating Configuration Cycles'.
+ * as defined in section 3.6.4.1, `Generating Configuration Cycles'.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.54 2012/02/15 16:30:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.55 2012/02/28 18:14:47 jakllsch Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -163,9 +163,9 @@ static void pci_conf_select(uint32_t);
static void pci_conf_lock(struct pci_conf_lock *, uint32_t);
static void pci_bridge_hook(pci_chipset_tag_t, pcitag_t, void *);
struct pci_bridge_hook_arg {
- void (*func)(pci_chipset_tag_t, pcitag_t, void *);
- void *arg;
-};
+ void (*func)(pci_chipset_tag_t, pcitag_t, void *);
+ void *arg;
+};
#define PCI_MODE1_ENABLE 0x80000000UL
#define PCI_MODE1_ADDRESS_REG 0x0cf8
@@ -676,7 +676,7 @@ pci_device_foreach_min(pci_chipset_tag_t
bhlcr = pci_conf_read(pc, tag, PCI_BHLC_REG);
if (PCI_HDRTYPE_MULTIFN(bhlcr) ||
(qd != NULL &&
- (qd->quirks & PCI_QUIRK_MULTIFUNCTION) != 0))
+ (qd->quirks & PCI_QUIRK_MULTIFUNCTION) != 0))
nfuncs = 8;
else
nfuncs = 1;
@@ -707,10 +707,10 @@ pci_bridge_foreach(pci_chipset_tag_t pc,
struct pci_bridge_hook_arg bridge_hook;
bridge_hook.func = func;
- bridge_hook.arg = ctx;
+ bridge_hook.arg = ctx;
pci_device_foreach_min(pc, minbus, maxbus, pci_bridge_hook,
- &bridge_hook);
+ &bridge_hook);
}
static void
@@ -721,7 +721,7 @@ pci_bridge_hook(pci_chipset_tag_t pc, pc
reg = pci_conf_read(pc, tag, PCI_CLASS_REG);
if (PCI_CLASS(reg) == PCI_CLASS_BRIDGE &&
- (PCI_SUBCLASS(reg) == PCI_SUBCLASS_BRIDGE_PCI ||
+ (PCI_SUBCLASS(reg) == PCI_SUBCLASS_BRIDGE_PCI ||
PCI_SUBCLASS(reg) == PCI_SUBCLASS_BRIDGE_CARDBUS)) {
(*bridge_hook->func)(pc, tag, bridge_hook->arg);
}
@@ -884,7 +884,7 @@ device_pci_register(device_t dev, void *
* 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_PCI &&
device_is_a(device_parent(dev), "pci")) {
@@ -951,7 +951,7 @@ device_pci_register(device_t dev, void *
#endif
if (fbinfo->depth == 8) {
gfb_cb.gcc_cookie = NULL;
- gfb_cb.gcc_set_mapreg =
+ gfb_cb.gcc_set_mapreg =
x86_genfb_set_mapreg;
prop_dictionary_set_uint64(dict,
"cmap_callback",
