diff --git a/src/disk/hdc.c b/src/disk/hdc.c
index eb6c3a1b3..ad56a39d4 100644
--- a/src/disk/hdc.c
+++ b/src/disk/hdc.c
@@ -54,49 +54,55 @@ static const struct {
     const device_t *device;
 } controllers[] = {
     // clang-format off
-    { &device_none                 },
-    { &device_internal             },
+    { &device_none                          },
+    { &device_internal                      },
     /* ISA */
-    { &xtide_acculogic_device      },
-    { &st506_xt_dtc5150x_device    },
-    { &st506_xt_xebec_device       },
-    { &xtide_device                },
-    { &st506_xt_st11_m_device      },
-    { &st506_xt_st11_r_device      },
-    { &xta_st50x_device            },
-    { &st506_xt_victor_v86p_device },
-    { &st506_xt_wd1002a_27x_device },
-    { &st506_xt_wd1002a_wx1_device },
-    { &st506_xt_wd1004_27x_device  },
-    { &st506_xt_wd1004a_27x_device },
-    { &st506_xt_wd1004a_wx1_device },
-    { &xta_wdxt150_device          },
-    { &st506_xt_wdxt_gen_device    },
+    { &xtide_acculogic_device               },
+    { &st506_xt_dtc5150x_device             },
+    { &st506_xt_xebec_device                },
+    { &xtide_device                         },
+    { &st506_xt_st11_m_device               },
+    { &st506_xt_st11_r_device               },
+    { &xta_st50x_device                     },
+    { &st506_xt_victor_v86p_device          },
+    { &st506_xt_wd1002a_27x_device          },
+    { &st506_xt_wd1002a_wx1_device          },
+    { &st506_xt_wd1004_27x_device           },
+    { &st506_xt_wd1004a_27x_device          },
+    { &st506_xt_wd1004a_wx1_device          },
+    { &xta_wdxt150_device                   },
+    { &st506_xt_wdxt_gen_device             },
     /* ISA16 */
-    { &ide_isa_device              },
-    { &ide_isa_2ch_device          },
-    { &xtide_at_device             },
-    { &xtide_at_2ch_device         },
-    { &xtide_at_ps2_device         },
-    { &xtide_at_ps2_2ch_device     },
-    { &ide_ter_device              },
-    { &ide_qua_device              },
-    { &st506_at_wd1003_device      },
-    { &esdi_at_wd1007vse1_device   },
+    { &ide_isa_device                       },
+    { &ide_isa_2ch_device                   },
+    { &xtide_at_device                      },
+    { &xtide_at_2ch_device                  },
+    { &xtide_at_ps2_device                  },
+    { &xtide_at_ps2_2ch_device              },
+    { &ide_ter_device                       },
+    { &ide_qua_device                       },
+    { &st506_at_wd1003_device               },
+    { &esdi_at_wd1007vse1_device            },
     /* MCA */
-    { &esdi_ps2_device             },
-    { &esdi_integrated_device      },
-    { &mcide_device                },
+    { &esdi_ps2_device                      },
+    { &esdi_integrated_device               },
+    { &mcide_device                         },
     /* VLB */
-    { &ide_vlb_device              },
-    { &ide_vlb_2ch_device          },
+#if 0
+    { &ide_ali5213_device                   }, /* TODO: to add standalone ADI2 HDC */
+#endif
+    { &ide_cmd640_vlb_device                },
+    { &ide_vlb_device                       },
+    { &ide_vlb_2ch_device                   },
+    { &ide_opti611_vlb_device               },
     /* PCI */
-    { &ide_cmd646_ter_qua_device   },
-    { &ide_cmd648_ter_qua_device   },
-    { &ide_cmd649_ter_qua_device   },
-    { &ide_pci_device              },
-    { &ide_pci_2ch_device          },
-    { NULL                         }
+    { &ide_cmd640_pci_device                },
+    { &ide_cmd646_ter_qua_device            },
+    { &ide_cmd648_ter_qua_device            },
+    { &ide_cmd649_ter_qua_device            },
+    { &ide_pci_device                       },
+    { &ide_pci_2ch_device                   },
+    { NULL                                  }
     // clang-format on
 };
 
diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c
index cfc51f2b0..d9f28eec4 100644
--- a/src/floppy/fdc.c
+++ b/src/floppy/fdc.c
@@ -108,7 +108,12 @@ static fdc_cards_t fdc_cards[] = {
     { &device_none               },
     { &device_internal           },
     { &fdc_xt_device             },
+    { &fdc_xt_umc_um8398_device  },
     { &fdc_at_device             },
+    { &fdc_at_nsc_dp8473_device  },
+    { &fdc_at_nsc_device         }, /* TODO: PC87311 SIO & floppy controller */
+    { &fdc_at_smc_device         },
+    { &fdc_at_winbond_device     },
     { &fdc_b215_device           },
     { &fdc_pii151b_device        },
     { &fdc_pii158b_device        },