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

Add explicit initialization of static variables in hid_report.c

Browse Source
This commit is contained in:
mbanth
2021-12-09 16:15:29 +00:00
parent 26cac1abb1
commit 2b5dab51b5
4 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib_xua/src/core/endpoint0/xua_endpoint0.c
View File

@@ -525,6 +525,7 @@ void XUA_Endpoint0_init(chanend c_ep0_out, chanend c_ep0_in, NULLABLE_RESOURCE(c
#endif #endif
#if( 0 < HID_CONTROLS ) #if( 0 < HID_CONTROLS )
hidReportInit();
hidPrepareReportDescriptor(); hidPrepareReportDescriptor();
size_t hidReportDescriptorLength = hidGetReportDescriptorLength(); size_t hidReportDescriptorLength = hidGetReportDescriptorLength();

21
lib_xua/src/hid/hid_report.c
View File

@@ -16,15 +16,15 @@
/* /*
* Each element in s_hidChangePending corresponds to an element in hidReports. * Each element in s_hidChangePending corresponds to an element in hidReports.
*/ */
static unsigned s_hidChangePending[ HID_REPORT_COUNT ] = { 0U }; static unsigned s_hidChangePending[ HID_REPORT_COUNT ];
static unsigned char s_hidReportDescriptor[ HID_REPORT_DESCRIPTOR_MAX_LENGTH ]; static unsigned char s_hidReportDescriptor[ HID_REPORT_DESCRIPTOR_MAX_LENGTH ];
static size_t s_hidReportDescriptorLength = 0U; static size_t s_hidReportDescriptorLength;
static unsigned s_hidReportDescriptorPrepared = 0U; static unsigned s_hidReportDescriptorPrepared;
static unsigned s_hidCurrentPeriod[ HID_REPORT_COUNT ] = { ENDPOINT_INT_INTERVAL_IN_HID * MS_IN_TICKS }; static unsigned s_hidCurrentPeriod[ HID_REPORT_COUNT ];
static unsigned s_hidIdleActive[ HID_REPORT_COUNT ] = { 0U }; static unsigned s_hidIdleActive[ HID_REPORT_COUNT ];
static unsigned s_hidNextReportTime[ HID_REPORT_COUNT ] = { 0U }; static unsigned s_hidNextReportTime[ HID_REPORT_COUNT ];
static unsigned s_hidReportTime[ HID_REPORT_COUNT ] = { 0U }; static unsigned s_hidReportTime[ HID_REPORT_COUNT ];
/** /**
* @brief Get the bit position from the location of a report element * @brief Get the bit position from the location of a report element
@@ -362,6 +362,13 @@ void hidPrepareReportDescriptor( void )
} }
} }
void hidReportInit( void )
{
for( unsigned idx = 0U; idx < HID_REPORT_COUNT; ++idx ) {
s_hidCurrentPeriod[ idx ] = ENDPOINT_INT_INTERVAL_IN_HID * MS_IN_TICKS;
}
}
void hidResetReportDescriptor( void ) void hidResetReportDescriptor( void )
{ {
s_hidReportDescriptorPrepared = 0U; s_hidReportDescriptorPrepared = 0U;

7
lib_xua/src/hid/xua_hid_report.h
View File

@@ -350,6 +350,13 @@ unsigned hidIsIdleActive( const unsigned id );
*/ */
void hidPrepareReportDescriptor( void ); void hidPrepareReportDescriptor( void );
/**
* @brief Initialise the USB HID Report functionality
*
* Call this function before using any other functions in this API.
*/
void hidReportInit( void );
/** /**
* @brief Reset the USB HID Report descriptor * @brief Reset the USB HID Report descriptor
* *

6
tests/xua_unit_tests/src/test_hid.c
View File

@@ -45,6 +45,7 @@ void test_unprepared_hidGetReportDescriptor( void )
void test_prepared_hidGetReportDescriptor( void ) void test_prepared_hidGetReportDescriptor( void )
{ {
hidReportInit();
hidPrepareReportDescriptor(); hidPrepareReportDescriptor();
unsigned char* reportDescPtr = hidGetReportDescriptor(); unsigned char* reportDescPtr = hidGetReportDescriptor();
TEST_ASSERT_NOT_NULL( reportDescPtr ); TEST_ASSERT_NOT_NULL( reportDescPtr );
@@ -55,6 +56,7 @@ void test_prepared_hidGetReportDescriptor( void )
void test_reset_unprepared_hidGetReportDescriptor( void ) void test_reset_unprepared_hidGetReportDescriptor( void )
{ {
hidReportInit();
hidPrepareReportDescriptor(); hidPrepareReportDescriptor();
hidResetReportDescriptor(); hidResetReportDescriptor();
unsigned char* reportDescPtr = hidGetReportDescriptor(); unsigned char* reportDescPtr = hidGetReportDescriptor();
@@ -63,6 +65,7 @@ void test_reset_unprepared_hidGetReportDescriptor( void )
void test_reset_prepared_hidGetReportDescriptor( void ) void test_reset_prepared_hidGetReportDescriptor( void )
{ {
hidReportInit();
hidPrepareReportDescriptor(); hidPrepareReportDescriptor();
hidResetReportDescriptor(); hidResetReportDescriptor();
hidPrepareReportDescriptor(); hidPrepareReportDescriptor();
@@ -404,6 +407,7 @@ void test_initial_modification_with_subsequent_preparation( void )
const unsigned char header = construct_usage_header( sizeof data / sizeof( unsigned char )); const unsigned char header = construct_usage_header( sizeof data / sizeof( unsigned char ));
const unsigned char page = CONSUMER_CONTROL_PAGE; const unsigned char page = CONSUMER_CONTROL_PAGE;
hidReportInit();
unsigned retVal = hidSetReportItem( byte, bit, page, header, data ); unsigned retVal = hidSetReportItem( byte, bit, page, header, data );
TEST_ASSERT_EQUAL_UINT( HID_STATUS_GOOD, retVal ); TEST_ASSERT_EQUAL_UINT( HID_STATUS_GOOD, retVal );
@@ -484,6 +488,7 @@ void test_initial_modification_with_subsequent_verification_2( void )
void test_modification_without_subsequent_preparation( void ) void test_modification_without_subsequent_preparation( void )
{ {
hidReportInit();
hidPrepareReportDescriptor(); hidPrepareReportDescriptor();
unsigned char* reportDescPtr = hidGetReportDescriptor(); unsigned char* reportDescPtr = hidGetReportDescriptor();
TEST_ASSERT_NOT_NULL( reportDescPtr ); TEST_ASSERT_NOT_NULL( reportDescPtr );
@@ -504,6 +509,7 @@ void test_modification_without_subsequent_preparation( void )
void test_modification_with_subsequent_preparation( void ) void test_modification_with_subsequent_preparation( void )
{ {
hidReportInit();
hidPrepareReportDescriptor(); hidPrepareReportDescriptor();
unsigned char* reportDescPtr = hidGetReportDescriptor(); unsigned char* reportDescPtr = hidGetReportDescriptor();
TEST_ASSERT_NOT_NULL( reportDescPtr ); TEST_ASSERT_NOT_NULL( reportDescPtr );