Add usage pages from usb HID Power Devices spec.

ok mpi@

1 files changed, 175 insertions, 3 deletions

diff --git a/sys/dev/usb/usbhid.h b/sys/dev/usb/usbhid.h
index 7bcb7507f59..699e5840415 100644
--- a/sys/dev/usb/usbhid.h
+++ b/sys/dev/usb/usbhid.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbhid.h,v 1.15 2013/04/15 09:23:02 mglocker Exp $ */
+/*	$OpenBSD: usbhid.h,v 1.16 2014/03/15 02:24:44 andre Exp $ */
 /*	$NetBSD: usbhid.h,v 1.11 2001/12/28 00:20:24 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbhid.h,v 1.7 1999/11/17 22:33:51 n_hibma Exp $ */
 
@@ -83,14 +83,186 @@ struct usb_hid_descriptor {
 #define HUP_VESA_VC		0x0082
 #define HUP_VESA_CMD		0x0083
 #define HUP_POWER		0x0084
-#define HUP_BATTERY_SYSTEM	0x0085
+#define HUP_BATTERY		0x0085
 #define HUP_BARCODE_SCANNER	0x008b
 #define HUP_SCALE		0x008c
 #define HUP_CAMERA_CONTROL	0x0090
 #define HUP_ARCADE		0x0091
-#define HUP_APPLE		0x00ff 
+#define HUP_APPLE		0x00ff
 #define HUP_MICROSOFT		0xff00
 
+/* Usage pages for USB Power Devices (0x84 power device page) */
+#define HUP_INAME		0x0001
+#define HUP_PRESENT_STATUS	0x0002
+#define HUP_CHANGED_STATUS	0x0003
+#define HUP_UPS			0x0004
+#define HUP_POWER_SUPPLY	0x0005
+#define HUP_BATTERY_SYSTEM	0x0010
+#define HUP_BATTERY_SYSTEM_ID	0x0011
+#define HUP_PD_BATTERY		0x0012
+#define HUP_BATTERY_ID		0x0013
+#define HUP_CHARGER		0x0014
+#define HUP_CHARGER_ID		0x0015
+#define HUP_POWER_CONVERTER	0x0016
+#define HUP_POWER_CONVERTER_ID	0x0017
+#define HUP_OUTLET_SYSTEM	0x0018
+#define HUP_OUTLET_SYSTEM_ID	0x0019
+#define HUP_INPUT		0x001a
+#define HUP_INPUT_ID		0x001b
+#define HUP_OUTPUT		0x001c
+#define HUP_OUTPUT_ID		0x001d
+#define HUP_FLOW		0x001e
+#define HUP_FLOW_ID		0x001f
+#define HUP_OUTLET		0x0020
+#define HUP_OUTLET_ID		0x0021
+#define HUP_GANG		0x0022
+#define HUP_GANG_ID		0x0023
+#define HUP_POWER_SUMMARY	0x0024
+#define HUP_POWER_SUMMARY_ID	0x0025
+#define HUP_VOLTAGE		0x0030
+#define HUP_CURRENT		0x0031
+#define HUP_FREQUENCY		0x0032
+#define HUP_APPARENT_POWER	0x0033
+#define HUP_ACTIVE_POWER	0x0034
+#define HUP_PERCENT_LOAD	0x0035
+#define HUP_TEMPERATURE		0x0036
+#define HUP_HUMIDITY		0x0037
+#define HUP_BADCOUNT		0x0038
+#define HUP_CONFIG_VOLTAGE	0x0040
+#define HUP_CONFIG_CURRENT	0x0041
+#define HUP_CONFIG_FREQUENCY	0x0042
+#define HUP_CONFIG_APP_POWER	0x0043
+#define HUP_CONFIG_ACT_POWER	0x0044
+#define HUP_CONFIG_PERCENT_LOAD	0x0045
+#define HUP_CONFIG_TEMPERATURE	0x0046
+#define HUP_CONFIG_HUMIDITY	0x0047
+#define HUP_SWITCHON_CONTROL	0x0050
+#define HUP_SWITCHOFF_CONTROL	0x0051
+#define HUP_TOGGLE_CONTROL	0x0052
+#define HUP_LOW_VOLT_TRANSF	0x0053
+#define HUP_HIGH_VOLT_TRANSF	0x0054
+#define HUP_DELAYBEFORE_REBOOT	0x0055
+#define HUP_DELAYBEFORE_STARTUP	0x0056
+#define HUP_DELAYBEFORE_SHUTDWN	0x0057
+#define HUP_TEST		0x0058
+#define HUP_MODULE_RESET	0x0059
+#define HUP_AUDIBLE_ALRM_CTL	0x005a
+#define HUP_PRESENT		0x0060
+#define HUP_GOOD		0x0061
+#define HUP_INTERNAL_FAILURE	0x0062
+#define HUP_PD_VOLT_OUTOF_RANGE	0x0063
+#define HUP_FREQ_OUTOFRANGE	0x0064
+#define HUP_OVERLOAD		0x0065
+#define HUP_OVERCHARGED		0x0066
+#define HUP_OVERTEMPERATURE	0x0067
+#define HUP_SHUTDOWN_REQUESTED	0x0068
+#define HUP_SHUTDOWN_IMMINENT	0x0069
+#define HUP_SWITCH_ON_OFF	0x006b
+#define HUP_SWITCHABLE		0x006c
+#define HUP_USED		0x006d
+#define HUP_BOOST		0x006e
+#define HUP_BUCK		0x006f
+#define HUP_INITIALIZED		0x0070
+#define HUP_TESTED		0x0071
+#define HUP_AWAITING_POWER	0x0072
+#define HUP_COMMUNICATION_LOST	0x0073
+#define HUP_IMANUFACTURER	0x00fd
+#define HUP_IPRODUCT		0x00fe
+#define HUP_ISERIALNUMBER	0x00ff
+
+/* Usage pages for USB Power Devices (0x85 battery system page) */
+#define HUB_SMB_BATTERY_MODE	0x0001
+#define HUB_SMB_BATTERY_STATUS	0x0002
+#define HUB_SMB_ALARM_WARNING	0x0003
+#define HUB_SMB_CHARGER_MODE	0x0004
+#define HUB_SMB_CHARGER_STATUS	0x0005
+#define HUB_SMB_CHARGER_SPECINF	0x0006
+#define HUB_SMB_SELECTR_STATE	0x0007
+#define HUB_SMB_SELECTR_PRESETS	0x0008
+#define HUB_SMB_SELECTR_INFO	0x0009
+#define HUB_SMB_OPT_MFGFUNC1	0x0010
+#define HUB_SMB_OPT_MFGFUNC2	0x0011
+#define HUB_SMB_OPT_MFGFUNC3	0x0012
+#define HUB_SMB_OPT_MFGFUNC4	0x0013
+#define HUB_SMB_OPT_MFGFUNC5	0x0014
+#define HUB_CONNECTIONTOSMBUS	0x0015
+#define HUB_OUTPUT_CONNECTION	0x0016
+#define HUB_CHARGER_CONNECTION	0x0017
+#define HUB_BATTERY_INSERTION	0x0018
+#define HUB_USENEXT		0x0019
+#define HUB_OKTOUSE		0x001a
+#define HUB_BATTERY_SUPPORTED	0x001b
+#define HUB_SELECTOR_REVISION	0x001c
+#define HUB_CHARGING_INDICATOR	0x001d
+#define HUB_MANUFACTURER_ACCESS	0x0028
+#define HUB_REM_CAPACITY_LIM	0x0029
+#define HUB_REM_TIME_LIM	0x002a
+#define HUB_ATRATE		0x002b
+#define HUB_CAPACITY_MODE	0x002c
+#define HUB_BCAST_TO_CHARGER	0x002d
+#define HUB_PRIMARY_BATTERY	0x002e
+#define HUB_CHANGE_CONTROLLER	0x002f
+#define HUB_TERMINATE_CHARGE	0x0040
+#define HUB_TERMINATE_DISCHARGE	0x0041
+#define HUB_BELOW_REM_CAP_LIM	0x0042
+#define HUB_REM_TIME_LIM_EXP	0x0043
+#define HUB_CHARGING		0x0044
+#define HUB_DISCHARGING		0x0045
+#define HUB_FULLY_CHARGED	0x0046
+#define HUB_FULLY_DISCHARGED	0x0047
+#define HUB_CONDITIONING_FLAG	0x0048
+#define HUB_ATRATE_OK		0x0049
+#define HUB_SMB_ERROR_CODE	0x004a
+#define HUB_SMB_NEED_REPLACE	0x004b
+#define HUB_ATRATE_TIMETOFULL	0x0060
+#define HUB_ATRATE_TIMETOEMPTY	0x0061
+#define HUB_AVERAGE_CURRENT	0x0062
+#define HUB_MAXERROR		0x0063
+#define HUB_REL_STATEOF_CHARGE	0x0064
+#define HUB_ABS_STATEOF_CHARGE	0x0065
+#define HUB_REM_CAPACITY	0x0066
+#define HUB_FULLCHARGE_CAPACITY	0x0067
+#define HUB_RUNTIMETO_EMPTY	0x0068
+#define HUB_AVERAGETIMETO_EMPTY	0x0069
+#define HUB_AVERAGETIMETO_FULL	0x006a
+#define HUB_CYCLECOUNT		0x006b
+#define HUB_BATTPACKMODEL_LEVEL	0x0080
+#define HUB_INTERNAL_CHARGE_CTL	0x0081
+#define HUB_PRIMARY_BATTERY_SUP	0x0082
+#define HUB_DESIGN_CAPACITY	0x0083
+#define HUB_SPECIFICATION_INFO	0x0084
+#define HUB_MANUFACTURER_DATE	0x0085
+#define HUB_SERIAL_NUMBER	0x0086
+#define HUB_IMANUFACTURERNAME	0x0087
+#define HUB_IDEVICENAME		0x0088
+#define HUB_IDEVICECHEMISTERY	0x0089
+#define HUB_MANUFACTURERDATA	0x008a
+#define HUB_RECHARGABLE		0x008b
+#define HUB_WARN_CAPACITY_LIM	0x008c
+#define HUB_CAPACITY_GRANUL1	0x008d
+#define HUB_CAPACITY_GRANUL2	0x008e
+#define HUB_IOEM_INFORMATION	0x008f
+#define HUB_INHIBIT_CHARGE	0x00c0
+#define HUB_ENABLE_POLLING	0x00c1
+#define HUB_RESTORE_TO_ZERO	0x00c2
+#define HUB_AC_PRESENT		0x00d0
+#define HUB_BATTERY_PRESENT	0x00d1
+#define HUB_POWER_FAIL		0x00d2
+#define HUB_ALARM_INHIBITED	0x00d3
+#define HUB_THERMISTOR_UNDRANGE	0x00d4
+#define HUB_THERMISTOR_HOT	0x00d5
+#define HUB_THERMISTOR_COLD	0x00d6
+#define HUB_THERMISTOR_OVERANGE	0x00d7
+#define HUB_BS_VOLT_OUTOF_RANGE	0x00d8
+#define HUB_BS_CURR_OUTOF_RANGE	0x00d9
+#define HUB_BS_CURR_NOT_REGULTD	0x00da
+#define HUB_BS_VOLT_NOT_REGULTD	0x00db
+#define HUB_MASTER_MODE		0x00dc
+#define HUB_CHARGER_SELECTR_SUP	0x00f0
+#define HUB_CHARGER_SPEC	0x00f1
+#define HUB_LEVEL2		0x00f2
+#define HUB_LEVEL3		0x00f3
+
 /* Usages, generic desktop */
 #define HUG_POINTER		0x0001
 #define HUG_MOUSE		0x0002