Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

do not issue 'error' if user has defined PSA_CORE_TYPES #684

Merged
merged 2 commits into from
Jun 1, 2017
Merged

do not issue 'error' if user has defined PSA_CORE_TYPES #684

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39e6a3c
do not issue 'error' if user has defined PSA_CORE_TYPES
hanw-bfn May 30, 2017
31319f9
remove unused annotation in psa
hanw-bfn May 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions p4include/psa.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ typedef bit<unspecified> ParserErrorLocation_t;
typedef bit<unspecified> entry_key; /// for DirectMeters
const InstanceType_t INSTANCE_NORMAL = unspecified;
const PortId_t PORT_CPU = unspecified;
#else
#error "Please define the core types for PSA and the PSA_CORE_TYPES macro"
#endif

#include "core.p4"
Expand Down Expand Up @@ -556,12 +554,11 @@ parser Parser<H, M>(packet_in buffer, out H parsed_hdr, inout M user_meta,

control VerifyChecksum<H, M>(in H hdr, inout M user_meta);

@control
control Ingress<H, M>(inout H hdr, inout M user_meta,
PacketReplicationEngine pre,
in psa_ingress_input_metadata_t istd,
out psa_ingress_output_metadata_t ostd);
@control

control Egress<H, M>(inout H hdr, inout M user_meta,
PacketReplicationEngine pre,
in psa_egress_input_metadata_t istd);
Expand Down