New tests.

[mono.git] / mcs / class / System / System.IO.Ports / SerialPort.cs

diff --git a/mcs/class/System/System.IO.Ports/SerialPort.cs b/mcs/class/System/System.IO.Ports/SerialPort.cs
index 7ae1da7fad9ad715b9dbe29166b051438ec9f361..b5ac97e046eea1c8bbc656844f3ae557a0271a4e 100644 (file)
--- a/mcs/class/System/System.IO.Ports/SerialPort.cs
+++ b/mcs/class/System/System.IO.Ports/SerialPort.cs
@@ -25,6 +25,7 @@ using System.ComponentModel;
 using System.Diagnostics;
 using System.Text;
 using System.Runtime.InteropServices;
+using Microsoft.Win32;
 
 namespace System.IO.Ports
 {
@@ -59,8 +60,6 @@ namespace System.IO.Ports
                object error_received = new object ();
                object data_received = new object ();
                object pin_changed = new object ();
-               
-               static string default_port_name = "ttyS0";
 
                public SerialPort () : 
                        this (GetDefaultPortName (), DefaultBaudRate, DefaultParity, DefaultDataBits, DefaultStopBits)
@@ -103,16 +102,23 @@ namespace System.IO.Ports
 
                static string GetDefaultPortName ()
                {
-                       return default_port_name;
+                       string[] ports = GetPortNames();
+                       if (ports.Length > 0) {
+                               return ports[0];
+                       } else {
+                               int p = (int)Environment.OSVersion.Platform;
+                               if (p == 4 || p == 128 || p == 6)
+                                       return "ttyS0"; // Default for Unix
+                               else
+                                       return "COM1"; // Default for Windows
+                       }
                }
 
                [Browsable (false)]
                [DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
                public Stream BaseStream {
                        get {
-                               if (!is_open)
-                                       throw new InvalidOperationException ();
-
+                               CheckOpen ();
                                return (Stream) stream;
                        }
                }
@@ -211,11 +217,12 @@ namespace System.IO.Ports
                [DefaultValue (false)]
                public bool DiscardNull {
                        get {
-                               CheckOpen ();
                                throw new NotImplementedException ();
                        }
                        set {
-                               CheckOpen ();
+                               // LAMESPEC: Msdn states that an InvalidOperationException exception
+                               // is fired if the port is not open, which is *not* happening.
+
                                throw new NotImplementedException ();
                        }
                }
@@ -296,6 +303,8 @@ namespace System.IO.Ports
                        set {
                                if (value == null)
                                        throw new ArgumentNullException ("value");
+                               if (value.Length == 0)
+                                       throw new ArgumentException ("NewLine cannot be null or empty.", "value");
                                
                                new_line = value;
                        }
@@ -481,7 +490,7 @@ namespace System.IO.Ports
 
                public void Close ()
                {
-                       Dispose (false);
+                       Dispose (true);
                }
 
                protected override void Dispose (bool disposing)
@@ -490,7 +499,9 @@ namespace System.IO.Ports
                                return;
                        
                        is_open = false;
-                       stream.Close ();
+                       // Do not close the base stream when the finalizer is run; the managed code can still hold a reference to it.
+                       if (disposing)
+                               stream.Close ();
                        stream = null;
                }
 
@@ -506,28 +517,49 @@ namespace System.IO.Ports
                        stream.DiscardOutBuffer ();
                }
 
-               static Exception GetNotImplemented ()
-               {
-                       return new NotImplementedException ("Detection of ports is not implemented for this platform yet.");
-               }
-
                public static string [] GetPortNames ()
                {
                        int p = (int) Environment.OSVersion.Platform;
+                       List<string> serial_ports = new List<string>();
                        
                        // Are we on Unix?
-                       if (p == 4 || p == 128){
-                               string [] ttys = Directory.GetFiles ("/dev/", "tty*");
-                               List<string> serial_ports = new List<string> ();
-                               
-                               foreach (string dev in ttys){
-                                       if (dev.StartsWith ("/dev/ttyS") || dev.StartsWith ("/dev/ttyUSB"))
-                                               serial_ports.Add (dev);
-                                               
+                       if (p == 4 || p == 128 || p == 6) {
+                               string[] ttys = Directory.GetFiles("/dev/", "tty*");
+                               bool linux_style = false;
+
+                               //
+                               // Probe for Linux-styled devices: /dev/ttyS* or /dev/ttyUSB*
+                               // 
+                               foreach (string dev in ttys) {
+                                       if (dev.StartsWith("/dev/ttyS") || dev.StartsWith("/dev/ttyUSB")){
+                                               linux_style = true;
+                                               break;
+                                       }
+                               }
+
+                               foreach (string dev in ttys) {
+                                       if (linux_style){
+                                               if (dev.StartsWith("/dev/ttyS") || dev.StartsWith("/dev/ttyUSB"))
+                                                       serial_ports.Add (dev);
+                                       } else {
+                                               if (dev != "/dev/tty" && dev.StartsWith ("/dev/tty") && !dev.StartsWith ("/dev/ttyC"))
+                                                       serial_ports.Add (dev);
+                                       }
+                               }
+                       } else {
+                               using (RegistryKey subkey = Registry.LocalMachine.OpenSubKey("HARDWARE\\DEVICEMAP\\SERIALCOMM"))
+                               {
+                                       if (subkey != null) {
+                                               string[] names = subkey.GetValueNames();
+                                               foreach (string value in names) {
+                                                       string port = subkey.GetValue(value, "").ToString();
+                                                       if (port != "")
+                                                               serial_ports.Add(port);
+                                               }
+                                       }
                                }
-                               return serial_ports.ToArray ();
                        }
-                       throw GetNotImplemented ();
+                       return serial_ports.ToArray();
                }
 
                static bool IsWindows {