Skip to content

Commit

Permalink
fix(PeriphDrivers): Resolve compiler warnings for the MAX32690 librar…
Browse files Browse the repository at this point in the history
…ies when building with IAR's Embedded Workbench (#953)
  • Loading branch information
lorne-maxim authored Mar 18, 2024
1 parent b2762b6 commit 7a8039b
Show file tree
Hide file tree
Showing 6 changed files with 241 additions and 257 deletions.
110 changes: 40 additions & 70 deletions Examples/MAX78000/CNN/facial_recognition/include/ffconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@
/ Configurations of FatFs Module
/---------------------------------------------------------------------------*/

#define FFCONF_DEF 80286 /* Revision ID */
#define FFCONF_DEF 80286 /* Revision ID */

/*---------------------------------------------------------------------------/
/ Function Configurations
/---------------------------------------------------------------------------*/

#define FF_FS_READONLY 0
#define FF_FS_READONLY 0
/* This option switches read-only configuration. (0:Read/Write or 1:Read-only)
/ Read-only configuration removes writing API functions, f_write(), f_sync(),
/ f_unlink(), f_mkdir(), f_chmod(), f_rename(), f_truncate(), f_getfree()
/ and optional writing functions as well. */


#define FF_FS_MINIMIZE 0
#define FF_FS_MINIMIZE 0
/* This option defines minimization level to remove some basic API functions.
/
/ 0: Basic functions are fully enabled.
Expand All @@ -24,42 +23,34 @@
/ 2: f_opendir(), f_readdir() and f_closedir() are removed in addition to 1.
/ 3: f_lseek() function is removed in addition to 2. */


#define FF_USE_FIND 0
#define FF_USE_FIND 0
/* This option switches filtered directory read functions, f_findfirst() and
/ f_findnext(). (0:Disable, 1:Enable 2:Enable with matching altname[] too) */


#define FF_USE_MKFS 1
#define FF_USE_MKFS 1
/* This option switches f_mkfs() function. (0:Disable or 1:Enable) */


#define FF_USE_FASTSEEK 0
#define FF_USE_FASTSEEK 0
/* This option switches fast seek function. (0:Disable or 1:Enable) */


#define FF_USE_EXPAND 0
#define FF_USE_EXPAND 0
/* This option switches f_expand function. (0:Disable or 1:Enable) */


#define FF_USE_CHMOD 1
#define FF_USE_CHMOD 1
/* This option switches attribute manipulation functions, f_chmod() and f_utime().
/ (0:Disable or 1:Enable) Also FF_FS_READONLY needs to be 0 to enable this option. */


#define FF_USE_LABEL 1
#define FF_USE_LABEL 1
/* This option switches volume label functions, f_getlabel() and f_setlabel().
/ (0:Disable or 1:Enable) */


#define FF_USE_FORWARD 1
#define FF_USE_FORWARD 1
/* This option switches f_forward() function. (0:Disable or 1:Enable) */


#define FF_USE_STRFUNC 0
#define FF_PRINT_LLI 1
#define FF_PRINT_FLOAT 1
#define FF_STRF_ENCODE 3
#define FF_USE_STRFUNC 0
#define FF_PRINT_LLI 1
#define FF_PRINT_FLOAT 1
#define FF_STRF_ENCODE 3
/* FF_USE_STRFUNC switches string functions, f_gets(), f_putc(), f_puts() and
/ f_printf().
/
Expand All @@ -79,12 +70,11 @@
/ 3: Unicode in UTF-8
*/


/*---------------------------------------------------------------------------/
/ Locale and Namespace Configurations
/---------------------------------------------------------------------------*/

#define FF_CODE_PAGE 932
#define FF_CODE_PAGE 932
/* This option specifies the OEM code page to be used on the target system.
/ Incorrect code page setting can cause a file open failure.
/
Expand Down Expand Up @@ -112,9 +102,8 @@
/ 0 - Include all code pages above and configured by f_setcp()
*/


#define FF_USE_LFN 1
#define FF_MAX_LFN 255
#define FF_USE_LFN 1
#define FF_MAX_LFN 255
/* The FF_USE_LFN switches the support for LFN (long file name).
/
/ 0: Disable LFN. FF_MAX_LFN has no effect.
Expand All @@ -132,8 +121,7 @@
/ memory for the working buffer, memory management functions, ff_memalloc() and
/ ff_memfree() exemplified in ffsystem.c, need to be added to the project. */


#define FF_LFN_UNICODE 0
#define FF_LFN_UNICODE 0
/* This option switches the character encoding on the API when LFN is enabled.
/
/ 0: ANSI/OEM in current CP (TCHAR = char)
Expand All @@ -144,34 +132,30 @@
/ Also behavior of string I/O functions will be affected by this option.
/ When LFN is not enabled, this option has no effect. */


#define FF_LFN_BUF 255
#define FF_SFN_BUF 12
#define FF_LFN_BUF 255
#define FF_SFN_BUF 12
/* This set of options defines size of file name members in the FILINFO structure
/ which is used to read out directory items. These values should be suffcient for
/ the file names to read. The maximum possible length of the read file name depends
/ on character encoding. When LFN is not enabled, these options have no effect. */


#define FF_FS_RPATH 2
#define FF_FS_RPATH 2
/* This option configures support for relative path.
/
/ 0: Disable relative path and remove related functions.
/ 1: Enable relative path. f_chdir() and f_chdrive() are available.
/ 2: f_getcwd() function is available in addition to 1.
*/


/*---------------------------------------------------------------------------/
/ Drive/Volume Configurations
/---------------------------------------------------------------------------*/

#define FF_VOLUMES 1
#define FF_VOLUMES 1
/* Number of volumes (logical drives) to be used. (1-10) */


#define FF_STR_VOLUME_ID 0
#define FF_VOLUME_STRS "RAM","NAND","CF","SD","SD2","USB","USB2","USB3"
#define FF_STR_VOLUME_ID 0
#define FF_VOLUME_STRS "RAM", "NAND", "CF", "SD", "SD2", "USB", "USB2", "USB3"
/* FF_STR_VOLUME_ID switches support for volume ID in arbitrary strings.
/ When FF_STR_VOLUME_ID is set to 1 or 2, arbitrary strings can be used as drive
/ number in the path name. FF_VOLUME_STRS defines the volume ID strings for each
Expand All @@ -183,64 +167,55 @@
/ const char* VolumeStr[FF_VOLUMES] = {"ram","flash","sd","usb",...
*/


#define FF_MULTI_PARTITION 0
#define FF_MULTI_PARTITION 0
/* This option switches support for multiple volumes on the physical drive.
/ By default (0), each logical drive number is bound to the same physical drive
/ number and only an FAT volume found on the physical drive will be mounted.
/ When this function is enabled (1), each logical drive number can be bound to
/ arbitrary physical drive and partition listed in the VolToPart[]. Also f_fdisk()
/ function will be available. */


#define FF_MIN_SS 512
#define FF_MAX_SS 512
#define FF_MIN_SS 512
#define FF_MAX_SS 512
/* This set of options configures the range of sector size to be supported. (512,
/ 1024, 2048 or 4096) Always set both 512 for most systems, generic memory card and
/ harddisk, but a larger value may be required for on-board flash memory and some
/ type of optical media. When FF_MAX_SS is larger than FF_MIN_SS, FatFs is configured
/ for variable sector size mode and disk_ioctl() function needs to implement
/ GET_SECTOR_SIZE command. */


#define FF_LBA64 0
#define FF_LBA64 0
/* This option switches support for 64-bit LBA. (0:Disable or 1:Enable)
/ To enable the 64-bit LBA, also exFAT needs to be enabled. (FF_FS_EXFAT == 1) */


#define FF_MIN_GPT 0x10000000
#define FF_MIN_GPT 0x10000000
/* Minimum number of sectors to switch GPT as partitioning format in f_mkfs and
/ f_fdisk function. 0x100000000 max. This option has no effect when FF_LBA64 == 0. */


#define FF_USE_TRIM 0
#define FF_USE_TRIM 0
/* This option switches support for ATA-TRIM. (0:Disable or 1:Enable)
/ To enable Trim function, also CTRL_TRIM command should be implemented to the
/ disk_ioctl() function. */



/*---------------------------------------------------------------------------/
/ System Configurations
/---------------------------------------------------------------------------*/

#define FF_FS_TINY 0
#define FF_FS_TINY 0
/* This option switches tiny buffer configuration. (0:Normal or 1:Tiny)
/ At the tiny configuration, size of file object (FIL) is shrinked FF_MAX_SS bytes.
/ Instead of private sector buffer eliminated from the file object, common sector
/ buffer in the filesystem object (FATFS) is used for the file data transfer. */


#define FF_FS_EXFAT 0
#define FF_FS_EXFAT 0
/* This option switches support for exFAT filesystem. (0:Disable or 1:Enable)
/ To enable exFAT, also LFN needs to be enabled. (FF_USE_LFN >= 1)
/ Note that enabling exFAT discards ANSI C (C89) compatibility. */


#define FF_FS_NORTC 1
#define FF_NORTC_MON 1
#define FF_NORTC_MDAY 1
#define FF_NORTC_YEAR 2022
#define FF_FS_NORTC 1
#define FF_NORTC_MON 1
#define FF_NORTC_MDAY 1
#define FF_NORTC_YEAR 2022
/* The option FF_FS_NORTC switches timestamp feature. If the system does not have
/ an RTC or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable the
/ timestamp feature. Every object modified by FatFs will have a fixed timestamp
Expand All @@ -250,8 +225,7 @@
/ FF_NORTC_MDAY and FF_NORTC_YEAR have no effect.
/ These options have no effect in read-only configuration (FF_FS_READONLY = 1). */


#define FF_FS_NOFSINFO 0
#define FF_FS_NOFSINFO 0
/* If you need to know correct free space on the FAT32 volume, set bit 0 of this
/ option, and f_getfree() function at the first time after volume mount will force
/ a full FAT scan. Bit 1 controls the use of last allocated cluster number.
Expand All @@ -262,8 +236,7 @@
/ bit1=1: Do not trust last allocated cluster number in the FSINFO.
*/


#define FF_FS_LOCK 0
#define FF_FS_LOCK 0
/* The option FF_FS_LOCK switches file lock function to control duplicated file open
/ and illegal operation to open objects. This option must be 0 when FF_FS_READONLY
/ is 1.
Expand All @@ -274,9 +247,8 @@
/ can be opened simultaneously under file lock control. Note that the file
/ lock control is independent of re-entrancy. */


#define FF_FS_REENTRANT 0
#define FF_FS_TIMEOUT 1000
#define FF_FS_REENTRANT 0
#define FF_FS_TIMEOUT 1000
/* The option FF_FS_REENTRANT switches the re-entrancy (thread safe) of the FatFs
/ module itself. Note that regardless of this option, file access to different
/ volume is always re-entrant and volume control functions, f_mount(), f_mkfs()
Expand All @@ -291,6 +263,4 @@
/ The FF_FS_TIMEOUT defines timeout period in unit of O/S time tick.
*/



/*--- End of configuration options ---*/
12 changes: 10 additions & 2 deletions Libraries/PeriphDrivers/Source/GPIO/gpio_me18.c
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,11 @@ int MXC_GPIO_Config(const mxc_gpio_cfg_t *cfg)
uint32_t MXC_GPIO_InGet(mxc_gpio_regs_t *port, uint32_t mask)
{
if (port == MXC_GPIO4) {
return GPIO4_DATAIN_MASK(mask);
uint32_t gpio40 = (MXC_MCR->gpio4_ctrl & MXC_F_MCR_GPIO4_CTRL_P40_IN) >>
MXC_F_MCR_GPIO4_CTRL_P40_IN_POS;
uint32_t gpio41 = (MXC_MCR->gpio4_ctrl & MXC_F_MCR_GPIO4_CTRL_P41_IN) >>
(MXC_F_MCR_GPIO4_CTRL_P41_IN_POS - 1);
return ((gpio40 | gpio41) & mask);
}

return MXC_GPIO_RevA_InGet((mxc_gpio_reva_regs_t *)port, mask);
Expand Down Expand Up @@ -288,7 +292,11 @@ void MXC_GPIO_OutClr(mxc_gpio_regs_t *port, uint32_t mask)
uint32_t MXC_GPIO_OutGet(mxc_gpio_regs_t *port, uint32_t mask)
{
if (port == MXC_GPIO4) {
return GPIO4_DATAOUT_GET_MASK(mask);
uint32_t gpio40 = (MXC_MCR->gpio4_ctrl & MXC_F_MCR_GPIO4_CTRL_P40_DO) >>
MXC_F_MCR_GPIO4_CTRL_P40_DO_POS;
uint32_t gpio41 = (MXC_MCR->gpio4_ctrl & MXC_F_MCR_GPIO4_CTRL_P41_DO) >>
(MXC_F_MCR_GPIO4_CTRL_P41_DO_POS - 1);
return ((gpio40 | gpio41) & mask);
}

return MXC_GPIO_RevA_OutGet((mxc_gpio_reva_regs_t *)port, mask);
Expand Down
10 changes: 5 additions & 5 deletions Libraries/PeriphDrivers/Source/I2S/i2s_reva.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,21 @@ static void configure_data_sizes(mxc_i2s_reva_regs_t *i2s, uint8_t bits_word, ui
uint8_t wsize)
{
if (bits_word > 0) {
MXC_SETFIELD(i2s->ctrl1ch0, 0b11111 << MXC_F_I2S_REVA_CTRL1CH0_BITS_WORD_POS,
MXC_SETFIELD(i2s->ctrl1ch0, MXC_F_I2S_REVA_CTRL1CH0_BITS_WORD,
(bits_word - 1) << MXC_F_I2S_REVA_CTRL1CH0_BITS_WORD_POS); // Subtract 1
} else {
MXC_SETFIELD(i2s->ctrl1ch0, 0b11111 << MXC_F_I2S_REVA_CTRL1CH0_BITS_WORD_POS,
MXC_SETFIELD(i2s->ctrl1ch0, MXC_F_I2S_REVA_CTRL1CH0_BITS_WORD,
0); // Clear to 0
}

//Set sample length if defined:
//The SMP_SIZE is equal to bitsWord when sampleSize == 0 or sampleSize > bitsWord
if (smp_sz > 0) {
MXC_SETFIELD(i2s->ctrl1ch0, 0b11111 << MXC_F_I2S_REVA_CTRL1CH0_SMP_SIZE_POS,
MXC_SETFIELD(i2s->ctrl1ch0, MXC_F_I2S_REVA_CTRL1CH0_SMP_SIZE,
(smp_sz - 1) << MXC_F_I2S_REVA_CTRL1CH0_SMP_SIZE_POS); // Subtract 1
} else {
MXC_SETFIELD(i2s->ctrl1ch0, 0b11111 << MXC_F_I2S_REVA_CTRL1CH0_SMP_SIZE_POS,
smp_sz); // Clear to 0
MXC_SETFIELD(i2s->ctrl1ch0, MXC_F_I2S_REVA_CTRL1CH0_SMP_SIZE,
0); // Clear to 0
}

//Set datasize to load in FIFO
Expand Down
Loading

0 comments on commit 7a8039b

Please sign in to comment.