Merge branch 'master' of gitlab.ethz.ch:nicosc/master-thesis

This commit is contained in:
Nico Schottelius 2019-07-23 16:10:43 +02:00
commit 6096d8f933
1 changed files with 11 additions and 9 deletions

View File

@ -72,14 +72,15 @@ parser TopParser(packet_in packet,
*/ */
// control TopPipe(inout Parsed_packet p, // control TopPipe(inout Parsed_packet p,
// inout user_metadata_t user_metadata,
// inout digest_data_t digest_data, // inout digest_data_t digest_data,
// inout sume_metadata_t sume_metadata) { // inout sume_metadata_t sume_metadata) {
control TopPipe(inout headers hdr, control TopPipe(inout headers hdr,
inout metadata meta, //inout metadata meta,
inout digest_data_t digest_data, inout user_metadata_t user_metadata,
inout sume_metadata_t sume_metadata) { inout digest_data_t digest_data,
inout sume_metadata_t sume_metadata) {
// actions to be enabled // actions to be enabled
// #include "actions_nat64_generic.p4" // includes controller & delta checksum // #include "actions_nat64_generic.p4" // includes controller & delta checksum
@ -242,15 +243,16 @@ control TopPipe(inout headers hdr,
@Xilinx_MaxPacketRegion(1024) @Xilinx_MaxPacketRegion(1024)
control TopDeparser(packet_out packet, control TopDeparser(packet_out packet,
in headers hdr, in headers hdr,
in metadata meta, in user_metadata_t user_metadata,
inout digest_data_t digest_data, // in metadata meta,
inout sume_metadata_t sume_metadata) { inout digest_data_t digest_data,
inout sume_metadata_t sume_metadata) {
// @Xilinx_MaxPacketRegion(1024) // @Xilinx_MaxPacketRegion(1024)
// control TopDeparser(packet_out b, // control TopDeparser(packet_out b,
// in Parsed_packet p, // in Parsed_packet p,
// in user_metadata_t user_metadata,
// inout digest_data_t digest_data, // inout digest_data_t digest_data,
// inout sume_metadata_t sume_metadata) { // inout sume_metadata_t sume_metadata) {