GVP A1208 SCSI

diff --git a/a2091.cpp b/a2091.cpp
index 5e39006acfca4988582e7ba26237b048081b2a77..999197558e88c66750035b2594b052c329994772 100644 (file)
--- a/a2091.cpp
+++ b/a2091.cpp
@@ -87,6 +87,7 @@
 #define GVP_A1291_SCSI         0x47
 #define GVP_COMBO_R4           0x60
 #define GVP_COMBO_R4_SCSI      0x70
+#define GVP_A1208                      0x97
 #define GVP_IO_EXTENDER                0x98
 #define GVP_GFORCE_030         0xa0
 #define GVP_GFORCE_030_SCSI    0xb0
@@ -276,6 +277,7 @@ static struct wd_state *wd_a2090[MAX_DUPLICATE_EXPANSION_BOARDS];
 static struct wd_state *wd_a3000;
 static struct wd_state *wd_gvps1[MAX_DUPLICATE_EXPANSION_BOARDS];
 static struct wd_state *wd_gvps2[MAX_DUPLICATE_EXPANSION_BOARDS];
+static struct wd_state *wd_gvpa1208[MAX_DUPLICATE_EXPANSION_BOARDS];
 static struct wd_state *wd_gvps2accel;
 static struct wd_state *wd_comspec[MAX_DUPLICATE_EXPANSION_BOARDS];
 struct wd_state *wd_cdtv;
@@ -1548,6 +1550,7 @@ static void scsi_hsync(void)
                scsi_hsync2_a2091(wd_a2090[i]);
                scsi_hsync2_gvp(wd_gvps1[i]);
                scsi_hsync2_gvp(wd_gvps2[i]);
+               scsi_hsync2_gvp(wd_gvpa1208[i]);
                scsi_hsync2_comspec(wd_comspec[i]);
        }
        scsi_hsync2_gvp(wd_gvps2accel);
@@ -3998,6 +4001,14 @@ void gvp_s2_add_accelerator_scsi_unit(int ch, struct uaedev_config_info *ci, str
        add_scsi_device(&wd->scsis[ch], ch, ci, rc);
 }
 
+void gvp_a1208_add_scsi_unit(int ch, struct uaedev_config_info *ci, struct romconfig *rc)
+{
+       struct wd_state *wd = allocscsi(&wd_gvpa1208[ci->controller_type_unit], rc, ch);
+       if (!wd || ch < 0)
+               return;
+       add_scsi_device(&wd->scsis[ch], ch, ci, rc);
+}
+
 static void a2091_free_device (struct wd_state *wd)
 {
        freencrunit(wd);
@@ -4243,6 +4254,7 @@ static void gvp_free(void)
        for (int i = 0; i < MAX_DUPLICATE_EXPANSION_BOARDS; i++) {
                gvp_free_device(wd_gvps1[i]);
                gvp_free_device(wd_gvps2[i]);
+               gvp_free_device(wd_gvpa1208[i]);
        }
        gvp_free_device(wd_gvps2accel);
 }
@@ -4266,6 +4278,7 @@ static void gvp_reset(int hardreset)
        for (int i = 0; i < MAX_DUPLICATE_EXPANSION_BOARDS; i++) {
                gvp_reset_device(wd_gvps1[i]);
                gvp_reset_device(wd_gvps2[i]);
+               gvp_reset_device(wd_gvpa1208[i]);
        }
        gvp_reset_device(wd_gvps2accel);
 }
@@ -4280,7 +4293,7 @@ static bool is_gvp_accelerator(void)
        return ISCPUBOARD(BOARD_GVP, -1);
 }
 
-static bool gvp_init(struct autoconfig_info *aci, bool series2, bool accel)
+static bool gvp_init(struct autoconfig_info *aci, bool series2, bool accel, uae_u8 gvp_id)
 {
        int romtype;
        bool autoboot_disabled = false;
@@ -4406,7 +4419,7 @@ static bool gvp_init(struct autoconfig_info *aci, bool series2, bool accel)
        }
 
        if (series2) {
-               wd->gdmac.version = GVP_SERIESII;
+               wd->gdmac.version = gvp_id;
                wd->gdmac.addr_mask = 0x00ffffff;
                if (ISCPUBOARD(BOARD_GVP, BOARD_GVP_SUB_A530)) {
                        wd->gdmac.version = isscsi ? GVP_A530_SCSI : GVP_A530;
@@ -4434,15 +4447,19 @@ static bool gvp_init(struct autoconfig_info *aci, bool series2, bool accel)
 
 bool gvp_init_s1(struct autoconfig_info *aci)
 {
-       return gvp_init(aci, false, false);
+       return gvp_init(aci, false, false, 0);
 }
 bool gvp_init_s2(struct autoconfig_info *aci)
 {
-       return gvp_init(aci, true, false);
+       return gvp_init(aci, true, false, GVP_SERIESII);
 }
 bool gvp_init_accelerator(struct autoconfig_info *aci)
 {
-       return gvp_init(aci, true, true);
+       return gvp_init(aci, true, true, 0);
+}
+bool gvp_init_a1208(struct autoconfig_info *aci)
+{
+       return gvp_init(aci, true, true, GVP_A1208);
 }
 
 void cdtv_add_scsi_unit (int ch, struct uaedev_config_info *ci, struct romconfig *rc)

diff --git a/expansion.cpp b/expansion.cpp
index cf1e26837ef733f4187d8ec13d918786bfa1e36d..ca8c7e58754d3253222dada84ce6429716f823f8 100644 (file)
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -5421,6 +5421,13 @@ const struct expansionromtype expansionroms[] = {
                true, EXPANSIONTYPE_SCSI | EXPANSIONTYPE_DMA24,
                2017, 10, 0
        },
+       {
+               _T("gvpa1208"), _T("GVP A1208"), _T("Great Valley Products"),
+               NULL, gvp_init_a1208, NULL, gvp_a1208_add_scsi_unit, ROMTYPE_GVPA1208 | ROMTYPE_NONE, ROMTYPE_GVPS2, 0, BOARD_AUTOCONFIG_Z2, false,
+               NULL, 0,
+               true, EXPANSIONTYPE_SCSI | EXPANSIONTYPE_DMA24,
+               2017, 9, 0
+       },
        {
                _T("dotto"), _T("Dotto"), _T("Hardital"),
                NULL, dotto_init, NULL, dotto_add_ide_unit, ROMTYPE_DOTTO, 0, 0, BOARD_AUTOCONFIG_Z2, false,

diff --git a/include/rommgr.h b/include/rommgr.h
index 58301a88606523da8275cadaabfebe502c146446..e3908942d4db6fb1314ab118d4f480907b326ca9 100644 (file)
--- a/include/rommgr.h
+++ b/include/rommgr.h
@@ -205,6 +205,7 @@ extern int decode_cloanto_rom_do(uae_u8 *mem, int size, int real_size);
 #define ROMTYPE_HD20A          0x0010008b
 #define ROMTYPE_DEVHD          0x0010008c
 #define ROMTYPE_CSMK1SCSI      0x0010008d
+#define ROMTYPE_GVPA1208       0x0010008e
 
 #define ROMTYPE_NOT                    0x00800000
 #define ROMTYPE_QUAD           0x01000000