Attachment 220605 Details for Bug 251882 – Patch (Revision 1)

[patch] Patch (Revision 1)

bossa-1.9.1.diff (text/plain), 9.48 KB, created by Neel Chauhan on 2020-12-16 02:56:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neel Chauhan

Created: 2020-12-16 02:56:37 UTC

Size: 9.48 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 558135)
>+++ Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	bossa
>-PORTVERSION=	1.7.0
>-PORTREVISION=	9
>+PORTVERSION=	1.9.1
> CATEGORIES=	devel
> 
> MAINTAINER=	kevans@FreeBSD.org
>Index: distinfo
>===================================================================
>--- distinfo	(revision 558135)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1475463215
>-SHA256 (shumatech-BOSSA-1.7.0_GH0.tar.gz) = 758ddaa70163561de9877d2f0f61dd64b51616273ac8709278d7e67ab90a6af3
>-SIZE (shumatech-BOSSA-1.7.0_GH0.tar.gz) = 539347
>+TIMESTAMP = 1608087319
>+SHA256 (shumatech-BOSSA-1.9.1_GH0.tar.gz) = ca650455dfa36cbd029010167347525bea424717a71a691381c0811591c93e72
>+SIZE (shumatech-BOSSA-1.9.1_GH0.tar.gz) = 544082
>Index: files/patch-src_Command.cpp
>===================================================================
>--- files/patch-src_Command.cpp	(revision 558135)
>+++ files/patch-src_Command.cpp	(nonexistent)
>@@ -1,20 +0,0 @@
>---- src/Command.cpp.orig	2018-01-15 20:28:09 UTC
>-+++ src/Command.cpp
>-@@ -674,7 +674,7 @@ CommandMwb::invoke(char* argv[], int argc)
>-             char* input = readline("? ");
>-             if (!input)
>-                 return;
>--            if (input == '\0' ||
>-+            if (*input == '\0' ||
>-                 !argUint32(input, &value))
>-             {
>-                 free(input);
>-@@ -777,7 +777,7 @@ CommandMww::invoke(char* argv[], int argc)
>-             char* input = readline("? ");
>-             if (!input)
>-                 return;
>--            if (input == '\0' ||
>-+            if (*input == '\0' ||
>-                 !argUint32(input, &value))
>-             {
>-                 free(input);
>
>Property changes on: files/patch-src_Command.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: files/patch-src_PosixSerialPort.cpp
>===================================================================
>--- files/patch-src_PosixSerialPort.cpp	(revision 558135)
>+++ files/patch-src_PosixSerialPort.cpp	(nonexistent)
>@@ -1,47 +0,0 @@
>---- src/PosixSerialPort.cpp.orig	2017-03-31 15:31:35 UTC
>-+++ src/PosixSerialPort.cpp
>-@@ -85,6 +85,9 @@ PosixSerialPort::open(int baud,
>- 
>-     switch (baud)
>-     {
>-+    case 1200:
>-+        speed = B1200;
>-+        break;
>-     case 9600:
>-         speed = B9600;
>-         break;
>-@@ -297,6 +300,34 @@ PosixSerialPort::timeout(int millisecs)
>- {
>-     _timeout = millisecs;
>-     return true;
>-+}
>-+
>-+void
>-+PosixSerialPort::setDTR(bool dtr)
>-+{
>-+    if (_devfd == -1)
>-+        return;
>-+
>-+    int iFlags = TIOCM_DTR;
>-+
>-+    if (dtr)
>-+        ioctl(_devfd, TIOCMBIS, &iFlags);
>-+    else
>-+        ioctl(_devfd, TIOCMBIC, &iFlags);
>-+}
>-+
>-+void
>-+PosixSerialPort::setRTS(bool rts)
>-+{
>-+    if (_devfd == -1)
>-+        return;
>-+
>-+    int iFlags = TIOCM_RTS;
>-+
>-+    if (rts)
>-+        ioctl(_devfd, TIOCMBIS, &iFlags);
>-+    else
>-+        ioctl(_devfd, TIOCMBIC, &iFlags);
>- }
>- 
>- void
>
>Property changes on: files/patch-src_PosixSerialPort.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: files/patch-src_PosixSerialPort.h
>===================================================================
>--- files/patch-src_PosixSerialPort.h	(revision 558135)
>+++ files/patch-src_PosixSerialPort.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/PosixSerialPort.h.orig	2017-03-31 15:31:35 UTC
>-+++ src/PosixSerialPort.h
>-@@ -52,6 +52,8 @@ class PosixSerialPort : public SerialPort (public)
>- 
>-     bool timeout(int millisecs);
>-     void flush();
>-+    void setDTR(bool dtr);
>-+    void setRTS(bool rts);
>-     void setAutoFlush(bool autoflush);
>- 
>- private:
>
>Property changes on: files/patch-src_PosixSerialPort.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: files/patch-src_SerialPort.h
>===================================================================
>--- files/patch-src_SerialPort.h	(revision 558135)
>+++ files/patch-src_SerialPort.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/SerialPort.h.orig	2017-03-31 15:31:35 UTC
>-+++ src/SerialPort.h
>-@@ -68,6 +68,8 @@ class SerialPort (public)
>- 
>-     virtual bool timeout(int millisecs) = 0;
>-     virtual void flush() = 0;
>-+    virtual void setDTR(bool dtr) = 0;
>-+    virtual void setRTS(bool rts) = 0;
>- 
>-     virtual std::string name() const { return _name; }
>- 
>
>Property changes on: files/patch-src_SerialPort.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: files/patch-src_WinSerialPort.cpp
>===================================================================
>--- files/patch-src_WinSerialPort.cpp	(revision 558135)
>+++ files/patch-src_WinSerialPort.cpp	(nonexistent)
>@@ -1,18 +0,0 @@
>---- src/WinSerialPort.cpp.orig	2017-03-31 15:31:35 UTC
>-+++ src/WinSerialPort.cpp
>-@@ -251,3 +251,15 @@ WinSerialPort::flush()
>- {
>-     Sleep(1);
>- }
>-+
>-+void
>-+WinSerialPort::setDTR(bool dtr)
>-+{
>-+    Sleep(1);
>-+}
>-+
>-+void
>-+WinSerialPort::setRTS(bool rts)
>-+{
>-+    Sleep(1);
>-+}
>
>Property changes on: files/patch-src_WinSerialPort.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: files/patch-src_WinSerialPort.h
>===================================================================
>--- files/patch-src_WinSerialPort.h	(revision 558135)
>+++ files/patch-src_WinSerialPort.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/WinSerialPort.h.orig	2017-03-31 15:31:35 UTC
>-+++ src/WinSerialPort.h
>-@@ -55,6 +55,8 @@ class WinSerialPort : public SerialPort (public)
>- 
>-     bool timeout(int millisecs);
>-     void flush();
>-+    void setDTR(bool dtr);
>-+    void setRTS(bool rts);
>- 
>- private:
>-     HANDLE _handle;
>
>Property changes on: files/patch-src_WinSerialPort.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: files/patch-src_bossac.cpp
>===================================================================
>--- files/patch-src_bossac.cpp	(revision 558135)
>+++ files/patch-src_bossac.cpp	(nonexistent)
>@@ -1,69 +0,0 @@
>---- src/bossac.cpp.orig	2017-03-31 15:31:35 UTC
>-+++ src/bossac.cpp
>-@@ -64,6 +64,7 @@ class BossaConfig (public)
>-     bool help;
>-     bool forceUsb;
>-     string forceUsbArg;
>-+    bool arduinoErase;
>- 
>-     int readArg;
>-     string portArg;
>-@@ -89,6 +90,7 @@ BossaConfig::BossaConfig()
>-     info = false;
>-     help = false;
>-     forceUsb = false;
>-+    arduinoErase = false;
>- 
>-     readArg = 0;
>-     bootArg = 1;
>-@@ -189,6 +191,11 @@ static Option opts[] =
>-       'R', "reset", &config.reset,
>-       { ArgNone },
>-       "reset CPU (if supported)"
>-+    },
>-+    {
>-+      'a', "arduino_erase", &config.arduinoErase,
>-+      { ArgNone },
>-+      "erase and reset via Arduino 1200 baud hack (cannot be used with port autodetection)"
>-     }
>- };
>- 
>-@@ -257,6 +264,12 @@ main(int argc, char* argv[])
>-         return help(argv[0]);
>-     }
>- 
>-+    if (config.arduinoErase && !config.port)
>-+    {
>-+        fprintf(stderr, "%s: port must be specified for Arduino 1200bps erase hack\n", argv[0]);
>-+        return help(argv[0]);
>-+    }
>-+
>-     if (config.read || config.write || config.verify)
>-     {
>-         if (args == argc)
>-@@ -311,6 +324,25 @@ main(int argc, char* argv[])
>-                 fprintf(stderr, "Invalid USB value: %s\n", config.forceUsbArg.c_str());
>-                 return 1;
>-             }
>-+        }
>-+
>-+        if (config.arduinoErase)
>-+        {
>-+            SerialPort::Ptr port;
>-+            if (config.forceUsb)
>-+                port = portFactory.create(config.portArg, isUsb);
>-+            else
>-+                port = portFactory.create(config.portArg);
>-+
>-+            if(!port->open(1200))
>-+            {
>-+                fprintf(stderr, "Failed to open port at 1200bps\n");
>-+                return 1;
>-+            }
>-+
>-+            port->setRTS(true);
>-+            port->setDTR(false);
>-+            port->close();
>-         }
>- 
>-         if (config.port)
>
>Property changes on: files/patch-src_bossac.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

Flags:

kevans: maintainer-approval+

Actions: View | Diff

Attachments on bug 251882: 220605