merge to develop

2020-06-01 19:27:44 +08:00
parent a102405896
commit 03d354efce
338 changed files with 11521 additions and 28975 deletions
@@ -30,6 +30,9 @@
 * \warning
 */

+#ifndef __ETHERNET_USERSPACE_LIB_IF_DEFS__H__
+#define __ETHERNET_USERSPACE_LIB_IF_DEFS__H__
+
 #include <netinet/ether.h>
 #include <stdint.h>

@@ -37,15 +40,11 @@
 #include "PHY/LTE_TRANSPORT/if5_tools.h"

 // ETH transport preference modes
-#ifdef OCP_FRAMEWORK
-#include "enums.h"
-#else
 #define ETH_UDP_MODE        0
 #define ETH_RAW_MODE        1
 #define ETH_UDP_IF4p5_MODE    2
 #define ETH_RAW_IF4p5_MODE    3
 #define ETH_RAW_IF5_MOBIPASS    4    
-#endif

 // COMMOM HEADER LENGTHS

@@ -84,3 +83,5 @@
 #define RAW_IF5_MOBIPASS_BLOCK_SIZE_BYTES 1280
 #define RAW_IF5_MOBIPASS_SIZE_BYTES (MAC_HEADER_SIZE_BYTES + sizeof_IF5_mobipass_header_t + RAW_IF5_MOBIPASS_BLOCK_SIZE_BYTES)
 #define PAYLOAD_MOBIPASS_NUM_SAMPLES  640
+
+#endif