Merge remote-tracking branch 'origin/master' into cdrom_changes

2025-02-12 03:21:41 +01:00
parent ae597c2e46 0884f8d732
commit 1168d2d002
3 changed files with 4 additions and 5 deletions
--- a/src/device/serial_passthrough.c
+++ b/src/device/serial_passthrough.c
@@ -260,7 +260,7 @@ static const device_config_t serial_passthrough_config[] = {
        .name           = "host_serial_path",
        .description    = "Host Serial Device",
        .type           = CONFIG_SERPORT,
-        .default_string = NULL,
+        .default_string = "",
        .default_int    = 0,
        .file_filter    = NULL,
        .spinner        = { 0 },
--- a/src/scsi/scsi_t128.c
+++ b/src/scsi/scsi_t128.c
@@ -616,7 +616,6 @@ const device_t scsi_t128_device = {
    .config        = t128_config
 };

-
 const device_t scsi_t228_device = {
    .name          = "Trantor T228",
    .internal_name = "t228",
@@ -624,7 +623,6 @@ const device_t scsi_t228_device = {
    .local         = 0,
    .init          = t128_init,
    .close         = t128_close,
-    .close         = t128_close,
    .reset         = NULL,
    .available     = t128_available,
    .speed_changed = NULL,