All devices now have the bus marked in their name;

The Settings dialog now correctly filters devices by bus;
Split the dual VLB/PCI graphics cards into VLB and PCI versions;
Device filtering is now done using the new device_is_valid() call that compares device flags to machine flags;
Moved the NCR-based SCSI controllers to the main branch;
Moved the NE1000 to the dev branch until it's finished.

src/device.c

@@ -329,6 +329,54 @@ device_set_config_mac(char *s, int val)
 }
 
 
+int
+device_is_valid(device_t *device, int machine_flags)
+{
+    if (!device)
+    {
+	return 1;
+    }
+
+    if ((device->flags & DEVICE_AT) && !(machine_flags & MACHINE_AT)) {
+	return 0;
+    }
+
+    if ((device->flags & DEVICE_CBUS) && !(machine_flags & MACHINE_CBUS)) {
+	return 0;
+    }
+
+    if ((device->flags & DEVICE_ISA) && !(machine_flags & MACHINE_ISA)) {
+	return 0;
+    }
+
+    if ((device->flags & DEVICE_MCA) && !(machine_flags & MACHINE_MCA)) {
+	return 0;
+    }
+
+    if ((device->flags & DEVICE_EISA) && !(machine_flags & MACHINE_EISA)) {
+	return 0;
+    }
+
+    if ((device->flags & DEVICE_VLB) && !(machine_flags & MACHINE_VLB)) {
+	return 0;
+    }
+
+    if ((device->flags & DEVICE_PCI) && !(machine_flags & MACHINE_PCI)) {
+	return 0;
+    }
+
+    if ((device->flags & DEVICE_PS2) && !(machine_flags & MACHINE_PS2_HDD)) {
+	return 0;
+    }
+
+    if ((device->flags & DEVICE_AGP) && !(machine_flags & MACHINE_AGP)) {
+	return 0;
+    }
+
+    return 1;
+}
+
+
 int
 machine_get_config_int(char *s)
 {