Author: miguel
Date: 2007-12-03 14:40:03 -0500 (Mon, 03 Dec 2007)
New Revision: 90583

Modified:
   trunk/mcs/class/System/System.IO.Ports/ChangeLog
   trunk/mcs/class/System/System.IO.Ports/SerialPort.cs
Log:
2007-12-03  Miguel de Icaza  <[EMAIL PROTECTED]>

        * SerialPort.cs: Apply patch from Martin Green
        <[EMAIL PROTECTED]> to support Serial Ports enumeration on
        Windows.

Modified: trunk/mcs/class/System/System.IO.Ports/ChangeLog
===================================================================
--- trunk/mcs/class/System/System.IO.Ports/ChangeLog    2007-12-03 19:21:28 UTC 
(rev 90582)
+++ trunk/mcs/class/System/System.IO.Ports/ChangeLog    2007-12-03 19:40:03 UTC 
(rev 90583)
@@ -1,3 +1,9 @@
+2007-12-03  Miguel de Icaza  <[EMAIL PROTECTED]>
+
+       * SerialPort.cs: Apply patch from Martin Green
+       <[EMAIL PROTECTED]> to support Serial Ports enumeration on
+       Windows.
+
 2007-11-13  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
        * SerialPort.cs :

Modified: trunk/mcs/class/System/System.IO.Ports/SerialPort.cs
===================================================================
--- trunk/mcs/class/System/System.IO.Ports/SerialPort.cs        2007-12-03 
19:21:28 UTC (rev 90582)
+++ trunk/mcs/class/System/System.IO.Ports/SerialPort.cs        2007-12-03 
19:40:03 UTC (rev 90583)
@@ -25,6 +25,7 @@
 using System.Diagnostics;
 using System.Text;
 using System.Runtime.InteropServices;
+using Microsoft.Win32;
 
 namespace System.IO.Ports
 {
@@ -59,8 +60,6 @@
                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,7 +102,16 @@
 
                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)
+                                       return "ttyS0"; // Default for Unix
+                               else
+                                       return "COM1"; // Default for Windows
+                       }
                }
 
                [Browsable (false)]
@@ -506,28 +514,32 @@
                        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) {
+                               string[] ttys = Directory.GetFiles("/dev/", 
"tty*");
+                               foreach (string dev in ttys) {
+                                       if (dev.StartsWith("/dev/ttyS") || 
dev.StartsWith("/dev/ttyUSB"))
+                                               serial_ports.Add(dev);
                                }
-                               return serial_ports.ToArray ();
+                       } 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);
+                                               }
+                                       }
+                               }
                        }
-                       throw GetNotImplemented ();
+                       return serial_ports.ToArray();
                }
 
                static bool IsWindows {

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to