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/disk/hdc_xtide.c

@@ -236,7 +236,7 @@ xtide_close(void *priv)
 
 device_t xtide_device = {
     "XTIDE",
-    0,
+    DEVICE_ISA,
     0,
     xtide_init, xtide_close, NULL,
     xtide_available, NULL, NULL, NULL,
@@ -245,7 +245,7 @@ device_t xtide_device = {
 
 device_t xtide_at_device = {
     "XTIDE (AT)",
-    DEVICE_AT,
+    DEVICE_ISA | DEVICE_AT,
     0,
     xtide_at_init, xtide_close, NULL,
     xtide_at_available, NULL, NULL, NULL,
@@ -254,7 +254,7 @@ device_t xtide_at_device = {
 
 device_t xtide_ps2_device = {
     "XTIDE (Acculogic)",
-    0,
+    DEVICE_ISA,
     0,
     xtide_ps2_init, xtide_close, NULL,
     xtide_ps2_available, NULL, NULL, NULL,
@@ -263,7 +263,7 @@ device_t xtide_ps2_device = {
 
 device_t xtide_at_ps2_device = {
     "XTIDE (AT) (1.1.5)",
-    DEVICE_PS2,
+    DEVICE_ISA | DEVICE_PS2,
     0,
     xtide_at_ps2_init, xtide_close, NULL,
     xtide_at_ps2_available, NULL, NULL, NULL,