Removed unused metadata from demo P4 programs
Change-Id: Ie50dd70ee6172fe6c77f8ce6e6be136db282219e
diff --git a/tools/test/p4src/p4-16/include/checksums.p4 b/tools/test/p4src/p4-16/include/checksums.p4
index cb86f90..effab74 100644
--- a/tools/test/p4src/p4-16/include/checksums.p4
+++ b/tools/test/p4src/p4-16/include/checksums.p4
@@ -1,7 +1,6 @@
#ifndef CHECKSUMS
#define CHECKSUMS
#include "headers.p4"
-#include "metadata.p4"
control verifyChecksum(in headers_t hdr, inout metadata_t meta) {
apply {
diff --git a/tools/test/p4src/p4-16/include/defines.p4 b/tools/test/p4src/p4-16/include/defines.p4
index ef258f6..6d37036 100644
--- a/tools/test/p4src/p4-16/include/defines.p4
+++ b/tools/test/p4src/p4-16/include/defines.p4
@@ -2,14 +2,14 @@
#define DEFINES
#define MAX_PORTS 254
-#define CPU_PORT 9w255
-#define DROP_PORT 9w511
-#define ETH_TYPE_IPV4 16w0x0800
+#define ETH_TYPE_IPV4 16w0x800
#define IP_TYPE_TCP 8w6
#define IP_TYPE_UDP 8w17
-typedef bit<16> group_id_t;
-typedef bit<8> group_size_t;
typedef bit<9> port_t;
+
+const port_t CPU_PORT = 255;
+const port_t DROP_PORT = 511;
+
#endif
diff --git a/tools/test/p4src/p4-16/include/metadata.p4 b/tools/test/p4src/p4-16/include/metadata.p4
deleted file mode 100644
index a026e2d..0000000
--- a/tools/test/p4src/p4-16/include/metadata.p4
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef METADATA
-#define METADATA
-
-struct ecmp_metadata_t {
- bit<16> group_id;
- bit<16> selector;
-}
-
-struct wcmp_metadata_t {
- bit<16> group_id;
- bit<8> numBits;
- bit<64> selector;
-}
-
-struct metadata_t {
- ecmp_metadata_t ecmp_metadata;
- wcmp_metadata_t wcmp_meta;
- intrinsic_metadata_t intrinsic_metadata;
-}
-#endif
diff --git a/tools/test/p4src/p4-16/include/parsers.p4 b/tools/test/p4src/p4-16/include/parsers.p4
index 68f3876..f5a785f 100644
--- a/tools/test/p4src/p4-16/include/parsers.p4
+++ b/tools/test/p4src/p4-16/include/parsers.p4
@@ -1,7 +1,6 @@
#ifndef PARSERS
#define PARSERS
#include "headers.p4"
-#include "metadata.p4"
parser ParserImpl(packet_in packet, out headers_t hdr, inout metadata_t meta,
inout standard_metadata_t standard_metadata) {