Skip to content

Remove use of vendor specific macros #1975

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove use of vendor specific macros #1975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 deletions test/saithrift/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,6 @@ ifeq ($(shell dpkg --compare-versions $(THRIFT_VERSION) "le" 0.11.0 && echo True
CFLAGS += -DFORCE_BOOST_SMART_PTR
endif

ifeq ($(platform),MLNX)
CDEFS = -DMLNXSAI
else
ifeq ($(platform),BFT)
CDEFS = -DBFTSAI
else
ifeq ($(platform),CAVIUM)
CDEFS = -DCAVIUMSAI
else
CDEFS = -DBRCMSAI
endif
endif
endif
DEPS = switch_sai_rpc.h switch_sai_types.h
OBJS = switch_sai_rpc.o switch_sai_types.o

Expand Down
9 changes: 2 additions & 7 deletions test/saithrift/src/saiserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ const sai_service_method_table_t test_services = {
test_profile_get_next_value
};

#ifdef BRCMSAI
void sai_diag_shell()
{
sai_status_t status;
Expand All @@ -234,7 +233,6 @@ void sai_diag_shell()
sleep(1);
}
}
#endif

struct cmdOptions
{
Expand Down Expand Up @@ -442,7 +440,6 @@ main(int argc, char* argv[])
exit(EXIT_FAILURE);
}

//in case of the brcm switch not (!defined(INCLUDE_KNET) && !defined(BCMSIM))
sai_attribute_t attr_pkt;
attr_pkt.id = SAI_SWITCH_ATTR_PACKET_EVENT_NOTIFY;
attr_pkt.value.ptr = reinterpret_cast<sai_pointer_t>(&on_packet_event);
Expand All @@ -454,10 +451,8 @@ main(int argc, char* argv[])

handleInitScript(options.initScript);

#ifdef BRCMSAI
std::thread bcm_diag_shell_thread = std::thread(sai_diag_shell);
bcm_diag_shell_thread.detach();
#endif
std::thread diag_shell_thread = std::thread(sai_diag_shell);
diag_shell_thread.detach();

start_sai_thrift_rpc_server(SWITCH_SAI_THRIFT_RPC_SERVER_PORT);

Expand Down
14 changes: 0 additions & 14 deletions test/saithriftv2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,6 @@ CPPFLAGS = -I$(SAI_HEADER_DIR) -I. -std=c++11 -O0 -ggdb
# specify add'l libraries along with libsai
SAIRPC_EXTRA_LIBS?=

ifeq ($(platform),MLNX)
CDEFS = -DMLNXSAI
else
ifeq ($(platform),BFN)
CDEFS = -DBFNSAI
else
ifeq ($(platform),CAVIUM)
CDEFS = -DCAVIUMSAI
else
CDEFS = -DBRCMSAI
endif
endif
endif

ifneq (, $(wildcard /usr/local/bin/ctypesgen))
CTYPESGEN = /usr/local/bin/ctypesgen
else
Expand Down