From 28aed3c2c360b84762f76b322e9fc80bd74c036b Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Fri, 9 May 2014 17:37:40 +0200 Subject: Hardware: spring cleanup & refactor * use openlmi common library where possible * get rid of LMI_Hardware.h file * some other cosmetic changes --- src/hardware/LMI_BaseboardProvider.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/hardware/LMI_BaseboardProvider.c') diff --git a/src/hardware/LMI_BaseboardProvider.c b/src/hardware/LMI_BaseboardProvider.c index cb3622f..daf84f1 100644 --- a/src/hardware/LMI_BaseboardProvider.c +++ b/src/hardware/LMI_BaseboardProvider.c @@ -20,7 +20,7 @@ #include #include "LMI_Baseboard.h" -#include "LMI_Hardware.h" +#include "utils.h" #include "dmidecode.h" static const CMPIBroker* _cb = NULL; @@ -57,7 +57,7 @@ static CMPIStatus LMI_BaseboardEnumInstances( { LMI_Baseboard lmi_baseboard; const char *ns = KNameSpace(cop); - char instance_id[INSTANCE_ID_LEN]; + char instance_id[BUFLEN]; DmiBaseboard dmi_baseboard; if (dmi_get_baseboard(&dmi_baseboard) != 0) { @@ -67,24 +67,24 @@ static CMPIStatus LMI_BaseboardEnumInstances( LMI_Baseboard_Init(&lmi_baseboard, _cb, ns); LMI_Baseboard_Set_CreationClassName(&lmi_baseboard, - LMI_ORGID "_" BASEBOARD_CLASS_NAME); + LMI_Baseboard_ClassName); LMI_Baseboard_Set_PackageType(&lmi_baseboard, LMI_Baseboard_PackageType_Cross_Connect_Backplane); - LMI_Baseboard_Set_Name(&lmi_baseboard, BASEBOARD_CLASS_NAME); - LMI_Baseboard_Set_ElementName(&lmi_baseboard, BASEBOARD_CLASS_NAME); + LMI_Baseboard_Set_Name(&lmi_baseboard, "Baseboard"); + LMI_Baseboard_Set_ElementName(&lmi_baseboard, "Baseboard"); LMI_Baseboard_Set_HostingBoard(&lmi_baseboard, 1); - LMI_Baseboard_Set_Caption(&lmi_baseboard, BASEBOARD_CLASS_NAME); + LMI_Baseboard_Set_Caption(&lmi_baseboard, "Baseboard"); LMI_Baseboard_Set_Description(&lmi_baseboard, "This object represents baseboard of the system."); if (strcmp(dmi_baseboard.serial_number, "Not Specified") == 0) { LMI_Baseboard_Set_Tag(&lmi_baseboard, "0"); LMI_Baseboard_Set_InstanceID(&lmi_baseboard, - LMI_ORGID ":" LMI_ORGID "_" BASEBOARD_CLASS_NAME ":0"); + LMI_ORGID ":" LMI_Baseboard_ClassName ":0"); } else { LMI_Baseboard_Set_Tag(&lmi_baseboard, dmi_baseboard.serial_number); - snprintf(instance_id, INSTANCE_ID_LEN, - LMI_ORGID ":" LMI_ORGID "_" BASEBOARD_CLASS_NAME ":%s", + snprintf(instance_id, BUFLEN, + LMI_ORGID ":" LMI_Baseboard_ClassName ":%s", dmi_baseboard.serial_number); LMI_Baseboard_Set_InstanceID(&lmi_baseboard, instance_id); } -- cgit