Skip to content

Commit d24cbb2

Browse files
authored
Unify SAI_HOSTIF_USER_DEFINED_TRAP_TYPE_CUSTOM_RANGE_BASE (opencomputeproject#2114)
To match all other custom range bases starting from 0x1000000. All other _CUSTOM_RANGE_BASE enums are indexed at 0x1000000, lets's move this one to the same base to have all vendor custom enums at the same base across entire SAI
1 parent 2602b2a commit d24cbb2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

inc/saihostif.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -712,14 +712,14 @@ typedef enum _sai_hostif_user_defined_trap_type_t
712712
/** Traps to be associated with TAM collector */
713713
SAI_HOSTIF_USER_DEFINED_TRAP_TYPE_TAM,
714714

715-
/** Custom range base */
716-
SAI_HOSTIF_USER_DEFINED_TRAP_TYPE_CUSTOM_RANGE_BASE = 0x00001000,
717-
718715
/**
719716
* @brief End of user defined trap types
720717
*/
721718
SAI_HOSTIF_USER_DEFINED_TRAP_TYPE_END,
722719

720+
/** Custom range base */
721+
SAI_HOSTIF_USER_DEFINED_TRAP_TYPE_CUSTOM_RANGE_BASE = 0x10000000,
722+
723723
} sai_hostif_user_defined_trap_type_t;
724724

725725
/**

meta/checkheaders.pl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@ sub CheckHash
197197
next if $key eq "SAI_PORT_INTERFACE_TYPE_MAX";
198198
next if $key eq "SAI_PORT_STAT_END";
199199
next if $key eq "SAI_PORT_BREAKOUT_MODE_TYPE_MAX";
200+
next if $key eq "SAI_HOSTIF_USER_DEFINED_TRAP_TYPE_CUSTOM_RANGE_BASE";
201+
next if $key eq "SAI_HOSTIF_USER_DEFINED_TRAP_TYPE_END";
200202

201203
# NOTE: some other attributes/enum with END range could be added
202204
}

meta/test.pm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,6 @@ sub CreateCustomRangeBaseTest
190190

191191
for my $range (@ranges)
192192
{
193-
next if $range eq "SAI_HOSTIF_USER_DEFINED_TRAP_TYPE_CUSTOM_RANGE_BASE"; # TODO exception, to be remove
194-
195193
my $prefix = uc $1 if $key =~ /(sai_\w+)_t$/;
196194

197195
if ($range eq "${prefix}_CUSTOM_RANGE_BASE")

0 commit comments

Comments
 (0)