laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Modify the interface to the User HID functionality.

Browse Source 
Setting the HID data use to occur through a global variable.  It now occurs
through a function call.  A list of general HID events has been provided as
well.
This commit is contained in:
mbanth
2019-12-18 12:09:11 +00:00
parent 02185f6701
commit 538f2be5b4
2 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib_xua/src/core/buffer/ep/ep_buffer.xc
View File

@@ -21,7 +21,7 @@
#if( 0 < HID_CONTROLS ) #if( 0 < HID_CONTROLS )
#include "user_hid.h" #include "user_hid.h"
unsigned char g_hidData[1] = {0}; unsigned char g_hidData[HID_DATA_BYTES] = {0};
#endif #endif
void GetADCCounts(unsigned samFreq, int &min, int &mid, int &max); void GetADCCounts(unsigned samFreq, int &min, int &mid, int &max);
@@ -880,7 +880,7 @@ void XUA_Buffer_Ep(register chanend c_aud_out,
case XUD_SetData_Select(c_hid, ep_hid, result): case XUD_SetData_Select(c_hid, ep_hid, result):
{ {
g_hidData[0]=0; g_hidData[0]=0;
g_hidData[0]=UserHIDGetData(); UserHIDGetData(g_hidData);
XUD_SetReady_In(ep_hid, g_hidData, 1); XUD_SetReady_In(ep_hid, g_hidData, 1);
} }
break; break;

41
lib_xua/src/core/user/hid/user_hid.h
View File

@@ -3,7 +3,13 @@
#ifndef __USER_HID_H__ #ifndef __USER_HID_H__
#define __USER_HID_H__ #define __USER_HID_H__
/* These enumerated constants relate to the HID report desc - do not mod */ /**
* \brief HID event identifiers
*
* This enumeration defines a constant value for each HID event.
* It defines one value for each of the four GPI pins supported in the standard voice products.
* It defines a further 28 values for generic events.
*/
typedef enum hidEventId_t { typedef enum hidEventId_t {
HID_EVENT_ID_GPI0 = 0, HID_EVENT_ID_GPI0 = 0,
HID_EVENT_ID_GPI1, HID_EVENT_ID_GPI1,
@@ -39,13 +45,40 @@ typedef enum hidEventId_t {
HID_EVENT_ID_EVT27 HID_EVENT_ID_EVT27
} hidEventId_t; } hidEventId_t;
#define HID_DATA_SIZE 1 #define HID_DATA_BYTES 4
#if( 0 < HID_CONTROLS ) #if( 0 < HID_CONTROLS )
unsigned UserHIDGetData( void ); /**
* \brief Get the data for the next HID report
*
* \note This function returns the HID data as a list of unsigned char because the
* \c XUD_SetReady_In() accepts data for transmission to the USB Host using
* this type.
*
* \param{out} hidData The HID data
*/
void UserHIDGetData( unsigned char hidData[ HID_DATA_BYTES ]);
/**
* \brief Initialize HID processing
*/
void UserHIDInit( void ); void UserHIDInit( void );
void UserHIDRegisterEvent( const hidEventId_t hidEventId, const int * hidEventData, const unsigned hidEventDataSize );
/**
* \brief Record that a HID event has occurred
*
* \param{in} hidEventId The identifier of an event which has occurred
* \param{in} hidEventData A list of data associated with the event
* \param{in} hidEventDataSize The length of the event data list
*
* \note At present, this function only takes a single element of event data, i.e.
* hidEventDataSize must equal 1.
*
* \note At present, this function treats the event data as a Boolean flag.
* Zero means False; all other values mean True.
*/
void UserHIDRecordEvent( const hidEventId_t hidEventId, const int * hidEventData, const unsigned hidEventDataSize );
#endif /* ( 0 < HID_CONTROLS ) */ #endif /* ( 0 < HID_CONTROLS ) */
#endif /* __USER_HID_H__ */ #endif /* __USER_HID_H__ */