Merge remote-tracking branch 'origin/cleanup-may-2020' into develop_integration_2020_w22

2020-05-28 12:58:42 +02:00
parent a0ab138a5e 9b06211056
commit 768b4e0f24
52 changed files with 143 additions and 3336 deletions
@@ -88,16 +88,12 @@ typedef guint8   gboolean;
    { .s5= {NULL }} ,                   \
  }

-#ifdef OCP_FRAMEWORK
-#include <enums.h>
-#else
 typedef enum trace_mode_e {
  OPT_WIRESHARK,
  OPT_PCAP,
  OPT_TSHARK,
  OPT_NONE
 } trace_mode_t;
-#endif

 typedef enum radio_type_e {
  RADIO_TYPE_FDD = 1,