Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-29 20:56:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

nuttx: Use MIN/MAX definitions from "sys/param.h"

Browse Source 
Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
This commit is contained in:
Gustavo Henrique Nihei
2023-02-01 10:41:12 -03:00
committed by Xiang Xiao
parent 079e2b8c7c
commit e6b204f438
179 changed files with 195 additions and 1304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/armv7-a/arm_l2cc_pl310.c
+1 -8
View File
@@ -31,6 +31,7 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <sys/param.h>
#include <assert.h>
#include <debug.h>
@@ -224,14 +225,6 @@
/* Misc commoly defined and re-defined things */
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef OK
# define OK 0
#endif
arch/arm/src/armv7-r/arm_l2cc_pl310.c
+1 -8
View File
@@ -31,6 +31,7 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <sys/param.h>
#include <assert.h>
#include <debug.h>
@@ -224,14 +225,6 @@
/* Misc commoly defined and re-defined things */
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef OK
# define OK 0
#endif
arch/arm/src/cxd56xx/cxd56_emmc.c
+1 -4
View File
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <string.h>
@@ -74,10 +75,6 @@
#define EMMC_MSIZE (6) /* Burst size is 512B */
#define EMMC_FIFO_DEPTH (0x100) /* FIFO size is 1KB */
#ifndef MIN
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#endif
/****************************************************************************
* Private Types
****************************************************************************/
arch/arm/src/cxd56xx/cxd56_scu.c
+1 -8
View File
@@ -34,6 +34,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
#include <sys/param.h>
#include <assert.h>
#include <debug.h>
#include <errno.h>
@@ -99,14 +100,6 @@
#define DECIMATION_OFF 15
#ifndef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
* Private Types
****************************************************************************/
arch/arm/src/cxd56xx/cxd56_sdhci.c
+1 -4
View File
@@ -29,6 +29,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
#include <sys/param.h>
#include <assert.h>
#include <debug.h>
#include <errno.h>
@@ -211,10 +212,6 @@
#define SDIO_OCR_NUM_FUNCTIONS(ocr) (((ocr) >> 28) & 0x7)
#define SDIO_FUNC_NUM_MAX (7)
#ifndef MIN
# define MIN(a, b) ((a) < (b) ? (a) : (b))
#endif
#define SDIO_BLOCK_TIMEOUT 200
#define SDIO_BLOCK_SIZE 512
arch/arm/src/efm32/efm32_usbdev.c
+1 -10
View File
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
@@ -258,16 +259,6 @@
#define efm32_rqempty(ep) ((ep)->head == NULL)
#define efm32_rqpeek(ep) ((ep)->head)
/* Standard stuff ***********************************************************/
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
/****************************************************************************
* Private Types
****************************************************************************/
arch/arm/src/efm32/efm32_usbhost.c
+1 -10
View File
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
@@ -135,16 +136,6 @@
#define EFM32_SETUP_DELAY SEC2TICK(5) /* 5 seconds in system ticks */
#define EFM32_DATANAK_DELAY SEC2TICK(5) /* 5 seconds in system ticks */
/* Ever-present MIN/MAX macros */
#ifndef MIN
# define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a, b) (((a) > (b)) ? (a) : (b))
#endif
/* Tracing ******************************************************************/
#define TR_FMT1 false
arch/arm/src/imxrt/imxrt_mpuinit.c
+1 -8
View File
@@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <assert.h>
#include <sys/param.h>
#include <nuttx/userspace.h>
@@ -41,14 +42,6 @@
* Pre-processor Definitions
****************************************************************************/
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef CONFIG_ARMV7M_DCACHE
/* With Dcache off:
* Cacheable (MPU_RASR_C) and Bufferable (MPU_RASR_B) needs to be off
arch/arm/src/kinetis/kinetis_mpuinit.c
+1 -8
View File
@@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <assert.h>
#include <sys/param.h>
#include <nuttx/userspace.h>
@@ -40,14 +41,6 @@
* Pre-processor Definitions
****************************************************************************/
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
* Private Data
****************************************************************************/
arch/arm/src/kinetis/kinetis_usbdev.c
+1 -10
View File
@@ -35,6 +35,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
@@ -342,16 +343,6 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
/* Misc Helper Macros *******************************************************/
/* Ever-present MIN and MAX macros */
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/* Byte ordering in host-based values */
#ifdef CONFIG_ENDIAN_BIG
arch/arm/src/lc823450/lc823450_dma.c
+1 -4
View File
@@ -26,6 +26,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/semaphore.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
@@ -75,10 +76,6 @@
#define DMACCFG_SRCPERI_SHIFT 1
#define DMACCFG_E (1 << 0)
#ifndef MIN
# define MIN(a, b) ((a) > (b) ? (b) : (a))
#endif /* MIN */
#define LC823450_DMA_EN (1 << 26)
/****************************************************************************
arch/arm/src/lc823450/lc823450_mpuinit2.c
+1 -8
View File
@@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <assert.h>
#include <sys/param.h>
#include <nuttx/userspace.h>
@@ -38,14 +39,6 @@
* Pre-processor Definitions
****************************************************************************/
#ifndef MAX
# define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
/****************************************************************************
* Private Data
****************************************************************************/
arch/arm/src/lc823450/lc823450_procfs_dvfs.c
+1 -4
View File
@@ -33,6 +33,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/param.h>
#include <fcntl.h>
#include <assert.h>
#include <errno.h>
@@ -54,10 +55,6 @@
#define DVFS_LINELEN 128
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
/****************************************************************************
* Private Types
****************************************************************************/
arch/arm/src/lc823450/lc823450_serial.c
+1 -4
View File
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <inttypes.h>
#include <stdint.h>
@@ -141,10 +142,6 @@ int g_console_disable;
# define HS_DMAACT_ACT2 3
#endif
#ifndef MIN
# define MIN(a, b) ((a) > (b) ? (b) : (a))
#endif
/****************************************************************************
* Private Types
****************************************************************************/
arch/arm/src/lc823450/lc823450_spi.c
+1 -4
View File
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <inttypes.h>
#include <stdint.h>
@@ -53,10 +54,6 @@
# error "SPI_EXCHANGE is not supported"
#endif
#ifndef MIN
# define MIN(a, b) ((a) > (b) ? (b) : (a))
#endif
/****************************************************************************
* Private Types
****************************************************************************/
arch/arm/src/lc823450/lc823450_usbdev.c
+1 -4
View File
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
@@ -73,10 +74,6 @@
* Pre-processor Definitions
****************************************************************************/
#ifndef MIN
# define MIN(a, b) ((a) > (b) ? (b) : (a))
#endif
#if 0
# define DPRINTF(fmt, args...) uinfo(fmt, ##args)
#else
arch/arm/src/lpc17xx_40xx/lpc17_40_mpuinit.c
+1 -12
View File
@@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <assert.h>
#include <sys/param.h>
#include <nuttx/userspace.h>
@@ -33,18 +34,6 @@
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU)
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
* Public Functions
****************************************************************************/
arch/arm/src/lpc43xx/lpc43_mpuinit.c
+1 -12
View File
@@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <assert.h>
#include <sys/param.h>
#include <nuttx/userspace.h>
@@ -33,18 +34,6 @@
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU)
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
* Public Functions
****************************************************************************/
arch/arm/src/lpc54xx/lpc54_mpuinit.c
+1 -12
View File
@@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <assert.h>
#include <sys/param.h>
#include <nuttx/userspace.h>
@@ -33,18 +34,6 @@
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU)
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
* Public Functions
****************************************************************************/
arch/arm/src/max326xx/common/max326_mpuinit.c
+1 -12
View File
@@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <assert.h>
#include <sys/param.h>
#include <nuttx/userspace.h>
@@ -33,18 +34,6 @@
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU)
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
* Public Functions
****************************************************************************/
arch/arm/src/rtl8720c/amebaz_coex.c
+2 -4
View File
@@ -24,16 +24,14 @@
#include <stdio.h>
#include <string.h>
#include <sys/param.h>
#include "amebaz_coex.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#define HCI_VENDOR_MAILBOX_CMD 0xfc8f
/* static net_buf_simple *Xiaomi_buf; */
arch/arm/src/s32k3xx/s32k3xx_mpuinit.c
+1 -8
View File
@@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <assert.h>
#include <sys/param.h>
#include <nuttx/userspace.h>
@@ -37,14 +38,6 @@
* Pre-processor Definitions
****************************************************************************/
#ifndef MAX
# define MAX(a,b) a > b ? a : b
#endif
#ifndef MIN
# define MIN(a,b) a < b ? a : b
#endif
#ifndef CONFIG_ARMV7M_DCACHE
/* With Dcache off:
* Cacheable (MPU_RASR_C) and Bufferable (MPU_RASR_B) needs to be off
arch/arm/src/sam34/sam_mpuinit.c
+1 -12
View File
@@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <assert.h>
#include <sys/param.h>
#include <nuttx/userspace.h>
@@ -33,18 +34,6 @@
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU)
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
* Private Data
****************************************************************************/
arch/arm/src/sam34/sam_udp.c
+1 -10
View File
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
@@ -175,16 +176,6 @@
#define SAM_TRACEINTID_UPSTRRES 0x001f
#define SAM_TRACEINTID_WAKEUP 0x0020
/* Ever-present MIN and MAX macros */
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/* Byte ordering in host-based values */
#ifdef CONFIG_ENDIAN_BIG
arch/arm/src/sama5/sam_can.c
+1 -10
View File
@@ -51,6 +51,7 @@
#include <nuttx/config.h>
#include <stdio.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
@@ -77,16 +78,6 @@
* Pre-processor Definitions
****************************************************************************/
/* Common definitions *******************************************************/
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/* Mailboxes ****************************************************************/
#define SAMA5_CAN_NRECVMB MAX(CONFIG_SAMA5_CAN0_NRECVMB, CONFIG_SAMA5_CAN1_NRECVMB)
arch/arm/src/sama5/sam_hsmci.c
+1 -10
View File
@@ -28,6 +28,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
#include <sys/param.h>
#include <assert.h>
#include <debug.h>
#include <errno.h>
@@ -338,16 +339,6 @@
# define DEBUG_NCMDSAMPLES 2
#endif
/* Some semi-standard definitions */
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
* Private Types
****************************************************************************/
arch/arm/src/sama5/sam_mcan.c
+1 -10
View File
@@ -31,6 +31,7 @@
#include <nuttx/config.h>
#include <stdio.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <inttypes.h>
@@ -62,16 +63,6 @@
* Pre-processor Definitions
****************************************************************************/
/* Common definitions */
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
/* dedicated RS and TX buffers are not supported */
#define DEDICATED_BUFFERS_NOT_USED
arch/arm/src/sama5/sam_tsd.c
+1 -10
View File
@@ -50,6 +50,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <inttypes.h>
@@ -127,16 +128,6 @@
# define TSD_PENMOVE (TOUCH_MOVE | TOUCH_ID_VALID | TOUCH_POS_VALID)
#endif
/* Ever-present MIN and MAX macros */
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef BOARD_TSSCTIM
# define BOARD_TSSCTIM 0
#endif
arch/arm/src/sama5/sam_udphs.c
+1 -10
View File
@@ -49,6 +49,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <inttypes.h>
#include <stdint.h>
@@ -207,16 +208,6 @@
#define SAM_TRACEINTID_UPSTRRES 0x0021
#define SAM_TRACEINTID_WAKEUP 0x0022
/* Ever-present MIN and MAX macros */
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/* Byte ordering in host-based values */
#ifdef CONFIG_ENDIAN_BIG
arch/arm/src/samd2l2/sam_usb.c
+1 -10
View File
@@ -66,6 +66,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
@@ -211,16 +212,6 @@
#define SAM_TRACEINTID_EP0WRSTATUS 0x002a
#define SAM_TRACEINTID_EPTRCPT0_LEN 0x002b
/* Ever-present MIN and MAX macros */
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/* Byte ordering in host-based values */
#ifdef CONFIG_ENDIAN_BIG
arch/arm/src/samd5e5/sam_mpuinit.c
+1 -12
View File
@@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <assert.h>
#include <sys/param.h>
#include <nuttx/userspace.h>
@@ -33,18 +34,6 @@
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU)
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
* Private Data
****************************************************************************/
arch/arm/src/samd5e5/sam_progmem.c
+1 -10
View File
@@ -26,6 +26,7 @@
#include <string.h>
#include <semaphore.h>
#include <sys/param.h>
#include <assert.h>
#include <errno.h>
@@ -140,16 +141,6 @@
#define SAMD5E5_PROGMEM_ERASEDVAL (0xffu)
/* Misc stuff */
#ifndef MIN
# define MIN(a, b) ((a) < (b) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a, b) ((a) > (b) ? (a) : (b))
#endif
/****************************************************************************
* Private Functions
****************************************************************************/
arch/arm/src/samd5e5/sam_usb.c
+1 -10
View File
@@ -66,6 +66,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
@@ -233,16 +234,6 @@
#define SAM_TRACEINTID_PENDING_PIPE 0x002c
#define SAM_TRACEINTID_PIPENO 0x002d
/* Ever-present MIN and MAX macros */
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/* Byte ordering in host-based values */
#ifdef CONFIG_ENDIAN_BIG
arch/arm/src/samv7/sam_hsmci.c
+1 -10
View File
@@ -28,6 +28,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
#include <sys/param.h>
#include <assert.h>
#include <debug.h>
#include <errno.h>
@@ -271,16 +272,6 @@
# define DEBUG_NCMDSAMPLES 2
#endif
/* Some semi-standard definitions */
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
* Private Types
****************************************************************************/
arch/arm/src/samv7/sam_mcan.c
+1 -10
View File
@@ -30,6 +30,7 @@
#include <nuttx/config.h>
#include <stdio.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <inttypes.h>
@@ -59,16 +60,6 @@
* Pre-processor Definitions
****************************************************************************/
/* Common definitions *******************************************************/
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/* Clock source *************************************************************/
/* PCK5 is the programmable clock source, common to all MCAN controllers */
arch/arm/src/samv7/sam_mpuinit.c
+1 -12
View File
@@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <assert.h>
#include <sys/param.h>
#include <nuttx/userspace.h>
@@ -37,18 +38,6 @@
#ifdef CONFIG_ARM_MPU
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
* Private Data
****************************************************************************/
arch/arm/src/samv7/sam_progmem.c
+1 -10
View File
@@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <string.h>
#include <sys/param.h>
#include <errno.h>
#include <nuttx/arch.h>
@@ -138,16 +139,6 @@
#define SAMV7_PROGMEM_ERASEDVAL (0xffu)
/* Misc stuff */
#ifndef MIN
# define MIN(a, b) ((a) < (b) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a, b) ((a) > (b) ? (a) : (b))
#endif
/****************************************************************************
* Private Functions
****************************************************************************/
arch/arm/src/samv7/sam_usbdevhs.c
+1 -10
View File
@@ -51,6 +51,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
@@ -271,16 +272,6 @@
#define SAM_TRACEINTID_UPSTRRES 0x0025
#define SAM_TRACEINTID_WAKEUP 0x0026
/* Ever-present MIN and MAX macros */
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/* Byte ordering in host-based values */
#ifdef CONFIG_ENDIAN_BIG
arch/arm/src/stm32/stm32_ltdc.c
+1 -4
View File
@@ -31,6 +31,7 @@
#include <inttypes.h>
#include <stdint.h>
#include <string.h>
#include <sys/param.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
@@ -573,10 +574,6 @@
# endif
#endif
/* Helper */
#define MIN(x,y) ((x) < (y) ? (x) : (y))
/* Color normalization */
#if defined(CONFIG_STM32_LTDC_L1_RGB565)
arch/arm/src/stm32/stm32_mpuinit.c
+1 -12
View File
@@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <assert.h>
#include <sys/param.h>
#include <nuttx/userspace.h>
@@ -33,18 +34,6 @@
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU)
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
* Private Data
****************************************************************************/
arch/arm/src/stm32/stm32_otgfsdev.c
+1 -10
View File
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <inttypes.h>
#include <stdint.h>
@@ -301,16 +302,6 @@
#define stm32_rqempty(ep) ((ep)->head == NULL)
#define stm32_rqpeek(ep) ((ep)->head)
/* Standard stuff ***********************************************************/
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
/****************************************************************************
* Private Types
****************************************************************************/
arch/arm/src/stm32/stm32_otgfshost.c
+1 -10
View File
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <inttypes.h>
#include <stdint.h>
@@ -145,16 +146,6 @@
#define STM32_SETUP_DELAY SEC2TICK(5) /* 5 seconds in system ticks */
#define STM32_DATANAK_DELAY SEC2TICK(5) /* 5 seconds in system ticks */
/* Ever-present MIN/MAX macros */
#ifndef MIN
# define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a, b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
* Private Types
****************************************************************************/
arch/arm/src/stm32/stm32_otghsdev.c
+1 -10
View File
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <inttypes.h>
#include <stdint.h>
@@ -257,16 +258,6 @@
#define stm32_rqempty(ep) ((ep)->head == NULL)
#define stm32_rqpeek(ep) ((ep)->head)
/* Standard stuff ***********************************************************/
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
/****************************************************************************
* Private Types
****************************************************************************/
arch/arm/src/stm32/stm32_otghshost.c
+1 -10
View File
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <inttypes.h>
#include <stdint.h>
@@ -150,16 +151,6 @@
#define STM32_SETUP_DELAY SEC2TICK(5) /* 5 seconds in system ticks */
#define STM32_DATANAK_DELAY SEC2TICK(5) /* 5 seconds in system ticks */
/* Ever-present MIN/MAX macros */
#ifndef MIN
# define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a, b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
* Private Types
****************************************************************************/
arch/arm/src/stm32/stm32_usbdev.c
+1 -10
View File
@@ -29,6 +29,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
@@ -232,16 +233,6 @@
#define STM32_TRACEINTID_EP0SETUPOUT 0x001f
#define STM32_TRACEINTID_EP0SETUPOUTDATA 0x0020
/* Ever-present MIN and MAX macros */
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/* Byte ordering in host-based values */
#ifdef CONFIG_ENDIAN_BIG
arch/arm/src/stm32/stm32_usbfs.c
+1 -10
View File
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
@@ -213,16 +214,6 @@
#define STM32_TRACEINTID_EP0SETUPOUT 0x001f
#define STM32_TRACEINTID_EP0SETUPOUTDATA 0x0020
/* Ever-present MIN and MAX macros */
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/* Byte ordering in host-based values */
#ifdef CONFIG_ENDIAN_BIG
arch/arm/src/stm32f0l0g0/stm32_usbdev.c
+1 -10
View File
@@ -29,6 +29,7 @@
#include <nuttx/config.h>
#include <sys/param.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
@@ -217,16 +218,6 @@
#define STM32_TRACEINTID_EP0SETUPOUT 0x001e
#define STM32_TRACEINTID_EP0SETUPOUTDATA 0x001f
/* Ever-present MIN and MAX macros */
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/* Byte ordering in host-based values */
#ifdef CONFIG_ENDIAN_BIG
arch/arm/src/stm32f7/stm32_ethernet.c
+1 -4
View File
@@ -27,6 +27,7 @@
#include <inttypes.h>
#include <stdint.h>
#include <stdbool.h>
#include <sys/param.h>
#include <time.h>
#include <string.h>
#include <assert.h>
@@ -218,10 +219,6 @@
# define CONFIG_STM32F7_ETH_NTXDESC 4
#endif
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
/* We need at least one more free buffer than transmit buffers */
#define STM32_ETH_NFREEBUFFERS (CONFIG_STM32F7_ETH_NTXDESC+1)
arch/arm/src/stm32f7/stm32_ltdc.c
+1 -4
View File
@@ -30,6 +30,7 @@
#include <stdint.h>
#include <string.h>
#include <sys/param.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
@@ -574,10 +575,6 @@
# endif
#endif
/* Helper */
#define MIN(x,y) ((x) < (y) ? (x) : (y))
/* Color normalization */
#if defined(CONFIG_STM32F7_LTDC_L1_RGB565)
arch/arm/src/stm32f7/stm32_mpuinit.c
+1 -12
View File
@@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <assert.h>
#include <sys/param.h>
#include <nuttx/userspace.h>
@@ -33,18 +34,6 @@
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_ARM_MPU)
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
* Public Functions
****************************************************************************/

Some files were not shown because too many files have changed in this diff Show More