summaryrefslogtreecommitdiffstats
path: root/doc/user/conf.t
diff options
context:
space:
mode:
authorDaniel Hellstrom <daniel@gaisler.com>2015-04-08 17:00:43 +0200
committerDaniel Hellstrom <daniel@gaisler.com>2015-04-17 01:10:28 +0200
commit1b645c3f4cb25e1e991b341e1f079e99603dd073 (patch)
tree1ee9623306bc34e594b62739a074c8dba4bea57f /doc/user/conf.t
parentLIBPCI: new implementation private header file (diff)
downloadrtems-1b645c3f4cb25e1e991b341e1f079e99603dd073.tar.bz2
LIBPCI: corrected documentation
Diffstat (limited to 'doc/user/conf.t')
-rw-r--r--doc/user/conf.t12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/user/conf.t b/doc/user/conf.t
index ae2d9668ea..7a0ae4c1e7 100644
--- a/doc/user/conf.t
+++ b/doc/user/conf.t
@@ -5277,11 +5277,11 @@ None.
@c
@section PCI Library
-This section defines the system configuration paramters supported
+This section defines the system configuration parameters supported
by @code{rtems/confdefs.h} related to configuring the PCI Library
for RTEMS.
-The PCI Library startup behaviour can be configured in four diffent
+The PCI Library startup behaviour can be configured in four different
ways depending on how @code{CONFIGURE_PCI_CONFIG_LIB} is defined:
@itemize @bullet
@@ -5298,7 +5298,7 @@ bridge driver set up.
@item @code{PCI_LIB_READ} is used to enable the PCI read configuration
software. The current PCI configuration is read to create the RAM
representation (the PCI device tree) of the PCI devices present. PCI devices
-are assumed to already have been initialized and PCI buses enumrated, it is
+are assumed to already have been initialized and PCI buses enumerated, it is
therefore required that a BIOS or a boot loader has set up configuration space
prior to booting into RTEMS.
@@ -5307,15 +5307,15 @@ prior to booting into RTEMS.
software. The user provides a PCI tree with information how all PCI devices
are to be configured at compile time by linking in a custom
@code{struct pci_bus pci_hb} tree. The static PCI library will not probe PCI
-for devices, instead it will assume that all devices defined by the user is
+for devices, instead it will assume that all devices defined by the user are
present, it will enumerate the PCI buses and configure all PCI devices in
static configuration accordingly. Since probe and allocation software is not
-needed the startup is faster, have smaller footprint and does not require
+needed the startup is faster, has smaller footprint and does not require
dynamic memory allocation.
@findex PCI_LIB_PERIPHERAL
@item @code{PCI_LIB_PERIPHERAL} is used to enable the PCI peripheral
-configuration. It is similar to @code{PCI_LIB_STATIC}, but is will never write
+configuration. It is similar to @code{PCI_LIB_STATIC}, but it will never write
the configuration to the PCI devices since PCI peripherals are not allowed to
access PCI configuration space.