diff options
Diffstat (limited to 'src/hardware/LMI_PCIDeviceProvider.c')
| -rw-r--r-- | src/hardware/LMI_PCIDeviceProvider.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/hardware/LMI_PCIDeviceProvider.c b/src/hardware/LMI_PCIDeviceProvider.c index 1c94915..e2d0e55 100644 --- a/src/hardware/LMI_PCIDeviceProvider.c +++ b/src/hardware/LMI_PCIDeviceProvider.c @@ -23,7 +23,6 @@ #include "LMI_PCIDevice.h" #include "LMI_Hardware.h" #include "PCIDev.h" -#include "globals.h" static const CMPIBroker* _cb = NULL; @@ -39,7 +38,7 @@ static void LMI_PCIDeviceInitialize(const CMPIContext *ctx) | PCI_FILL_ROM_BASE | PCI_FILL_CLASS | PCI_FILL_CAPS) != 0) { - error("Failed to access the PCI bus."); + lmi_error("Failed to access the PCI bus."); abort(); } } @@ -111,7 +110,7 @@ static CMPIStatus LMI_PCIDeviceEnumInstances( snprintf(device_id_str, PCI_DEVID_STR_SIZE, "%02x:%02x.%u", dev->bus, dev->dev, dev->func); snprintf(instance_id, INSTANCE_ID_LEN, - ORGID ":" ORGID "_" PCI_DEVICE_CLASS_NAME ":%s", device_id_str); + LMI_ORGID ":" LMI_ORGID "_" PCI_DEVICE_CLASS_NAME ":%s", device_id_str); LMI_PCIDevice_Init(&lmi_dev, _cb, ns); @@ -119,7 +118,7 @@ static CMPIStatus LMI_PCIDeviceEnumInstances( get_system_creation_class_name()); LMI_PCIDevice_Set_SystemName(&lmi_dev, get_system_name()); LMI_PCIDevice_Set_CreationClassName(&lmi_dev, - ORGID "_" PCI_DEVICE_CLASS_NAME); + LMI_ORGID "_" PCI_DEVICE_CLASS_NAME); LMI_PCIDevice_Set_Caption(&lmi_dev, "This object represents one logical PCI device contained in system."); |