Index: head/devel/msp430-debug-stack/Makefile =================================================================== --- head/devel/msp430-debug-stack/Makefile (revision 530682) +++ head/devel/msp430-debug-stack/Makefile (revision 530683) @@ -1,57 +1,56 @@ # $FreeBSD$ PORTNAME= msp430-debug-stack -PORTVERSION= 3.12.000.004 -PORTREVISION= 12 +PORTVERSION= 3.15.0.1 +#PORTREVISION= 0 CATEGORIES= devel -MASTER_SITES= http://www.ti.com/lit/sw/slac460x/ \ - http://www.ti.com/lit/ug/slau320ac/:doc1 \ +MASTER_SITES= http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPDS/3_15_0_000/export/ \ + http://www.ti.com/lit/ug/slau320ai/:doc1 \ http://www.ti.com/lit/ug/slau656b/:doc2 -DISTFILES= slac460x.zip \ - slau320ac.pdf:doc1 \ +DISTFILES= MSPDebugStack_OS_Package_${PORTVERSION:S/./_/g}.zip \ + slau320ai.pdf:doc1 \ slau656b.pdf:doc2 -DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} -EXTRACT_ONLY= slac460x.zip +EXTRACT_ONLY= MSPDebugStack_OS_Package_${PORTVERSION:S/./_/g}.zip MAINTAINER= lev@FreeBSD.org COMMENT= TI MSP430 debugging interface library LICENSE= BSD3CLAUSE LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libhidapi.so:comms/hidapi USES= compiler:c++11-lib dos2unix gmake zip:infozip USE_LDCONFIG= yes DOS2UNIX_REGEX= .*/Makefile|.*\.(cpp|h) MAKE_ARGS= BOOST_DIR=${LOCALBASE} \ HIDAPI_DIR=${LOCALBASE} MAKE_JOBS_UNSAFE= yes NO_WRKSUBDIR= yes SUB_FILES= pkg-message REINPLACE_ARGS= -i "" OPTIONS_DEFINE= DOCS post-patch: @${FIND} ${WRKSRC}/DLL430_v3/src/TI/DLL430 \ \( -name '*.cpp' -o -name '*.h' \) -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's|[io]fstream|std::&|; s|std::std::|std::|' do-install: ${INSTALL_LIB} ${WRKSRC}/libmsp430.so ${STAGEDIR}${PREFIX}/lib/libmsp430.so ${INSTALL_DATA} ${WRKSRC}/libmsp430.a ${STAGEDIR}${PREFIX}/lib/libmsp430.a ${MKDIR} ${STAGEDIR}${PREFIX}/include/libmsp430 ${INSTALL_DATA} ${WRKSRC}/DLL430_v3/include/* ${STAGEDIR}${PREFIX}/include/libmsp430/ ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/slau320ac.pdf ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/slau320ai.pdf ${STAGEDIR}${DOCSDIR}/ ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/slau656b.pdf ${STAGEDIR}${DOCSDIR}/ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd ${INSTALL_DATA} ${FILESDIR}/mspfet.conf ${STAGEDIR}${PREFIX}/etc/devd .include Index: head/devel/msp430-debug-stack/distinfo =================================================================== --- head/devel/msp430-debug-stack/distinfo (revision 530682) +++ head/devel/msp430-debug-stack/distinfo (revision 530683) @@ -1,7 +1,7 @@ -TIMESTAMP = 1521731563 -SHA256 (msp430-debug-stack-3.12.000.004/slac460x.zip) = c6bf24338b50f6ce8f6f0127ec2673e10add251e0a89e894fd30897eaa4e0cbc -SIZE (msp430-debug-stack-3.12.000.004/slac460x.zip) = 2253925 -SHA256 (msp430-debug-stack-3.12.000.004/slau320ac.pdf) = 01c24c306e11cfa129a3fcdd4ee116b439f809db52456f43e564f550940d6ea4 -SIZE (msp430-debug-stack-3.12.000.004/slau320ac.pdf) = 817214 -SHA256 (msp430-debug-stack-3.12.000.004/slau656b.pdf) = a27303bf1060a598bab53481cdee05642dbb3cde7804786c5ab31cb1e911df0c -SIZE (msp430-debug-stack-3.12.000.004/slau656b.pdf) = 487655 +TIMESTAMP = 1585852124 +SHA256 (MSPDebugStack_OS_Package_3_15_0_1.zip) = 31f8f66ce9f9156bcb550adf3937ebf44ad7995bef2517f2b09e408be947c4c5 +SIZE (MSPDebugStack_OS_Package_3_15_0_1.zip) = 2183498 +SHA256 (slau320ai.pdf) = f8444827b5536939872842a6ad11a0e92caaf02620d5ca59efefc68e1bf6c3ae +SIZE (slau320ai.pdf) = 753510 +SHA256 (slau656b.pdf) = a27303bf1060a598bab53481cdee05642dbb3cde7804786c5ab31cb1e911df0c +SIZE (slau656b.pdf) = 487655 Index: head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_BSL430__DLL_Physical__Interfaces_MSPBSL__PhysicalInterfaceUSB.cpp =================================================================== --- head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_BSL430__DLL_Physical__Interfaces_MSPBSL__PhysicalInterfaceUSB.cpp (revision 530682) +++ head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_BSL430__DLL_Physical__Interfaces_MSPBSL__PhysicalInterfaceUSB.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- ThirdParty/BSL430_DLL/BSL430_DLL/Physical_Interfaces/MSPBSL_PhysicalInterfaceUSB.cpp.orig 2017-12-05 18:47:14.538669000 +0300 -+++ ThirdParty/BSL430_DLL/BSL430_DLL/Physical_Interfaces/MSPBSL_PhysicalInterfaceUSB.cpp 2017-12-05 18:47:14.575461000 +0300 -@@ -189,7 +189,7 @@ uint16_t MSPBSL_PhysicalInterfaceUSB::RX - return ERROR_READING_DATA; - } - -- this_thread::sleep_for(chrono::milliseconds(500)); -+ this_thread::sleep_for(std::chrono::milliseconds(500)); - } - - return 0; Property changes on: head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_BSL430__DLL_Physical__Interfaces_MSPBSL__PhysicalInterfaceUSB.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_MSPBSL_Factory.cpp =================================================================== --- head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_MSPBSL_Factory.cpp (revision 530682) +++ head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_MSPBSL_Factory.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- ThirdParty/BSL430_DLL/BSL430_DLL/MSPBSL_Factory.cpp.orig 2017-12-05 18:38:46.036313000 +0300 -+++ ThirdParty/BSL430_DLL/BSL430_DLL/MSPBSL_Factory.cpp 2017-12-05 18:39:50.453006000 +0300 -@@ -212,7 +212,7 @@ MSPBSL_Connection* MSPBSL_Factory::getMS - bool isOpen = s->physicalInterfaceCommand(ENUMERATE_COMMAND) == 0; - while (s && !isOpen && retries-- > 0) - { -- this_thread::sleep_for(chrono::seconds(2)); -+ this_thread::sleep_for(std::chrono::seconds(2)); - isOpen = s->physicalInterfaceCommand(ENUMERATE_COMMAND) == 0; - } - if (!isOpen) Property changes on: head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_MSPBSL_Factory.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_UpdateManagerMSP_FET430.cpp =================================================================== --- head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_UpdateManagerMSP_FET430.cpp (revision 530682) +++ head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_UpdateManagerMSP_FET430.cpp (nonexistent) @@ -1,29 +0,0 @@ ---- DLL430_v3/src/TI/DLL430/UpdateManagerMSP_FET430.cpp.orig 2018-03-26 17:14:12.210044000 +0300 -+++ DLL430_v3/src/TI/DLL430/UpdateManagerMSP_FET430.cpp 2018-03-26 17:15:34.167641000 +0300 -@@ -226,7 +226,7 @@ - - for (int i = 0; i < 8; ++i) - { -- this_thread::sleep_for(chrono::seconds(1)); -+ this_thread::sleep_for(std::chrono::seconds(1)); - if (callback) - { - --requiredUpdates; -@@ -313,7 +313,7 @@ - const bool initFailed = !this->fetHandle->send(initCmd); - - // give the firmware time to execute initialisation -- this_thread::sleep_for(chrono::seconds(1)); -+ this_thread::sleep_for(std::chrono::seconds(1)); - if (callback) - { - --requiredUpdates; -@@ -338,7 +338,7 @@ - fetHandle->send(cmd); - for (int i = 0; i < 2; ++i) - { -- this_thread::sleep_for(chrono::seconds(1)); -+ this_thread::sleep_for(std::chrono::seconds(1)); - if (callback) - { - --requiredUpdates; Property changes on: head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_UpdateManagerMSP_FET430.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_UsbCdcIoChannel.h =================================================================== --- head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_UsbCdcIoChannel.h (revision 530682) +++ head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_UsbCdcIoChannel.h (nonexistent) @@ -1,14 +0,0 @@ ---- DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.h.orig 2017-12-05 19:32:41.218250000 +0300 -+++ DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.h 2017-12-05 19:33:09.405049000 +0300 -@@ -73,7 +73,11 @@ - - private: - std::vector inputBuffer; -+#if BOOST_VERSION < 106600 - boost::asio::io_service* ioService; -+#else -+ boost::asio::io_context* ioService; -+#endif - boost::asio::serial_port* port; - boost::asio::deadline_timer* timer; - ComState comState; Property changes on: head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_UsbCdcIoChannel.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_Physical_Interfaces_MSPBSL_PhysicalInterfaceSerialUART.h =================================================================== --- head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_Physical_Interfaces_MSPBSL_PhysicalInterfaceSerialUART.h (revision 530682) +++ head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_Physical_Interfaces_MSPBSL_PhysicalInterfaceSerialUART.h (nonexistent) @@ -1,13 +0,0 @@ ---- ThirdParty/BSL430_DLL/BSL430_DLL/Physical_Interfaces/MSPBSL_PhysicalInterfaceSerialUART.h.orig 2017-12-05 19:35:16.469154000 +0300 -+++ ThirdParty/BSL430_DLL/BSL430_DLL/Physical_Interfaces/MSPBSL_PhysicalInterfaceSerialUART.h 2017-12-05 19:35:38.930835000 +0300 -@@ -72,6 +72,10 @@ - virtual std::string getErrorInformation( uint16_t err ); - - private: -+#if BOOST_VERSION < 106600 - boost::asio::io_service io; -+#else -+ boost::asio::io_context io; -+#endif - boost::asio::serial_port* port; - }; Property changes on: head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_Physical_Interfaces_MSPBSL_PhysicalInterfaceSerialUART.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_DLL430_OldApiV3.cpp =================================================================== --- head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_DLL430_OldApiV3.cpp (revision 530682) +++ head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_DLL430_OldApiV3.cpp (nonexistent) @@ -1,83 +0,0 @@ ---- DLL430_v3/src/DLL430_OldApiV3.cpp.orig 2018-03-26 17:21:18.500487000 +0300 -+++ DLL430_v3/src/DLL430_OldApiV3.cpp 2018-03-26 17:22:50.850255000 +0300 -@@ -191,7 +191,7 @@ - //With trace/variable watch enabled, give storage events on same trigger time to be reported - if (trace_storage.trControl == TR_ENABLE) - { -- this_thread::sleep_for(chrono::milliseconds(100)); -+ this_thread::sleep_for(std::chrono::milliseconds(100)); - } - db_man->pausePolling(); - } -@@ -330,7 +330,7 @@ - catch (const std::runtime_error& e) - { - #ifndef NDEBUG -- ofstream("xml_error.log") << e.what() << endl; -+ std::ofstream("xml_error.log") << e.what() << endl; - #endif - log(LogTarget::ERR, DEVICE_DB_ERR, e.what()); - return false; -@@ -356,7 +356,7 @@ - catch (const std::runtime_error& e) - { - #ifndef NDEBUG -- ofstream("xml_error.log") << e.what() << endl; -+ std::ofstream("xml_error.log") << e.what() << endl; - #endif - log(LogTarget::ERR, DEVICE_DB_ERR, e.what()); - return false; -@@ -1569,7 +1569,7 @@ - log(LogTarget::ERR, ERASE_ERR, ""); - return false; - } -- this_thread::sleep_for(chrono::seconds(1)); -+ this_thread::sleep_for(std::chrono::seconds(1)); - return true; - - } -@@ -1583,7 +1583,7 @@ - } - if (singleDevice) - { -- this_thread::sleep_for(chrono::seconds(1)); -+ this_thread::sleep_for(std::chrono::seconds(1)); - return true; - } - } -@@ -1987,7 +1987,7 @@ - if (devArchitecture != MSP432_M4) - { - db_man->resumePolling(); -- this_thread::sleep_for(chrono::milliseconds(500)); -+ this_thread::sleep_for(std::chrono::milliseconds(500)); - db_man->pausePolling(); - } - if (!State(&state, true, &pCPUCycles)) -@@ -3848,7 +3848,7 @@ - int timeout = 50; - while (timeout-- && !this->Initialize(&port[0], &version)) - { -- this_thread::sleep_for(chrono::seconds(1)); -+ this_thread::sleep_for(std::chrono::seconds(1)); - } - if (!handle) - { -@@ -3873,7 +3873,7 @@ - #endif - UpdateLog.append("\n---------------------Firmware upate end--------------------------\n"); - -- ofstream(logfile.c_str(), ios::app | ios::out) << UpdateLog; -+ std::ofstream(logfile.c_str(), ios::app | ios::out) << UpdateLog; - } - } - } -@@ -4272,7 +4272,7 @@ - - Run(FREE_RUN, true); // start execution of loader code - -- this_thread::sleep_for(chrono::seconds(15)); -+ this_thread::sleep_for(std::chrono::seconds(15)); - - int32_t state; - int32_t pCPUCycles; Property changes on: head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_DLL430_OldApiV3.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_FetControl.cpp =================================================================== --- head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_FetControl.cpp (revision 530682) +++ head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_FetControl.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- DLL430_v3/src/TI/DLL430/FetControl.cpp.orig 2017-12-05 18:47:14.471975000 +0300 -+++ DLL430_v3/src/TI/DLL430/FetControl.cpp 2017-12-05 18:47:14.610359000 +0300 -@@ -222,7 +222,7 @@ bool FetControl::resetCommunication() - data.push_back(0x00); - this->sendData(data); // reset connection - -- std::this_thread::sleep_for(std::chrono::milliseconds(100)); -+ std::this_thread::sleep_for(std::chrono::milliseconds(300)); - - HalExecElement* el = new HalExecElement(ID_Zero); - el->appendInputData8(STREAM_CORE_ZERO_VERSION); Property changes on: head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_FetControl.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_Connections_MSPBSL_Connection5xxUSB.cpp =================================================================== --- head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_Connections_MSPBSL_Connection5xxUSB.cpp (revision 530682) +++ head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_Connections_MSPBSL_Connection5xxUSB.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- ThirdParty/BSL430_DLL/BSL430_DLL/Connections/MSPBSL_Connection5xxUSB.cpp.orig 2017-12-05 18:38:46.035629000 +0300 -+++ ThirdParty/BSL430_DLL/BSL430_DLL/Connections/MSPBSL_Connection5xxUSB.cpp 2017-12-05 18:39:43.517163000 +0300 -@@ -70,7 +70,7 @@ void MSPBSL_Connection5xxUSB:: closeBslc - { - uint8_t usbDisconnct = USB_DISCONNECT_COMMAND; - this->thePacketHandler->TX_Packet(&usbDisconnct,1); -- this_thread::sleep_for(chrono::seconds(5)); -+ this_thread::sleep_for(std::chrono::seconds(5)); - } - - /***************************************************************************//** -@@ -134,7 +134,7 @@ uint16_t MSPBSL_Connection5xxUSB::loadRA - { - return retValue; - } -- this_thread::sleep_for(chrono::seconds(1)); -+ this_thread::sleep_for(std::chrono::seconds(1)); - - return ACK; - } Property changes on: head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_Connections_MSPBSL_Connection5xxUSB.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_UpdateManagerFet.cpp =================================================================== --- head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_UpdateManagerFet.cpp (revision 530682) +++ head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_UpdateManagerFet.cpp (nonexistent) @@ -1,64 +0,0 @@ ---- DLL430_v3/src/TI/DLL430/UpdateManagerFet.cpp.orig 2018-03-26 17:23:13.431436000 +0300 -+++ DLL430_v3/src/TI/DLL430/UpdateManagerFet.cpp 2018-03-26 17:25:33.815661000 +0300 -@@ -68,6 +68,7 @@ - - #include "../../../../Bios/include/MSP_FetDcdc.h" - #include "../../../../Bios/include/MSP_FetHal.h" -+#include "../../../../Bios/include/MSP_FetFpgaHal.h" - #include "../../../../Bios/include/MSP_FetHil.h" - #include "../../../../Bios/include/MSP_FetCore.h" - #include "../../../../Bios/include/MSP_FetComChannel.h" -@@ -131,7 +132,7 @@ - intCallback(BL_DATA_BLOCK_PROGRAMMED, (uint32_t)(100 - (requiredCoreUpdates)*percentCore), 0); - } - -- this_thread::sleep_for(chrono::seconds(4)); -+ this_thread::sleep_for(std::chrono::seconds(4)); - - fetHandle->shutdown(); - -@@ -144,7 +145,7 @@ - uint32_t countedHidDevices = 0, timeout = 50; - do - { -- this_thread::sleep_for(chrono::seconds(1)); -+ this_thread::sleep_for(std::chrono::seconds(1)); - countedHidDevices = HidUpdateManager::countHidDevices(currentPid); - - if (intCallback) -@@ -648,7 +649,7 @@ - // Start the FPGA update - this->upInit(3); - -- this_thread::sleep_for(chrono::seconds(1)); -+ this_thread::sleep_for(std::chrono::seconds(1)); - - // Restore the normal HAL module - if (returnValue && !updateHal()) -@@ -839,7 +840,7 @@ - #endif - UpdateLog.append("\n---------------------Firmware upate end--------------------------\n"); - -- ofstream(logfile.c_str(), ios::app | ios::out) << UpdateLog; -+ std::ofstream(logfile.c_str(), ios::app | ios::out) << UpdateLog; - } - - return retval; -@@ -1020,7 +1021,7 @@ - #endif - UpdateLog.append("\n---------------------Firmware upate end--------------------------\n"); - -- ofstream(logfile.c_str(), ios::app | ios::out) << UpdateLog; -+ std::ofstream(logfile.c_str(), ios::app | ios::out) << UpdateLog; - } - return returnValue; - } -@@ -1134,7 +1135,7 @@ - this->upInit(0); - - // give the firmware time to execute initialisation -- this_thread::sleep_for(chrono::seconds(1)); -+ this_thread::sleep_for(std::chrono::seconds(1)); - return true; - } - Property changes on: head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_UpdateManagerFet.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_ConfigManager.cpp =================================================================== --- head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_ConfigManager.cpp (revision 530682) +++ head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_ConfigManager.cpp (nonexistent) @@ -1,91 +0,0 @@ ---- DLL430_v3/src/TI/DLL430/ConfigManager.cpp.orig 2017-12-05 18:47:14.461686000 +0300 -+++ DLL430_v3/src/TI/DLL430/ConfigManager.cpp 2017-12-05 18:47:14.601264000 +0300 -@@ -135,7 +135,7 @@ void ConfigManager::init () - iniFile = string(iniPathEnv) + "/" + iniFile; - } - -- ifstream DllV3Ini(iniFile.c_str()); -+ std::ifstream DllV3Ini(iniFile.c_str()); - - while (DllV3Ini && !DllV3Ini.eof()) - { -@@ -259,9 +259,9 @@ bool ConfigManager::jtagErase(uint16_t e - return false; - } - #if defined(_WIN32) || defined(_WIN64) || defined(__APPLE__) -- this_thread::sleep_for(chrono::milliseconds(100)); -+ this_thread::sleep_for(std::chrono::milliseconds(100)); - #else -- this_thread::sleep_for(chrono::milliseconds(500)); -+ this_thread::sleep_for(std::chrono::milliseconds(500)); - #endif - return true; - } -@@ -561,7 +561,7 @@ bool ConfigManager::reset(bool vcc, bool - return false; - } - // keep voltage 0 for minmum 5 seconds -- this_thread::sleep_for(chrono::seconds(5)); -+ this_thread::sleep_for(std::chrono::seconds(5)); - - if (!this->setDeviceVcc(voltage)) - { -@@ -622,7 +622,7 @@ bool ConfigManager::reset(bool vcc, bool - return false; - } - // keep voltate 0 for minmum 5 seconds -- this_thread::sleep_for(chrono::seconds(5)); -+ this_thread::sleep_for(std::chrono::seconds(5)); - if (!this->setDeviceVcc(voltage)) - { - return false; -@@ -718,10 +718,10 @@ bool ConfigManager::setVccEzFet(uint16_t - #if defined(_WIN32) || defined(_WIN64) || defined(__APPLE__) - if (vcc) - { -- this_thread::sleep_for(chrono::milliseconds(500)); -+ this_thread::sleep_for(std::chrono::milliseconds(500)); - } - #else -- this_thread::sleep_for(chrono::milliseconds(1000)); -+ this_thread::sleep_for(std::chrono::milliseconds(1000)); - #endif - - } -@@ -789,9 +789,9 @@ bool ConfigManager::setVccMspFET(uint16_ - } - - #if defined(_WIN32) || defined(_WIN64) || defined(__APPLE__) -- this_thread::sleep_for(chrono::milliseconds(100)); -+ this_thread::sleep_for(std::chrono::milliseconds(100)); - #else -- this_thread::sleep_for(chrono::milliseconds(700)); -+ this_thread::sleep_for(std::chrono::milliseconds(700)); - #endif - - // now run calibration to support Energy Trace -@@ -822,9 +822,9 @@ bool ConfigManager::setVccMspFET(uint16_ - return false; - } - #if defined(_WIN32) || defined(_WIN64) || defined(__APPLE__) -- this_thread::sleep_for(chrono::milliseconds(100)); -+ this_thread::sleep_for(std::chrono::milliseconds(100)); - #else -- this_thread::sleep_for(chrono::milliseconds(700)); -+ this_thread::sleep_for(std::chrono::milliseconds(700)); - #endif - - // Send power down command to Sub mcu Firmware -@@ -858,10 +858,10 @@ bool ConfigManager::setVccMspFetUif(uint - #if defined(_WIN32) || defined(_WIN64) || defined(__APPLE__) - if (vcc) - { -- this_thread::sleep_for(chrono::milliseconds(1000)); -+ this_thread::sleep_for(std::chrono::milliseconds(1000)); - } - #else -- this_thread::sleep_for(chrono::milliseconds(2500)); -+ this_thread::sleep_for(std::chrono::milliseconds(2500)); - #endif - return true; - } Property changes on: head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_ConfigManager.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_Physical_Interfaces_MSPBSL_PhysicalInterfaceSerialUART.cpp =================================================================== --- head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_Physical_Interfaces_MSPBSL_PhysicalInterfaceSerialUART.cpp (revision 530682) +++ head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_Physical_Interfaces_MSPBSL_PhysicalInterfaceSerialUART.cpp (nonexistent) @@ -1,49 +0,0 @@ ---- ThirdParty/BSL430_DLL/BSL430_DLL/Physical_Interfaces/MSPBSL_PhysicalInterfaceSerialUART.cpp.orig 2017-12-05 19:25:19.310735000 +0300 -+++ ThirdParty/BSL430_DLL/BSL430_DLL/Physical_Interfaces/MSPBSL_PhysicalInterfaceSerialUART.cpp 2017-12-05 19:34:23.723027000 +0300 -@@ -129,7 +129,11 @@ - - - //TODO: Catch exception forunknown ports -+#if BOOST_VERSION < 106600 - io_service io; -+#else -+ io_context io; -+#endif - port = new serial_port( io, PORT ); - port->set_option( serial_port_base::character_size( 8 ) ); - port->set_option( serial_port_base::flow_control( serial_port_base::flow_control::none ) ); -@@ -193,27 +197,27 @@ - - port->set_option(RESETControl(LOW_SIGNAL)); - port->set_option(TESTControl(LOW_SIGNAL)); -- this_thread::sleep_for(chrono::milliseconds(10)); -+ this_thread::sleep_for(std::chrono::milliseconds(10)); - port->set_option(TESTControl(HIGH_SIGNAL)); -- this_thread::sleep_for(chrono::milliseconds(10)); -+ this_thread::sleep_for(std::chrono::milliseconds(10)); - port->set_option(TESTControl(LOW_SIGNAL)); -- this_thread::sleep_for(chrono::milliseconds(10)); -+ this_thread::sleep_for(std::chrono::milliseconds(10)); - port->set_option(TESTControl(HIGH_SIGNAL)); -- this_thread::sleep_for(chrono::milliseconds(10)); -+ this_thread::sleep_for(std::chrono::milliseconds(10)); - if( method == STANDARD_INVOKE ) - { - port->set_option(RESETControl(HIGH_SIGNAL)); -- this_thread::sleep_for(chrono::milliseconds(10)); -+ this_thread::sleep_for(std::chrono::milliseconds(10)); - port->set_option(TESTControl(LOW_SIGNAL)); - } - else if ( method == BSL_XXXX_INVOKE ) - { - port->set_option(TESTControl(LOW_SIGNAL)); -- this_thread::sleep_for(chrono::milliseconds(10)); -+ this_thread::sleep_for(std::chrono::milliseconds(10)); - port->set_option(RESETControl(HIGH_SIGNAL)); - } - -- this_thread::sleep_for(chrono::milliseconds(250)); -+ this_thread::sleep_for(std::chrono::milliseconds(250)); - - } - Property changes on: head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_Physical_Interfaces_MSPBSL_PhysicalInterfaceSerialUART.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp =================================================================== --- head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp (revision 530682) +++ head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp (revision 530683) @@ -1,63 +1,33 @@ ---- DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp.orig 2017-12-05 19:25:19.220234000 +0300 -+++ DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp 2017-12-05 19:31:57.808647000 +0300 -@@ -309,6 +309,22 @@ +--- DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp.orig 2020-02-14 09:38:32 UTC ++++ DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp +@@ -310,6 +310,22 @@ void UsbCdcIoChannel::createCdcPortList(const uint16_t } #else stringstream cdcIdStream; + +#ifdef __FreeBSD__ + + path p( "/dev" ); + if( exists(p) && is_directory(p) ) { + + cdcIdStream << hex << setfill('0') << "mspfet" << setw(4) << productId; + + const directory_iterator end; + for( directory_iterator it(p); it != end; ++it ) { + + string dir = it->path().string(); + if( dir.find( cdcIdStream.str() ) != string::npos ) { + { + +#else cdcIdStream << hex << setfill('0') << "usb:v" << setw(4) << vendorId << "p" << setw(4) << productId; path p("/sys/class/tty/"); -@@ -330,6 +346,7 @@ +@@ -331,6 +347,7 @@ void UsbCdcIoChannel::createCdcPortList(const uint16_t ifNumStream >> interfaceNumber; if (modalias.find(cdcIdStream.str()) == 0 && interfaceNumber == 0) { +#endif const string filename = it->path().filename().string(); const string portPath = string("/dev/") + filename; -@@ -375,7 +392,11 @@ - - bool UsbCdcIoChannel::openPort() - { -+#if BOOST_VERSION < 106600 - ioService = new boost::asio::io_service; -+#else -+ ioService = new boost::asio::io_context; -+#endif - port = new boost::asio::serial_port(*ioService); - timer = new boost::asio::deadline_timer(*ioService); - -@@ -384,7 +405,7 @@ - int retry = 5; - while (ec && --retry ) - { -- this_thread::sleep_for(chrono::milliseconds(5)); -+ this_thread::sleep_for(std::chrono::milliseconds(5)); - ec = port->open(portInfo.path, ec); - } - -@@ -409,7 +430,7 @@ - { - openPort(); - //Seeing issues on some platforms (eg. Ubuntu) when port is immediately closed again -- this_thread::sleep_for(chrono::milliseconds(100)); -+ this_thread::sleep_for(std::chrono::milliseconds(100)); - close(); - } - } Index: head/devel/msp430-debug-stack/files/patch-Makefile =================================================================== --- head/devel/msp430-debug-stack/files/patch-Makefile (revision 530682) +++ head/devel/msp430-debug-stack/files/patch-Makefile (revision 530683) @@ -1,49 +1,49 @@ ---- Makefile.orig 2017-06-22 12:44:14.000000000 +0300 -+++ Makefile 2017-12-05 18:35:24.639422000 +0300 +--- Makefile.orig 2020-02-24 09:36:30 UTC ++++ Makefile @@ -16,6 +16,7 @@ MAKE_PCH += -x c++-header USE_PCH += -include $(PCH_HEADER) export BOOST_DIR +export HIDAPI_DIR - export BIT32 export STATIC export DEBUG -@@ -76,15 +77,15 @@ ifeq ($(PLATFORM),Linux) +@@ -68,15 +69,15 @@ ifeq ($(PLATFORM),Linux) + HIDOBJ := $(LIBTHIRD)/hid-libusb.o else - CXX:= clang++ +# CXX:= clang++ - OUTPUT := libmsp430.dylib - STATICOUTPUT := mac64 + OUTPUT := libmsp430.so + STATICOUTPUT := libmsp430 ifdef STATIC - STATIC_LIBS += -framework CoreFoundation -framework IOKit -lhidapi + STATIC_LIBS += -lhidapi else - LIBS += -framework CoreFoundation -framework IOKit -lhidapi + LIBS += -lhidapi endif ifdef BOOST_DIR -@@ -92,9 +93,14 @@ else +@@ -84,9 +85,14 @@ else LIBDIRS += -L$(BOOST_DIR)/lib endif - OUTNAME := -install_name - BSTATIC := - BDYNAMIC := + ifdef HIDAPI_DIR + INCLUDES += -I$(HIDAPI_DIR)/include/hidapi + LIBDIRS += -L$(HIDAPI_DIR)/lib + endif + + OUTNAME := -Wl,-soname, + BSTATIC := -Wl,-Bstatic + BDYNAMIC := -Wl,-Bdynamic HIDOBJ := endif Index: head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_Makefile =================================================================== --- head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_Makefile (revision 530682) +++ head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_Makefile (revision 530683) @@ -1,19 +1,18 @@ ---- ThirdParty/BSL430_DLL/Makefile.orig 2016-02-29 15:26:38.000000000 +0300 -+++ ThirdParty/BSL430_DLL/Makefile 2017-12-05 18:35:24.642830000 +0300 -@@ -47,11 +47,15 @@ ifeq ($(PLATFORM),Linux) +--- ThirdParty/BSL430_DLL/Makefile.orig 2019-11-18 10:16:00 UTC ++++ ThirdParty/BSL430_DLL/Makefile +@@ -47,10 +47,14 @@ ifeq ($(PLATFORM),Linux) INCLUDES += -I$(BOOST_DIR) endif else - CXX:= clang++ +# CXX:= clang++ ifdef BOOST_DIR INCLUDES += -I$(BOOST_DIR)/include - endif ++ endif + ifdef HIDAPI_DIR + INCLUDES += -I$(HIDAPI_DIR)/include/hidapi + LIBDIRS += -L$(HIDAPI_DIR)/lib -+ endif + endif endif - all: $(OBJS) Index: head/devel/msp430-debug-stack/pkg-plist =================================================================== --- head/devel/msp430-debug-stack/pkg-plist (revision 530682) +++ head/devel/msp430-debug-stack/pkg-plist (revision 530683) @@ -1,12 +1,12 @@ include/libmsp430/DLL430_SYMBOL.h include/libmsp430/MSP430.h include/libmsp430/MSP430_Debug.h include/libmsp430/MSP430_EEM.h include/libmsp430/MSP430_EnergyTrace.h include/libmsp430/MSP430_FET.h include/libmsp430/MSP430_HIL.h lib/libmsp430.so lib/libmsp430.a -%%PORTDOCS%%%%DOCSDIR%%/slau320ac.pdf +%%PORTDOCS%%%%DOCSDIR%%/slau320ai.pdf %%PORTDOCS%%%%DOCSDIR%%/slau656b.pdf etc/devd/mspfet.conf