Skip to content
Closed
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
1 change: 1 addition & 0 deletions fboss/agent/Utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,7 @@ uint32_t getRemotePortOffset(const PlatformType platformType) {
return 0;
case PlatformType::PLATFORM_MERU800BIA:
case PlatformType::PLATFORM_MERU800BIAB:
case PlatformType::PLATFORM_MERU800BIAC:
case PlatformType::PLATFORM_JANGA800BIC:
return 1024;

Expand Down
5 changes: 3 additions & 2 deletions fboss/platform/helpers/PlatformNameLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ std::string sanitizePlatformName(const std::string& platformNameFromBios) {
return "TAHAN800BC";
}

// MERU800BIAB and MERU800BIA have equivalent configs
if (platformNameUpper == "MERU800BIAB") {
// MERU800BIAB, MERU800BIAC and MERU800BIA have equivalent configs
if (platformNameUpper == "MERU800BIAB" ||
platformNameUpper == "MERU800BIAC") {
return "MERU800BIA";
}

Expand Down
9 changes: 6 additions & 3 deletions fboss/util/wedge_qsfp_util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4357,7 +4357,8 @@ std::pair<std::unique_ptr<TransceiverI2CApi>, int> getTransceiverAPI() {
auto ioBus = std::make_unique<BspIOBus>(systemContainer);
return std::make_pair(std::move(ioBus), 0);
} else if (
FLAGS_platform == "meru800bia" || FLAGS_platform == "meru800biab") {
FLAGS_platform == "meru800bia" || FLAGS_platform == "meru800biab" ||
FLAGS_platform == "meru800biac") {
auto systemContainer =
BspGenericSystemContainer<Meru800biaBspPlatformMapping>::getInstance()
.get();
Expand Down Expand Up @@ -4435,7 +4436,8 @@ std::pair<std::unique_ptr<TransceiverI2CApi>, int> getTransceiverAPI() {
return std::make_pair(std::move(ioBus), 0);
} else if (
mode == PlatformType::PLATFORM_MERU800BIA ||
mode == PlatformType::PLATFORM_MERU800BIAB) {
mode == PlatformType::PLATFORM_MERU800BIAB ||
mode == PlatformType::PLATFORM_MERU800BIAC) {
auto systemContainer =
BspGenericSystemContainer<Meru800biaBspPlatformMapping>::getInstance()
.get();
Expand Down Expand Up @@ -4560,7 +4562,8 @@ getTransceiverPlatformAPI(TransceiverI2CApi* i2cBus) {
std::make_unique<BspTransceiverApi>(systemContainer), 0);
} else if (
mode == PlatformType::PLATFORM_MERU800BIA ||
mode == PlatformType::PLATFORM_MERU800BIAB) {
mode == PlatformType::PLATFORM_MERU800BIAB ||
mode == PlatformType::PLATFORM_MERU800BIAC) {
auto systemContainer =
BspGenericSystemContainer<Meru800biaBspPlatformMapping>::getInstance()
.get();
Expand Down