Merge branch 'master' of https://github.com/86Box/86Box

src/disk/hdc.c

@@ -49,35 +49,13 @@ hdc_log(const char *fmt, ...)
 #    define hdc_log(fmt, ...)
 #endif
 
-static void *
-nullhdc_init(const device_t *info)
-{
-    return (NULL);
-}
-
-static void
-nullhdc_close(void *priv)
-{
-}
-
-static void *
-inthdc_init(const device_t *info)
-{
-    return (NULL);
-}
-
-static void
-inthdc_close(void *priv)
-{
-}
-
 static const device_t hdc_none_device = {
     .name          = "None",
     .internal_name = "none",
     .flags         = 0,
     .local         = 0,
-    .init          = nullhdc_init,
-    .close         = nullhdc_close,
+    .init          = NULL,
+    .close         = NULL,
     .reset         = NULL,
     { .available = NULL },
     .speed_changed = NULL,
@@ -90,8 +68,8 @@ static const device_t hdc_internal_device = {
     .internal_name = "internal",
     .flags         = 0,
     .local         = 0,
-    .init          = inthdc_init,
-    .close         = inthdc_close,
+    .init          = NULL,
+    .close         = NULL,
     .reset         = NULL,
     { .available = NULL },
     .speed_changed = NULL,

src/disk/hdc_ide_cmd640.c

@@ -51,6 +51,7 @@ static int next_id = 0;
 
 #ifdef ENABLE_CMD640_LOG
 int cmd640_do_log = ENABLE_CMD640_LOG;
+
 static void
 cmd640_log(const char *fmt, ...)
 {

src/disk/hdc_ide_cmd646.c

@@ -49,6 +49,7 @@ typedef struct
 
 #ifdef ENABLE_CMD646_LOG
 int cmd646_do_log = ENABLE_CMD646_LOG;
+
 static void
 cmd646_log(const char *fmt, ...)
 {