From ad004bec6744d09487aee3e64c54807d314b0cbd Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Tue, 23 Jul 2019 16:25:44 +0200
Subject: [PATCH] re-inroduce general meta, replacing user_metadata

---
 p4src/minip4_solution.p4 | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/p4src/minip4_solution.p4 b/p4src/minip4_solution.p4
index e9af07f..87f1879 100644
--- a/p4src/minip4_solution.p4
+++ b/p4src/minip4_solution.p4
@@ -50,13 +50,14 @@ struct digest_data_t {
 @Xilinx_MaxPacketRegion(1024)
 parser TopParser(packet_in packet,
                  out headers hdr,
-//                 out metadata meta,
-                 out user_metadata_t user_metadata,
+                 out metadata meta,
+//                 out user_metadata_t user_metadata,
                  out digest_data_t digest_data,
                  inout sume_metadata_t standard_metadata) {
     state start {
         packet.extract(hdr.ethernet);
-        user_metadata.unused = 0;
+        //user_metadata.unused = 0;
+        meta.task = 0; // all others missing
         digest_data.unused = 0;
 
         transition accept;
@@ -77,8 +78,8 @@ parser TopParser(packet_in packet,
 //                 inout sume_metadata_t sume_metadata) {
 
 control TopPipe(inout headers hdr,
-        //inout metadata meta,
-        inout user_metadata_t user_metadata,
+        inout metadata meta,
+        //inout user_metadata_t user_metadata,
         inout digest_data_t digest_data,
         inout sume_metadata_t sume_metadata) {
 
@@ -244,8 +245,8 @@ control TopPipe(inout headers hdr,
 @Xilinx_MaxPacketRegion(1024)
 control TopDeparser(packet_out packet,
         in headers hdr,
-        in user_metadata_t user_metadata,
-//        in metadata meta,
+        //in user_metadata_t user_metadata,
+        in metadata meta,
         inout digest_data_t digest_data,
         inout sume_metadata_t sume_metadata) {