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.

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

[cherry-pick][1.15]Add new enum to support 8 lanes breakout mode (#2009) #2106

Merged
merged 1 commit into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions inc/saiport.h
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,9 @@ typedef enum _sai_port_breakout_mode_type_t
/** 4 lanes breakout Mode */
SAI_PORT_BREAKOUT_MODE_TYPE_4_LANE = 2,

/** 8 lanes breakout Mode */
SAI_PORT_BREAKOUT_MODE_TYPE_8_LANE = 3,

/** Breakout mode max count */
SAI_PORT_BREAKOUT_MODE_TYPE_MAX
} sai_port_breakout_mode_type_t;
Expand Down
2 changes: 2 additions & 0 deletions meta/ancestry.pl
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ sub BuildCommitHistory
next if $enumName eq "SAI_API_MAX";
next if $enumName eq "SAI_OBJECT_TYPE_MAX";
next if $enumName eq "SAI_PORT_INTERFACE_TYPE_MAX";
next if $enumName eq "SAI_PORT_BREAKOUT_MODE_TYPE_MAX";

LogError "wrong initializer on $enumName $enumValue" if not $enumValue =~ /^0x[0-9a-f]{8}$/;

Expand Down Expand Up @@ -207,6 +208,7 @@ sub BuildCommitHistory
{
#print "elsif (defined $enumName $IGNORED{$enumName} and $IGNORED{$enumName} eq $HISTORY{$enumTypeName}{$enumName}{name})";

next if $HISTORY{$enumTypeName}{$enumValue} eq "SAI_PORT_BREAKOUT_MODE_TYPE_MAX";
LogWarning "Both enums have the same value $enumName and $HISTORY{$enumTypeName}{$enumValue} = $enumValue";
}
}
Expand Down
1 change: 1 addition & 0 deletions meta/checkheaders.pl
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ sub CheckHash
next if $key eq "SAI_OBJECT_TYPE_MAX";
next if $key eq "SAI_API_MAX";
next if $key eq "SAI_PORT_INTERFACE_TYPE_MAX";
next if $key eq "SAI_PORT_BREAKOUT_MODE_TYPE_MAX";

# NOTE: some other attributes/enum with END range could be added
}
Expand Down
Loading