outlet_eco_yes_no_info move to mge-xml.c

Signed-off-by: DaRK AnGeL <[email protected]>

drivers/mge-hid.c

@@ -689,12 +689,6 @@ static info_lkp_t pegasus_yes_no_info[] = {
 	{ 0, NULL, NULL, NULL }
 };
 
-static info_lkp_t outlet_eco_yes_no_info[] = {
-	{ 0, "The outlet is not ECO controlled", pegasus_yes_no_info_fun, pegasus_yes_no_info_nuf },
-	{ 1, "The outlet is ECO controlled", pegasus_yes_no_info_fun, pegasus_yes_no_info_nuf },
-	{ 0, NULL, NULL, NULL }
-};
-
 /* Determine country using UPS.PowerSummary.Country.
  * If not present:
  * 		if PowerConverter.Output.Voltage >= 200 => "Europe"
@@ -1533,7 +1527,7 @@ static hid_info_t mge_hid2nut[] =
 	{ "outlet.2.current", 0, 0, "UPS.OutletSystem.Outlet.[3].Current", NULL, "%.2f", 0, NULL },
 	{ "outlet.2.powerfactor", 0, 0, "UPS.OutletSystem.Outlet.[3].PowerFactor", NULL, "%.2f", 0, NULL }, /* "%s", 0, mge_powerfactor_conversion }, */
 	/* 0: The outlet is not ECO controlled. / 1 : The outlet is ECO controlled. => Readonly! use some yes_no_info */
-	{ "outlet.2.ecocontrol", 0, 0, "UPS.OutletSystem.Outlet.[3].ECOControl", NULL, "%s", HU_FLAG_SEMI_STATIC, eco_pegasus_yes_no_info},
+	{ "outlet.2.ecocontrol", 0, 0, "UPS.OutletSystem.Outlet.[3].ECOControl", NULL, "%s", HU_FLAG_SEMI_STATIC, outlet_eco_yes_no_info},
 
 	/* instant commands. */
 	/* splited into subset while waiting for extradata support

drivers/mge-xml.c

@@ -411,6 +411,20 @@ static const char *yes_no_info(const char *arg_val)
 	}
 }
 
+static const char *outlet_eco_yes_no_info(const char *arg_val)
+{
+	switch(arg_val[0])
+	{
+	case '1':
+		return "The outlet is ECO controlled";
+	case '0':
+		return "The outlet is not ECO controlled";
+	default:
+		upsdebugx(2, "%s: unexpected value [%s]", __func__, arg_val);
+		return "<unknown>";
+	}
+}
+
 static const char *on_off_info(const char *arg_val)
 {
 	switch(arg_val[0])