From e1c44764ef30ce2fd53219561bd3c2d582334882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sat, 22 Jun 2013 19:35:43 +0200 Subject: [PATCH] pci: switched PCI::[Read|Write]Config to type uint16 for the offset. --- src/add-ons/kernel/bus_managers/pci/pci.cpp | 10 +++++----- src/add-ons/kernel/bus_managers/pci/pci.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/pci/pci.cpp b/src/add-ons/kernel/bus_managers/pci/pci.cpp index 67f0585b0c..fc3f5dc23a 100644 --- a/src/add-ons/kernel/bus_managers/pci/pci.cpp +++ b/src/add-ons/kernel/bus_managers/pci/pci.cpp @@ -1467,7 +1467,7 @@ PCI::_RefreshDeviceInfo(PCIBus *bus) status_t PCI::ReadConfig(uint8 domain, uint8 bus, uint8 device, uint8 function, - uint8 offset, uint8 size, uint32 *value) + uint16 offset, uint8 size, uint32 *value) { domain_data *info = _GetDomainData(domain); if (!info) @@ -1490,7 +1490,7 @@ PCI::ReadConfig(uint8 domain, uint8 bus, uint8 device, uint8 function, uint32 PCI::ReadConfig(uint8 domain, uint8 bus, uint8 device, uint8 function, - uint8 offset, uint8 size) + uint16 offset, uint8 size) { uint32 value; if (ReadConfig(domain, bus, device, function, offset, size, &value) @@ -1502,7 +1502,7 @@ PCI::ReadConfig(uint8 domain, uint8 bus, uint8 device, uint8 function, uint32 -PCI::ReadConfig(PCIDev *device, uint8 offset, uint8 size) +PCI::ReadConfig(PCIDev *device, uint16 offset, uint8 size) { uint32 value; if (ReadConfig(device->domain, device->bus, device->device, @@ -1515,7 +1515,7 @@ PCI::ReadConfig(PCIDev *device, uint8 offset, uint8 size) status_t PCI::WriteConfig(uint8 domain, uint8 bus, uint8 device, uint8 function, - uint8 offset, uint8 size, uint32 value) + uint16 offset, uint8 size, uint32 value) { domain_data *info = _GetDomainData(domain); if (!info) @@ -1537,7 +1537,7 @@ PCI::WriteConfig(uint8 domain, uint8 bus, uint8 device, uint8 function, status_t -PCI::WriteConfig(PCIDev *device, uint8 offset, uint8 size, uint32 value) +PCI::WriteConfig(PCIDev *device, uint16 offset, uint8 size, uint32 value) { return WriteConfig(device->domain, device->bus, device->device, device->function, offset, size, value); diff --git a/src/add-ons/kernel/bus_managers/pci/pci.h b/src/add-ons/kernel/bus_managers/pci/pci.h index c86676f582..bb7f9dce11 100644 --- a/src/add-ons/kernel/bus_managers/pci/pci.h +++ b/src/add-ons/kernel/bus_managers/pci/pci.h @@ -77,17 +77,17 @@ public: status_t GetNthInfo(long index, pci_info *outInfo); status_t ReadConfig(uint8 domain, uint8 bus, uint8 device, - uint8 function, uint8 offset, uint8 size, + uint8 function, uint16 offset, uint8 size, uint32 *value); uint32 ReadConfig(uint8 domain, uint8 bus, uint8 device, - uint8 function, uint8 offset, uint8 size); - uint32 ReadConfig(PCIDev *device, uint8 offset, + uint8 function, uint16 offset, uint8 size); + uint32 ReadConfig(PCIDev *device, uint16 offset, uint8 size); status_t WriteConfig(uint8 domain, uint8 bus, uint8 device, - uint8 function, uint8 offset, uint8 size, + uint8 function, uint16 offset, uint8 size, uint32 value); - status_t WriteConfig(PCIDev *device, uint8 offset, + status_t WriteConfig(PCIDev *device, uint16 offset, uint8 size, uint32 value); status_t FindCapability(uint8 domain, uint8 bus,