From 51481b5b9e979f51ea1618817e6670013908f19f Mon Sep 17 00:00:00 2001
From: Stéphane Raimbault <stephane.raimbault@gmail.com>
Date: Tue, 13 Nov 2007 00:02:49 +0100
Subject: [PATCH] Merge -r10..12 from libmodbus 1.2 branch

---
 NEWS         | 17 +++++++++++++++++
 src/modbus.h |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index e69de29..b3899a9 100644
--- a/NEWS
+++ b/NEWS
@@ -0,0 +1,17 @@
+libmodbus 1.2.2 (2007-11-12)
+- Fix #161989 (Konstantinos Togias)
+  Serial device paths more than 10 chars long (eg. /dev/ttyUSB0) don't
+  fit to modbus_param_t -> device char[11] var.
+- Structure is also bit better 'packed' to conserve memory (see the
+  trunk for a real enhancement).
+
+libmodbus 1.2.1 (2007-11-02)
+- Fix #159443 (Stefan Bisanz)
+  Index of incoming data in force multiple coils function
+- Deleted unuseful code in check_crc16()
+- Untabify source code
+- Changed author's email (Stéphane Raimbault)
+
+libmodbus 1.2.0 (2007-05-10)
+- FIX Compilation GCC-4.0
+- Project name in autogen.sh
diff --git a/src/modbus.h b/src/modbus.h
index dee32d1..3108b2a 100644
--- a/src/modbus.h
+++ b/src/modbus.h
@@ -114,8 +114,8 @@ typedef enum { RTU, TCP } type_com_t;
 typedef struct {
         /* Communication : RTU or TCP */
         type_com_t type_com;
-        /* Device: "/dev/ttyS0" */
-        char device[11];
+        /* Device: "/dev/ttyS0" or "/dev/ttyUSB0" */
+        char device[19];
         /* Parity: "even", "odd", "none" */
         char parity[5];
         /* Bauds: 19200 */
--
libgit2 0.21.4