fixes for 4.3.3 GCC warnings/errors

[people/ms/rstp.git] / ctl_functions.h

diff --git a/ctl_functions.h b/ctl_functions.h
index 9d630f652157d06a77b3c75420904e45053cb52c..74ac158b40470408589239b2aa0fa2440f69704d 100644 (file)
--- a/ctl_functions.h
+++ b/ctl_functions.h
@@ -25,38 +25,20 @@
 #ifndef CTL_FUNCTIONS_H
 #define CTL_FUNCTIONS_H
 
-#include <bitmap.h>
-#include <uid_stp.h>
+#include "rstp.h"
 
 int CTL_enable_bridge_rstp(int br_index, int enable);
 
-int CTL_get_bridge_state(int br_index,
-                        UID_STP_CFG_T * cfg, UID_STP_STATE_T * state);
+int CTL_get_bridge_status(int br_index, STP_BridgeStatus *status);
 
-int CTL_set_bridge_config(int br_index, UID_STP_CFG_T * cfg);
+int CTL_set_bridge_config(int br_index,  STP_BridgeConfig *cfg);
 
-int CTL_get_port_state(int br_index, int port_index,
-                      UID_STP_PORT_CFG_T * cfg, UID_STP_PORT_STATE_T * state);
+int CTL_get_port_status(int br_index, int port_index, STP_PortStatus *status);
 
-int CTL_set_port_config(int br_index, int port_index, UID_STP_PORT_CFG_T * cfg);
+int CTL_set_port_config(int br_index, int port_index, STP_PortConfig *cfg);
 
-int CTL_set_debug_level(int level);
-
-#define CTL_ERRORS \
- CHOOSE(Err_Interface_not_a_bridge), \
- CHOOSE(Err_Bridge_RSTP_not_enabled), \
- CHOOSE(Err_Bridge_is_down), \
- CHOOSE(Err_Port_does_not_belong_to_bridge), \
-
-#define CHOOSE(a) a
+int CTL_port_mcheck(int br_index, int port_index);
 
-enum Errors {
-       Err_Dummy_Start = 1000,
-       CTL_ERRORS Err_Dummy_End
-};
-
-#undef CHOOSE
-
-const char *CTL_error_explanation(int err);
+int CTL_set_debug_level(int level);
 
 #endif