diff --git a/.gitignore b/.gitignore index 5ec3816451..ef2a1c8168 100644 --- a/.gitignore +++ b/.gitignore @@ -37,5 +37,3 @@ node_modules package-lock.json package.json .python-version -mxc_version.h -mxc_version.mk diff --git a/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk b/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk new file mode 100644 index 0000000000..6a910da3fe --- /dev/null +++ b/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk @@ -0,0 +1,24 @@ +############################################################################### + # + # Copyright (C) 2024 Analog Devices, Inc. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + # + ############################################################################## +# Autogenerated version info for build system. +MSDK_VERSION_STRING := v2023_10-172-gd3f8669fd6 +MSDK_VERSION_YEAR := 2023 +MSDK_VERSION_MONTH := 10 + +# Add root MAXIM_PATH to IPATH so compiler can locate msdk_version.h +IPATH += $(MAXIM_PATH) diff --git a/Libraries/SDHC/Include/sdhc_lib.h b/Libraries/SDHC/Include/sdhc_lib.h index 48ba47faf1..95759f4df0 100644 --- a/Libraries/SDHC/Include/sdhc_lib.h +++ b/Libraries/SDHC/Include/sdhc_lib.h @@ -56,7 +56,6 @@ typedef enum { MXC_SDHC_LIB_SINGLE_DATA = 1, MXC_SDHC_LIB_QUAD_DATA, - MXC_SDHC_LIB_DEFAULT_DATA, } mxc_sdhc_data_width; typedef enum { diff --git a/Libraries/SDHC/Source/sdhc_lib.c b/Libraries/SDHC/Source/sdhc_lib.c index 8965f30243..cefa46a1fd 100644 --- a/Libraries/SDHC/Source/sdhc_lib.c +++ b/Libraries/SDHC/Source/sdhc_lib.c @@ -237,7 +237,7 @@ int MXC_SDHC_Lib_SetBusWidth(mxc_sdhc_data_width bus_width) uint32_t card_status; int result; - bus_width = bus_width == MXC_SDHC_LIB_DEFAULT_DATA ? MXC_SDHC_Get_Default_DataWidth() : bus_width; + cmd_cfg.direction = MXC_SDHC_DIRECTION_CFG; cmd_cfg.callback = NULL; @@ -448,7 +448,7 @@ int MXC_SDHC_Lib_Prepare_Trans(mxc_sdhc_data_width width) mxc_sdhc_cmd_cfg_t cmd_cfg; int result; - width = width == MXC_SDHC_LIB_DEFAULT_DATA ? MXC_SDHC_Get_Default_DataWidth() : width; + cmd_cfg.direction = MXC_SDHC_DIRECTION_CFG; @@ -505,7 +505,7 @@ int MXC_SDHC_Lib_Write(unsigned int dst_addr, void *src_addr, unsigned int cnt, int result; mxc_sdhc_cmd_cfg_t cmd_cfg; - width = width == MXC_SDHC_LIB_DEFAULT_DATA ? MXC_SDHC_Get_Default_DataWidth() : width; + result = MXC_SDHC_Lib_Prepare_Trans(width); if (result != E_NO_ERROR) { @@ -535,7 +535,7 @@ int MXC_SDHC_Lib_Read(void *dst_addr, unsigned int src_addr, unsigned int cnt, m int result; mxc_sdhc_cmd_cfg_t cmd_cfg; - width = width == MXC_SDHC_LIB_DEFAULT_DATA ? MXC_SDHC_Get_Default_DataWidth() : width; + result = MXC_SDHC_Lib_Prepare_Trans(width); @@ -566,7 +566,6 @@ int MXC_SDHC_Lib_WriteAsync(unsigned int dst_addr, void *src_addr, unsigned int int data; mxc_sdhc_cmd_cfg_t cmd_cfg; - width = width == MXC_SDHC_LIB_DEFAULT_DATA ? MXC_SDHC_Get_Default_DataWidth() : width; data = MXC_SDHC_Lib_Prepare_Trans(width); if (data == E_BUSY) { @@ -599,7 +598,7 @@ int MXC_SDHC_Lib_ReadAsync(void *dst_addr, unsigned int src_addr, unsigned int c int data; mxc_sdhc_cmd_cfg_t cmd_cfg; - width = width == MXC_SDHC_LIB_DEFAULT_DATA ? MXC_SDHC_Get_Default_DataWidth() : width; + data = MXC_SDHC_Lib_Prepare_Trans(width); if (data == E_BUSY) {