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

Add explicit reset

Browse Source
This commit is contained in:
mbanth
2021-05-27 11:54:31 +01:00
parent 3c129ab521
commit 8a9d8cdd3e
2 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib_xua/src/hid/hid_report_descriptor.c
View File

@@ -143,9 +143,17 @@ void hidPrepareReportDescriptor( void )
} }
} }
void hidResetReportDescriptor( void )
{
hidReportDescriptorPrepared = 0;
}
unsigned hidSetReportItem( const unsigned byte, const unsigned bit, const unsigned char header, const unsigned char data[] ) unsigned hidSetReportItem( const unsigned byte, const unsigned bit, const unsigned char header, const unsigned char data[] )
{ {
unsigned retVal = HID_STATUS_BAD_LOCATION; unsigned retVal = HID_STATUS_IN_USE;
if( !hidReportDescriptorPrepared ) {
retVal = HID_STATUS_BAD_LOCATION;
unsigned bSize = hidGetItemSize( header ); unsigned bSize = hidGetItemSize( header );
unsigned bTag = hidGetItemTag ( header ); unsigned bTag = hidGetItemTag ( header );
unsigned bType = hidGetItemType( header ); unsigned bType = hidGetItemType( header );
@@ -168,11 +176,11 @@ unsigned hidSetReportItem( const unsigned byte, const unsigned bit, const unsign
} }
*hidConfigurableItems[ itemIdx ] = item; *hidConfigurableItems[ itemIdx ] = item;
hidReportDescriptorPrepared = 0;
retVal = HID_STATUS_GOOD; retVal = HID_STATUS_GOOD;
} }
} }
} }
}
return retVal; return retVal;
} }

15
lib_xua/src/hid/xua_hid_report_descriptor.h
View File

@@ -4,7 +4,8 @@
/** /**
* @brief Human Interface Device (HID) Report descriptor * @brief Human Interface Device (HID) Report descriptor
* *
* This file defines the structure and default content of the HID Report descriptor. * This file defines the structure of the HID Report descriptor and decalres
* functions for manipulating it.
* Document section numbers refer to the HID Device Class Definition, version 1.11. * Document section numbers refer to the HID Device Class Definition, version 1.11.
*/ */
@@ -34,6 +35,7 @@
#define HID_STATUS_GOOD ( 0 ) #define HID_STATUS_GOOD ( 0 )
#define HID_STATUS_BAD_HEADER ( 1 ) #define HID_STATUS_BAD_HEADER ( 1 )
#define HID_STATUS_BAD_LOCATION ( 2 ) #define HID_STATUS_BAD_LOCATION ( 2 )
#define HID_STATUS_IN_USE ( 3 )
/** /**
* @brief USB HID Report Descriptor. Short Item * @brief USB HID Report Descriptor. Short Item
@@ -84,11 +86,19 @@ size_t hidGetReportDescriptorLength( void );
* @brief Prepare the USB HID Report descriptor * @brief Prepare the USB HID Report descriptor
* *
* After preparation, \c hidGetReportDescriptor() returns a list suitablefor transmission over USB. * After preparation, \c hidGetReportDescriptor() returns a list suitablefor transmission over USB.
*
* Call this function after altering one or more Report Items using \c hidSetReportItem(). * Call this function after altering one or more Report Items using \c hidSetReportItem().
*/ */
void hidPrepareReportDescriptor( void ); void hidPrepareReportDescriptor( void );
/**
* @brief Reset the USB HID Report descriptor
*
* After reset, \c hidGetReportDescriptor() returns NULL until a subsequent call to
* \c hidPrepareReportDescriptor() occurs.
* Call this function before altering one or more Report Items using \c hidSetReportItem().
*/
void hidResetReportDescriptor( void );
/** /**
* @brief Modify a HID Report descriptor item * @brief Modify a HID Report descriptor item
* *
@@ -109,6 +119,7 @@ void hidPrepareReportDescriptor( void );
* a Tag or Type inconsistent with a Usage Item * a Tag or Type inconsistent with a Usage Item
* @retval \c HID_STATUS_BAD_LOCATION The \a bit or \a byte arguments specify a location outside * @retval \c HID_STATUS_BAD_LOCATION The \a bit or \a byte arguments specify a location outside
* of the HID Report * of the HID Report
* @retval \c HID_STATUS_IN_USE The Report descriptor is in use
*/ */
unsigned hidSetReportItem( const unsigned byte, const unsigned bit, const unsigned char header, const unsigned char data[] ); unsigned hidSetReportItem( const unsigned byte, const unsigned bit, const unsigned char header, const unsigned char data[] );