summaryrefslogtreecommitdiff
path: root/src/include/device
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/device')
-rw-r--r--src/include/device/agp.h2
-rw-r--r--src/include/device/cardbus.h2
-rw-r--r--src/include/device/device.h10
-rw-r--r--src/include/device/hypertransport.h2
-rw-r--r--src/include/device/hypertransport_def.h2
-rw-r--r--src/include/device/pci.h2
-rw-r--r--src/include/device/pci_def.h10
-rw-r--r--src/include/device/pciexp.h2
-rw-r--r--src/include/device/pcix.h2
9 files changed, 17 insertions, 17 deletions
diff --git a/src/include/device/agp.h b/src/include/device/agp.h
index 073858ae10..564b0bb4e6 100644
--- a/src/include/device/agp.h
+++ b/src/include/device/agp.h
@@ -2,7 +2,7 @@
#define DEVICE_AGP_H
/* (c) 2005 Linux Networx GPL see COPYING for details */
-unsigned int agp_scan_bus(struct bus *bus,
+unsigned int agp_scan_bus(struct bus *bus,
unsigned min_devfn, unsigned max_devfn, unsigned int max);
unsigned int agp_scan_bridge(device_t dev, unsigned int max);
diff --git a/src/include/device/cardbus.h b/src/include/device/cardbus.h
index 07cc46a54a..5b003d3217 100644
--- a/src/include/device/cardbus.h
+++ b/src/include/device/cardbus.h
@@ -3,7 +3,7 @@
/* (c) 2005 Linux Networx GPL see COPYING for details */
void cardbus_read_resources(device_t dev);
-unsigned int cardbus_scan_bus(struct bus *bus,
+unsigned int cardbus_scan_bus(struct bus *bus,
unsigned min_devfn, unsigned max_devfn, unsigned int max);
unsigned int cardbus_scan_bridge(device_t dev, unsigned int max);
void cardbus_enable_resources(device_t dev);
diff --git a/src/include/device/device.h b/src/include/device/device.h
index df8fb5f6d5..59dd0815e6 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -49,8 +49,8 @@ struct bus {
unsigned disable_relaxed_ordering : 1;
};
-#define MAX_RESOURCES 24
-#define MAX_LINKS 8
+#define MAX_RESOURCES 24
+#define MAX_LINKS 8
/*
* There is one device structure for each slot-number/function-number
* combination:
@@ -78,7 +78,7 @@ struct device {
unsigned int resources;
/* links are (downstream) buses attached to the device, usually a leaf
- * device with no children have 0 buses attached and a bridge has 1 bus
+ * device with no children have 0 buses attached and a bridge has 1 bus
*/
struct bus link[MAX_LINKS];
/* number of buses attached to the device */
@@ -139,10 +139,10 @@ void show_one_resource(int debug_level, struct device *dev,
struct resource *resource, const char *comment);
void show_all_devs_resources(int debug_level, const char* msg);
-/* Rounding for boundaries.
+/* Rounding for boundaries.
* Due to some chip bugs, go ahead and round IO to 16
*/
-#define DEVICE_IO_ALIGN 16
+#define DEVICE_IO_ALIGN 16
#define DEVICE_MEM_ALIGN 4096
extern struct device_operations default_dev_ops_root;
diff --git a/src/include/device/hypertransport.h b/src/include/device/hypertransport.h
index 6a350f8232..e927d617fd 100644
--- a/src/include/device/hypertransport.h
+++ b/src/include/device/hypertransport.h
@@ -3,7 +3,7 @@
#include <device/hypertransport_def.h>
-unsigned int hypertransport_scan_chain(struct bus *bus,
+unsigned int hypertransport_scan_chain(struct bus *bus,
unsigned min_devfn, unsigned max_devfn, unsigned int max, unsigned *ht_unit_base, unsigned offset_unitid);
unsigned int ht_scan_bridge(struct device *dev, unsigned int max);
extern struct device_operations default_ht_ops_bus;
diff --git a/src/include/device/hypertransport_def.h b/src/include/device/hypertransport_def.h
index 6c12dcf39f..d6276ba003 100644
--- a/src/include/device/hypertransport_def.h
+++ b/src/include/device/hypertransport_def.h
@@ -11,7 +11,7 @@
#define HT_FREQ_1200Mhz 7
#define HT_FREQ_1400Mhz 8
#define HT_FREQ_1600Mhz 9
-#define HT_FREQ_1800Mhz 10
+#define HT_FREQ_1800Mhz 10
#define HT_FREQ_2000Mhz 11
#define HT_FREQ_2200Mhz 12
#define HT_FREQ_2400Mhz 13
diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index 5485644393..131564c8c5 100644
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -61,7 +61,7 @@ void pci_bus_enable_resources(device_t dev);
void pci_bus_reset(struct bus *bus);
device_t pci_probe_dev(device_t dev, struct bus *bus, unsigned devfn);
unsigned int do_pci_scan_bridge(device_t bus, unsigned int max,
- unsigned int (*do_scan_bus)(struct bus *bus,
+ unsigned int (*do_scan_bus)(struct bus *bus,
unsigned min_devfn, unsigned max_devfn, unsigned int max));
unsigned int pci_scan_bridge(device_t bus, unsigned int max);
unsigned int pci_scan_bus(struct bus *bus, unsigned min_devfn, unsigned max_devfn, unsigned int max);
diff --git a/src/include/device/pci_def.h b/src/include/device/pci_def.h
index ba972547ea..a5aa3a1c3b 100644
--- a/src/include/device/pci_def.h
+++ b/src/include/device/pci_def.h
@@ -26,7 +26,7 @@
#define PCI_STATUS_FAST_BACK 0x80 /* Accept fast-back to back */
#define PCI_STATUS_PARITY 0x100 /* Detected parity error */
#define PCI_STATUS_DEVSEL_MASK 0x600 /* DEVSEL timing */
-#define PCI_STATUS_DEVSEL_FAST 0x000
+#define PCI_STATUS_DEVSEL_FAST 0x000
#define PCI_STATUS_DEVSEL_MEDIUM 0x200
#define PCI_STATUS_DEVSEL_SLOW 0x400
#define PCI_STATUS_SIG_TARGET_ABORT 0x800 /* Set on target abort */
@@ -55,8 +55,8 @@
/*
* Base addresses specify locations in memory or I/O space.
- * Decoded size can be determined by writing a value of
- * 0xffffffff to the register, and reading it back. Only
+ * Decoded size can be determined by writing a value of
+ * 0xffffffff to the register, and reading it back. Only
* 1 bits are decoded.
*/
#define PCI_BASE_ADDRESS_0 0x10 /* 32 bits */
@@ -80,7 +80,7 @@
/* Header type 0 (normal devices) */
#define PCI_CARDBUS_CIS 0x28
#define PCI_SUBSYSTEM_VENDOR_ID 0x2c
-#define PCI_SUBSYSTEM_ID 0x2e
+#define PCI_SUBSYSTEM_ID 0x2e
#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */
#define PCI_ROM_ADDRESS_ENABLE 0x01
#define PCI_ROM_ADDRESS_MASK (~0x7ffUL)
@@ -189,7 +189,7 @@
/* Hypertransport Registers */
#define PCI_HT_CAP_SIZEOF 4
-#define PCI_HT_CAP_HOST_CTRL 4 /* Host link control */
+#define PCI_HT_CAP_HOST_CTRL 4 /* Host link control */
#define PCI_HT_CAP_HOST_WIDTH 6 /* width value & capability */
#define PCI_HT_CAP_HOST_FREQ 0x09 /* Host frequency */
#define PCI_HT_CAP_HOST_FREQ_CAP 0x0a /* Host Frequency capability */
diff --git a/src/include/device/pciexp.h b/src/include/device/pciexp.h
index 9ea662d490..becc800934 100644
--- a/src/include/device/pciexp.h
+++ b/src/include/device/pciexp.h
@@ -2,7 +2,7 @@
#define DEVICE_PCIEXP_H
/* (c) 2005 Linux Networx GPL see COPYING for details */
-unsigned int pciexp_scan_bus(struct bus *bus,
+unsigned int pciexp_scan_bus(struct bus *bus,
unsigned min_devfn, unsigned max_devfn, unsigned int max);
unsigned int pciexp_scan_bridge(device_t dev, unsigned int max);
diff --git a/src/include/device/pcix.h b/src/include/device/pcix.h
index 8bf193530a..e017922ef1 100644
--- a/src/include/device/pcix.h
+++ b/src/include/device/pcix.h
@@ -2,7 +2,7 @@
#define DEVICE_PCIX_H
/* (c) 2005 Linux Networx GPL see COPYING for details */
-unsigned int pcix_scan_bus(struct bus *bus,
+unsigned int pcix_scan_bus(struct bus *bus,
unsigned min_devfn, unsigned max_devfn, unsigned int max);
unsigned int pcix_scan_bridge(device_t dev, unsigned int max);
const char *pcix_speed(unsigned sstatus);