From 65e789324552a000d761b645841694507900462a Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Tue, 23 Jul 2019 20:33:09 +0200
Subject: [PATCH] Revert everything besides naming

---
 p4src/minip4_solution.p4 | 70 ++++++++++++++--------------------------
 1 file changed, 25 insertions(+), 45 deletions(-)

diff --git a/p4src/minip4_solution.p4 b/p4src/minip4_solution.p4
index 87f1879..e1d1b3e 100644
--- a/p4src/minip4_solution.p4
+++ b/p4src/minip4_solution.p4
@@ -14,8 +14,8 @@
 
 typedef bit<48> EthAddr_t;
 header Ethernet_h {
-    EthAddr_t dstAddr;
-    EthAddr_t srcAddr;
+    EthAddr_t dst_addr;
+    EthAddr_t src_addr;
     bit<16> etherType;
 }
 
@@ -39,25 +39,18 @@ struct digest_data_t {
  * Parser
  */
 
-// @Xilinx_MaxPacketRegion(1024)
-// parser TopParser(packet_in b,
-//                  out Parsed_packet p,
-//                  out user_metadata_t user_metadata,
-//                  out digest_data_t digest_data,
-//                  inout sume_metadata_t sume_metadata) {
-// }
-
 @Xilinx_MaxPacketRegion(1024)
 parser TopParser(packet_in packet,
-                 out headers hdr,
-                 out metadata meta,
-//                 out user_metadata_t user_metadata,
+//                 out headers hdr,
+    out Parsed_packet hdr,
+    //                 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;
-        meta.task = 0; // all others missing
+        user_metadata.unused = 0;
+        //meta.task = 0; // all others missing
         digest_data.unused = 0;
 
         transition accept;
@@ -71,15 +64,11 @@ parser TopParser(packet_in packet,
 /********************************************************************************
  * Main
 */
-
-// control TopPipe(inout Parsed_packet p,
-
-//                 inout digest_data_t digest_data,
-//                 inout sume_metadata_t sume_metadata) {
-
-control TopPipe(inout headers hdr,
-        inout metadata meta,
-        //inout user_metadata_t user_metadata,
+    control TopPipe(
+        inout Parsed_packet hdr,
+//        inout headers hdr,
+        //inout metadata meta,
+        inout user_metadata_t user_metadata,
         inout digest_data_t digest_data,
         inout sume_metadata_t sume_metadata) {
 
@@ -228,9 +217,7 @@ control TopPipe(inout headers hdr,
             send_to_all_ports;
         }
         size = 64;
-//        default_action = swap_eth_addresses; // test_mirror(): in gen_testdata.py
         default_action = send_to_port1; // test_port1()
-//        default_action = send_to_all_ports; // test_allports():
     }
 
     apply {
@@ -243,26 +230,19 @@ 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,
-        inout digest_data_t digest_data,
-        inout sume_metadata_t sume_metadata) {
+control TopDeparser(
+    packet_out packet,
+//    in headers hdr,
+    in Parsed_packet hdr,
+    in user_metadata_t user_metadata,
+    //in metadata meta,
+    inout digest_data_t digest_data,
+    inout sume_metadata_t sume_metadata) {
+    apply {
+        packet.emit(hdr.ethernet);
+    }
 
-// @Xilinx_MaxPacketRegion(1024)
-// control TopDeparser(packet_out b,
-//             in Parsed_packet p,
-
-//             inout digest_data_t digest_data,
-//             inout sume_metadata_t sume_metadata) {
-
-
-            apply {
-                packet.emit(hdr.ethernet);
-            }
-
-//    #include "deparser.p4"
+    //    #include "deparser.p4"
 
 }