Skip to content

Commit e345542

Browse files
authored
Merge pull request #12978 from vmedcy/pr-dev/pdl-1.5.2
Update psoc6pdl to v1.5.2
2 parents 475621c + 0fa5e32 commit e345542

File tree

24 files changed

+461
-50214
lines changed

24 files changed

+461
-50214
lines changed
Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,34 @@
1-
# PSoC 6 Peripheral Driver Library v1.5.1
1+
# PSoC 6 Peripheral Driver Library v1.5.2
22

3-
Please refer to the [README.md](./README.md) and the [PDL API Reference Manual](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/index.html) for a complete description of the Peripheral Driver Library.
3+
Please refer to the [README.md](./README.md) and the
4+
[PDL API Reference Manual](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/index.html)
5+
for a complete description of the Peripheral Driver Library.
46

5-
### New Features
7+
## New Features
68

7-
* New ECO calculation algorithm
9+
* No new features
810

9-
### Updated Personalities
11+
## Updated Personalities
1012

11-
* ECO 2.0 - added new parameter C0; narrowed the frequency range to 16..35 MHz; updated the calculation algorithm per ECO Trimming section of the device TRM.
13+
* WiFi - Fix build warning in the generated code. Minor parameter name updates.
1214

13-
### Updated Drivers
15+
## Updated Drivers
1416

15-
* [SysClk 2.0](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__sysclk.html)
17+
* [SD Host 1.50](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__sd__host.html)
18+
* [CTB 1.10.2](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__ctb.html)
19+
* [SysLib 2.50.3](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__syslib.html)
1620

17-
### Known Issues
21+
## Known Issues
1822

19-
None
23+
See the Known Issues section of
24+
[SysLib](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/group__group__syslib.html)
25+
driver.
2026

21-
### Defect Fixes
27+
## Defect Fixes
2228

2329
See the Changelog section of each Driver in the [PDL API Reference](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/modules.html) for all fixes and updates.
2430

25-
### Supported Software and Tools
31+
## Supported Software and Tools
2632

2733
This version of PDL was validated for compatibility with the following Software and Tools:
2834

@@ -36,7 +42,7 @@ This version of PDL was validated for compatibility with the following Software
3642
| ARM Compiler 6 | 6.13 |
3743
| FreeRTOS | 10.0.1 |
3844

39-
### More information
45+
## More information
4046

4147
* [Peripheral Driver Library README.md](./README.md)
4248
* [Peripheral Driver Library API Reference Manual](https://cypresssemiconductorco.github.io/psoc6pdl/pdl_api_reference_manual/html/index.html)
@@ -46,6 +52,6 @@ This version of PDL was validated for compatibility with the following Software
4652
* [PSoC 6 Technical Reference Manuals](https://www.cypress.com/search/all/PSoC%206%20Technical%20Reference%20Manual?f%5b0%5d=meta_type%3Atechnical_documents&f%5b1%5d=resource_meta_type%3A583)
4753
* [PSoC 6 MCU Datasheets](https://www.cypress.com/search/all?f%5b0%5d=meta_type%3Atechnical_documents&f%5b1%5d=resource_meta_type%3A575&f%5b2%5d=field_related_products%3A114026)
4854
* [Cypress Semiconductor](http://www.cypress.com)
49-
55+
5056
---
5157
© Cypress Semiconductor Corporation, 2020.

targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/devices/include/psoc6a256k.h

Lines changed: 0 additions & 1197 deletions
This file was deleted.

targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/drivers/include/cy_ctb.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/***************************************************************************//**
22
* \file cy_ctb.h
3-
* \version 1.10.1
3+
* \version 1.10.2
44
*
55
* Header file for the CTB driver
66
*
77
********************************************************************************
88
* \copyright
9-
* Copyright 2017-2019 Cypress Semiconductor Corporation
9+
* Copyright 2017-2020 Cypress Semiconductor Corporation
1010
* SPDX-License-Identifier: Apache-2.0
1111
*
1212
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -287,6 +287,12 @@
287287
* <table class="doxtable">
288288
* <tr><th>Version</th><th>Changes</th><th>Reason for Change</th></tr>
289289
* <tr>
290+
* <td>1.10.2</td>
291+
* <td>The \ref Cy_CTB_Init function description is expanded with a
292+
* clarification note.</td>
293+
* <td>Documentation enhancement based on a usability feedback.</td>
294+
* </tr>
295+
* <tr>
290296
* <td>1.10.1</td>
291297
* <td>Added header guard CY_IP_MXS40PASS to the source file.</td>
292298
* <td>To enable the PDL compilation with wounded out IP blocks.</td>

targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/drivers/include/cy_sd_host.h

Lines changed: 374 additions & 355 deletions
Large diffs are not rendered by default.

targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/drivers/include/cy_syslib.h

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***************************************************************************//**
22
* \file cy_syslib.h
3-
* \version 2.50.2
3+
* \version 2.50.3
44
*
55
* Provides an API declaration of the SysLib driver.
66
*
@@ -28,9 +28,9 @@
2828
* The system libraries provide APIs that can be called in the user application
2929
* to handle the timing, logical checking or register.
3030
*
31-
* The functions and other declarations used in this driver are in cy_syslib.h.
32-
* You can include cy_pdl.h (ModusToolbox only) to get access to all functions
33-
* and declarations in the PDL.
31+
* The functions and other declarations used in this driver are in cy_syslib.h.
32+
* You can include cy_pdl.h (ModusToolbox only) to get access to all functions
33+
* and declarations in the PDL.
3434
*
3535
* The SysLib driver contains a set of different system functions. These functions
3636
* can be called in the application routine. Major features of the system library:
@@ -62,7 +62,7 @@
6262
* name and line number of the ASSERT into global variables, cy_assertFileName
6363
* and cy_assertLine . It then calls the Cy_SysLib_Halt() function.
6464
* \note Firmware can redefine the Cy_SysLib_AssertFailed() function for custom processing.
65-
*
65+
*
6666
* The PDL source code uses this assert mechanism extensively. It is recommended
6767
* that you enable asserts when debugging firmware. \n
6868
* <b> Assertion Classes and Levels </b> <br />
@@ -89,15 +89,15 @@
8989
* </table>
9090
* Firmware defines which ASSERT class is enabled by defining CY_ASSERT_LEVEL.
9191
* This is a compiler command line argument, similar to how the DEBUG / NDEBUG
92-
* macro is passed. \n
92+
* macro is passed. \n
9393
* Enabling any class also enables any lower-numbered class.
9494
* CY_ASSERT_CLASS_3 is the default level, and it enables asserts for all three
9595
* classes. The following example shows the command-line option to enable all
9696
* the assert levels:
9797
* \code -D CY_ASSERT_LEVEL=CY_ASSERT_CLASS_3 \endcode
9898
* \note The use of special characters, such as spaces, parenthesis, etc. must
99-
* be protected with quotes.
100-
*
99+
* be protected with quotes.
100+
*
101101
* After CY_ASSERT_LEVEL is defined, firmware can use
102102
* one of the three level macros to make an assertion. For example, if the
103103
* parameter can vary between devices, firmware uses the L1 macro.
@@ -135,19 +135,38 @@
135135
* </tr>
136136
* </table>
137137
*
138+
* \section group_syslib_errata Known Issues
139+
*
140+
* <table class="doxtable">
141+
* <tr><th>Issue</th><th>Workaround</th></tr>
142+
* <tr>
143+
* <td>The function malloc() does not return an error when the allocation
144+
* size is bigger than the heap size.
145+
* </td>
146+
* <td>PDL does not implement the _sbrk function. The user needs to add
147+
* custom _sbrk function.
148+
* </td>
149+
* </tr>
150+
* </table>
151+
*
138152
* \section group_syslib_changelog Changelog
139153
* <table class="doxtable">
140154
* <tr><th>Version</th><th>Changes</th><th>Reason for Change</th></tr>
141155
* <tr>
156+
* <td>2.50.3</td>
157+
* <td>Add section Known Issues
158+
* <td>Documentation update and clarification.</td>
159+
* </tr>
160+
* <tr>
142161
* <td>2.50.1</td>
143162
* <td>Used the core library defines for the message codes forming.
144163
* <td>Improve PDL code base.</td>
145164
* </tr>
146165
* <tr>
147166
* <td>2.50</td>
148-
* <td>Moved following macros to the core library:
149-
* CY_LO8,CY_HI8,CY_LO16,CY_HI16,CY_SWAP_ENDIAN16,CY_SWAP_ENDIAN32,
150-
* CY_SWAP_ENDIAN64,CY_GET_REG8,CY_SET_REG8,CY_GET_REG16,CY_SET_REG16,
167+
* <td>Moved following macros to the core library:
168+
* CY_LO8,CY_HI8,CY_LO16,CY_HI16,CY_SWAP_ENDIAN16,CY_SWAP_ENDIAN32,
169+
* CY_SWAP_ENDIAN64,CY_GET_REG8,CY_SET_REG8,CY_GET_REG16,CY_SET_REG16,
151170
* CY_GET_REG24,CY_SET_REG24,CY_GET_REG32,CY_SET_REG32,_CLR_SET_FLD32U,
152171
* CY_REG32_CLR_SET,_CLR_SET_FLD16U,CY_REG16_CLR_SET,_CLR_SET_FLD8U,
153172
* CY_REG8_CLR_SET,_BOOL2FLD,_FLD2BOOL,CY_SYSLIB_DIV_ROUND,
@@ -204,7 +223,7 @@
204223
* <tr>
205224
* <td>Added register access layer. Use register access macros instead
206225
* of direct register access using dereferenced pointers.</td>
207-
* <td>Makes register access device-independent, so that the PDL does
226+
* <td>Makes register access device-independent, so that the PDL does
208227
* not need to be recompiled for each supported part number.</td>
209228
* </tr>
210229
* <tr>
@@ -526,7 +545,7 @@ typedef double float64_t; /**< Specific-length typedef for the basic numerical
526545
* Defines for the Assert Classes and Levels
527546
*/
528547

529-
/**
548+
/**
530549
* Class 1 - The highest class, safety-critical functions which rely on parameters that could be
531550
* changed between different PSoC devices
532551
*/

targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/drivers/source/cy_ctb.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/***************************************************************************//**
22
* \file cy_ctb.c
3-
* \version 1.10.1
3+
* \version 1.10.2
44
*
55
* \brief
66
* Provides the public functions for the CTB driver.
77
*
88
********************************************************************************
99
* \copyright
10-
* Copyright 2017-2019 Cypress Semiconductor Corporation
10+
* Copyright 2017-2020 Cypress Semiconductor Corporation
1111
* SPDX-License-Identifier: Apache-2.0
1212
*
1313
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -153,6 +153,9 @@ const cy_stc_ctb_fast_config_oa1_t Cy_CTB_Fast_Opamp1_Vdac_Ref_Pin5 =
153153
*
154154
* Initialize or restore the CTB and both opamps according to the
155155
* provided settings. Parameters are usually set only once, at initialization.
156+
*
157+
* \note This function call disables a whole CTB block,
158+
* call \ref Cy_CTB_Enable after this function call.
156159
*
157160
* \param base
158161
* Pointer to structure describing registers

targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/drivers/source/cy_sd_host.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************
22
* \file cy_sd_host.c
3-
* \version 1.40
3+
* \version 1.50
44
*
55
* \brief
66
* This file provides the driver code to the API for the SD Host Controller
@@ -4829,18 +4829,18 @@ uint32_t Cy_SD_Host_GetPresentState(SDHC_Type const *base)
48294829
* \ref Cy_SysPm_CpuEnterDeepSleep : specify \ref CY_SYSPM_DEEPSLEEP as the callback
48304830
* type and call \ref Cy_SysPm_RegisterCallback.
48314831
*
4832-
* \note When waking up from Deep Sleep, the SD Host driver requires up to 100ms
4832+
* \note When waking up from Deep Sleep, the SD Host driver requires up to 1 us
48334833
* for clock stabilization. By default the SD Host driver will wait this length
48344834
* of time on power up. The waiting loop is implemented in this function.
48354835
* If the application is time sensitive this delay can be overridden by the
4836-
* application by defining \ref CY_SD_HOST_CLK_RAMP_UP_TIME_MS_WAKEUP to a lower
4837-
* value. This allows the application to perform other operations while the clock
4836+
* application by defining \ref CY_SD_HOST_CLK_RAMP_UP_TIME_US_WAKEUP.
4837+
* This allows the application to perform other operations while the clock
48384838
* is stabilizing in the background. However, the application must still make sure
48394839
* that the SD Host clock has had time to stabilize before attempting to use the
48404840
* SD card. The recommended way to override the value is to specify this as
4841-
* a custom define on the compiler command line. This can be done by appending
4841+
* a custom define on the compiler command line. This can be done by appending
48424842
* the entry to the DEFINES variable in the application Makefile.
4843-
* Eg: DEFINES+=CY_SD_HOST_CLK_RAMP_UP_TIME_MS_WAKEUP=40.
4843+
* Eg: DEFINES+=CY_SD_HOST_CLK_RAMP_UP_TIME_US_WAKEUP=40.
48444844
*
48454845
* \param callbackParams
48464846
* The pointer to the callback parameters structure
@@ -4894,7 +4894,7 @@ cy_en_syspm_status_t Cy_SD_Host_DeepSleepCallback(cy_stc_syspm_callback_params_t
48944894
Cy_SD_Host_EnableSdClk(locBase);
48954895

48964896
/* Wait for the stable CLK */
4897-
Cy_SysLib_Delay(CY_SD_HOST_CLK_RAMP_UP_TIME_MS_WAKEUP);
4897+
Cy_SysLib_DelayUs(CY_SD_HOST_CLK_RAMP_UP_TIME_US_WAKEUP);
48984898

48994899
ret = CY_SYSPM_SUCCESS;
49004900
}

targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/drivers/source/cy_syslib.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***************************************************************************//**
22
* \file cy_syslib.c
3-
* \version 2.50.2
3+
* \version 2.50.3
44
*
55
* Description:
66
* Provides system API implementation for the SysLib driver.
@@ -71,7 +71,7 @@
7171
* \param milliseconds The number of milliseconds to delay.
7272
*
7373
* \note The function calls \ref Cy_SysLib_DelayCycles() API to generate a delay.
74-
* If the function parameter (milliseconds) is bigger than
74+
* If the function parameter (milliseconds) is bigger than
7575
* CY_DELAY_MS_OVERFLOW constant, then an additional loop runs to prevent
7676
* an overflow in parameter passed to \ref Cy_SysLib_DelayCycles() API.
7777
*
@@ -294,7 +294,7 @@ void Cy_SysLib_ClearResetReason(void)
294294
*/
295295
SRSS_RES_CAUSE = 0xFFFFFFFFU;
296296
SRSS_RES_CAUSE2 = 0xFFFFFFFFU;
297-
297+
298298
if(0U != _FLD2VAL(SRSS_PWR_HIBERNATE_TOKEN, SRSS_PWR_HIBERNATE))
299299
{
300300
/* Clears PWR_HIBERNATE token */
@@ -556,7 +556,7 @@ void Cy_SysLib_SetWaitStates(bool ulpMode, uint32_t clkHfMHz)
556556
waitStates = (clkHfMHz <= cy_device->flashCtlMainWs0Freq) ? 0UL :
557557
((clkHfMHz <= cy_device->flashCtlMainWs1Freq) ? 1UL :
558558
((clkHfMHz <= cy_device->flashCtlMainWs2Freq) ? 2UL :
559-
((clkHfMHz <= cy_device->flashCtlMainWs3Freq) ? 3UL :
559+
((clkHfMHz <= cy_device->flashCtlMainWs3Freq) ? 3UL :
560560
((clkHfMHz <= cy_device->flashCtlMainWs4Freq) ? 4UL : 5UL))));
561561
}
562562

targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/personalities/peripheral/connectivity_wifi-1.0.cypersonality

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@
170170

171171
<!-- TCPKA Offload settings -->
172172
<ParamBool id="tcpkaOffload" name="Enable" group="TCP Keep Alive Offload" default="false" visible="true" editable="true" desc="Enable TCP Keep Alive offload feature." />
173-
<ParamRange id="tcpkaInterval" name="Interval" group="TCP Keep Alive Offload" default="20" min="0" max="65535" resolution="1" visible="`${tcpkaOffload}`" editable="`${tcpkaOffload}`" desc="Interval in seconds between keep alive transmissions." />
174-
<ParamRange id="tcpkaRetryInterval" name="Retry Interval" group="TCP Keep Alive Offload" default="3" min="0" max="65535" resolution="1" visible="`${tcpkaOffload}`" editable="`${tcpkaOffload}`" desc="Interval in seconds to retry a transmission if no keep alive ACK is received." />
173+
<ParamRange id="tcpkaInterval" name="Interval (s)" group="TCP Keep Alive Offload" default="20" min="0" max="65535" resolution="1" visible="`${tcpkaOffload}`" editable="`${tcpkaOffload}`" desc="Interval in seconds between keep alive transmissions." />
174+
<ParamRange id="tcpkaRetryInterval" name="Retry Interval (s)" group="TCP Keep Alive Offload" default="3" min="0" max="65535" resolution="1" visible="`${tcpkaOffload}`" editable="`${tcpkaOffload}`" desc="Interval in seconds to retry a transmission if no keep alive ACK is received." />
175175
<ParamRange id="tcpkaRetryCount" name="Retry Count" group="TCP Keep Alive Offload" default="3" min="0" max="65535" resolution="1" visible="`${tcpkaOffload}`" editable="`${tcpkaOffload}`" desc="Number of retries to send a keep alive if no ACK is received." />
176176
<!-- Up to 4 simultaneous connections -->
177177
<Repeat count="4">
@@ -205,14 +205,14 @@
205205
<ConfigInclude value="cy_lpa_wifi_ol.h" include="true" />
206206
<ConfigInclude value="cy_lpa_wifi_ol_common.h" include="true" />
207207
<ConfigInclude value="cy_lpa_wifi_arp_ol.h" include="`${arpOffload}`" />
208-
<ConfigInclude value="cy_lpa_wifi_pf_ol.h" include="true" />
208+
<ConfigInclude value="cy_lpa_wifi_pf_ol.h" include="`${pktFilterEn}`" />
209209
<ConfigInclude value="cy_lpa_wifi_tko_ol.h" include="`${tcpkaOffload}`" />
210210
<ConfigInclude value="cycfg_pins.h" include="`${hostWake}`" />
211211

212212
<ConfigDefine name="CYCFG_WIFI_HOST_WAKE_ENABLED" public="true" value="(`${hostIRQConnected ? 1 : 0}`u)" include="`${hostWake}`" preventOverride="false" />
213213
<ConfigDefine name="CYCFG_ARP_OL_ENABLED" public="false" value="(1u)" include="`${arpOffload}`" preventOverride="false" />
214214
<ConfigDefine name="CYCFG_PF_OL_ENABLED" public="false" value="(1u)" include="`${pktFilterEn}`" preventOverride="false" />
215-
<ConfigDefine name="CYCFG_TKO_OL_ENABLED" public="false" value="(1u)" include="`${pktFilterEn}`" preventOverride="false" />
215+
<ConfigDefine name="CYCFG_TKO_OL_ENABLED" public="false" value="(1u)" include="`${tcpkaOffload}`" preventOverride="false" />
216216

217217
<!-- HOST_WAKE Pin Configuration -->
218218
<ConfigDefine name="CYCFG_WIFI_HOST_WAKE_GPIO" public="true" value="`${hostIRQConnected ? hostIRQ . &quot;_HAL_PORT_PIN&quot; : &quot;CYHAL_NC_PIN_VALUE&quot;}`" include="`${hostWake}`" preventOverride="false" />
@@ -234,7 +234,7 @@
234234
</ConfigStruct>
235235

236236
<!-- Packet Filter (PF) Offload Configuration -->
237-
<ConfigStruct name="cy_pf_ol_cfg_0" type="cy_pf_ol_cfg_t" const="true" isArray="true" public="false" include="true">
237+
<ConfigStruct name="cy_pf_ol_cfg_0" type="cy_pf_ol_cfg_t" const="true" isArray="true" public="false" include="`${pktFilterEn}`">
238238
<Member name="`${configTLSID}`u" value="{.feature = CY_PF_OL_FEAT_PORTNUM,&#xA;`${longIndent}`.bits = `${filterTLSAllow}``${filterTLSAction eq CY_PF_ACTION_DISCARD ? (&quot; | CY_PF_ACTION_DISCARD&quot;) : (&quot;&quot;)}`,&#xA;`${longIndent}`.id = `${configTLSID}`u,&#xA;`${longIndent}`.u = {&#xA;&#9;`${longIndent}`.pf = {&#xA;`${longIndent}``${longIndent}`.portnum = {.portnum = `${filterTLSPort}`u,&#xA;`${longIndent}``${longIndent}``${longIndent}`.range = 0u,&#xA;`${longIndent}``${longIndent}``${longIndent}`.direction = `${filterTLSDir}`,},&#xA;`${longIndent}``${longIndent}`.proto = `${filterTLSProt}`,&#xA;&#9;&#9;`${longIndent}`},&#xA;&#9;`${longIndent}`},&#xA;`${longIndent}`}" include="`${configTLS}`" />
239239

240240
<Member name="`${configNonTLSID}`u" value="{.feature = CY_PF_OL_FEAT_PORTNUM,&#xA;`${longIndent}`.bits = `${filterNonTLSAllow}``${filterNonTLSAction eq CY_PF_ACTION_DISCARD ? (&quot; | CY_PF_ACTION_DISCARD&quot;) : (&quot;&quot;)}`,&#xA;`${longIndent}`.id = `${configNonTLSID}`u,&#xA;`${longIndent}`.u = {&#xA;&#9;`${longIndent}`.pf = {&#xA;`${longIndent}``${longIndent}`.portnum = {.portnum = `${filterNonTLSPort}`u,&#xA;`${longIndent}``${longIndent}``${longIndent}`.range = 0u,&#xA;`${longIndent}``${longIndent}``${longIndent}`.direction = `${filterNonTLSDir}`,},&#xA;`${longIndent}``${longIndent}`.proto = `${filterNonTLSProt}`,&#xA;&#9;&#9;`${longIndent}`},&#xA;&#9;`${longIndent}`},&#xA;`${longIndent}`}" include="`${configNonTLS}`" />

0 commit comments

Comments
 (0)