commit 35d9b333f876edaec547fac0e364bf01585ef3e5
author Carmelo Cascone <carmelo@opennetworking.org> Fri Jun 15 16:27:22 2018 +0200
committer Carmelo Cascone <carmelo@opennetworking.org> Fri Jun 15 19:05:11 2018 +0000
tree 8c47cbbafdac0ace9993717d6d2dfbf37dfaa0f7
parent 6af4e17c53a8220127b91c637c8ad08ce51a8bdb

Support compiling fabric.p4 with non-standard bool declarations

Change-Id: I5e579f58f274996fdff55d8e35d1dd96a7013941

pipelines/fabric/src/main/resources/include/define.p4

diff --git a/pipelines/fabric/src/main/resources/include/define.p4 b/pipelines/fabric/src/main/resources/include/define.p4
index eb61f91..1522df1 100644
--- a/pipelines/fabric/src/main/resources/include/define.p4
+++ b/pipelines/fabric/src/main/resources/include/define.p4
@@ -19,6 +19,40 @@
 
 #define MAX_PORTS 511
 
+#ifndef _BOOL
+#define _BOOL bool
+#endif
+#ifndef _TRUE
+#define _TRUE true
+#endif
+#ifndef _FALSE
+#define _FALSE true
+#endif
+
+#ifndef _PKT_OUT_HDR_ANNOT
+#define _PKT_OUT_HDR_ANNOT
+#endif
+
+#ifndef IP_VER_LENGTH
+#define IP_VER_LENGTH 4
+#endif
+#ifndef IP_VERSION_4
+#define IP_VERSION_4 4
+#endif
+#ifndef IP_VERSION_6
+#define IP_VERSION_6 6
+#endif
+
+#define ETH_HDR_SIZE 14
+#define IPV4_HDR_SIZE 20
+#define UDP_HDR_SIZE 8
+#define GTP_HDR_SIZE 8
+
+#define UDP_PORT_GTPU 2152
+#define GTP_GPDU 0xff
+#define GTPU_VERSION 0x01
+#define GTP_PROTOCOL_TYPE_GTP 0x01
+
 typedef bit<3>  fwd_type_t;
 typedef bit<32> next_id_t;
 typedef bit<20> mpls_label_t;
@@ -36,16 +70,6 @@
 const bit<16> ETHERTYPE_IPV6 = 0x86dd;
 const bit<16> ETHERTYPE_ARP  = 0x0806;
 
-#ifndef IP_VER_LENGTH
-#define IP_VER_LENGTH 4
-#endif
-#ifndef IP_VERSION_4
-#define IP_VERSION_4 4
-#endif
-#ifndef IP_VERSION_6
-#define IP_VERSION_6 6
-#endif
-
 const bit<8> PROTO_ICMP = 1;
 const bit<8> PROTO_TCP = 6;
 const bit<8> PROTO_UDP = 17;
@@ -53,10 +77,6 @@
 
 const bit<4> IPV4_MIN_IHL = 5;
 
-#ifndef _PKT_OUT_HDR_ANNOT_
-#define _PKT_OUT_HDR_ANNOT_
-#endif
-
 const fwd_type_t FWD_BRIDGING = 0;
 const fwd_type_t FWD_MPLS = 1;
 const fwd_type_t FWD_IPV4_UNICAST = 2;
@@ -67,16 +87,6 @@
 const bit<8> DEFAULT_MPLS_TTL = 64;
 const bit<8> DEFAULT_IPV4_TTL = 64;
 
-#define ETH_HDR_SIZE 14
-#define IPV4_HDR_SIZE 20
-#define UDP_HDR_SIZE 8
-#define GTP_HDR_SIZE 8
-
-#define UDP_PORT_GTPU 2152
-#define GTP_GPDU 0xff
-#define GTPU_VERSION 0x01
-#define GTP_PROTOCOL_TYPE_GTP 0x01
-
 typedef bit direction_t;
 typedef bit pcc_gate_status_t;
 typedef bit<32> sdf_rule_id_t;