svn commit: r455587 - in head/devel/msp430-debug-stack: . files

[Jan Beich]

"Lev A. Serebryakov" <lev at FreeBSD.org> writes:

> Modified: 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	Tue Dec  5 15:56:04 2017	(r455586)
> +++ head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp	Tue Dec  5 15:57:25 2017	(r455587)
> @@ -1,33 +1,20 @@
> ---- DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp.orig	2016-05-02 09:51:53.763023000 +0200
> -+++ DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp	2016-05-02 09:53:56.332580000 +0200
> -@@ -303,6 +303,22 @@
> - 	}
> - #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;

I think, you've accidentally removed existing patch against this file.