include/icsneo/device/idevicesettings.h

@@ -668,37 +668,6 @@ typedef struct
 } Fire3LinuxSettings;
 #define FIRE3LINUXSETTINGS_SIZE 8
 static_assert(sizeof(Fire3LinuxSettings) == FIRE3LINUXSETTINGS_SIZE, "Fire3LinuxSettings is the wrong size!");
-
-
-/* Define number of CMP streams per device*/
-#define CMP_STREAMS_FIRE3 (10)
-#define CMP_STREAMS_FIRE3FR (10)
-#define CMP_STREAMS_RED2 (10)
-#define CMP_STREAMS_A2B (3)
-#define CMP_STREAMS_GIGASTAR (10)
-
-/* CMP Network Enables */
-typedef struct
-{
-	uint8_t bStreamEnabled : 1;
-	uint8_t EthModule : 2;
-	uint8_t bControlEnabled : 1;
-	uint8_t spare : 4;
-	uint8_t streamId;
-	uint8_t dstMac[6];
-	uint64_t network_enables_1;
-	uint64_t network_enables_2;
-} CMP_NETWORK_DATA;
-
-/* Global CMP Data */
-typedef struct
-{
-	uint8_t cmp_enabled : 1;
-	uint8_t sparebits : 7;
-	uint8_t spare;
-	uint16_t cmp_device_id;
-} CMP_GLOBAL_DATA;
-
 #pragma pack(pop)
 
 #ifdef __cplusplus

include/icsneo/device/tree/neovired2/neovired2settings.h

@@ -79,15 +79,7 @@ typedef struct {
 	uint16_t digitalIoThresholdEnable;
 	uint16_t misc_io_initial_ddr;
 	uint16_t misc_io_initial_latch;
-	ETHERNET_SETTINGS2 ethernet2_1;
+	ETHERNET_SETTINGS2 ethernet2;
-	ETHERNET_SETTINGS ethernet_2;
-	ETHERNET_SETTINGS2 ethernet2_2;
-	Fire3LinuxSettings os_settings;
-	RAD_GPTP_SETTINGS gPTP;
-	uint16_t iso_tester_pullup_enable;
-	CMP_GLOBAL_DATA cmp_global_data;
-	CMP_NETWORK_DATA cmp_stream_data[CMP_STREAMS_RED2];
-	uint32_t networkTimeSync;
 } neovired2_settings_t;
 
 typedef struct {

platform/servd.cpp

@@ -142,7 +142,6 @@ bool Servd::close() {
 		messageSocket.sendto(request.data(), request.size(), SERVD_ADDRESS);
 	}
 	opened = false;
-	setIsClosing(false);
 	return true;
 }