Projekt an neue Buildstruktur angepasst. Demo adaptiert.

libmininet/.gitignore → .gitignore

@@ -8,5 +8,7 @@
 Debug/
 Profile/
 Release/
+install/
+buildall.sh
 *.pro.user
 *.bak

demo/demo.pro

@@ -1,13 +1,21 @@
 TEMPLATE = app
 CONFIG += console
-CONFIG -= app_bundle
-CONFIG -= qt
+CONFIG -= app_bundle qt
+CONFIG += shared thread
+
+QMAKE_LIBDIR += $$[QT_SYSROOT]/usr/lib/gfa
+QMAKE_RPATHDIR += /usr/lib/gfa
 
 CONFIG(debug, debug|release) {
     QMAKE_CXXFLAGS -= -Os
     QMAKE_CFLAGS -= -Os
     QMAKE_CXXFLAGS += -D_DEBUG
     QMAKE_CFLAGS += -D_DEBUG
+	QMAKE_LIBS += -lgfamininetd
+}
+
+CONFIG(release, debug|release) {
+	QMAKE_LIBS += -lgfamininet
 }
 
 linux-buildroot-g++ {
@@ -17,8 +25,6 @@ linux-buildroot-g++ {
 	INSTALLS += target
 }
 
-QMAKE_LIBS += -lgfamininetd
-QMAKE_INCDIR += ../ti
-#QMAKE_LIBDIR += $$OUT_PWD/../../../libmininet/Debug/Desktop_Qt_5_7_0_GCC_64bit
+#QMAKE_INCDIR += ../ti
 
 SOURCES += main.c

demo/main.c

@@ -1,134 +1,49 @@
 #include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <byteswap.h>
-#include <unistd.h>
-#include <stddef.h>
-#include <time.h>
-#include <errno.h>
-#include <gfaserial.h>
-#include <gfabootlmast.h>
-#include "../libmininet/dbghlp.h"
+#include <string.h> // memset
+#include <gfa/gfaserial.h>
+#include <gfa/gfamininetmst.h>
+#include "../src/dbghlp.h"
 
-#ifdef _TARGET_BUILD
-#define _DEVICE_NAME				"/dev/ttyO4"
-#else
-#define _DEVICE_NAME				"/dev/tty0"
-#endif	//	_TARGET_BUILD
+////////////////////////////////////////////////////////////////////////////////////
 
+#define _DEVICE_NAME				"/dev/ttyO4"
 #define _NODE_ADDR					0x11
-#define _BL_MATERIAL				"G.Z.40015 P01"
-#define _BL_SERIAL					"18-080015 1409"
-#define _IMG_FILE_PATH				"/opt/sflash/OLS-1V1_0009_crc.bin"
-//#define _IMG_FILE_PATH				"/opt/sflash/test.jpg"
+#define _BAUD_RATE					19200
+#define _DATA_BITS					8
+#define _STOP_BITS					1
+#define _PARITY						'N'
 
-#define _BAUD_HI					115200 // 921600 460800 230400 115200
-#define _BAUD_LO					19200
-
-// gfativaflashutil
-/////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////
 
-static uint64_t _Timespec2Ns(const struct timespec *pts)
+static int _BootloaderGetExecutionContext(HGFAMINEMST hMinem, uint8_t nNodeAddr)
 {
-	if(pts)
-		return (uint64_t)pts->tv_sec * 1000000000 + (uint64_t)pts->tv_nsec;
-	return (uint64_t)-1;
-}
+	if(hMinem && !NODE_IS_MULTICAST(nNodeAddr))
+	{
+		uint8_t nIndex;
+		ssize_t nRet, nLen;
+		char txb[32], rxb[256];
 
-/////////////////////////////////////////////////////////////////////////////
+	    nLen = GfaMininetMasterBuildFrame(hMinem, nNodeAddr, 0, "BU", 2, txb, sizeof(txb));
 
-static int64_t _TimespecDiff(const struct timespec *pts1, const struct timespec *pts2)
-{
-	int64_t nRet = 0;
+		if((nRet = GfaMininetMasterTransmitFrame(hMinem, txb, nLen)) != nLen)
+			return -1;
 
-	if(pts1 && pts2)
-	{
-		uint64_t t1 = _Timespec2Ns(pts1);
-		uint64_t t2 = _Timespec2Ns(pts2);
-		nRet = (int64_t)(t1 - t2);
-	}
+		if((nLen = GfaMininetMasterReceiveFrame(hMinem, rxb, sizeof(rxb), true)) <= 0)
+			return -1;
 
-	return nRet;
-}
+		nRet = GfaMininetMasterEvaluateSlaveResponse(hMinem, nNodeAddr, rxb, nLen, true, &nIndex);
 
-#ifdef _DEBUG
-static void _BuCmdDownloadStatus(const char *pszFile, int nLine, uint8_t nNodeAddr, uint32_t nFlashStartAddr, uint32_t nCbData, int nCtx, int nErrorCode)
-#else	//	_DEBUG
-static void _BuCmdDownloadStatus(uint8_t nNodeAddr, uint32_t nFlashStartAddr, uint32_t nCbData, int nCtx, int nErrorCode)
-#endif	//	_DEBUG
-{
-	static struct timespec tsStart, tsEnd;
-	int64_t nInterval;
-	
-	switch(nCtx)
-	{
-	case 0:
-		TRACE("\n%s:%d: %s!\n", pszFile, nLine, GfaBlmStrError(nErrorCode));
-		break;
-	case 1:
-		clock_gettime(CLOCK_MONOTONIC, &tsStart);
-		TRACE("Start download of %u Bytes to Node 0x%02hhX @ 0x%X.\n", nCbData, nNodeAddr, nFlashStartAddr);
-		break;
-	case 2:
-		break;
-	case 3:
-		clock_gettime(CLOCK_MONOTONIC, &tsEnd);
-		nInterval = _TimespecDiff(&tsEnd, &tsStart);
-		TRACE("Erased Flash in %lld ms.\n", nInterval / 1000000);
-		break;
-	default:
-		break;
-	}
-}
+		if(nRet == MINET_SLAVE_RESPONSE_SUCCESS)
+			return -1; // Slave is neither a Bootloader nor an App
+		if(nRet == MINET_SLAVE_RESPONSE_ACK)
+			return 0; // Bootloader responding
+		else if(nRet == MINET_SLAVE_RESPONSE_INDEX_IS_STATUS_CODE)
+			return 1; // Application responding
 
-#ifdef _DEBUG
-static void _BuCmdSendDataStatus(const char *pszFile, int nLine, uint8_t nNodeAddr, uint32_t nCbBlock, uint32_t nCbData, int nCtx, int nErrorCode)
-#else	//	_DEBUG
-static void _BuCmdSendDataStatus(uint8_t nNodeAddr, uint32_t nCbBlock, uint32_t nCbData, int nCtx, int nErrorCode)
-#endif	//	_DEBUG
-{
-	static struct timespec tsStart, tsEnd;
-	static uint32_t nBlockNr;
-	int64_t nInterval;
-	
-	switch(nCtx)
-	{
-	case 0:
-		TRACE("\n%s:%d: %s!\n", pszFile, nLine, GfaBlmStrError(nErrorCode));
-		break;
-	case 1:
-		nBlockNr = 0;
-		clock_gettime(CLOCK_MONOTONIC, &tsStart);
-		TRACE("Start sending data to Node 0x%02hhX - block size: %u bytes.\n", nNodeAddr, nCbBlock);
-		break;
-	case 2:
-#if 1
-		if(nBlockNr > 0)
-			TRACE("\b\b\b\b\b\b");
-		TRACE("%06u", nCbData);
-#endif
-		++nBlockNr;
-		break;
-	case 3:
-		clock_gettime(CLOCK_MONOTONIC, &tsEnd);
-		nInterval = _TimespecDiff(&tsEnd, &tsStart);
-		TRACE("\nSent %u blocks to Node 0x%02hhX in %llu ms.\n", nBlockNr, nNodeAddr, nInterval / 1000000);
-		break;
-	default:
-		break;
+		return -1;
 	}
-}
 
-static void _TraceImageInfo(const char *pszContext, LPCGFA_IMG_INFO pii)
-{
-	if(pszContext && pii && pii->nImgLength != 0xFFFFFFFF && pii->nImgCRC32 != 0xFFFFFFFF)
-	{
-		TRACE("%s Image Information:\n", pszContext);
-		TRACE("  Length:  %u\n", pii->nImgLength);
-		TRACE("  CRC32:   0x%08X\n", pii->nImgCRC32);
-		TRACE("  Mat.Nr.: %s\n", pii->szImgMaterialNum);
-		TRACE("  Build:   %s\n", pii->szImgNameBuild);
-	}
+	return -1;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////
@@ -136,129 +51,54 @@ static void _TraceImageInfo(const char *pszContext, LPCGFA_IMG_INFO pii)
 
 int main(void)
 {
-	ssize_t nRet = 0;
+	int nRet = 0;
 
 	////////////////////////////////////////////////////////////////////////////////
 
-	GFA_BLM_CFG_PARAMS blmcp;
-	memset(&blmcp, 0, sizeof(blmcp));
+	GFA_MININET_MST_CFG_PARAMS mmcp;
+	memset(&mmcp, 0, sizeof(mmcp));
 
-	if(GfaSerialGetDeviceInterface(&blmcp.mmcp.devcfg.itf))
+	if(GfaSerialGetDeviceInterface(&mmcp.devcfg.itf))
 	{
-		HGFABLM hBlm;
+		HGFAMINEMST hMinem;
 		GFA_SER_CFG_PARAMS scp;
 		memset(&scp, 0, sizeof(scp));
 
 		////////////////////////////////////////////////////////////////////////////
-		// serial interface parameters
+		// serial interface configuration
 
-		scp.baud			= _BAUD_LO;
-		scp.data			= 8;
-		scp.stop			= 1;
-		scp.parity			= 'N';
-#ifdef _TARGET_BUILD
+		scp.baud			= _BAUD_RATE;
+		scp.data			= _DATA_BITS;
+		scp.stop			= _STOP_BITS;
+		scp.parity			= _PARITY;
 		scp.bHandleTxEcho	= true;
-#endif	//	_TARGET_BUILD
 
 		////////////////////////////////////////////////////////////////////////////
 		// mininet master configuration
 
-		blmcp.mmcp.devcfg.pszDeviceName		= _DEVICE_NAME;
-		blmcp.mmcp.devcfg.pDevParams		= &scp;
-		blmcp.mmcp.devcfg.nSizeDevParams	= sizeof(scp);
-		blmcp.pfnBuCmdDownloadStatus		= _BuCmdDownloadStatus;
-		blmcp.pfnBuCmdSendDataStatus		= _BuCmdSendDataStatus;
+		mmcp.devcfg.pszDeviceName	= _DEVICE_NAME;
+		mmcp.devcfg.pDevParams		= &scp;
+		mmcp.devcfg.nSizeDevParams	= sizeof(scp);
 
 		////////////////////////////////////////////////////////////////////////////
-		////////////////////////////////////////////////////////////////////////////
-		////////////////////////////////////////////////////////////////////////////
+		//
 
-		if((hBlm = GfaBlmOpen(&blmcp)))
+		if((hMinem = GfaMininetMasterOpen(&mmcp)))
 		{
-			uint32_t nImgCRC32;
-			GFA_BL_APP_IMG_INFO aii;
-			GFA_BLM_EXEC_CONTEXT ctx;
-			char szMaterial[16], szSerial[16];
-
 			do
 			{
-//	            GfaBlmSetVerbosity(hBlm, 4);
-
-	            if((nRet = GfaBlmResetSlaveIndex(hBlm, _NODE_ADDR)) != 0)
-		        {
-					TRACE("%s!\n", GfaBlmStrError(errno));
-					break;
-		        }
-
-		        if((ctx = GfaBlmGetExecutionContext(hBlm, _NODE_ADDR)) == GfaBlmCtx_Err)
-		        {
-					TRACE("%s!\n", GfaBlmStrError(errno));
+				if((nRet = GfaMininetMasterSetVerbosity(hMinem, 4)) < 0) // enable output of frames
 					break;
-		        }
-		        
-		        TRACE("Currently running: %s\n", (ctx == GfaBlmCtx_App) ? "Application" : "Bootloader");
-
-	            if(ctx == GfaBlmCtx_App)
-	            {
-					if((nRet = GfaBlmBootloaderExecute(hBlm, _NODE_ADDR, &nImgCRC32, 500)) != 0)
-					{
-						TRACE("%s!\n", GfaBlmStrError(errno));
-						break;
-					}
-				}
-
-				if((nRet = GfaBlmBootloaderSetBaudrate(hBlm, _NODE_ADDR, _BAUD_HI)) != 0)
-				{
-					TRACE("%s!\n", GfaBlmStrError(errno));
+				if((nRet = GfaMininetMasterResetSlaveIndex(hMinem, _NODE_ADDR)) < 0)
 					break;
-		        }
-
-	//            GfaBlmSetVerbosity(hBlm, 3);
-
-	            if((nRet = GfaBlmBUCmdSendDataFile(hBlm, _NODE_ADDR, _IMG_FILE_PATH, 0x2000, 76, 5000)) == 0)
-	            {
-	//	            GfaBlmSetVerbosity(hBlm, 4);
-
-					TRACE("Resetting slave ...\n");
-
-		            if((nRet = GfaBlmBUCmdReset(hBlm, _NODE_ADDR, 500)) != 0)
-		            {
-						TRACE("%s!\n", GfaBlmStrError(errno));
-						break;
-		            }
-
-	//	            GfaBlmSetVerbosity(hBlm, 0);
-
-			        if((ctx = GfaBlmGetExecutionContext(hBlm, _NODE_ADDR)) == GfaBlmCtx_Err)
-		            {
-						TRACE("%s!\n", GfaBlmStrError(errno));
-						break;
-		            }
-
-			        TRACE("%s\n", (ctx == GfaBlmCtx_App) ? "Application started." : "Application failed to start!");
-	            }
-	            else
-	            {
-					TRACE("%s!\n", GfaBlmStrError(errno));
+				if((nRet = GfaMininetMasterPingSlave(hMinem, _NODE_ADDR)) < 0)
 					break;
-	            }
-	            
-	//            GfaBlmSetVerbosity(hBlm, 4);
 
-		        if((nRet = GfaBlmGetInfoBI(hBlm, _NODE_ADDR, &aii)) == 0)
-		        {
-		        	_TraceImageInfo("Bootloader", &aii.bl);
-		        	_TraceImageInfo("Application", &aii.app);
-		        }
-	            else if((nRet = GfaBlmGetInfoBD(hBlm, _NODE_ADDR, &aii)) > -2)
-				{
-		        	_TraceImageInfo("Bootloader", &aii.bl);
-		        	_TraceImageInfo("Application", &aii.app);
-		        }
-		    }
-		    while(false);
+				nRet = _BootloaderGetExecutionContext(hMinem, _NODE_ADDR); // demonstrates the implementation of commands
+			}
+			while(0);
 
-			GfaBlmClose(hBlm); // important!!!
+			GfaMininetMasterClose(hMinem);
 		}
 	}
 

gfamininet.pro

@@ -0,0 +1,118 @@
+TEMPLATE = lib
+VERSION = 1.0
+CONFIG -= qt app_bundle
+CONFIG += c++11 shared thread
+
+####################################################################################
+
+SOURCES += \
+    src/gfaserial.c \
+    src/gfamininetmst.c \
+    src/gfamininetdev.c \
+    src/gfabootlmast.c \
+    src/dbghlp.c
+
+linux-buildroot-g++ {
+}
+
+HEADERS += \
+    src/gfamininetmst.h \
+    src/gfamininetdev.h \
+    src/gfagenericdev.h \
+    src/gfaserial.h \
+    src/gfabootlmast.h \
+    src/dbghlp.h
+
+####################################################################################
+
+GFA_LIB_PATH = /usr/lib/gfa
+GFA_INC_PATH = /usr/include/gfa
+QMAKE_INCDIR += ti
+QMAKE_RPATHLINKDIR += $$GFA_LIB_PATH
+QMAKE_RPATHDIR += $$GFA_LIB_PATH
+QMAKE_DEL_DIR = rmdir --ignore-fail-on-non-empty
+QMAKE_LN_SHLIB = :
+
+####################################################################################
+
+CONFIG(debug, debug|release) {
+    QMAKE_CXXFLAGS -= -Os
+    QMAKE_CFLAGS -= -Os
+    QMAKE_CXXFLAGS += -D_DEBUG
+    QMAKE_CFLAGS += -D_DEBUG
+	TARGET = $$join(TARGET,,,d)
+}
+
+####################################################################################
+
+target.path = $$GFA_LIB_PATH
+INSTALLS += target
+
+####################################################################################
+
+linux-g++ {
+	includes.path = $$GFA_INC_PATH
+	includes.extra += -$(INSTALL_FILE) $$PWD/src/gfamininetmst.h $(INSTALL_ROOT)$$includes.path
+	includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/gfamininetdev.h $(INSTALL_ROOT)$$includes.path
+	includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/gfagenericdev.h $(INSTALL_ROOT)$$includes.path
+	includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/gfaserial.h $(INSTALL_ROOT)$$includes.path
+	includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/gfabootlmast.h $(INSTALL_ROOT)$$includes.path
+	includes.uninstall += -$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/gfamininetmst.h
+	includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/gfamininetdev.h
+	includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/gfagenericdev.h
+	includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/gfaserial.h
+	includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/gfabootlmast.h
+	INSTALLS += includes
+}
+
+####################################################################################
+
+linux-buildroot-g++ {
+	exists($$[QT_SYSROOT]) {
+		library.path = $$[QT_SYSROOT]$$target.path
+		library.extra += -$(INSTALL_PROGRAM) $(TARGET) $(INSTALL_ROOT)$$library.path/$(TARGET)
+		library.extra += $$escape_expand(\\n\\t)-$(SYMLINK) $(TARGET) $(INSTALL_ROOT)$$library.path/$(TARGET0)
+		library.extra += $$escape_expand(\\n\\t)-$(SYMLINK) $(TARGET) $(INSTALL_ROOT)$$library.path/$(TARGET1)
+		library.extra += $$escape_expand(\\n\\t)-$(SYMLINK) $(TARGET) $(INSTALL_ROOT)$$library.path/$(TARGET2)
+		library.uninstall += -$(DEL_FILE) $(INSTALL_ROOT)$$library.path/$(TARGET)
+		library.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$library.path/$(TARGET0)
+		library.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$library.path/$(TARGET1)
+		library.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$library.path/$(TARGET2)
+		INSTALLS += library
+
+		includes.path = $$[QT_SYSROOT]$$GFA_INC_PATH
+		includes.extra += -$(INSTALL_FILE) $$PWD/src/gfamininetmst.h $(INSTALL_ROOT)$$includes.path
+		includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/gfamininetdev.h $(INSTALL_ROOT)$$includes.path
+		includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/gfagenericdev.h $(INSTALL_ROOT)$$includes.path
+		includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/gfaserial.h $(INSTALL_ROOT)$$includes.path
+		includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/gfabootlmast.h $(INSTALL_ROOT)$$includes.path
+		includes.uninstall += -$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/gfamininetmst.h
+		includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/gfamininetdev.h
+		includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/gfagenericdev.h
+		includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/gfaserial.h
+		includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/gfabootlmast.h
+		INSTALLS += includes
+
+		itoolchain.target = install_toolchain
+		itoolchain.depends = install_library install_includes
+		QMAKE_EXTRA_TARGETS += itoolchain
+
+		utoolchain.target = uninstall_toolchain
+		utoolchain.depends = uninstall_library uninstall_includes
+		QMAKE_EXTRA_TARGETS += utoolchain
+	}
+    QMAKE_CXXFLAGS += -D_TARGET_BUILD
+    QMAKE_CFLAGS += -D_TARGET_BUILD
+}
+
+####################################################################################
+
+deploylib.target = deploylib
+deploylib.commands = @echo BASENAME="$(QMAKE_TARGET)" > deploytargets
+deploylib.commands += $$escape_expand(\\n\\t)@echo TARGET="$(TARGET)" >> deploytargets
+deploylib.commands += $$escape_expand(\\n\\t)@echo TARGET0="$(TARGET0)" >> deploytargets
+deploylib.commands += $$escape_expand(\\n\\t)@echo TARGET1="$(TARGET1)" >> deploytargets
+deploylib.commands += $$escape_expand(\\n\\t)@echo TARGET2="$(TARGET2)" >> deploytargets
+deploylib.commands += $$escape_expand(\\n\\t)@echo HEADERS="\\\"gfamininetmst.h gfamininetdev.h gfagenericdev.h gfaserial.h gfabootlmast.h\\\"" >> deploytargets
+PRE_TARGETDEPS += deploylib
+QMAKE_EXTRA_TARGETS += deploylib

libmininet/install.sh

@@ -1,65 +0,0 @@
-#!/bin/bash
-set -e
-set -o pipefail
-
-REMPWD="root"
-REMUSR="root@192.168.0.125"
-
-
-TOOLCHAIN_SYSROOT="/opt/GfA/TC_L44104_C493_QT57/usr/arm-buildroot-linux-gnueabihf/sysroot"
-LIBBASENAMEREL="gfamininet"
-LIBBASENAMEDBG="gfamininetd"
-LIBDBGx86_64SRC="Debug/Desktop_Qt_5_7_0_GCC_64bit/lib$LIBBASENAMEDBG.so.1.0.0"
-LIBRELx86_64SRC="Release/Desktop_Qt_5_7_0_GCC_64bit/lib$LIBBASENAMEREL.so.1.0.0"
-LIBDBGARMSRC="Debug/GfA_Device/lib$LIBBASENAMEDBG.so.1.0.0"
-LIBRELARMSRC="Release/GfA_Device/lib$LIBBASENAMEREL.so.1.0.0"
-
-INCSRC1="gfaserial.h"
-INCSRC2="gfamininetmst.h"
-INCSRC3="gfamininetdev.h"
-INCSRC4="gfagenericdev.h"
-INCSRC5="gfabootlmast.h"
-
-LIBDBGx86_64DST="/usr/lib/"
-LIBRELx86_64DST="/usr/lib/"
-INCDSTx86_64DST="/usr/include/"
-
-LIBDBGARMDST_LOC="$TOOLCHAIN_SYSROOT/usr/lib/"
-LIBRELARMDST_LOC="$TOOLCHAIN_SYSROOT/usr/lib/"
-INCDSTARM_LOC="$TOOLCHAIN_SYSROOT/usr/include/"
-
-sudo cp $LIBDBGx86_64SRC $LIBDBGx86_64DST
-sudo cp $LIBRELx86_64SRC $LIBRELx86_64DST
-sudo cp $INCSRC1 $INCDSTx86_64DST
-sudo cp $INCSRC2 $INCDSTx86_64DST
-sudo cp $INCSRC3 $INCDSTx86_64DST
-sudo cp $INCSRC4 $INCDSTx86_64DST
-sudo cp $INCSRC5 $INCDSTx86_64DST
-
-sudo ln -sfnr /usr/lib/lib$LIBBASENAMEDBG.so.1.0.0 /usr/lib/lib$LIBBASENAMEDBG.so.1
-sudo ln -sfnr /usr/lib/lib$LIBBASENAMEDBG.so.1 /usr/lib/lib$LIBBASENAMEDBG.so
-sudo ln -sfnr /usr/lib/lib$LIBBASENAMEREL.so.1.0.0 /usr/lib/lib$LIBBASENAMEREL.so.1
-sudo ln -sfnr /usr/lib/lib$LIBBASENAMEREL.so.1 /usr/lib/lib$LIBBASENAMEREL.so
-
-cp $LIBDBGARMSRC $LIBDBGARMDST_LOC
-cp $LIBRELARMSRC $LIBRELARMDST_LOC
-cp $INCSRC1 $INCDSTARM_LOC
-cp $INCSRC2 $INCDSTARM_LOC
-cp $INCSRC3 $INCDSTARM_LOC
-cp $INCSRC4 $INCDSTARM_LOC
-cp $INCSRC5 $INCDSTARM_LOC
-
-ln -sfnr $TOOLCHAIN_SYSROOT/usr/lib/lib$LIBBASENAMEDBG.so.1.0.0 $TOOLCHAIN_SYSROOT/usr/lib/lib$LIBBASENAMEDBG.so.1
-ln -sfnr $TOOLCHAIN_SYSROOT/usr/lib/lib$LIBBASENAMEDBG.so.1 $TOOLCHAIN_SYSROOT/usr/lib/lib$LIBBASENAMEDBG.so
-ln -sfnr $TOOLCHAIN_SYSROOT/usr/lib/lib$LIBBASENAMEREL.so.1.0.0 $TOOLCHAIN_SYSROOT/usr/lib/lib$LIBBASENAMEREL.so.1
-ln -sfnr $TOOLCHAIN_SYSROOT/usr/lib/lib$LIBBASENAMEREL.so.1 $TOOLCHAIN_SYSROOT/usr/lib/lib$LIBBASENAMEREL.so
-
-pscp -pw $REMPWD $LIBDBGARMSRC $REMUSR:/usr/lib/ > /dev/null
-pscp -pw $REMPWD $LIBRELARMSRC $REMUSR:/usr/lib/ > /dev/null
-
-plink -batch -t -pw $REMPWD $REMUSR ln -sfn /usr/lib/lib$LIBBASENAMEDBG.so.1.0.0 /usr/lib/lib$LIBBASENAMEDBG.so.1
-plink -batch -t -pw $REMPWD $REMUSR ln -sfn /usr/lib/lib$LIBBASENAMEDBG.so.1 /usr/lib/lib$LIBBASENAMEDBG.so
-plink -batch -t -pw $REMPWD $REMUSR ln -sfn /usr/lib/lib$LIBBASENAMEREL.so.1.0.0 /usr/lib/lib$LIBBASENAMEREL.so.1
-plink -batch -t -pw $REMPWD $REMUSR ln -sfn /usr/lib/lib$LIBBASENAMEREL.so.1 /usr/lib/lib$LIBBASENAMEREL.so
-
-echo Done.

libmininet/libmininet.pro

@@ -1,35 +0,0 @@
-TEMPLATE = lib
-TARGET = gfamininet
-CONFIG -= app_bundle
-CONFIG -= qt
-
-CONFIG(debug, debug|release) {
-    QMAKE_CXXFLAGS -= -Os
-    QMAKE_CFLAGS -= -Os
-    QMAKE_CXXFLAGS += -D_DEBUG
-    QMAKE_CFLAGS += -D_DEBUG
-	TARGET = gfamininetd
-}
-
-SOURCES += \
-    gfaserial.c \
-    gfamininetmst.c \
-    gfamininetdev.c \
-    gfabootlmast.c \
-    dbghlp.c
-
-linux-buildroot-g++ {
-}
-
-HEADERS += \
-    gfamininetmst.h \
-    gfamininetdev.h \
-    gfagenericdev.h \
-    gfaserial.h \
-    gfabootlmast.h \
-    dbghlp.h
-
-QMAKE_INCDIR += ../ti
-
-# do not create symbolic links
-QMAKE_LN_SHLIB = :

libmininet/gfabootlmast.c → src/gfabootlmast.c

@@ -4,9 +4,9 @@
 #include <ctype.h>
 #include <errno.h>
 #include <unistd.h>
-#include <gfaserial.h>
-#include <gfamininetmst.h>
 #include <byteswap.h>
+#include "gfaserial.h"
+#include "gfamininetmst.h"
 #include "bl_commands.h"
 #include "gfabootlmast.h"
 #include "dbghlp.h"

libmininet/gfabootlmast.h → src/gfabootlmast.h

@@ -9,7 +9,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <sys/time.h>
-#include <gfamininetmst.h>
+#include "gfamininetmst.h"
 
 #ifdef __cplusplus
 extern "C" {

libmininet/gfamininetdev.c → src/gfamininetdev.c

@@ -3,7 +3,7 @@
 #include <string.h>
 #include <malloc.h>
 #include <errno.h>
-#include <gfamininetdev.h>
+#include "gfamininetdev.h"
 
 /////////////////////////////////////////////////////////////////////////////
 

libmininet/gfamininetdev.h → src/gfamininetdev.h

@@ -4,7 +4,7 @@
 #if !defined(AGD_GFAMININETDEV_H__A748DF9B_2D65_499F_952B_104B6F1228F7__INCLUDED_)
 #define AGD_GFAMININETDEV_H__A748DF9B_2D65_499F_952B_104B6F1228F7__INCLUDED_
 
-#include <gfagenericdev.h>
+#include "gfagenericdev.h"
 
 #ifdef __cplusplus
 extern "C" {

libmininet/gfamininetmst.h → src/gfamininetmst.h

@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <sys/time.h>
-#include <gfamininetdev.h>
+#include "gfamininetdev.h"
 
 #ifdef __cplusplus
 extern "C" {

libmininet/gfaserial.h → src/gfaserial.h

@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <sys/time.h>
-#include <gfagenericdev.h>
+#include "gfagenericdev.h"
 
 #ifdef __cplusplus
 extern "C" {