From 0b526858d46e27d7507074426e4e93a90a1e23f6 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Sun, 18 Dec 2022 19:45:57 -0500
Subject: [PATCH] Fix some bits which got messed up

Also cleanups in machine table
---
 src/machine/machine_table.c | 20 ++++++++++----------
 src/mem/sst_flash.c         | 19 +++++--------------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index e57263654..9b07d9733 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -833,14 +833,14 @@ const machine_t machines[] = {
             .min_voltage = 0,
             .max_voltage = 0,
             .min_multi = 0,
-            .max_multi = 0,
+            .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
         .flags = MACHINE_FLAGS_NONE,
         .ram = {
             .min = 128,
             .max = 640,
-            .step = 64,
+            .step = 64
         },
         .nvrmask = 0,
         .kbc = KBC_IBM_PC_XT,
@@ -1232,7 +1232,7 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        MACHINE_FLAGS_NONE,
+        .flags = MACHINE_FLAGS_NONE,
         .ram = {
             .min = 256,
             .max = 640,
@@ -9586,7 +9586,7 @@ const machine_t machines[] = {
            .min_voltage = 2800,
            .max_voltage = 3520,
            .min_multi = 1.5,
-           .max_multi = 5.5,
+           .max_multi = 5.5
         },
         .bus_flags = MACHINE_PS2_PCI,
         .flags = MACHINE_IDE_DUAL,
@@ -11636,7 +11636,7 @@ const machine_t machines[] = {
             .min_voltage = 1300,
             .max_voltage = 3500,
             .min_multi = 1.5,
-            .max_multi = 8.0 /* limits assumed */ 
+            .max_multi = 8.0 /* limits assumed */
         },
         .bus_flags = MACHINE_PS2_AGP,
         .flags = MACHINE_IDE_DUAL,
@@ -11832,7 +11832,7 @@ const machine_t machines[] = {
             .min_voltage = 1300,
             .max_voltage = 3500,
             .min_multi = MACHINE_MULTIPLIER_FIXED,
-            .max_multi = MACHINE_MULTIPLIER_FIXED,
+            .max_multi = MACHINE_MULTIPLIER_FIXED
         },
         .bus_flags = MACHINE_PS2_A97,
         .flags = MACHINE_IDE_DUAL | MACHINE_AG,
@@ -11948,14 +11948,14 @@ const machine_t machines[] = {
             .min_voltage = 1300,
             .max_voltage = 3500,
             .min_multi = 1.5,
-            .max_multi = 8.0,
+            .max_multi = 8.0
         },
         .bus_flags = MACHINE_PS2_NOISA,
         .flags = MACHINE_IDE_DUAL,
         .ram = {
             .min = 32768,
             .max = 524288,
-            .step = 32768,
+            .step = 32768
         },
         .nvrmask = 255,
         .kbc = KBC_UNKNOWN,
@@ -11984,14 +11984,14 @@ const machine_t machines[] = {
             .min_voltage = 1300,
             .max_voltage = 3500,
             .min_multi = 1.5,
-            .max_multi = 8.0,
+            .max_multi = 8.0
         },
         .bus_flags = MACHINE_PS2_NOISA,
         .flags = MACHINE_IDE_DUAL,
         .ram = {
             .min = 32768,
             .max = 524288,
-            .step = 32768,
+            .step = 32768
         },
         .nvrmask = 255,
         .kbc = KBC_UNKNOWN,
diff --git a/src/mem/sst_flash.c b/src/mem/sst_flash.c
index 16c67ee86..40b6dd948 100644
--- a/src/mem/sst_flash.c
+++ b/src/mem/sst_flash.c
@@ -80,6 +80,11 @@ static char flash_path[1024];
 #define SST39SF010    0xb500
 #define SST39SF020    0xb600
 #define SST39SF040    0xb700
+
+#define SST39LF512    0xd400
+#define SST39LF010    0xd500
+#define SST39LF020    0xd600
+#define SST39LF040    0xd700
 #define SST39LF080    0xd800
 #define SST39LF016    0xd900
 
@@ -525,20 +530,6 @@ const device_t sst_flash_29ee010_device = {
     .config        = NULL
 };
 
-const device_t winbond_flash_w29c010_device = {
-    .name          = "Winbond W29C010 Flash BIOS",
-    .internal_name = "winbond_flash_w29c010",
-    .flags         = 0,
-    .local         = WINBOND | W29C010 | SIZE_1M,
-    .init          = sst_init,
-    .close         = sst_close,
-    .reset         = NULL,
-    { .available = NULL },
-    .speed_changed = NULL,
-    .force_redraw  = NULL,
-    .config        = NULL
-};
-
 const device_t sst_flash_29ee020_device = {
     .name          = "SST 29EE020 Flash BIOS",
     .internal_name = "sst_flash_29ee020",