summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mof/60_LMI_Hardware.mof8
-rw-r--r--src/hardware/LMI_DiskDriveATAProtocolEndpointProvider.c (renamed from src/hardware/LMI_ATAProtocolEndpointProvider.c)96
-rw-r--r--src/hardware/LMI_DiskDriveDeviceSAPImplementationProvider.c14
-rw-r--r--src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c14
-rw-r--r--src/hardware/LMI_Hardware.h2
5 files changed, 68 insertions, 66 deletions
diff --git a/mof/60_LMI_Hardware.mof b/mof/60_LMI_Hardware.mof
index 6a49a25..c0e1730 100644
--- a/mof/60_LMI_Hardware.mof
+++ b/mof/60_LMI_Hardware.mof
@@ -1424,8 +1424,8 @@ class LMI_DiskDriveElementSoftwareIdentity: CIM_ElementSoftwareIdentity
LMI_DiskDrive REF Dependent;
};
-[ Version("0.5.0"), Provider("cmpi:cmpiLMI_ATAProtocolEndpoint") ]
-class LMI_ATAProtocolEndpoint: CIM_ATAProtocolEndpoint
+[ Version("0.5.0"), Provider("cmpi:cmpiLMI_DiskDriveATAProtocolEndpoint") ]
+class LMI_DiskDriveATAProtocolEndpoint: CIM_ATAProtocolEndpoint
{
[ Implemented(true), Override("SystemCreationClassName") ]
string SystemCreationClassName;
@@ -1462,7 +1462,7 @@ class LMI_ATAProtocolEndpoint: CIM_ATAProtocolEndpoint
class LMI_DiskDriveSAPAvailableForElement: CIM_SAPAvailableForElement
{
[ Override("AvailableSAP") ]
- LMI_ATAProtocolEndpoint REF AvailableSAP;
+ LMI_DiskDriveATAProtocolEndpoint REF AvailableSAP;
[ Override("ManagedElement") ]
LMI_DiskDrive REF ManagedElement;
@@ -1518,6 +1518,6 @@ class LMI_DiskDriveDeviceSAPImplementation: CIM_DeviceSAPImplementation
LMI_DiskDriveATAPort REF Antecedent;
[ Override("Dependent") ]
- LMI_ATAProtocolEndpoint REF Dependent;
+ LMI_DiskDriveATAProtocolEndpoint REF Dependent;
};
diff --git a/src/hardware/LMI_ATAProtocolEndpointProvider.c b/src/hardware/LMI_DiskDriveATAProtocolEndpointProvider.c
index c994874..2c4140d 100644
--- a/src/hardware/LMI_ATAProtocolEndpointProvider.c
+++ b/src/hardware/LMI_DiskDriveATAProtocolEndpointProvider.c
@@ -19,19 +19,19 @@
*/
#include <konkret/konkret.h>
-#include "LMI_ATAProtocolEndpoint.h"
+#include "LMI_DiskDriveATAProtocolEndpoint.h"
#include "LMI_Hardware.h"
#include "globals.h"
#include "lsblk.h"
static const CMPIBroker* _cb = NULL;
-static void LMI_ATAProtocolEndpointInitialize(const CMPIContext *ctx)
+static void LMI_DiskDriveATAProtocolEndpointInitialize(const CMPIContext *ctx)
{
lmi_init(provider_name, _cb, ctx, provider_config_defaults);
}
-static CMPIStatus LMI_ATAProtocolEndpointCleanup(
+static CMPIStatus LMI_DiskDriveATAProtocolEndpointCleanup(
CMPIInstanceMI* mi,
const CMPIContext* cc,
CMPIBoolean term)
@@ -39,7 +39,7 @@ static CMPIStatus LMI_ATAProtocolEndpointCleanup(
CMReturn(CMPI_RC_OK);
}
-static CMPIStatus LMI_ATAProtocolEndpointEnumInstanceNames(
+static CMPIStatus LMI_DiskDriveATAProtocolEndpointEnumInstanceNames(
CMPIInstanceMI* mi,
const CMPIContext* cc,
const CMPIResult* cr,
@@ -49,14 +49,14 @@ static CMPIStatus LMI_ATAProtocolEndpointEnumInstanceNames(
_cb, mi, cc, cr, cop);
}
-static CMPIStatus LMI_ATAProtocolEndpointEnumInstances(
+static CMPIStatus LMI_DiskDriveATAProtocolEndpointEnumInstances(
CMPIInstanceMI* mi,
const CMPIContext* cc,
const CMPIResult* cr,
const CMPIObjectPath* cop,
const char** properties)
{
- LMI_ATAProtocolEndpoint lmi_hdd_endpoint;
+ LMI_DiskDriveATAProtocolEndpoint lmi_hdd_endpoint;
const char *ns = KNameSpace(cop);
unsigned i;
char instance_id[INSTANCE_ID_LEN], name[ELEMENT_NAME_LEN];
@@ -73,23 +73,23 @@ static CMPIStatus LMI_ATAProtocolEndpointEnumInstances(
continue;
}
- LMI_ATAProtocolEndpoint_Init(&lmi_hdd_endpoint, _cb, ns);
+ LMI_DiskDriveATAProtocolEndpoint_Init(&lmi_hdd_endpoint, _cb, ns);
- LMI_ATAProtocolEndpoint_Set_SystemCreationClassName(&lmi_hdd_endpoint,
- get_system_creation_class_name());
- LMI_ATAProtocolEndpoint_Set_SystemName(&lmi_hdd_endpoint,
+ LMI_DiskDriveATAProtocolEndpoint_Set_SystemCreationClassName(
+ &lmi_hdd_endpoint, get_system_creation_class_name());
+ LMI_DiskDriveATAProtocolEndpoint_Set_SystemName(&lmi_hdd_endpoint,
get_system_name());
- LMI_ATAProtocolEndpoint_Set_CreationClassName(&lmi_hdd_endpoint,
+ LMI_DiskDriveATAProtocolEndpoint_Set_CreationClassName(&lmi_hdd_endpoint,
ORGID "_" DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME);
- LMI_ATAProtocolEndpoint_Set_Caption(&lmi_hdd_endpoint,
- "ATA Protocol Endpoint");
- LMI_ATAProtocolEndpoint_Set_Description(&lmi_hdd_endpoint,
+ LMI_DiskDriveATAProtocolEndpoint_Set_Caption(&lmi_hdd_endpoint,
+ "Disk Drive ATA Protocol Endpoint");
+ LMI_DiskDriveATAProtocolEndpoint_Set_Description(&lmi_hdd_endpoint,
"This object represents ATA Protocol Endpoint of disk drive in system.");
- LMI_ATAProtocolEndpoint_Set_Role(&lmi_hdd_endpoint,
- LMI_ATAProtocolEndpoint_Role_Target);
- LMI_ATAProtocolEndpoint_Set_ProtocolIFType(&lmi_hdd_endpoint,
- LMI_ATAProtocolEndpoint_ProtocolIFType_Unknown);
+ LMI_DiskDriveATAProtocolEndpoint_Set_Role(&lmi_hdd_endpoint,
+ LMI_DiskDriveATAProtocolEndpoint_Role_Target);
+ LMI_DiskDriveATAProtocolEndpoint_Set_ProtocolIFType(&lmi_hdd_endpoint,
+ LMI_DiskDriveATAProtocolEndpoint_ProtocolIFType_Unknown);
snprintf(name, ELEMENT_NAME_LEN,
"%s " DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME,
@@ -98,20 +98,22 @@ static CMPIStatus LMI_ATAProtocolEndpointEnumInstances(
ORGID ":" ORGID "_" DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME ":%s",
name);
- LMI_ATAProtocolEndpoint_Set_Name(&lmi_hdd_endpoint, name);
- LMI_ATAProtocolEndpoint_Set_ElementName(&lmi_hdd_endpoint, name);
- LMI_ATAProtocolEndpoint_Set_InstanceID(&lmi_hdd_endpoint, instance_id);
+ LMI_DiskDriveATAProtocolEndpoint_Set_Name(&lmi_hdd_endpoint, name);
+ LMI_DiskDriveATAProtocolEndpoint_Set_ElementName(&lmi_hdd_endpoint,
+ name);
+ LMI_DiskDriveATAProtocolEndpoint_Set_InstanceID(&lmi_hdd_endpoint,
+ instance_id);
if (lsblk_hdds[i].basename[0] == 'h') {
- LMI_ATAProtocolEndpoint_Set_ConnectionType(&lmi_hdd_endpoint,
- LMI_ATAProtocolEndpoint_ConnectionType_ATA);
+ LMI_DiskDriveATAProtocolEndpoint_Set_ConnectionType(&lmi_hdd_endpoint,
+ LMI_DiskDriveATAProtocolEndpoint_ConnectionType_ATA);
} else if (lsblk_hdds[i].basename[0] == 's') {
/* TODO: What about SAS? */
- LMI_ATAProtocolEndpoint_Set_ConnectionType(&lmi_hdd_endpoint,
- LMI_ATAProtocolEndpoint_ConnectionType_SATA);
+ LMI_DiskDriveATAProtocolEndpoint_Set_ConnectionType(&lmi_hdd_endpoint,
+ LMI_DiskDriveATAProtocolEndpoint_ConnectionType_SATA);
} else {
- LMI_ATAProtocolEndpoint_Set_ConnectionType(&lmi_hdd_endpoint,
- LMI_ATAProtocolEndpoint_ConnectionType_Other);
+ LMI_DiskDriveATAProtocolEndpoint_Set_ConnectionType(&lmi_hdd_endpoint,
+ LMI_DiskDriveATAProtocolEndpoint_ConnectionType_Other);
}
KReturnInstance(cr, lmi_hdd_endpoint);
@@ -123,7 +125,7 @@ done:
CMReturn(CMPI_RC_OK);
}
-static CMPIStatus LMI_ATAProtocolEndpointGetInstance(
+static CMPIStatus LMI_DiskDriveATAProtocolEndpointGetInstance(
CMPIInstanceMI* mi,
const CMPIContext* cc,
const CMPIResult* cr,
@@ -134,7 +136,7 @@ static CMPIStatus LMI_ATAProtocolEndpointGetInstance(
_cb, mi, cc, cr, cop, properties);
}
-static CMPIStatus LMI_ATAProtocolEndpointCreateInstance(
+static CMPIStatus LMI_DiskDriveATAProtocolEndpointCreateInstance(
CMPIInstanceMI* mi,
const CMPIContext* cc,
const CMPIResult* cr,
@@ -144,7 +146,7 @@ static CMPIStatus LMI_ATAProtocolEndpointCreateInstance(
CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
}
-static CMPIStatus LMI_ATAProtocolEndpointModifyInstance(
+static CMPIStatus LMI_DiskDriveATAProtocolEndpointModifyInstance(
CMPIInstanceMI* mi,
const CMPIContext* cc,
const CMPIResult* cr,
@@ -155,7 +157,7 @@ static CMPIStatus LMI_ATAProtocolEndpointModifyInstance(
CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
}
-static CMPIStatus LMI_ATAProtocolEndpointDeleteInstance(
+static CMPIStatus LMI_DiskDriveATAProtocolEndpointDeleteInstance(
CMPIInstanceMI* mi,
const CMPIContext* cc,
const CMPIResult* cr,
@@ -164,7 +166,7 @@ static CMPIStatus LMI_ATAProtocolEndpointDeleteInstance(
CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
}
-static CMPIStatus LMI_ATAProtocolEndpointExecQuery(
+static CMPIStatus LMI_DiskDriveATAProtocolEndpointExecQuery(
CMPIInstanceMI* mi,
const CMPIContext* cc,
const CMPIResult* cr,
@@ -176,12 +178,12 @@ static CMPIStatus LMI_ATAProtocolEndpointExecQuery(
}
CMInstanceMIStub(
- LMI_ATAProtocolEndpoint,
- LMI_ATAProtocolEndpoint,
+ LMI_DiskDriveATAProtocolEndpoint,
+ LMI_DiskDriveATAProtocolEndpoint,
_cb,
- LMI_ATAProtocolEndpointInitialize(ctx))
+ LMI_DiskDriveATAProtocolEndpointInitialize(ctx))
-static CMPIStatus LMI_ATAProtocolEndpointMethodCleanup(
+static CMPIStatus LMI_DiskDriveATAProtocolEndpointMethodCleanup(
CMPIMethodMI* mi,
const CMPIContext* cc,
CMPIBoolean term)
@@ -189,7 +191,7 @@ static CMPIStatus LMI_ATAProtocolEndpointMethodCleanup(
CMReturn(CMPI_RC_OK);
}
-static CMPIStatus LMI_ATAProtocolEndpointInvokeMethod(
+static CMPIStatus LMI_DiskDriveATAProtocolEndpointInvokeMethod(
CMPIMethodMI* mi,
const CMPIContext* cc,
const CMPIResult* cr,
@@ -198,21 +200,21 @@ static CMPIStatus LMI_ATAProtocolEndpointInvokeMethod(
const CMPIArgs* in,
CMPIArgs* out)
{
- return LMI_ATAProtocolEndpoint_DispatchMethod(
+ return LMI_DiskDriveATAProtocolEndpoint_DispatchMethod(
_cb, mi, cc, cr, cop, meth, in, out);
}
CMMethodMIStub(
- LMI_ATAProtocolEndpoint,
- LMI_ATAProtocolEndpoint,
+ LMI_DiskDriveATAProtocolEndpoint,
+ LMI_DiskDriveATAProtocolEndpoint,
_cb,
- LMI_ATAProtocolEndpointInitialize(ctx))
+ LMI_DiskDriveATAProtocolEndpointInitialize(ctx))
-KUint32 LMI_ATAProtocolEndpoint_RequestStateChange(
+KUint32 LMI_DiskDriveATAProtocolEndpoint_RequestStateChange(
const CMPIBroker* cb,
CMPIMethodMI* mi,
const CMPIContext* context,
- const LMI_ATAProtocolEndpointRef* self,
+ const LMI_DiskDriveATAProtocolEndpointRef* self,
const KUint16* RequestedState,
KRef* Job,
const KDateTime* TimeoutPeriod,
@@ -224,11 +226,11 @@ KUint32 LMI_ATAProtocolEndpoint_RequestStateChange(
return result;
}
-KUint32 LMI_ATAProtocolEndpoint_BroadcastReset(
+KUint32 LMI_DiskDriveATAProtocolEndpoint_BroadcastReset(
const CMPIBroker* cb,
CMPIMethodMI* mi,
const CMPIContext* context,
- const LMI_ATAProtocolEndpointRef* self,
+ const LMI_DiskDriveATAProtocolEndpointRef* self,
CMPIStatus* status)
{
KUint32 result = KUINT32_INIT;
@@ -239,6 +241,6 @@ KUint32 LMI_ATAProtocolEndpoint_BroadcastReset(
KONKRET_REGISTRATION(
"root/cimv2",
- "LMI_ATAProtocolEndpoint",
- "LMI_ATAProtocolEndpoint",
+ "LMI_DiskDriveATAProtocolEndpoint",
+ "LMI_DiskDriveATAProtocolEndpoint",
"instance method")
diff --git a/src/hardware/LMI_DiskDriveDeviceSAPImplementationProvider.c b/src/hardware/LMI_DiskDriveDeviceSAPImplementationProvider.c
index 6745804..f34ae8f 100644
--- a/src/hardware/LMI_DiskDriveDeviceSAPImplementationProvider.c
+++ b/src/hardware/LMI_DiskDriveDeviceSAPImplementationProvider.c
@@ -57,7 +57,7 @@ static CMPIStatus LMI_DiskDriveDeviceSAPImplementationEnumInstances(
const char** properties)
{
LMI_DiskDriveDeviceSAPImplementation lmi_hdd_sap_impl;
- LMI_ATAProtocolEndpointRef lmi_hdd_ata_endp;
+ LMI_DiskDriveATAProtocolEndpointRef lmi_hdd_ata_endp;
LMI_DiskDriveATAPortRef lmi_hdd_ata_port;
const char *ns = KNameSpace(cop);
char name[ELEMENT_NAME_LEN];
@@ -94,14 +94,14 @@ static CMPIStatus LMI_DiskDriveDeviceSAPImplementationEnumInstances(
"%s " DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME,
lsblk_hdds[i].name);
- LMI_ATAProtocolEndpointRef_Init(&lmi_hdd_ata_endp, _cb, ns);
- LMI_ATAProtocolEndpointRef_Set_SystemCreationClassName(&lmi_hdd_ata_endp,
- get_system_creation_class_name());
- LMI_ATAProtocolEndpointRef_Set_SystemName(&lmi_hdd_ata_endp,
+ LMI_DiskDriveATAProtocolEndpointRef_Init(&lmi_hdd_ata_endp, _cb, ns);
+ LMI_DiskDriveATAProtocolEndpointRef_Set_SystemCreationClassName(
+ &lmi_hdd_ata_endp, get_system_creation_class_name());
+ LMI_DiskDriveATAProtocolEndpointRef_Set_SystemName(&lmi_hdd_ata_endp,
get_system_name());
- LMI_ATAProtocolEndpointRef_Set_CreationClassName(&lmi_hdd_ata_endp,
+ LMI_DiskDriveATAProtocolEndpointRef_Set_CreationClassName(&lmi_hdd_ata_endp,
ORGID "_" DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME);
- LMI_ATAProtocolEndpointRef_Set_Name(&lmi_hdd_ata_endp, name);
+ LMI_DiskDriveATAProtocolEndpointRef_Set_Name(&lmi_hdd_ata_endp, name);
LMI_DiskDriveDeviceSAPImplementation_Set_Antecedent(&lmi_hdd_sap_impl,
&lmi_hdd_ata_port);
diff --git a/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c b/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c
index 48fa390..ee964b1 100644
--- a/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c
+++ b/src/hardware/LMI_DiskDriveSAPAvailableForElementProvider.c
@@ -57,7 +57,7 @@ static CMPIStatus LMI_DiskDriveSAPAvailableForElementEnumInstances(
const char** properties)
{
LMI_DiskDriveSAPAvailableForElement lmi_hdd_sap;
- LMI_ATAProtocolEndpointRef lmi_hdd_ata_endp;
+ LMI_DiskDriveATAProtocolEndpointRef lmi_hdd_ata_endp;
LMI_DiskDriveRef lmi_hdd;
const char *ns = KNameSpace(cop);
char name[ELEMENT_NAME_LEN];
@@ -89,14 +89,14 @@ static CMPIStatus LMI_DiskDriveSAPAvailableForElementEnumInstances(
"%s " DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME,
lsblk_hdds[i].name);
- LMI_ATAProtocolEndpointRef_Init(&lmi_hdd_ata_endp, _cb, ns);
- LMI_ATAProtocolEndpointRef_Set_SystemCreationClassName(&lmi_hdd_ata_endp,
- get_system_creation_class_name());
- LMI_ATAProtocolEndpointRef_Set_SystemName(&lmi_hdd_ata_endp,
+ LMI_DiskDriveATAProtocolEndpointRef_Init(&lmi_hdd_ata_endp, _cb, ns);
+ LMI_DiskDriveATAProtocolEndpointRef_Set_SystemCreationClassName(
+ &lmi_hdd_ata_endp, get_system_creation_class_name());
+ LMI_DiskDriveATAProtocolEndpointRef_Set_SystemName(&lmi_hdd_ata_endp,
get_system_name());
- LMI_ATAProtocolEndpointRef_Set_CreationClassName(&lmi_hdd_ata_endp,
+ LMI_DiskDriveATAProtocolEndpointRef_Set_CreationClassName(&lmi_hdd_ata_endp,
ORGID "_" DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME);
- LMI_ATAProtocolEndpointRef_Set_Name(&lmi_hdd_ata_endp, name);
+ LMI_DiskDriveATAProtocolEndpointRef_Set_Name(&lmi_hdd_ata_endp, name);
LMI_DiskDriveSAPAvailableForElement_Set_ManagedElement(&lmi_hdd_sap,
&lmi_hdd);
diff --git a/src/hardware/LMI_Hardware.h b/src/hardware/LMI_Hardware.h
index 9d4bd1e..9dadd06 100644
--- a/src/hardware/LMI_Hardware.h
+++ b/src/hardware/LMI_Hardware.h
@@ -49,7 +49,7 @@ const char *provider_name;
#define DISK_PHYS_PKG_CLASS_NAME "DiskPhysicalPackage"
#define DISK_DRIVE_CLASS_NAME "DiskDrive"
#define DISK_DRIVE_SW_IDENTITY_CLASS_NAME "DiskDriveSoftwareIdentity"
-#define DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME "ATAProtocolEndpoint"
+#define DISK_DRIVE_ATA_PROTO_ENDPOINT_CLASS_NAME "DiskDriveATAProtocolEndpoint"
#define DISK_DRIVE_ATA_PORT_CLASS_NAME "DiskDriveATAPort"
#endif /* LMI_HARDWARE_H_ */
generated by cgit (git 2.34.1) at 2024-05-03 07:54:45 +0000