Update Cypress udb-sdio-whd to 1.1.1

dustin-crossman · dustin-crossman · commit 202a979a615e · 2020-12-16T15:14:10.000-08:00
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P12/SDIO_HOST_cfg.h b/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P12/SDIO_HOST_cfg.h
@@ -860,9 +860,6 @@ void SDIO_Host_Config_UDBs(void);
 #define SDIO_HOST_Write_Int_INTC_CORTEXM4_PRIORITY 7u
 #define SDIO_HOST_Write_Int_INTC_NUMBER 67u
 
-// ****************************SDIO Port**************************************
-#define SDIO_HOST_GPIO_PORT GPIO_PRT12
-
 #if defined(__cplusplus)
 }
 #endif
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P2/SDIO_HOST_cfg.h b/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P2/SDIO_HOST_cfg.h
@@ -921,9 +921,6 @@ void SDIO_Host_Config_UDBs(void);
 #define SDIO_HOST_Write_Int_INTC_CORTEXM4_PRIORITY 7u
 #define SDIO_HOST_Write_Int_INTC_NUMBER 67u
 
-// ****************************SDIO Port**************************************
-#define SDIO_HOST_GPIO_PORT GPIO_PRT2
-
 #if defined(__cplusplus)
 }
 #endif
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P9/SDIO_HOST_cfg.h b/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/COMPONENT_UDB_SDIO_P9/SDIO_HOST_cfg.h
@@ -856,9 +856,6 @@ void SDIO_Host_Config_UDBs(void);
 #define SDIO_HOST_Write_Int_INTC_CORTEXM4_PRIORITY 7u
 #define SDIO_HOST_Write_Int_INTC_NUMBER 67u
 
-// ****************************SDIO Port**************************************
-#define SDIO_HOST_GPIO_PORT GPIO_PRT9
-
 #if defined(__cplusplus)
 }
 #endif
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/SDIO_HOST.c b/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/SDIO_HOST.c
@@ -25,6 +25,7 @@
 #include "SDIO_HOST.h"
 #include "cy_utils.h"
 #include "cy_gpio.h"
+#include "cybsp.h"
 
 #if defined(CYHAL_UDB_SDIO)
 
@@ -717,7 +718,9 @@ en_sdio_result_t SDIO_SendCommandAndWait(stc_sdio_cmd_t* pstcCmd)
 
         // Check DAT[0] to ensure it isn't low, if it is wait
         uint32_t count = 0;
-        while (0UL == Cy_GPIO_Read(SDIO_HOST_GPIO_PORT, 0) && count < SDIO_DAT_BUSY_TIMEOUT_MS)
+        while (0UL ==
+               Cy_GPIO_Read(Cy_GPIO_PortToAddr(CYHAL_GET_PORT(CYBSP_WIFI_SDIO_D0)),
+                            CYHAL_GET_PIN(CYBSP_WIFI_SDIO_D0)) && count < SDIO_DAT_BUSY_TIMEOUT_MS)
         {
             #if defined(CY_RTOS_AWARE) || defined(COMPONENT_RTOS_AWARE)
             cy_rtos_delay_milliseconds(1);
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/version.xml b/targets/TARGET_Cypress/TARGET_PSOC6/common/udb-sdio-whd/version.xml
@@ -1 +1 @@
-<version>.19214</version>
+<version>.19666</version>

Original file line number	Diff line number	Diff line change
`@@ -860,9 +860,6 @@ void SDIO_Host_Config_UDBs(void);`
`860`	`860`	`#define SDIO_HOST_Write_Int_INTC_CORTEXM4_PRIORITY 7u`
`861`	`861`	`#define SDIO_HOST_Write_Int_INTC_NUMBER 67u`
`862`	`862`
`863`		`-// **************************SDIO Port************************************`
`864`		`-#define SDIO_HOST_GPIO_PORT GPIO_PRT12`
`865`		`-`
`866`	`863`	`#if defined(__cplusplus)`
`867`	`864`	`}`
`868`	`865`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -921,9 +921,6 @@ void SDIO_Host_Config_UDBs(void);`
`921`	`921`	`#define SDIO_HOST_Write_Int_INTC_CORTEXM4_PRIORITY 7u`
`922`	`922`	`#define SDIO_HOST_Write_Int_INTC_NUMBER 67u`
`923`	`923`
`924`		`-// **************************SDIO Port************************************`
`925`		`-#define SDIO_HOST_GPIO_PORT GPIO_PRT2`
`926`		`-`
`927`	`924`	`#if defined(__cplusplus)`
`928`	`925`	`}`
`929`	`926`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -856,9 +856,6 @@ void SDIO_Host_Config_UDBs(void);`
`856`	`856`	`#define SDIO_HOST_Write_Int_INTC_CORTEXM4_PRIORITY 7u`
`857`	`857`	`#define SDIO_HOST_Write_Int_INTC_NUMBER 67u`
`858`	`858`
`859`		`-// **************************SDIO Port************************************`
`860`		`-#define SDIO_HOST_GPIO_PORT GPIO_PRT9`
`861`		`-`
`862`	`859`	`#if defined(__cplusplus)`
`863`	`860`	`}`
`864`	`861`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<version>.19214</version>`
	`1`	`+<version>.19666</version>`