From ff695a920239fb39724e46d551dc46daf45ff659 Mon Sep 17 00:00:00 2001
From: kudzu_cp <6d05c8c8ef5431987001abfdb2eadc9593ac9498>
Date: Wed, 6 Feb 2008 16:42:43 +0000
Subject: [PATCH]

---
 source/Boot/KudzuTest/Tests.cs              | 26 +++++++++++++++++++++
 source/Cosmos.Hardware.PC/Bus/PCIBus.cs     | 24 ++++---------------
 source/Cosmos/Cosmos.Hardware/Bus/PCIBus.cs |  2 ++
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/source/Boot/KudzuTest/Tests.cs b/source/Boot/KudzuTest/Tests.cs
index 396c43501..42317c940 100644
--- a/source/Boot/KudzuTest/Tests.cs
+++ b/source/Boot/KudzuTest/Tests.cs
@@ -34,6 +34,32 @@ namespace KudzuTest {
             Console.WriteLine("Dictionary test");
             //Console.WriteLine("  " + Tests.Dictionary());
             Console.WriteLine();
+
+            Console.WriteLine("Concat conversion test");
+            Console.WriteLine("  " + Tests.ConcatConversion());
+            //Console.WriteLine("  " + Tests.ConcatConversion2());
+            //Console.WriteLine("  " + Tests.ConcatConversion3());
+            Console.WriteLine();
+        }
+
+        //Fail - Returns in hex, and also wrong value
+        static public object ConcatConversion() {
+            int x = 1000;
+            return x + " Euros, but should be 1000. Not even correct by value";
+        }
+
+        //Fail - Crashes
+        static public object ConcatConversion2() {
+            UInt32 y = 100;
+            UInt32 z = 100;
+            return y + "-" + z;
+        }
+
+        //Fail - crashes...
+        static public object ConcatConversion3() {
+            UInt32 y = 100;
+            UInt32 z = 100;
+            return y.ToString() + "-" + z.ToString();
         }
 
         //Fail - IL2CPU error on compile
diff --git a/source/Cosmos.Hardware.PC/Bus/PCIBus.cs b/source/Cosmos.Hardware.PC/Bus/PCIBus.cs
index b228eb350..11c8605fe 100644
--- a/source/Cosmos.Hardware.PC/Bus/PCIBus.cs
+++ b/source/Cosmos.Hardware.PC/Bus/PCIBus.cs
@@ -23,34 +23,20 @@ namespace Cosmos.Hardware.PC.Bus {
                         UInt32 xDeviceID = xUInt32 >> 16;
                         if (xVendorID != 0xFFFF) {
                             string xVendor = xDeviceIDs.FindVendor(xVendorID);
-                            //string xVendorName = null;
                             if (xVendor == null) {
-                            //    xVendorName = xVendorID.ToString();
+                                xVendor = xVendorID.ToString();
                             }
-                            //Console.Write("Location: ");
                             Console.Write(xBus.ToString());
                             Console.Write("-");
                             Console.Write(xSlot.ToString());
                             Console.Write("-");
                             Console.Write(xFunction.ToString());
-                            if(xVendor != null)
-                            {
-                                Console.Write("(");
-                                Console.Write(xVendor);
-                                Console.Write(")");
-                            }
                             Console.Write(" ");
+                            Console.Write(xVendor);
+                            Console.Write(": ");
+                            Console.Write(xDeviceID.ToString());
 
-                            Console.Write("UInt32: ");
-                            Console.WriteLine(xUInt32.ToString());
-
-                            //Console.Write("Vendor: ");
-                            //Console.WriteLine(xVendorName);
-
-                            //Console.Write("Device: ");
-                            //Console.WriteLine(xDeviceID.ToString());
-
-                            //Console.WriteLine();
+                            Console.WriteLine();
                         }
                     }
                 }
diff --git a/source/Cosmos/Cosmos.Hardware/Bus/PCIBus.cs b/source/Cosmos/Cosmos.Hardware/Bus/PCIBus.cs
index 954697d04..694e0b82c 100644
--- a/source/Cosmos/Cosmos.Hardware/Bus/PCIBus.cs
+++ b/source/Cosmos/Cosmos.Hardware/Bus/PCIBus.cs
@@ -33,6 +33,8 @@ namespace Cosmos.Hardware.Bus {
 
             public DeviceIDs() {
                 mVendors.Add(0x8086, "Intel");
+                mVendors.Add(0x1013, "Cirrus Logic");
+                mVendors.Add(0x10EC, "Realtek Semiconductor Co., Ltd.");
             }
 
             public string FindVendor(UInt32 aVendorID) {