From c60da7fd82d393b7c0a86141483c5318a3b5fa4c Mon Sep 17 00:00:00 2001 From: Angel Cascarino Date: Tue, 11 Jan 2022 17:57:18 +0000 Subject: [PATCH] Reversed renaming function to avoid upversioning --- lib_xua/src/core/buffer/ep/ep_buffer.xc | 2 +- lib_xua/src/hid/hid_report.c | 2 +- lib_xua/src/hid/xua_hid_report.h | 2 +- .../src/test_multi_report/test_hid_multi_report.c | 2 +- tests/xua_unit_tests/src/test_simple/test_hid.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib_xua/src/core/buffer/ep/ep_buffer.xc b/lib_xua/src/core/buffer/ep/ep_buffer.xc index f6165f04..fa79f198 100644 --- a/lib_xua/src/core/buffer/ep/ep_buffer.xc +++ b/lib_xua/src/core/buffer/ep/ep_buffer.xc @@ -901,7 +901,7 @@ void XUA_Buffer_Ep(register chanend c_aud_out, unsigned reportTime; tmr :> reportTime; - for(unsigned id = hidAreReportIdsInUse(); id < hidGetReportIdLimit(); ++id) { + for(unsigned id = hidIsReportIdInUse(); id < hidGetReportIdLimit(); ++id) { if(0U == id || (hidIsChangePending(id) || !HidIsSetIdleSilenced(id))) { hidCaptureReportTime(id, reportTime); int hidDataLength = (int) UserHIDGetData(id, g_hidData); diff --git a/lib_xua/src/hid/hid_report.c b/lib_xua/src/hid/hid_report.c index b6ab341d..02c8122c 100644 --- a/lib_xua/src/hid/hid_report.c +++ b/lib_xua/src/hid/hid_report.c @@ -136,7 +136,7 @@ static unsigned hidGetUsagePage( const unsigned id ); */ static size_t hidTranslateItem( const USB_HID_Short_Item_t* inPtr, unsigned char** outPtrPtr ); -unsigned hidAreReportIdsInUse ( void ) { +unsigned hidIsReportIdInUse ( void ) { return !hidIsReportIdValid(0U); } diff --git a/lib_xua/src/hid/xua_hid_report.h b/lib_xua/src/hid/xua_hid_report.h index 58c45b3c..24ed3e8e 100644 --- a/lib_xua/src/hid/xua_hid_report.h +++ b/lib_xua/src/hid/xua_hid_report.h @@ -124,7 +124,7 @@ typedef struct * @retval 1 Report IDs are in use * @retval 0 Report IDs are not in use */ -unsigned hidAreReportIdsInUse ( void ); +unsigned hidIsReportIdInUse ( void ); /** * \brief Register that a previously changed HID Report data has been sent diff --git a/tests/xua_unit_tests/src/test_multi_report/test_hid_multi_report.c b/tests/xua_unit_tests/src/test_multi_report/test_hid_multi_report.c index a024dcda..d5f01760 100644 --- a/tests/xua_unit_tests/src/test_multi_report/test_hid_multi_report.c +++ b/tests/xua_unit_tests/src/test_multi_report/test_hid_multi_report.c @@ -59,7 +59,7 @@ void test_validate_report( void ) { } void test_reportid_in_use( void ) { - unsigned reportIdInUse = hidAreReportIdsInUse(); + unsigned reportIdInUse = hidIsReportIdInUse(); TEST_ASSERT_EQUAL_UINT( 1, reportIdInUse ); } diff --git a/tests/xua_unit_tests/src/test_simple/test_hid.c b/tests/xua_unit_tests/src/test_simple/test_hid.c index f530efc7..3bd930bc 100644 --- a/tests/xua_unit_tests/src/test_simple/test_hid.c +++ b/tests/xua_unit_tests/src/test_simple/test_hid.c @@ -46,7 +46,7 @@ void test_validate_report( void ) { } void test_reportid_in_use( void ) { - unsigned reportIdInUse = hidAreReportIdsInUse(); + unsigned reportIdInUse = hidIsReportIdInUse(); TEST_ASSERT_EQUAL_UINT( 0, reportIdInUse ); }