From f50ec335fe21989559a4cc08cbf40af5370284ea Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Sun, 16 Mar 2014 12:17:25 +0100
Subject: [PATCH] Removing the magic baudrate is no longer needed with JSSC

Fixes #1203.

The original patch was introduced to workaround a problem with ArduinoISP reported
in #995. After some debugging it seems caused by a glitch in RXTX library,
more discussion here: https://github.com/arduino/Arduino/issues/1203
---
 .../packages/uploaders/SerialUploader.java    | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/app/src/cc/arduino/packages/uploaders/SerialUploader.java b/app/src/cc/arduino/packages/uploaders/SerialUploader.java
index 9eefff106..5cc67afb0 100644
--- a/app/src/cc/arduino/packages/uploaders/SerialUploader.java
+++ b/app/src/cc/arduino/packages/uploaders/SerialUploader.java
@@ -125,8 +125,6 @@ public class SerialUploader extends Uploader {
       throw new RunnerException(e);
     }
 
-    // Remove the magic baud rate (1200bps) to avoid
-    // future unwanted board resets
     try {
       if (uploadResult && doTouch) {
         String uploadPort = Preferences.get("serial.port");
@@ -136,25 +134,13 @@ public class SerialUploader extends Uploader {
           // sketch port never comes back). Doing this saves users from accidentally
           // opening Serial Monitor on the soon-to-be-orphaned bootloader port.
           Thread.sleep(1000);
-          long timeout = System.currentTimeMillis() + 2000;
-          while (timeout > System.currentTimeMillis()) {
+          long started = System.currentTimeMillis();
+          while (System.currentTimeMillis() - started < 2000) {
             List<String> portList = Serial.list();
-            if (portList.contains(uploadPort)) {
-              try {
-                Serial.touchPort(uploadPort, 9600);
-                break;
-              } catch (SerialException e) {
-                // Port already in use
-              }
-            }
+            if (portList.contains(uploadPort))
+              break;
             Thread.sleep(250);
           }
-        } else {
-          try {
-            Serial.touchPort(uploadPort, 9600);
-          } catch (SerialException e) {
-            throw new RunnerException(e);
-          }
         }
       }
     } catch (InterruptedException ex) {