added touchscreen support, detect all known PCI chips in the Neomagic line.

    We'll not bother with ISA for now.

1 files changed, 13 insertions, 3 deletions

diff --git a/hw/kdrive/neomagic/neomagicstub.c b/hw/kdrive/neomagic/neomagicstub.c
index 9b57b4822..e8490bed8 100644
--- a/hw/kdrive/neomagic/neomagicstub.c
+++ b/hw/kdrive/neomagic/neomagicstub.c
@@ -26,13 +26,20 @@
 #endif
 #include "neomagic.h"
 
+extern struct NeoChipInfo neoChips[];
+
 void
 InitCard (char *name)
 {
     KdCardAttr	attr;
-	// NM2230 MagicGraph 256AV+ the only card I have for testing
-    if (LinuxFindPci (NEOMAGIC_VENDOR, NEOMAGIC_NM2230, 0, &attr)) 
-	KdCardInfoAdd (&neoFuncs, &attr, 0);
+    struct NeoChipInfo *chip;
+
+    for (chip = neoChips; chip->name != NULL; ++chip) {
+        int j = 0;
+        while (LinuxFindPci(chip->vendor, chip->device, j++, &attr)) {
+            KdCardInfoAdd(&neoFuncs, &attr, 0);
+        }
+    }
 }
 
 void
@@ -45,6 +52,9 @@ void
 InitInput (int argc, char **argv)
 {
     KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
+#ifdef TOUCHSCREEN
+    KdInitTouchScreen (&TsFuncs);
+#endif
 }
 
 void