Skip to content

Commit

Permalink
Merge pull request #7 from weston-embedded/release/v3.42.01
Browse files Browse the repository at this point in the history 
Release/v3.42.01
  • Loading branch information
@wes-jmagasrevy
wes-jmagasrevy authored May 20, 2021
2 parents d654468 + 224c548 commit 3ae4a7e
Show file tree
Hide file tree
Showing 62 changed files with 345 additions and 168 deletions.
2 changes: 1 addition & 1 deletion App/CDC/app_usbh_cdc_acm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* TEMPLATE
*
* Filename : app_usbh_cdc_acm.c
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
2 changes: 1 addition & 1 deletion App/CDC/app_usbh_cdc_acm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* TEMPLATE
*
* Filename : app_usbh_cdc_acm.c
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
2 changes: 1 addition & 1 deletion App/FTDI/app_usbh_ftdi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* TEMPLATE
*
* Filename : app_usbh_ftdi.c
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
2 changes: 1 addition & 1 deletion App/FTDI/app_usbh_ftdi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* TEMPLATE
*
* Filename : app_usbh_ftdi.h
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
2 changes: 1 addition & 1 deletion App/HID/app_usbh_hid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* TEMPLATE
*
* Filename : app_usbh_hid_demo.c
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
2 changes: 1 addition & 1 deletion App/HID/app_usbh_hid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* TEMPLATE
*
* Filename : app_usbh_hid.h
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
2 changes: 1 addition & 1 deletion App/HID/app_usbh_keyboard.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* TEMPLATE
*
* Filename : app_usbh_keyboard.c
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
2 changes: 1 addition & 1 deletion App/HID/app_usbh_keyboard.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* TEMPLATE
*
* Filename : app_usbh_keyboard.h
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
2 changes: 1 addition & 1 deletion App/HID/app_usbh_mouse.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* TEMPLATE
*
* Filename : app_usbh_mouse.c
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
2 changes: 1 addition & 1 deletion App/HID/app_usbh_mouse.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* TEMPLATE
*
* Filename : app_usbh_mouse.h
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
2 changes: 1 addition & 1 deletion App/MSC/uC-FS-V4/app_usbh_msc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* TEMPLATE
*
* Filename : app_usbh_msc.c
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
2 changes: 1 addition & 1 deletion App/MSC/uC-FS-V4/app_usbh_msc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* TEMPLATE
*
* Filename : app_usbh_msc.h
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
2 changes: 1 addition & 1 deletion App/Test/app_usbh_msc_stress.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* TEMPLATE
*
* Filename : app_usbh_msc.c
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
2 changes: 1 addition & 1 deletion App/Test/app_usbh_msc_stress.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* TEMPLATE
*
* Filename : app_usbh_msc.h
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
2 changes: 1 addition & 1 deletion App/app_usbh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
*
* Filename : app_usbh.c
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
2 changes: 1 addition & 1 deletion App/app_usbh.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
*
* Filename : app_usbh.h
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
4 changes: 2 additions & 2 deletions Cfg/Template/usbh_cfg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* uC/USB-Host
* The Embedded USB Host Stack
*
* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com
* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
Expand All @@ -20,7 +20,7 @@
* USB HOST STACK CONFIGURATION
*
* Filename : usbh_cfg.h
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
4 changes: 2 additions & 2 deletions Cfg/Template/usbh_hc_cfg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* uC/USB-Host
* The Embedded USB Host Stack
*
* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com
* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
Expand All @@ -22,7 +22,7 @@
* TEMPLATE
*
* Filename : usbh_hc_cfg.c
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
4 changes: 2 additions & 2 deletions Cfg/Template/usbh_hc_cfg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* uC/USB-Host
* The Embedded USB Host Stack
*
* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com
* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
Expand All @@ -22,7 +22,7 @@
* TEMPLATE
*
* Filename : usbh_hc_cfg.h
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
4 changes: 2 additions & 2 deletions Class/CDC/ACM/usbh_acm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* uC/USB-Host
* The Embedded USB Host Stack
*
* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com
* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
Expand All @@ -21,7 +21,7 @@
* ABSTRACT CONTROL MODEL (ACM)
*
* Filename : usbh_acm.c
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
4 changes: 2 additions & 2 deletions Class/CDC/ACM/usbh_acm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* uC/USB-Host
* The Embedded USB Host Stack
*
* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com
* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
Expand All @@ -21,7 +21,7 @@
* ABSTRACT CONTROL MODEL (ACM)
*
* Filename : usbh_acm.h
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
4 changes: 2 additions & 2 deletions Class/CDC/usbh_cdc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* uC/USB-Host
* The Embedded USB Host Stack
*
* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com
* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
Expand All @@ -20,7 +20,7 @@
* COMMUNICATIONS DEVICE CLASS (CDC)
*
* Filename : usbh_cdc.c
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
4 changes: 2 additions & 2 deletions Class/CDC/usbh_cdc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* uC/USB-Host
* The Embedded USB Host Stack
*
* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com
* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
Expand All @@ -20,7 +20,7 @@
* COMMUNICATIONS DEVICE CLASS (CDC)
*
* Filename : usbh_cdc.h
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down
4 changes: 2 additions & 2 deletions Class/FTDI/usbh_ftdi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* uC/USB-Host
* The Embedded USB Host Stack
*
* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com
* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
Expand All @@ -20,7 +20,7 @@
* FUTURE TECHNOLOGY DEVICES INTERNATIONAL CLASS
*
* Filename : usbh_ftdi.c
* Version : V3.42.00
* Version : V3.42.01
* Note(s) : The reference document "API for FTxxxx Devices Application Note AN_115" can be
* requested from FTDI after signing a Non-Disclosure Agreement (NDA).
*********************************************************************************************************
Expand Down
4 changes: 2 additions & 2 deletions Class/FTDI/usbh_ftdi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* uC/USB-Host
* The Embedded USB Host Stack
*
* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com
* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
Expand All @@ -20,7 +20,7 @@
* FUTURE TECHNOLOGY DEVICES INTERNATIONAL CLASS
*
* Filename : usbh_ftdi.h
* Version : V3.42.00
* Version : V3.42.01
* Note(s) : (1) The reference document "API for FTxxxx Devices Application Note AN_115" can be
* requested from FTDI after signing a Non-Disclosure Agreement (NDA).
*********************************************************************************************************
Expand Down
5 changes: 2 additions & 3 deletions Class/HID/usbh_hid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* uC/USB-Host
* The Embedded USB Host Stack
*
* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com
* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
Expand All @@ -20,7 +20,7 @@
* HUMAN INTERFACE DEVICE CLASS
*
* Filename : usbh_hid.c
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down Expand Up @@ -1514,7 +1514,6 @@ static USBH_ERR USBH_HID_DevLock (USBH_HID_DEV *p_hid_dev)
(void)USBH_OS_MutexUnlock(p_hid_dev->HMutex);
return (USBH_ERR_DEV_NOT_READY);
}
(void)USBH_OS_MutexUnlock(p_hid_dev->HMutex);

return (USBH_ERR_NONE);
}
Expand Down
5 changes: 3 additions & 2 deletions Class/HID/usbh_hid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* uC/USB-Host
* The Embedded USB Host Stack
*
* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com
* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
Expand All @@ -20,7 +20,7 @@
* HUMAN INTERFACE DEVICE CLASS
*
* Filename : usbh_hid.h
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down Expand Up @@ -522,6 +522,7 @@ typedef struct usbh_hid_dev {
CPU_INT08U NbrAppColl; /* Nbr of app coll in main item. */
USBH_HID_APP_COLL AppColl[USBH_HID_CFG_MAX_NBR_APP_COLL];/* App coll in main item. */
CPU_INT08U NbrReportID; /* Tot nbr of report ID. */
CPU_BOOLEAN IsReportID_Present; /* Indicate if report ID tag is present. */

/* Report ID of all colls. */
USBH_HID_REPORT_ID ReportID[USBH_HID_CFG_MAX_NBR_REPORT_ID];
Expand Down
7 changes: 5 additions & 2 deletions Class/HID/usbh_hidparser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* uC/USB-Host
* The Embedded USB Host Stack
*
* Copyright 2004-2020 Silicon Laboratories Inc. www.silabs.com
* Copyright 2004-2021 Silicon Laboratories Inc. www.silabs.com
*
* SPDX-License-Identifier: APACHE-2.0
*
Expand All @@ -20,7 +20,7 @@
* HUMAN INTERFACE DEVICE CLASS PARSER
*
* Filename : usbh_hidparser.c
* Version : V3.42.00
* Version : V3.42.01
*********************************************************************************************************
*/

Expand Down Expand Up @@ -1038,6 +1038,9 @@ static USBH_ERR USBH_HID_AddReport (USBH_HID_DEV *p_hid_dev,

/* ----------------- INITIALIZE REPORT ---------------- */
USBH_HID_InitReport(p_parser, p_report_new);
if (p_report_new->ReportID != 0u) {
p_hid_dev->IsReportID_Present = DEF_TRUE;
}

/* ------------------ VALIDATE REPORT ----------------- */
err = USBH_HID_ValidateReport(p_report_new);
Expand Down
Loading

0 comments on commit 3ae4a7e

Please sign in to comment.