Author: uwe Date: 2007-05-20 22:28:04 +0200 (Sun, 20 May 2007) New Revision: 329
Added: LinuxBIOSv3/include/device/pcie.h Removed: LinuxBIOSv3/include/device/pciexp.h Modified: LinuxBIOSv3/device/pci_device.c LinuxBIOSv3/device/pcie_device.c Log: Some more PCIexp -> PCIe fixes and renames (trivial).
Signed-off-by: Uwe Hermann uwe@hermann-uwe.de Acked-by: Uwe Hermann uwe@hermann-uwe.de
Modified: LinuxBIOSv3/device/pci_device.c =================================================================== --- LinuxBIOSv3/device/pci_device.c 2007-05-20 17:53:19 UTC (rev 328) +++ LinuxBIOSv3/device/pci_device.c 2007-05-20 20:28:04 UTC (rev 329) @@ -32,7 +32,7 @@ #include <device/pci_ids.h> #define CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT 0 #define CONFIG_PCIX_PLUGIN_SUPPORT 0 -#define CONFIG_PCIEXP_PLUGIN_SUPPORT 0 +#define CONFIG_PCIE_PLUGIN_SUPPORT 0 #define CONFIG_CARDBUS_PLUGIN_SUPPORT 0 #define CONFIG_AGP_PLUGIN_SUPPORT 0 #if CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT == 1 @@ -41,8 +41,8 @@ #if CONFIG_PCIX_PLUGIN_SUPPORT == 1 #include <device/pcix.h> #endif -#if CONFIG_PCIEXP_PLUGIN_SUPPORT == 1 -#include <device/pciexp.h> +#if CONFIG_PCIE_PLUGIN_SUPPORT == 1 +#include <device/pcie.h> #endif #if CONFIG_AGP_PLUGIN_SUPPORT == 1 #include <device/agp.h> @@ -747,7 +747,7 @@ } } #endif -#if CONFIG_PCIEXP_PLUGIN_SUPPORT == 1 +#if CONFIG_PCIE_PLUGIN_SUPPORT == 1 pos = pci_find_capability(dev, PCI_CAP_ID_PCIE); if (pos) { unsigned int flags; @@ -758,7 +758,7 @@ case PCI_EXP_TYPE_DOWNSTREAM: printk(BIOS_DEBUG, "%s subordinate bus PCI Express\n", dev_path(dev)); - return &default_pciexp_ops_bus; + return &default_pcie_ops_bus; case PCI_EXP_TYPE_PCI_BRIDGE: printk(BIOS_DEBUG, "%s subordinate PCI\n", dev_path(dev));
Modified: LinuxBIOSv3/device/pcie_device.c =================================================================== --- LinuxBIOSv3/device/pcie_device.c 2007-05-20 17:53:19 UTC (rev 328) +++ LinuxBIOSv3/device/pcie_device.c 2007-05-20 20:28:04 UTC (rev 329) @@ -22,9 +22,9 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <device/pciexp.h> +#include <device/pcie.h>
-static void pciexp_tune_dev(struct device *dev) +static void pcie_tune_dev(struct device *dev) { unsigned int cap; cap = pci_find_capability(dev, PCI_CAP_ID_PCIE); @@ -36,8 +36,8 @@ #warning "IMPLEMENT PCI EXPRESS TUNING" }
-unsigned int pciexp_scan_bus(struct bus *bus, unsigned int min_devfn, - unsigned int max_devfn, unsigned int max) +unsigned int pcie_scan_bus(struct bus *bus, unsigned int min_devfn, + unsigned int max_devfn, unsigned int max) { struct device *child; max = pci_scan_bus(bus, min_devfn, max_devfn, max); @@ -46,28 +46,28 @@ (child->path.u.pci.devfn > max_devfn)) { continue; } - pciexp_tune_dev(child); + pcie_tune_dev(child); } return max; }
-unsigned int pciexp_scan_bridge(struct device *dev, unsigned int max) +unsigned int pcie_scan_bridge(struct device *dev, unsigned int max) { - return do_pci_scan_bridge(dev, max, pciexp_scan_bus); + return do_pci_scan_bridge(dev, max, pcie_scan_bus); }
/** Default device operations for PCI Express bridges. */ -static struct pci_operations pciexp_bus_ops_pci = { +static struct pci_operations pcie_bus_ops_pci = { .set_subsystem = 0, };
-struct device_operations default_pciexp_ops_bus = { +struct device_operations default_pcie_ops_bus = { .read_resources = pci_bus_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pci_bus_enable_resources, .init = 0, - .scan_bus = pciexp_scan_bridge, + .scan_bus = pcie_scan_bridge, .enable = 0, .reset_bus = pci_bus_reset, - .ops_pci = &pciexp_bus_ops_pci, + .ops_pci = &pcie_bus_ops_pci, };
Copied: LinuxBIOSv3/include/device/pcie.h (from rev 328, LinuxBIOSv3/include/device/pciexp.h) =================================================================== --- LinuxBIOSv3/include/device/pcie.h (rev 0) +++ LinuxBIOSv3/include/device/pcie.h 2007-05-20 20:28:04 UTC (rev 329) @@ -0,0 +1,27 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ +#ifndef DEVICE_PCIE_H +#define DEVICE_PCIE_H +/* (c) 2005 Linux Networx GPL see COPYING for details */ + +unsigned int pcie_scan_bus(struct bus *bus, + unsigned min_devfn, unsigned max_devfn, unsigned int max); +unsigned int pcie_scan_bridge(struct device *dev, unsigned int max); + +extern struct device_operations default_pcie_ops_bus; + +#endif /* DEVICE_PCIE_H */
Deleted: LinuxBIOSv3/include/device/pciexp.h =================================================================== --- LinuxBIOSv3/include/device/pciexp.h 2007-05-20 17:53:19 UTC (rev 328) +++ LinuxBIOSv3/include/device/pciexp.h 2007-05-20 20:28:04 UTC (rev 329) @@ -1,27 +0,0 @@ -/* - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -*/ -#ifndef DEVICE_PCIEXP_H -#define DEVICE_PCIEXP_H -/* (c) 2005 Linux Networx GPL see COPYING for details */ - -unsigned int pciexp_scan_bus(struct bus *bus, - unsigned min_devfn, unsigned max_devfn, unsigned int max); -unsigned int pciexp_scan_bridge(struct device *dev, unsigned int max); - -extern struct device_operations default_pciexp_ops_bus; - -#endif /* DEVICE_PCIEXP_H */