Combine port and switch enums into one port enum

Signed-off-by: Rich Sugarman <rsugarman@nvidia.com>

Author: rdsugarmannv

inc/saiport.h

@@ -395,6 +395,9 @@ typedef enum _sai_port_priority_flow_control_mode_t
 
 /**
  * @brief PTP mode
+ * These modes can be used at the port and switch level.
+ * All ports use the value set at the switch level unless explicitly configured
+ * at the port level to a value other than SAI_PORT_PTP_MODE_NONE.
  */
 typedef enum _sai_port_ptp_mode_t
 {

inc/saiswitch.h

@@ -634,22 +634,6 @@ typedef enum _sai_packet_trim_queue_resolution_mode_t
 
 } sai_packet_trim_queue_resolution_mode_t;
 
-/**
- * @brief Global PTP configuration
- */
-typedef enum _sai_switch_ptp_mode_t
-{
-    /** None - per-port configuration can be used to switch PTP on for a port */
-    SAI_SWITCH_PTP_MODE_NONE,
-
-    /** One-step - all ports use one-step PTP mode */
-    SAI_SWITCH_PTP_MODE_SINGLE_STEP_TIMESTAMP,
-
-    /** Two-step - all ports use two-step PTP mode */
-    SAI_SWITCH_PTP_MODE_TWO_STEP_TIMESTAMP
-
-} sai_switch_ptp_mode_t;
-
 /**
  * @brief Attribute Id in sai_set_switch_attribute() and
  * sai_get_switch_attribute() calls.
@@ -3219,9 +3203,9 @@ typedef enum _sai_switch_attr_t
      * Global PTP mode configuration for the switch.
      * Applies to all ports unless overridden by port-specific settings.
      *
-     * @type sai_switch_ptp_mode_t
+     * @type sai_port_ptp_mode_t
      * @flags CREATE_AND_SET
-     * @default SAI_SWITCH_PTP_MODE_NONE
+     * @default SAI_PORT_PTP_MODE_NONE
      */
     SAI_SWITCH_ATTR_PTP_MODE,