rename to match fido sample uf2_hid..h
This commit is contained in:
parent
3846d5f38c
commit
d58120647a
|
@ -708,7 +708,7 @@ enum {
|
||||||
HID_USAGE_PAGE_MSR = 0x8e,
|
HID_USAGE_PAGE_MSR = 0x8e,
|
||||||
HID_USAGE_PAGE_CAMERA = 0x90,
|
HID_USAGE_PAGE_CAMERA = 0x90,
|
||||||
HID_USAGE_PAGE_ARCADE = 0x91,
|
HID_USAGE_PAGE_ARCADE = 0x91,
|
||||||
HID_USAGE_PAGE_FIDO_ALLIANCE = 0xF1D0,
|
HID_USAGE_PAGE_FIDO = 0xF1D0, // FIDO alliance HID usage page
|
||||||
HID_USAGE_PAGE_VENDOR = 0xFF00 // 0xFF00 - 0xFFFF
|
HID_USAGE_PAGE_VENDOR = 0xFF00 // 0xFF00 - 0xFFFF
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -848,9 +848,9 @@ enum
|
||||||
/// HID Usage Table: FIDO Alliance Page (0xF1D0)
|
/// HID Usage Table: FIDO Alliance Page (0xF1D0)
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
HID_USAGE_FIDO_U2F_AUTHENTICATOR_DEVICE = 0x01,
|
HID_USAGE_FIDO_U2FHID = 0x01, // U2FHID usage for top-level collection
|
||||||
HID_USAGE_FIDO_INPUT_REPORT_DATA = 0x20,
|
HID_USAGE_FIDO_DATA_IN = 0x20, // Raw IN data report
|
||||||
HID_USAGE_FIDO_OUTPUT_REPORT_DATA = 0x21
|
HID_USAGE_FIDO_DATA_OUT = 0x21 // Raw OUT data report
|
||||||
};
|
};
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
/*--------------------------------------------------------------------
|
||||||
|
|
|
@ -356,20 +356,20 @@ static inline bool tud_hid_gamepad_report(uint8_t report_id, int8_t x, int8_t y
|
||||||
// - 1st parameter is report size, which is 64 bytes maximum in U2F
|
// - 1st parameter is report size, which is 64 bytes maximum in U2F
|
||||||
// - 2nd parameter is HID_REPORT_ID(n) (optional)
|
// - 2nd parameter is HID_REPORT_ID(n) (optional)
|
||||||
#define TUD_HID_REPORT_DESC_FIDO_U2F(report_size, ...) \
|
#define TUD_HID_REPORT_DESC_FIDO_U2F(report_size, ...) \
|
||||||
HID_USAGE_PAGE_N ( HID_USAGE_PAGE_FIDO_ALLIANCE, 2 ) ,\
|
HID_USAGE_PAGE_N ( HID_USAGE_PAGE_FIDO, 2 ) ,\
|
||||||
HID_USAGE ( HID_USAGE_FIDO_U2F_AUTHENTICATOR_DEVICE ) ,\
|
HID_USAGE ( HID_USAGE_FIDO_U2FHID ) ,\
|
||||||
HID_COLLECTION ( HID_COLLECTION_APPLICATION ) ,\
|
HID_COLLECTION ( HID_COLLECTION_APPLICATION ) ,\
|
||||||
/* Report ID if any */ \
|
/* Report ID if any */ \
|
||||||
__VA_ARGS__ \
|
__VA_ARGS__ \
|
||||||
/* Usage Data In */ \
|
/* Usage Data In */ \
|
||||||
HID_USAGE ( HID_USAGE_FIDO_INPUT_REPORT_DATA ) ,\
|
HID_USAGE ( HID_USAGE_FIDO_DATA_IN ) ,\
|
||||||
HID_LOGICAL_MIN ( 0 ) ,\
|
HID_LOGICAL_MIN ( 0 ) ,\
|
||||||
HID_LOGICAL_MAX_N ( 0xff, 2 ) ,\
|
HID_LOGICAL_MAX_N ( 0xff, 2 ) ,\
|
||||||
HID_REPORT_SIZE ( 8 ) ,\
|
HID_REPORT_SIZE ( 8 ) ,\
|
||||||
HID_REPORT_COUNT ( report_size ) ,\
|
HID_REPORT_COUNT ( report_size ) ,\
|
||||||
HID_INPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
|
HID_INPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
|
||||||
/* Usage Data Out */ \
|
/* Usage Data Out */ \
|
||||||
HID_USAGE ( HID_USAGE_FIDO_OUTPUT_REPORT_DATA ) ,\
|
HID_USAGE ( HID_USAGE_FIDO_DATA_OUT ) ,\
|
||||||
HID_LOGICAL_MIN ( 0 ) ,\
|
HID_LOGICAL_MIN ( 0 ) ,\
|
||||||
HID_LOGICAL_MAX_N ( 0xff, 2 ) ,\
|
HID_LOGICAL_MAX_N ( 0xff, 2 ) ,\
|
||||||
HID_REPORT_SIZE ( 8 ) ,\
|
HID_REPORT_SIZE ( 8 ) ,\
|
||||||
|
|
Loading…
Reference in New Issue