diff options
author | Paolo Molaro <lupus@oddwiz.org> | 2007-04-11 17:43:24 +0400 |
---|---|---|
committer | Paolo Molaro <lupus@oddwiz.org> | 2007-04-11 17:43:24 +0400 |
commit | c5bdf444a29f6aca4d3446d8649d4bfa8b60573c (patch) | |
tree | 9ae567375fb131444d4ede79c4fae18ce7583be7 /mcs/class | |
parent | ad2b5ce673d42be98aa2264383ce29fb5ad68ced (diff) |
Wed Apr 11 15:40:55 CEST 2007 Paolo Molaro <lupus@ximian.com>
* WinSerialStream.cs: fixed logic for signal value check (bug #81342).
svn path=/trunk/mcs/; revision=75610
Diffstat (limited to 'mcs/class')
-rw-r--r-- | mcs/class/System/System.IO.Ports/ChangeLog | 5 | ||||
-rw-r--r-- | mcs/class/System/System.IO.Ports/WinSerialStream.cs | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/mcs/class/System/System.IO.Ports/ChangeLog b/mcs/class/System/System.IO.Ports/ChangeLog index bc5a2c037c1..a2240ee2e33 100644 --- a/mcs/class/System/System.IO.Ports/ChangeLog +++ b/mcs/class/System/System.IO.Ports/ChangeLog @@ -1,3 +1,8 @@ + +Wed Apr 11 15:40:55 CEST 2007 Paolo Molaro <lupus@ximian.com> + + * WinSerialStream.cs: fixed logic for signal value check (bug #81342). + 2006-11-18 Jelle Hissink <Jelle.Hissink@C-it.nl> * SerialPortStream.cs: Fix the parameters in Read, and also poll diff --git a/mcs/class/System/System.IO.Ports/WinSerialStream.cs b/mcs/class/System/System.IO.Ports/WinSerialStream.cs index c517b289aec..11f7c2beb17 100644 --- a/mcs/class/System/System.IO.Ports/WinSerialStream.cs +++ b/mcs/class/System/System.IO.Ports/WinSerialStream.cs @@ -420,20 +420,20 @@ namespace System.IO.Ports public void SetSignal (SerialSignal signal, bool value) { - if (signal != SerialSignal.Rts || signal != SerialSignal.Dtr) - throw new Exception ("Wrong internal value"); - uint flag; - if (signal == SerialSignal.Rts) + if (signal == SerialSignal.Rts) { if (value) flag = SetRts; else flag = ClearRts; - else + } else if (signal == SerialSignal.Dtr) { if (value) flag = SetDtr; else flag = ClearDtr; + } else { + throw new Exception ("Wrong internal value"); + } if (!EscapeCommFunction (handle, flag)) ReportIOError (null); |