Imported Upstream version 2.7.3

This commit is contained in:
Arnaud Quette 2015-04-30 15:53:36 +02:00
parent a356b56d11
commit fd413a3168
283 changed files with 14978 additions and 6511 deletions

View file

@ -29,20 +29,20 @@
#include "belkin-hid.h"
#include "usb-common.h"
#define BELKIN_HID_VERSION "Belkin HID 0.16"
#define BELKIN_HID_VERSION "Belkin/Liebert HID 0.17"
/* Belkin */
#define BELKIN_VENDORID 0x050d
/* Liebert */
#define LIEBERT_VENDORID 0x10af
/* Note that there are at least two Liebert firmware types which both report
/*! USB IDs device table.
* Note that there are at least two Liebert firmware types which both report
* a VID:PID of 10af:0001. The newer ones tend not to have the Belkin broken
* Usage Pages (and therefore use standard HID PDC paths) but they have
* incorrect exponents for some fields.
*/
/* USB IDs device table */
static usb_device_id_t belkin_usb_device_table[] = {
/* F6C800-UNV */
{ USB_DEVICE(BELKIN_VENDORID, 0x0980), NULL },
@ -60,6 +60,8 @@ static usb_device_id_t belkin_usb_device_table[] = {
{ USB_DEVICE(BELKIN_VENDORID, 0x0751), NULL },
/* F6H375-USB */
{ USB_DEVICE(BELKIN_VENDORID, 0x0375), NULL },
/* Regulator PRO-USB */
{ USB_DEVICE(BELKIN_VENDORID, 0x0f51), NULL },
/* F6C1100-UNV, F6C1200-UNV */
{ USB_DEVICE(BELKIN_VENDORID, 0x1100), NULL },
@ -67,6 +69,8 @@ static usb_device_id_t belkin_usb_device_table[] = {
{ USB_DEVICE(LIEBERT_VENDORID, 0x0001), NULL },
/* Liebert PowerSure PSI 1440 */
{ USB_DEVICE(LIEBERT_VENDORID, 0x0004), NULL },
/* Liebert GXT3 */
{ USB_DEVICE(LIEBERT_VENDORID, 0x0008), NULL },
/* Terminating entry */
{ -1, -1, NULL }
@ -521,6 +525,22 @@ static hid_info_t belkin_hid2nut[] = {
yet implemented) workaround, see the belkinunv(8) man page.
-PS 2005/08/28 */
#if 0
/* added for debugging Liebert GXT3 : */
{ "unmapped.ups.powersummary.iserialnumber", 0, 0, "UPS.PowerSummary.iSerialNumber", NULL, "%.0f", 0, NULL },
{ "unmapped.ups.powersummary.imanufacturer", 0, 0, "UPS.PowerSummary.iManufacturer", NULL, "%.0f", 0, NULL },
{ "unmapped.ups.powersummary.ioeminformation", 0, 0, "UPS.PowerSummary.iOEMInformation", NULL, "%s", 0, stringid_conversion },
{ "unmapped.ups.powersummary.designcapacity", 0, 0, "UPS.PowerSummary.DesignCapacity", NULL, "%.0f", 0, NULL },
{ "unmapped.ups.powersummary.remainingtimelimit", 0, 0, "UPS.PowerSummary.RemainingTimeLimit", NULL, "%.0f", 0, NULL },
{ "unmapped.ups.powersummary.capacitymode", 0, 0, "UPS.PowerSummary.CapacityMode", NULL, "%.0f", 0, NULL },
{ "unmapped.ups.powersummary.rechargeable", 0, 0, "UPS.PowerSummary.Rechargeable", NULL, "%.0f", 0, NULL },
{ "unmapped.ups.powersummary.batterypresent", 0, 0, "UPS.PowerSummary.BatteryPresent", NULL, "%.0f", 0, NULL },
{ "unmapped.ups.powersummary.fullchargecapacity", 0, 0, "UPS.PowerSummary.FullChargeCapacity", NULL, "%.0f", 0, NULL },
{ "unmapped.ups.powersummary.capacitygranularity1", 0, 0, "UPS.PowerSummary.CapacityGranularity1", NULL, "%.0f", 0, NULL },
{ "unmapped.ups.powersummary.capacitygranularity2", 0, 0, "UPS.PowerSummary.CapacityGranularity2", NULL, "%.0f", 0, NULL },
{ "unmapped.ups.powersummary.iproduct", 0, 0, "UPS.PowerSummary.iProduct", NULL, "%.0f", 0, NULL },
#endif
/* end of structure. */
{ NULL, 0, 0, NULL, NULL, NULL, 0, NULL }
};