tools/arduino/patches/arduino-1.5.7_linux.patch

   1 diff -Naur /home/joseph/Desktop/old_arduino/arduino-1.5.7/libraries/Ethernet/src/Ethernet.cpp /home/joseph/Desktop/arduino-1.5.7/./libraries/Ethernet/src/Ethernet.cpp
   2 --- /home/joseph/Desktop/old_arduino/arduino-1.5.7/libraries/Ethernet/src/Ethernet.cpp  2014-07-07 04:11:39.000000000 -0400
   3 +++ /home/joseph/Desktop/arduino-1.5.7/./libraries/Ethernet/src/Ethernet.cpp    2014-10-20 17:14:19.666407959 -0400
   4 @@ -7,10 +7,10 @@
   5    0, 0, 0, 0 };
   6  uint16_t EthernetClass::_server_port[MAX_SOCK_NUM] = {
   7    0, 0, 0, 0 };
   8 +static DhcpClass s_dhcp;
   9
  10  int EthernetClass::begin(uint8_t *mac_address)
  11  {
  12 -  static DhcpClass s_dhcp;
  13    _dhcp = &s_dhcp;
  14
  15
  16 diff -Naur /home/joseph/Desktop/old_arduino/arduino-1.5.7/libraries/Ethernet/src/utility/socket.cpp /home/joseph/Desktop/arduino-1.5.7/./libraries/Ethernet/src/utility/socket.cpp
  17 --- /home/joseph/Desktop/old_arduino/arduino-1.5.7/libraries/Ethernet/src/utility/socket.cpp    2014-07-07 04:11:39.000000000 -0400
  18 +++ /home/joseph/Desktop/arduino-1.5.7/./libraries/Ethernet/src/utility/socket.cpp      2014-10-20 17:16:31.834413773 -0400
  19 @@ -248,6 +248,7 @@
  20  {
  21    uint8_t head[8];
  22    uint16_t data_len=0;
  23 +  uint16_t data_copied=0;
  24    uint16_t ptr=0;
  25
  26    if ( len > 0 )
  27 @@ -285,10 +286,6 @@
  28        data_len = head[4];
  29        data_len = (data_len << 8) + head[5];
  30
  31 -      W5100.read_data(s, ptr, buf, data_len); // data copy.
  32 -      ptr += data_len;
  33 -
  34 -      W5100.writeSnRX_RD(s, ptr);
  35        break;
  36
  37      case SnMR::MACRAW:
  38 @@ -297,17 +294,22 @@
  39        data_len = head[0];
  40        data_len = (data_len<<8) + head[1] - 2;
  41
  42 -      W5100.read_data(s, ptr, buf, data_len);
  43 -      ptr += data_len;
  44 -      W5100.writeSnRX_RD(s, ptr);
  45        break;
  46
  47      default :
  48        break;
  49      }
  50 +
  51 +    if (data_len > 0)
  52 +    {
  53 +        data_copied = (data_len <= len) ? data_len : len;// only copy the len bytes, rest of is discarded.
  54 +        W5100.read_data(s, ptr, buf, data_copied); // data copy.
  55 +        ptr += data_len;
  56 +        W5100.writeSnRX_RD(s, ptr);
  57 +    }
  58      W5100.execCmdSn(s, Sock_RECV);
  59    }
  60 -  return data_len;
  61 +  return data_copied;
  62  }
  63
  64  /**
  65 diff -Naur /home/joseph/Desktop/old_arduino/arduino-1.5.7/libraries/WiFi/src/utility/wifi_spi.h /home/joseph/Desktop/arduino-1.5.7/./libraries/WiFi/src/utility/wifi_spi.h
  66 --- /home/joseph/Desktop/old_arduino/arduino-1.5.7/libraries/WiFi/src/utility/wifi_spi.h        2014-07-07 04:11:40.000000000 -0400
  67 +++ /home/joseph/Desktop/arduino-1.5.7/./libraries/WiFi/src/utility/wifi_spi.h  2014-10-20 17:17:59.490417629 -0400
  68 @@ -82,7 +82,7 @@
  69
  70         SEND_DATA_TCP_CMD               = 0x44,
  71      GET_DATABUF_TCP_CMD                = 0x45,
  72 -    INSERT_DATABUF_CMD         = 0x46,
  73 +    INSERT_DATABUF_CMD         = 0x46
  74  };
  75
  76
  77 diff -Naur /home/joseph/Desktop/old_arduino/arduino-1.5.7/libraries/WiFi/src/utility/wl_types.h /home/joseph/Desktop/arduino-1.5.7/./libraries/WiFi/src/utility/wl_types.h
  78 --- /home/joseph/Desktop/old_arduino/arduino-1.5.7/libraries/WiFi/src/utility/wl_types.h        2014-07-07 04:11:40.000000000 -0400
  79 +++ /home/joseph/Desktop/arduino-1.5.7/./libraries/WiFi/src/utility/wl_types.h  2014-10-20 17:17:25.754416145 -0400
  80 @@ -31,7 +31,7 @@
  81  \r
  82  typedef enum {\r
  83          WL_FAILURE = -1,\r
  84 -        WL_SUCCESS = 1,\r
  85 +        WL_SUCCESS = 1\r
  86  } wl_error_code_t;\r
  87  \r
  88  /* Authentication modes */\r