Merge pull request contiki-os#883 from cmorty/pull/global-macros

Move MAX, MIN and ABS to contiki-macros
ardarico · May 18, 2015 · 730bda2 · 730bda2
2 parents b8ff325 + 0dab692
commit 730bda2
Show file tree

Hide file tree

Showing 33 changed files with 41 additions and 93 deletions.
diff --git a/apps/er-coap/er-coap-engine.c b/apps/er-coap/er-coap-engine.c
@@ -36,6 +36,7 @@
  *      Matthias Kovatsch <[email protected]>
  */
 
+#include "sys/cc.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/apps/er-coap/er-coap-separate.c b/apps/er-coap/er-coap-separate.c
@@ -36,6 +36,7 @@
  *      Matthias Kovatsch <[email protected]>
  */
 
+#include "sys/cc.h"
 #include <stdio.h>
 #include <string.h>
 #include "er-coap-separate.h"

diff --git a/apps/er-coap/er-coap.c b/apps/er-coap/er-coap.c
@@ -39,6 +39,7 @@
 #include <string.h>
 #include <stdio.h>
 #include "contiki.h"
+#include "sys/cc.h"
 #include "contiki-net.h"
 
 #include "er-coap.h"

diff --git a/apps/er-coap/er-coap.h b/apps/er-coap/er-coap.h
@@ -79,10 +79,6 @@ enum { OPTION_MAP_SIZE = sizeof(uint8_t) * 8 };
 #define SET_OPTION(packet, opt) ((packet)->options[opt / OPTION_MAP_SIZE] |= 1 << (opt % OPTION_MAP_SIZE))
 #define IS_OPTION(packet, opt) ((packet)->options[opt / OPTION_MAP_SIZE] & (1 << (opt % OPTION_MAP_SIZE)))
 
-#ifndef MIN
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif /* MIN */
-
 /* parsed message struct */
 typedef struct {
   uint8_t *buffer; /* pointer to CoAP header / incoming packet buffer / memory to serialize packet */

diff --git a/apps/mqtt/mqtt.c b/apps/mqtt/mqtt.c
@@ -57,13 +57,12 @@
 
 #include "lib/assert.h"
 #include "lib/list.h"
+#include "sys/cc.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 /*---------------------------------------------------------------------------*/
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-/*---------------------------------------------------------------------------*/
 #define DEBUG 0
 #if DEBUG
 #define PRINTF(...) PRINTF(__VA_ARGS__)

diff --git a/apps/rest-engine/rest-engine.h b/apps/rest-engine/rest-engine.h
@@ -62,10 +62,6 @@
 #define REST_MAX_CHUNK_SIZE     64
 #endif
 
-#ifndef MIN
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif /* MIN */
-
 struct resource_s;
 struct periodic_resource_s;
 

diff --git a/apps/shell/shell-power.c b/apps/shell/shell-power.c
@@ -42,6 +42,7 @@
 #include "sys/energest.h"
 
 #include <stdio.h>
+#include "sys/cc.h"
 
 struct power_msg {
   uint16_t len;

diff --git a/apps/shell/shell-sky.c b/apps/shell/shell-sky.c
@@ -38,6 +38,7 @@
  */
 
 #include "contiki.h"
+#include "sys/cc.h"
 #include "shell-sky.h"
 
 #include "dev/watchdog.h"
@@ -84,8 +85,6 @@ SHELL_COMMAND(rfchannel_command,
 	      "rfchannel <channel>: change CC2420 radio channel (11 - 26)",
 	      &shell_rfchannel_process);
 /*---------------------------------------------------------------------------*/
-#define MAX(a, b) ((a) > (b)? (a): (b))
-#define MIN(a, b) ((a) < (b)? (a): (b))
 struct spectrum {
   int channel[16];
 };

diff --git a/apps/shell/shell-tcpsend.c b/apps/shell/shell-tcpsend.c
@@ -36,13 +36,10 @@
 #include <stddef.h>
 
 #include "contiki.h"
+#include "sys/cc.h"
 #include "shell.h"
 #include "telnet.h"
 
-#ifndef MIN
-#define MIN(a, b) ((a) < (b)? (a) : (b))
-#endif /* MIN */
-
 /*---------------------------------------------------------------------------*/
 PROCESS(shell_tcpsend_process, "tcpsend");
 SHELL_COMMAND(tcpsend_command,

diff --git a/apps/shell/shell-time.c b/apps/shell/shell-time.c
@@ -38,6 +38,7 @@
  */
 
 #include "contiki.h"
+#include "sys/cc.h"
 #include "shell-time.h"
 
 #include "sys/clock.h"
@@ -51,11 +52,6 @@
 #define MAX_COMMANDLENGTH 64
 #define PERIOD_INTERVAL   60
 
-#ifndef MIN
-#define MIN(a, b) ((a) < (b)? (a) : (b))
-#endif /* MIN */
-
-
 /*---------------------------------------------------------------------------*/
 PROCESS(shell_time_process, "time");
 SHELL_COMMAND(time_command,

diff --git a/apps/telnetd/telnetd.c b/apps/telnetd/telnetd.c
@@ -33,6 +33,7 @@
 
 #include <string.h>
 
+#include "sys/cc.h"
 #include "contiki-lib.h"
 #include "contiki-net.h"
 #include "lib/petsciiconv.h"
@@ -103,7 +104,6 @@ static uint8_t connected;
 
 #define MAX_SILENCE_TIME (CLOCK_SECOND * 30)
 
-#define MIN(a, b) ((a) < (b)? (a): (b))
 /*---------------------------------------------------------------------------*/
 static void
 buf_init(struct telnetd_buf *buf)

diff --git a/core/lib/settings.c b/core/lib/settings.c
@@ -65,10 +65,6 @@
 #define SETTINGS_BOTTOM_ADDR	(SETTINGS_TOP_ADDR + 1 - SETTINGS_MAX_SIZE)
 #endif
 
-#ifndef MIN
-#define MIN(a,b) ((a)<(b)?a:b)
-#endif
-
 typedef struct {
 #if SETTINGS_CONF_SUPPORT_LARGE_VALUES
   uint8_t size_extra;

diff --git a/core/net/ip/tcp-socket.c b/core/net/ip/tcp-socket.c
@@ -30,6 +30,7 @@
  */
 
 #include "contiki.h"
+#include "sys/cc.h"
 #include "contiki-net.h"
 
 #include "lib/list.h"
@@ -39,7 +40,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
 
 static void relisten(struct tcp_socket *s);
 

diff --git a/core/net/ipv4/uip.c b/core/net/ipv4/uip.c
@@ -78,6 +78,8 @@
 #include "net/ipv4/uip-neighbor.h"
 
 #include <string.h>
+#include "sys/cc.h"
+
 /*---------------------------------------------------------------------------*/
 /* Variable definitions. */
 
@@ -1953,7 +1955,6 @@ void
 uip_send(const void *data, int len)
 {
   int copylen;
-#define MIN(a,b) ((a) < (b)? (a): (b))
   copylen = MIN(len, UIP_BUFSIZE - UIP_LLH_LEN - UIP_TCPIP_HLEN -
 		(int)((char *)uip_sappdata - (char *)&uip_buf[UIP_LLH_LEN + UIP_TCPIP_HLEN]));
   if(copylen > 0) {

diff --git a/core/net/ipv6/uip6.c b/core/net/ipv6/uip6.c
@@ -71,6 +71,7 @@
  * the packet back to the peer.
  */
 
+#include "sys/cc.h"
 #include "net/ip/uip.h"
 #include "net/ip/uipopt.h"
 #include "net/ipv6/uip-icmp6.h"
@@ -2332,7 +2333,6 @@ void
 uip_send(const void *data, int len)
 {
   int copylen;
-#define MIN(a,b) ((a) < (b)? (a): (b))
 
   if(uip_sappdata != NULL) {
     copylen = MIN(len, UIP_BUFSIZE - UIP_LLH_LEN - UIP_TCPIP_HLEN -

diff --git a/core/net/mac/contikimac/contikimac.c b/core/net/mac/contikimac/contikimac.c
@@ -229,10 +229,6 @@ static struct compower_activity current_packet;
 
 #define DEFAULT_STREAM_TIME (4 * CYCLE_TIME)
 
-#ifndef MIN
-#define MIN(a, b) ((a) < (b)? (a) : (b))
-#endif /* MIN */
-
 #if CONTIKIMAC_CONF_BROADCAST_RATE_LIMIT
 static struct timer broadcast_rate_timer;
 static int broadcast_rate_counter;

diff --git a/core/net/mac/cxmac/cxmac.c b/core/net/mac/cxmac/cxmac.c
@@ -52,6 +52,7 @@
 #include "sys/rtimer.h"
 
 #include "contiki-conf.h"
+#include "sys/cc.h"
 
 #ifdef EXPERIMENT_SETUP
 #include "experiment-setup.h"
@@ -215,10 +216,6 @@ static linkaddr_t is_streaming_to, is_streaming_to_too;
 static rtimer_clock_t stream_until;
 #define DEFAULT_STREAM_TIME (RTIMER_ARCH_SECOND)
 
-#ifndef MIN
-#define MIN(a, b) ((a) < (b)? (a) : (b))
-#endif /* MIN */
-
 /*---------------------------------------------------------------------------*/
 static void
 on(void)

diff --git a/core/net/rime/broadcast-announcement.c b/core/net/rime/broadcast-announcement.c
@@ -92,8 +92,6 @@ static struct broadcast_announcement_state {
 #define PRINTF(...)
 #endif
 
-#define MIN(a, b) ((a)<(b)?(a):(b))
-
 /*---------------------------------------------------------------------------*/
 static void
 send_adv(void *ptr)

diff --git a/core/net/rime/ipolite.c b/core/net/rime/ipolite.c
@@ -42,20 +42,13 @@
  * @{
  */
 
+#include "sys/cc.h"
 #include "net/rime/rime.h"
 #include "net/rime/ipolite.h"
 #include "lib/random.h"
 
 #include <string.h>
 
-#ifndef MAX
-#define MAX(a, b) ((a) > (b)? (a) : (b))
-#endif /* MAX */
-
-#ifndef MIN
-#define MIN(a, b) ((a) < (b)? (a) : (b))
-#endif /* MIN */
-
 #define DEBUG 0
 #if DEBUG
 #include <stdio.h>

diff --git a/core/net/rime/polite-announcement.c b/core/net/rime/polite-announcement.c
@@ -43,7 +43,7 @@
  */
 
 #include "contiki.h"
-
+#include "sys/cc.h"
 #include "lib/list.h"
 #include "net/rime/rime.h"
 #include "net/rime/announcement.h"
@@ -90,8 +90,6 @@ static struct polite_announcement_state {
 #define PRINTF(...)
 #endif
 
-#define MIN(a, b) ((a)<(b)?(a):(b))
-
 /*---------------------------------------------------------------------------*/
 static void
 send_adv(clock_time_t interval)

diff --git a/core/net/rime/polite.c b/core/net/rime/polite.c
@@ -42,21 +42,13 @@
  * @{
  */
 
+#include "sys/cc.h"
 #include "net/rime/rime.h"
 #include "net/rime/polite.h"
 #include "lib/random.h"
 
 #include <string.h>
 
-#ifndef MAX
-#define MAX(a,b) ((a) > (b)? (a) : (b))
-#endif /* MAX */
-
-#ifndef MIN
-#define MIN(a, b) ((a) < (b)? (a) : (b))
-#endif /* MIN */
-
-
 /*---------------------------------------------------------------------------*/
 static void
 recv(struct abc_conn *abc)

diff --git a/core/sys/cc.h b/core/sys/cc.h
@@ -127,6 +127,19 @@
 #define NULL 0
 #endif /* NULL */
 
+#ifndef MAX
+#define MAX(n, m)   (((n) < (m)) ? (m) : (n))
+#endif
+
+#ifndef MIN
+#define MIN(n, m)   (((n) < (m)) ? (n) : (m))
+#endif
+
+#ifndef ABS
+#define ABS(n)      (((n) < 0) ? -(n) : (n))
+#endif
+
+
 #define CC_CONCAT2(s1, s2) s1##s2
 /**
  * A C preprocessing macro for concatenating two preprocessor tokens.

diff --git a/cpu/avr/dev/usb/compiler.h b/cpu/avr/dev/usb/compiler.h
@@ -280,9 +280,6 @@ typedef char      r_uart_ptchar;
 #define OUT_X(addrx,value)      (*addrx = value)
 #define IN_X(addrx)             (*addrx)
 
-#  define Max(a, b)            ( (a)>(b) ? (a) : (b) )       // Take the max between a and b
-#  define Min(a, b)            ( (a)<(b) ? (a) : (b) )       // Take the min between a and b
-
 // Align on the upper value <val> on a <n> boundary
 // i.e. Upper(0, 4)= 4
 //      Upper(1, 4)= 4

diff --git a/cpu/cc26xx/dev/cc26xx-rf.c b/cpu/cc26xx/dev/cc26xx-rf.c
@@ -47,6 +47,7 @@
 #include "sys/energest.h"
 #include "sys/clock.h"
 #include "sys/rtimer.h"
+#include "sys/cc.h"
 #include "lpm.h"
 #include "ti-lib.h"
 /*---------------------------------------------------------------------------*/
@@ -78,10 +79,6 @@
     while(!(cond) && RTIMER_CLOCK_LT(RTIMER_NOW(), t0 + (max_time))); \
   } while(0)
 /*---------------------------------------------------------------------------*/
-#ifndef MIN
-#define MIN(n, m)   (((n) < (m)) ? (n) : (m))
-#endif
-/*---------------------------------------------------------------------------*/
 #ifdef __GNUC__
 #define CC_ALIGN_ATTR(n) __attribute__ ((aligned(n)))
 #else

diff --git a/cpu/rl78/adf7023/ADF7023.c b/cpu/rl78/adf7023/ADF7023.c
@@ -45,6 +45,7 @@
 #include "sfrs-ext.h"
 
 #include "contiki.h"        /* for clock_wait() and CLOCK_SECOND. */
+#include "sys/cc.h"
 
 /******************************************************************************/
 /*************************** Macros Definitions *******************************/
@@ -91,9 +92,6 @@
     while(condition) { body; break_loop(); } \
 } while(0)
 
-#undef MIN
-#define MIN(x, y) (((x) < (y)) ? (x) : (y))
-
 /******************************************************************************/
 /************************ Variables Definitions *******************************/
 /******************************************************************************/

diff --git a/examples/cc26xx/cc26xx-web-demo/net-uart.c b/examples/cc26xx/cc26xx-web-demo/net-uart.c
@@ -65,6 +65,7 @@
 #include "net/ip/uiplib.h"
 #include "net-uart.h"
 #include "httpd-simple.h"
+#include "sys/cc.h"
 
 #include "ti-lib.h"
 
@@ -86,10 +87,6 @@
 #define ADDRESS_CONVERSION_OK       1
 #define ADDRESS_CONVERSION_ERROR    0
 /*---------------------------------------------------------------------------*/
-#ifndef MIN
-#define MIN(n, m)   (((n) < (m)) ? (n) : (m))
-#endif
-/*---------------------------------------------------------------------------*/
 static struct uip_udp_conn *udp_conn = NULL;
 
 static uint8_t buffer[MAX_MSG_SIZE];

diff --git a/examples/er-rest-example/resources/res-plugtest-large-update.c b/examples/er-rest-example/resources/res-plugtest-large-update.c
@@ -37,6 +37,7 @@
  */
 
 #include <string.h>
+#include "sys/cc.h"
 #include "rest-engine.h"
 #include "er-coap.h"
 #include "er-plugtest.h"