summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mof/Cura_Fan.mof121
-rw-r--r--mof/Cura_PowerManagement.mof27
-rw-r--r--mof/Cura_Service.mof49
3 files changed, 85 insertions, 112 deletions
diff --git a/mof/Cura_Fan.mof b/mof/Cura_Fan.mof
index 7456b9f..e3582ad 100644
--- a/mof/Cura_Fan.mof
+++ b/mof/Cura_Fan.mof
@@ -15,111 +15,92 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#pragma locale ("en_US")
-//#pragma namespace ("root/cimv2")
-
-// ===================================================================
-// Cura_Fan
-// ===================================================================
-
[ Provider("cmpi:cmpiCura_FanProvider") ]
-class Cura_Fan : CIM_Fan {
-
- [ Key, Override("DeviceID"),
- Description("Uniquely identifies fan. It is a composition of "
- "SysPath and Name glued with slash ('/').") ]
- string DeviceID;
-
- [ Override("Name"),
- Description("Name of fan provided by system.") ]
+class Cura_Fan: CIM_Fan
+{
+ [ Key, Override("DeviceID"),
+ Description("Uniquely identifies fan. It is a composition of "
+ "SysPath and Name glued with slash ('/').") ]
+ string DeviceID;
+
+ [ Override("Name"),
+ Description("Name of fan provided by system.") ]
string Name;
- [ Description("Array of fan features, that are exposed through system "
- " interface. In other words: those that are readible/writable."),
- ValueMap { "1", "2", "3", "4", "5", "6", "7", "8" },
- Values { "MinSpeed", "MaxSpeed", "Divisor", "Pulses", "Beep",
- "Alarm", "MinAlarm", "MaxAlarm" }
- ]
+ [ Description("Array of fan features, that are exposed through system "
+ " interface. In other words: those that are readible/writable."),
+ ValueMap { "1", "2", "3", "4", "5", "6", "7", "8" },
+ Values { "MinSpeed", "MaxSpeed", "Divisor", "Pulses", "Beep",
+ "Alarm", "MinAlarm", "MaxAlarm" }
+ ]
uint16 AccessibleFeatures[];
- [ Description("Minimum speed value."),
- Write,
- Units("Revolutions per Minute") ]
+ [ Description("Minimum speed value."), Write,
+ Units("Revolutions per Minute") ]
uint64 MinSpeed;
- [ Description("Maximum speed value."),
- Write,
- Units("Revolutions per Minute") ]
+ [ Description("Maximum speed value."), Write,
+ Units("Revolutions per Minute") ]
uint64 MaxSpeed;
- [ Description("Fan divisisor. It affects Minimum and Maximum speed value "
- "and accuracy of readings. "
- "The drivers account for the 'fan divisor' in their calculation "
- "of RPM. So changing the fan divisor will NOT change the "
- "nominal RPM reading, it will only affect the minimum and maximum "
- "readings and the accuracy of the readings. "
- "The actual formula is RPM = (60 * 22500) / (count * divisor)"),
- Write ]
+ [ Description("Fan divisisor. It affects Minimum and Maximum speed value "
+ "and accuracy of readings. "
+ "The drivers account for the 'fan divisor' in their calculation "
+ "of RPM. So changing the fan divisor will NOT change the "
+ "nominal RPM reading, it will only affect the minimum and maximum "
+ "readings and the accuracy of the readings. "
+ "The actual formula is RPM = (60 * 22500) / (count * divisor)"),
+ Write ]
uint32 Divisor;
[ Description("Number of tachometer pulses per fan revolution. "
- "Integer value, typically between 1 and 4. "
- "This value is a characteristic of the fan connected to the "
- "device's input, so it has to be set in accordance with the fan "
- "model."),
+ "Integer value, typically between 1 and 4. "
+ "This value is a characteristic of the fan connected to the "
+ "device's input, so it has to be set in accordance with the fan "
+ "model."),
Write ]
uint32 Pulses;
[ Description("This indicates, whether a PC's speaker should beep "
- "when an alarm occurs."),
+ "when an alarm occurs."),
Write ]
boolean Beep;
- [ Description("ALARM warning indicating, that current speed is out of "
- "range. This information is supplied by fan's chip driver.") ]
+ [ Description("ALARM warning indicating, that current speed is out of "
+ "range. This information is supplied by fan's chip driver.") ]
boolean Alarm;
- [ Description("ALARM warning indicating, that current speed is below "
- "the critical level. This information is supplied by fan's chip driver.")
- ]
+ [ Description("ALARM warning indicating, that current speed is below "
+ "the critical level. This information is supplied by fan's chip "
+ "driver.") ]
boolean MinAlarm;
- [ Description("ALARM warning indicating, that current speed is above "
- "the critical level. This information is supplied by fan's chip driver.")
- ]
+ [ Description("ALARM warning indicating, that current speed is above "
+ "the critical level. This information is supplied by fan's chip "
+ "driver.") ]
boolean MaxAlarm;
-
};
-// ===================================================================
-// Cura_FanSensor
-// ===================================================================
[ Provider("cmpi:cmpiCura_FanSensorProvider") ]
-class Cura_FanSensor : CIM_NumericSensor {
-
- [ Key, Override("DeviceID"),
- Description("Uniquely identifies fan. It is a composition of "
- "SysPath and Name glued with slash ('/').") ]
- string DeviceID;
-
- [ Override("Name"),
- Description("Name of fan provided by system.") ]
+class Cura_FanSensor: CIM_NumericSensor
+{
+ [ Key, Override("DeviceID"),
+ Description("Uniquely identifies fan. It is a composition of "
+ "SysPath and Name glued with slash ('/').") ]
+ string DeviceID;
+
+ [ Override("Name"),
+ Description("Name of fan provided by system.") ]
string Name;
-
};
-
-// ===================================================================
-// Associations
-// ===================================================================
[ Association,
Provider("cmpi:cmpiCura_FanAssociatedSensorProvider") ]
-class Cura_FanAssociatedSensor : CIM_AssociatedSensor {
-
+class Cura_FanAssociatedSensor: CIM_AssociatedSensor
+{
[ Override("Antecedent") ]
Cura_FanSensor REF Antecedent;
[ Override("Dependent") ]
Cura_Fan REF Dependent;
-
};
diff --git a/mof/Cura_PowerManagement.mof b/mof/Cura_PowerManagement.mof
index ab177b6..d0fe5cb 100644
--- a/mof/Cura_PowerManagement.mof
+++ b/mof/Cura_PowerManagement.mof
@@ -24,13 +24,12 @@ class Cura_PowerManagementService: CIM_PowerManagementService
Provider("cmpi:cmpiCura_PowerManagement") ]
class Cura_AssociatedPowerManagementService: CIM_AssociatedPowerManagementService
{
- [ Override ("ServiceProvided"),
- Max ( 1 ),
- Description ( "The Service that is available." )]
+ [ Override("ServiceProvided"), Max(1),
+ Description("The Service that is available.") ]
Cura_PowerManagementService REF ServiceProvided;
- [ Override ("UserOfService"),
- Description ( "The ManagedElement that can use the Service." )]
+ [ Override("UserOfService"),
+ Description("The ManagedElement that can use the Service.") ]
CIM_ComputerSystem REF UserOfService;
};
@@ -43,15 +42,12 @@ class Cura_PowerManagementCapabilities: CIM_PowerManagementCapabilities
Provider("cmpi:cmpiCura_PowerManagement") ]
class Cura_HostedService: CIM_HostedService
{
- [ Override ("Antecedent"),
- Min ( 1 ),
- Max ( 1 ),
- Description ( "The hosting System." )]
+ [ Override("Antecedent"), Min(1), Max(1),
+ Description("The hosting System.") ]
CIM_ComputerSystem REF Antecedent;
- [ Override ( "Dependent" ),
- Weak,
- Description ( "The Service hosted on the System." )]
+ [ Override("Dependent"), Weak,
+ Description("The Service hosted on the System.") ]
Cura_PowerManagementService REF Dependent;
};
@@ -63,13 +59,10 @@ class Cura_ConcreteJob: CIM_ConcreteJob
[ Provider("cmpi:cmpiCura_PowerManagement") ]
class Cura_ElementCapabilities: CIM_ElementCapabilities
{
- [ Key,
- Min ( 1 ),
- Description ( "The managed element." )]
+ [ Key, Min(1), Description("The managed element.") ]
Cura_PowerManagementService REF ManagedElement;
[ Key,
- Description ( "The Capabilities object associated with the element." )]
+ Description("The Capabilities object associated with the element.") ]
Cura_PowerManagementCapabilities REF Capabilities;
};
-
diff --git a/mof/Cura_Service.mof b/mof/Cura_Service.mof
index 8a9acda..1cd0c65 100644
--- a/mof/Cura_Service.mof
+++ b/mof/Cura_Service.mof
@@ -16,39 +16,38 @@
*/
[ Description("Class representing Linux Service"),
- Provider("cmpi:Service")
-]
-class Cura_Service : CIM_Service
+ Provider("cmpi:cmpiCura_Service") ]
+class Cura_Service: CIM_Service
{
- [ Override("StartService"),
- Provider("cmpi:Service") ]
- uint32 StartService();
+ [ Override("StartService"),
+ Provider("cmpi:cmpiCura_Service") ]
+ uint32 StartService();
- [ Override("StopService"),
- Provider("cmpi:Service") ]
- uint32 StopService();
+ [ Override("StopService"),
+ Provider("cmpi:cmpiCura_Service") ]
+ uint32 StopService();
- [ Provider("cmpi:Service") ]
- uint32 ReloadService();
+ [ Provider("cmpi:cmpiCura_Service") ]
+ uint32 ReloadService();
- [ Provider("cmpi:Service") ]
- uint32 RestartService();
+ [ Provider("cmpi:cmpiCura_Service") ]
+ uint32 RestartService();
- [ Provider("cmpi:Service") ]
- uint32 TryRestartService();
+ [ Provider("cmpi:cmpiCura_Service") ]
+ uint32 TryRestartService();
- [ Provider("cmpi:Service") ]
- uint32 CondRestartService();
+ [ Provider("cmpi:cmpiCura_Service") ]
+ uint32 CondRestartService();
- [ Provider("cmpi:Service") ]
- uint32 ReloadOrRestartService();
+ [ Provider("cmpi:cmpiCura_Service") ]
+ uint32 ReloadOrRestartService();
- [ Provider("cmpi:Service") ]
- uint32 ReloadOrTryRestartService();
+ [ Provider("cmpi:cmpiCura_Service") ]
+ uint32 ReloadOrTryRestartService();
- [ Provider("cmpi:Service") ]
- uint32 TurnServiceOn();
+ [ Provider("cmpi:cmpiCura_Service") ]
+ uint32 TurnServiceOn();
- [ Provider("cmpi:Service") ]
- uint32 TurnServiceOff();
+ [ Provider("cmpi:cmpiCura_Service") ]
+ uint32 TurnServiceOff();
};