From 115805d03617fde092296c5282d250c2da386fe9 Mon Sep 17 00:00:00 2001 From: Jacky Hou - A30492 Date: Wed, 21 Sep 2022 11:11:20 +0800 Subject: [PATCH] Remove unused compile options --- src/cli/l26_txtdef.h | 4 -- src/cli/txt_moredef.h | 4 -- src/switch/h2reg.h | 8 +-- src/switch/h2stats.h | 62 +------------------ src/switch/vtss_api/base/vtss_api_base_regs.h | 7 --- 5 files changed, 2 insertions(+), 83 deletions(-) diff --git a/src/cli/l26_txtdef.h b/src/cli/l26_txtdef.h index fa5d6c5..5fad49f 100644 --- a/src/cli/l26_txtdef.h +++ b/src/cli/l26_txtdef.h @@ -149,10 +149,6 @@ extern const char txt_TXT_NO_COMPILE_DATE []; typedef enum { #if TRANSIT_LLDP TXT_NO_CHIP_NAME, -#if defined(VTSS_ARCH_LUTON26) - TXT_NO_SWITCH_DESCRIPTION, - TXT_NO_SWITCH_NAME, -#endif #if UNMANAGED_LLDP_DEBUG_IF #if 0 TXT_NO_LLDP_OPTIONAL_TLVS, diff --git a/src/cli/txt_moredef.h b/src/cli/txt_moredef.h index 00d0d6e..f7b7ff9 100644 --- a/src/cli/txt_moredef.h +++ b/src/cli/txt_moredef.h @@ -177,10 +177,6 @@ extern const char txt_TXT_NO_COMPILE_DATE []; typedef enum { #if TRANSIT_LLDP TXT_NO_CHIP_NAME, -#if defined(VTSS_ARCH_LUTON26) - TXT_NO_SWITCH_DESCRIPTION, - TXT_NO_SWITCH_NAME, -#endif #if UNMANAGED_LLDP_DEBUG_IF #if 0 TXT_NO_LLDP_OPTIONAL_TLVS, diff --git a/src/switch/h2reg.h b/src/switch/h2reg.h index f6ec9aa..31347a7 100644 --- a/src/switch/h2reg.h +++ b/src/switch/h2reg.h @@ -198,13 +198,7 @@ /* ** Maximum number of ports in a link aggregation group */ - - -#if defined(LUTON26_L25) -#define MAX_NO_OF_AGGR_PORTS 16 -#elif defined(LUTON26_L10) || defined(LUTON26_L16) -#define MAX_NO_OF_AGGR_PORTS 10 -#elif defined(FERRET_F11) || defined(FERRET_F10P) +#if defined(FERRET_F11) || defined(FERRET_F10P) #define MAX_NO_OF_AGGR_PORTS 10 #elif defined(FERRET_F5) || defined(FERRET_F4P) #define MAX_NO_OF_AGGR_PORTS 4 diff --git a/src/switch/h2stats.h b/src/switch/h2stats.h index 7527d50..c3d3ead 100644 --- a/src/switch/h2stats.h +++ b/src/switch/h2stats.h @@ -17,67 +17,7 @@ * * ************************************************************************** */ -#if defined(VTSS_ARCH_LUTON26) -typedef enum _port_statistics_t { - /* TABLE Lookup counters */ - - CNT_RX_OCTETS = 0x0, - CNT_RX_PKTS = 0x1, - CNT_RX_MCAST_PKTS = 0x2, - CNT_RX_BCAST_PKTS = 0x3, - CNT_RX_UNDERSIZE_PKTS = 0x4, - CNT_RX_FRAGMENTS = 0x5, - CNT_RX_JABBERS = 0x6, - CNT_RX_CRC_ALIGN_ERRS = 0x7, - CNT_RX_64 = 0x8, - CNT_RX_65_TO_127 = 0x9, - CNT_RX_128_TO_255 = 0xa, - CNT_RX_256_TO_511 = 0xb, - CNT_RX_512_TO_1023 = 0xc, - CNT_RX_1024_TO_1526 = 0xd, - CNT_RX_OVERSIZE_PKTS = 0xe, - CNT_RX_PAUSE = 0xf, - CNT_RX_CTRL = 0x10, - CNT_RX_LONG = 0x11, - CNT_RX_CAT_DROP = 0x12, - - CNT_TX_OCTETS = 0x800, - CNT_TX_PKTS = 0x801, - CNT_TX_MCAST_PKTS = 0x802, - CNT_TX_BCAST_PKTS = 0x803, - CNT_TX_COLLISIONS = 0x804, - CNT_TX_DROP = 0x805, - CNT_TX_PAUSE = 0x806, - CNT_TX_64 = 0x807, - CNT_TX_65_TO_127 = 0x808, - CNT_TX_128_TO_255 = 0x809, - CNT_TX_256_TO_511 = 0x80a, - CNT_TX_512_TO_1023 = 0x80b, - CNT_TX_1024_TO_1526 = 0x80c, - CNT_TX_OVERSIZE_PKTS = 0x80d, - CNT_TX_AGED = 0x81e, - - CNT_DROP_LOCAL = 0xc00, - CNT_DROP_TAIL = 0xc01, - - /* Combined Counters */ - CNT_RX_UCAST_PKTS = 0x7000, - CNT_RX_NON_UCAST_PKTS = 0x7001, - CNT_RX_DISCARD_PKTS = 0x7002, - CNT_RX_ERR_PKTS = 0x7003, - CNT_RX_UNKNOWN_PROTOS = 0x7004, - CNT_RX_DROPEVENTS = 0x7005, - - CNT_TX_UCAST_PKTS = 0x7100, - CNT_TX_NON_UCAST_PKTS = 0x7101, - CNT_TX_DISCARDS = 0x7102, - CNT_TX_ERR_PKTS = 0x7103, - - - COUNTER_NONE = 0xffff, -} port_statistics_t; - -#elif defined(VTSS_ARCH_OCELOT) +#if defined(VTSS_ARCH_OCELOT) /* Refer to chip specification: Receive Counters in the Statistics Block */ typedef enum _port_statistics_t { /* TABLE Lookup counters */ diff --git a/src/switch/vtss_api/base/vtss_api_base_regs.h b/src/switch/vtss_api/base/vtss_api_base_regs.h index 1c4e52d..f29e6e0 100644 --- a/src/switch/vtss_api/base/vtss_api_base_regs.h +++ b/src/switch/vtss_api/base/vtss_api_base_regs.h @@ -12,13 +12,6 @@ #include "vtss_ocelot_regs_twi.h" #include "vtss_ocelot_regs_hsio.h" #include "vtss_ocelot_regs_icpu_cfg.h" - -#elif defined(VTSS_ARCH_LUTON26) -#include "vtss_luton26_reg.h" -#include "vtss_luton26_regs.h" -#include "vtss_luton26_regs_dev.h" -#include "vtss_luton26_regs_twi.h" -#include "vtss_luton26_regs_icpu_cfg.h" #endif // VTSS_ARCH_OCELOT #endif // __VTSS_API_BASE_REGS_H__