Misc updates.

diff --git a/audio.cpp b/audio.cpp
index 09fa1ff88e5765ed6e76d0f8c0b9f02764a157ed..ab6e99d573e70d2b957596ea6e1ebffcd283c9cd 100644 (file)
--- a/audio.cpp
+++ b/audio.cpp
@@ -2280,6 +2280,7 @@ void audio_enable_sndboard(bool enable)
        } else {
                audio_extra_channels[0] = true;
                acd[1].evtime = acd->evtime = CYCLE_UNIT;
+               audio_activate();
        }
        audio_set_extra_channels();
 }
@@ -2293,6 +2294,7 @@ void audio_enable_cda(bool enable)
        } else {
                audio_extra_channels[1] = true;
                acd[1].evtime = acd->evtime = CYCLE_UNIT;
+               audio_activate();
        }
        audio_set_extra_channels();
 }

diff --git a/include/memory.h b/include/memory.h
index 66996bf10205caa7f091c3a66a1b9e906928dbd5..24e5e8fd29d8f3c5e52e1e7b791141b22c672878 100644 (file)
--- a/include/memory.h
+++ b/include/memory.h
@@ -44,7 +44,6 @@ typedef void (REGPARAM3 *mem_put_func)(uaecptr, uae_u32) REGPARAM;
 typedef uae_u8 *(REGPARAM3 *xlate_func)(uaecptr) REGPARAM;
 typedef int (REGPARAM3 *check_func)(uaecptr, uae_u32) REGPARAM;
 
-extern uae_u8 *address_space, *good_address_map;
 extern uae_u32 max_z3fastmem;
 
 extern uae_u32 wait_cpu_cycle_read (uaecptr addr, int mode);

diff --git a/include/scsi.h b/include/scsi.h
index 6d32d8c57442ccf8118ecdf1522939299a785917..a99dac15977efe09221dd03888fb0e32641b9fe5 100644 (file)
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -216,3 +216,15 @@ void microforge_add_scsi_unit(int ch, struct uaedev_config_info *ci, struct romc
 
 addrbank *paradox_init(struct romconfig *rc);
 void paradox_add_scsi_unit(int ch, struct uaedev_config_info *ci, struct romconfig *rc);
+
+addrbank *hda506_init(struct romconfig *rc);
+void hda506_add_scsi_unit(int ch, struct uaedev_config_info *ci, struct romconfig *rc);
+
+addrbank *alf1_init(struct romconfig *rc);
+void alf1_add_scsi_unit(int ch, struct uaedev_config_info *ci, struct romconfig *rc);
+
+addrbank *promigos_init(struct romconfig *rc);
+void promigos_add_scsi_unit(int ch, struct uaedev_config_info *ci, struct romconfig *rc);
+
+addrbank *system2000_init(struct romconfig *rc);
+void system2000_add_scsi_unit(int ch, struct uaedev_config_info *ci, struct romconfig *rc);

diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h
index abcd3000a9ffc7ec3cb6b50ebf35a8a166149e72..74387de51f5da3fef421411b9be94b731274ae1f 100644 (file)
--- a/od-win32/resources/resource.h
+++ b/od-win32/resources/resource.h
@@ -1129,8 +1129,10 @@
 #define IDC_CS_TOCCATAMIXER             1774
 #define IDC_FS_SELECT_FILE              1775
 #define IDC_FLOPPY_FFS                  1775
+#define IDC_CS_ES1370                   1775
 #define IDC_DF2ENABLE                   1776
 #define IDC_FS_SELECT_EJECT             1776
+#define IDC_CS_FM801                    1776
 #define IDC_FS_RW                       1777
 #define IDC_FLOPPY_BOOTABLE             1777
 #define IDC_DF3ENABLE                   1778

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 7023684aa493ca17953a7ff3d67b1b0fce2e2cda..5d4638166a17b342e7d60bc49aeeb2273c8d996b 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -1204,7 +1204,7 @@ BEGIN
     EDITTEXT        IDC_DISKINFOBOX,5,4,481,292,ES_MULTILINE | ES_READONLY | WS_VSCROLL
 END
 
-IDD_EXPANSION2 DIALOGEX 0, 0, 396, 302
+IDD_EXPANSION2 DIALOGEX 0, 0, 396, 315
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
@@ -1230,28 +1230,30 @@ BEGIN
     CONTROL         "-",IDC_EXPANSION_SETTING1,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,14,79,92,10
     CONTROL         "-",IDC_EXPANSION_SETTING3,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,233,79,77,10
     GROUPBOX        "Accelerator Board Settings",IDC_STATIC,1,96,394,97
-    GROUPBOX        "Miscellaneous Expansions",IDC_STATIC,1,199,172,100
+    GROUPBOX        "Miscellaneous Expansions",IDC_STATIC,1,199,172,113
     CONTROL         "Catweasel Z2 emulation [] Catweasel MK2 Zorro II card emulation. Physical Windows compatible Catweasel card and drivers required.",IDC_CATWEASEL,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,218,147,11
     CONTROL         "uaescsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,231,147,11
     CONTROL         "CD32 Full Motion Video cartridge",IDC_CS_CD32FMV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,244,151,11
     CONTROL         "Toccata Z2 sound card emulation",IDC_CS_TOCCATA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,257,151,11
-    CONTROL         "Toccata Paula/CD audio mix",IDC_CS_TOCCATAMIXER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,269,151,11
-    GROUPBOX        "Network",IDC_STATIC,181,199,213,101
+    CONTROL         "Toccata Paula/CD audio mix",IDC_CS_TOCCATAMIXER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,270,151,11
+    GROUPBOX        "Network",IDC_STATIC,181,199,213,113
     CONTROL         "bsdsocket.library [] bsdsocket network library emulation.",IDC_SOCKETS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,217,187,11
     CONTROL         "uaenet.device [] Sana 2 compatible network device emulation.",IDC_SANA2,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,230,187,11
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,231,187,11
     CONTROL         "A2065 Z2 [] A2065 Ethernet Zorro II card emulation.",IDC_A2065,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,243,187,11
-    COMBOBOX        IDC_NETDEVICE,202,271,178,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Include host SCSI devices",IDC_CS_SCSIMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,286,147,11
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,244,187,11
+    COMBOBOX        IDC_NETDEVICE,202,274,178,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Include host SCSI devices",IDC_CS_SCSIMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,296,147,11
     CONTROL         "Realtek 8029 PCI [] Realtek 8029 PCI NIC emulation",IDC_NE2000,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,257,187,11
     CONTROL         "-",IDC_CPUBOARD_SETTING3,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,233,172,100,10
     CONTROL         "-",IDC_EXPANSION_SETTING2,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,121,79,101,10
     CONTROL         "Enabled",IDC_SCSIROMSELECTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,43,99,12
     COMBOBOX        IDC_SCSIROMSELECTCAT,12,23,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "ES1370 PCI sound card",IDC_CS_ES1370,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,283,151,11
+    CONTROL         "FM801 PCI sound card",IDC_CS_FM801,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,296,151,11
 END
 
 
@@ -1573,6 +1575,7 @@ BEGIN
 
     IDD_EXPANSION2, DIALOG
     BEGIN
+        BOTTOMMARGIN, 302
     END
 END
 #endif    // APSTUDIO_INVOKED

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 28030133ae7c8ecc52c938ed999ca5c446cf964a..a0bb29d8f6265afebab6376dadefc4331488dafc 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -8114,7 +8114,7 @@ static void expansion_net (HWND hDlg)
                SendDlgItemMessage (hDlg, IDC_NETDEVICE, CB_SETCURSEL, 0, 0);
 }
 
-static const int scsiromselectedmask[] = { EXPANSIONTYPE_SCSI, EXPANSIONTYPE_IDE, EXPANSIONTYPE_SASI, EXPANSIONTYPE_PCI_BRIDGE };
+static const int scsiromselectedmask[] = { EXPANSIONTYPE_SCSI, EXPANSIONTYPE_IDE, EXPANSIONTYPE_SASI, EXPANSIONTYPE_CUSTOM, EXPANSIONTYPE_PCI_BRIDGE };
 static void init_expansion2(HWND hDlg)
 {
        static int first = -1;
@@ -8129,7 +8129,7 @@ static void init_expansion2(HWND hDlg)
                        continue;
                if (!(expansionroms[i].deviceflags & scsiromselectedmask[scsiromselectedcatnum]))
                        continue;
-               if (scsiromselectedcatnum == 0 && (expansionroms[i].deviceflags & EXPANSIONTYPE_SASI))
+               if (scsiromselectedcatnum == 0 && (expansionroms[i].deviceflags & (EXPANSIONTYPE_SASI | EXPANSIONTYPE_CUSTOM)))
                        continue;
                name[0] = 0;
                int cnt = 0;
@@ -8168,7 +8168,7 @@ static void init_expansion2(HWND hDlg)
                                continue;
                        if (!(expansionroms[i].deviceflags & scsiromselectedmask[scsiromselectedcatnum]))
                                continue;
-                       if (scsiromselectedcatnum == 0 && (expansionroms[i].deviceflags & EXPANSIONTYPE_SASI))
+                       if (scsiromselectedcatnum == 0 && (expansionroms[i].deviceflags & (EXPANSIONTYPE_SASI | EXPANSIONTYPE_CUSTOM)))
                                continue;
                        if (cfgfile_board_enabled(&workprefs, romtype, 0)) {
                                if (found == -1)
@@ -8405,6 +8405,8 @@ static void enable_for_expansion2dlg (HWND hDlg)
        ew(hDlg, IDC_CS_CD32FMV, en);
        ew(hDlg, IDC_CS_TOCCATA, en);
        ew(hDlg, IDC_CS_TOCCATAMIXER, en && workprefs.sound_toccata);
+       ew(hDlg, IDC_CS_ES1370, en);
+       ew(hDlg, IDC_CS_FM801, en);
        ew (hDlg, IDC_CS_SCSIMODE, FALSE);
 
        ew(hDlg, IDC_CPUBOARDROMFILE, workprefs.cpuboard_type != 0);
@@ -8443,6 +8445,8 @@ static void values_to_expansion2dlg (HWND hDlg)
        CheckDlgButton(hDlg, IDC_CS_CD32FMV, workprefs.cs_cd32fmv);
        CheckDlgButton(hDlg, IDC_CS_TOCCATA, workprefs.sound_toccata);
        CheckDlgButton(hDlg, IDC_CS_TOCCATAMIXER, workprefs.sound_toccata_mixer);
+       CheckDlgButton(hDlg, IDC_CS_ES1370, workprefs.sound_es1370);
+       CheckDlgButton(hDlg, IDC_CS_FM801, workprefs.sound_fm801);
        CheckDlgButton(hDlg, IDC_CS_SCSIMODE, workprefs.scsi == 2);
        cw = catweasel_detect ();
        ew (hDlg, IDC_CATWEASEL, cw);
@@ -8551,10 +8555,11 @@ static INT_PTR CALLBACK Expansion2DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LP
                        }
 
                        SendDlgItemMessage(hDlg, IDC_SCSIROMSELECTCAT, CB_RESETCONTENT, 0, 0);
-                       SendDlgItemMessage(hDlg, IDC_SCSIROMSELECTCAT, CB_ADDSTRING, 0, (LPARAM) _T("SCSI Controllers"));
-                       SendDlgItemMessage(hDlg, IDC_SCSIROMSELECTCAT, CB_ADDSTRING, 0, (LPARAM) _T("IDE Controllers"));
-                       SendDlgItemMessage(hDlg, IDC_SCSIROMSELECTCAT, CB_ADDSTRING, 0, (LPARAM) _T("SASI Controllers"));
-                       SendDlgItemMessage(hDlg, IDC_SCSIROMSELECTCAT, CB_ADDSTRING, 0, (LPARAM) _T("PCI Bridges"));
+                       SendDlgItemMessage(hDlg, IDC_SCSIROMSELECTCAT, CB_ADDSTRING, 0, (LPARAM)_T("SCSI Controllers"));
+                       SendDlgItemMessage(hDlg, IDC_SCSIROMSELECTCAT, CB_ADDSTRING, 0, (LPARAM)_T("IDE Controllers"));
+                       SendDlgItemMessage(hDlg, IDC_SCSIROMSELECTCAT, CB_ADDSTRING, 0, (LPARAM)_T("SASI Controllers"));
+                       SendDlgItemMessage(hDlg, IDC_SCSIROMSELECTCAT, CB_ADDSTRING, 0, (LPARAM)_T("Custom Controllers"));
+                       SendDlgItemMessage(hDlg, IDC_SCSIROMSELECTCAT, CB_ADDSTRING, 0, (LPARAM)_T("PCI Bridges"));
                        hide(hDlg, IDC_SCSIROMSELECTED, 1);
                        expansion_net(hDlg);
                        init_expansion2(hDlg);
@@ -8634,6 +8639,12 @@ static INT_PTR CALLBACK Expansion2DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LP
                                case IDC_CS_TOCCATAMIXER:
                                workprefs.sound_toccata_mixer = ischecked(hDlg, IDC_CS_TOCCATAMIXER) ? 1 : 0;
                                break;
+                               case IDC_CS_ES1370:
+                               workprefs.sound_es1370 = ischecked(hDlg, IDC_CS_ES1370) ? 1 : 0;
+                               break;
+                               case IDC_CS_FM801:
+                               workprefs.sound_fm801 = ischecked(hDlg, IDC_CS_FM801) ? 1 : 0;
+                               break;
                                case IDC_SCSIROMSELECTED:
                                values_from_expansion2dlg(hDlg);
                                break;
@@ -8925,7 +8936,8 @@ static INT_PTR CALLBACK ExpansionDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LP
                SendDlgItemMessage (hDlg, IDC_RTG_Z2Z3, CB_ADDSTRING, 0, (LPARAM)_T("EGS-28/24 Spectrum Zorro II"));
                SendDlgItemMessage (hDlg, IDC_RTG_Z2Z3, CB_ADDSTRING, 0, (LPARAM)_T("EGS-28/24 Spectrum Zorro III"));
                SendDlgItemMessage (hDlg, IDC_RTG_Z2Z3, CB_ADDSTRING, 0, (LPARAM)_T("Picasso IV Zorro II"));
-               SendDlgItemMessage (hDlg, IDC_RTG_Z2Z3, CB_ADDSTRING, 0, (LPARAM)_T("Picasso IV Zorro III"));
+               SendDlgItemMessage(hDlg, IDC_RTG_Z2Z3, CB_ADDSTRING, 0, (LPARAM)_T("Picasso IV Zorro III"));
+               SendDlgItemMessage(hDlg, IDC_RTG_Z2Z3, CB_ADDSTRING, 0, (LPARAM)_T("A2410"));
 
                WIN32GUI_LoadUIString(IDS_ALL, tmp, sizeof tmp / sizeof (TCHAR));
                SendDlgItemMessage (hDlg, IDC_RTG_8BIT, CB_RESETCONTENT, 0, 0);
@@ -9200,7 +9212,6 @@ static INT_PTR CALLBACK MemoryDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARA
                workprefs.z3chipmem_size = memsizes[msi_z3chip[SendMessage (GetDlgItem (hDlg, IDC_Z3CHIPMEM), TBM_GETPOS, 0, 0)]];
                workprefs.mbresmem_low_size = memsizes[msi_gfx[SendMessage (GetDlgItem (hDlg, IDC_MBMEM1), TBM_GETPOS, 0, 0)]];
                workprefs.mbresmem_high_size = memsizes[msi_gfx[SendMessage (GetDlgItem (hDlg, IDC_MBMEM2), TBM_GETPOS, 0, 0)]];
-               workprefs.cpuboardmem1_size = memsizes[msi_cpuboard[SendMessage (GetDlgItem (hDlg, IDC_CPUBOARDMEM), TBM_GETPOS, 0, 0)]];
                fix_values_memorydlg ();
                values_to_memorydlg (hDlg);
                enable_for_memorydlg (hDlg);
@@ -11205,7 +11216,7 @@ static void inithdcontroller (HWND hDlg, int ctype, int ctype_unit, int devtype)
                const struct expansionromtype *ert = get_unit_expansion_rom(ctype);
                SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("0"));
                SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("1"));
-               if (!ert || !(ert->deviceflags & EXPANSIONTYPE_SASI)) {
+               if (!ert || !(ert->deviceflags & (EXPANSIONTYPE_SASI | EXPANSIONTYPE_CUSTOM)) ) {
                        SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("2"));
                        SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("3"));
                        SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("4"));
@@ -11230,8 +11241,9 @@ static void inithdcontroller (HWND hDlg, int ctype, int ctype_unit, int devtype)
                SendDlgItemMessage (hDlg, IDC_HDF_FEATURE_LEVEL, CB_ADDSTRING, 0, (LPARAM)_T("ATA-2+ Strict"));
        } else if (ctype >= HD_CONTROLLER_TYPE_SCSI_FIRST && ctype <= HD_CONTROLLER_TYPE_SCSI_LAST) {
                SendDlgItemMessage (hDlg, IDC_HDF_FEATURE_LEVEL, CB_ADDSTRING, 0, (LPARAM)_T("SCSI-1"));
-               SendDlgItemMessage(hDlg, IDC_HDF_FEATURE_LEVEL, CB_ADDSTRING, 0, (LPARAM) _T("SCSI-2"));
-               SendDlgItemMessage(hDlg, IDC_HDF_FEATURE_LEVEL, CB_ADDSTRING, 0, (LPARAM) _T("SASI"));
+               SendDlgItemMessage(hDlg, IDC_HDF_FEATURE_LEVEL, CB_ADDSTRING, 0, (LPARAM)_T("SCSI-2"));
+               SendDlgItemMessage(hDlg, IDC_HDF_FEATURE_LEVEL, CB_ADDSTRING, 0, (LPARAM)_T("SASI"));
+               SendDlgItemMessage(hDlg, IDC_HDF_FEATURE_LEVEL, CB_ADDSTRING, 0, (LPARAM)_T("SASI CHS"));
        }
 }
 

diff --git a/od-win32/winuae_msvc14/winuae_msvc.vcxproj b/od-win32/winuae_msvc14/winuae_msvc.vcxproj
index c0d52550303dd5c4f814d77af09cb7b16e59abc7..eb70459b6c0e68a02092fc7695eafb7318c721ab 100644 (file)
--- a/od-win32/winuae_msvc14/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc14/winuae_msvc.vcxproj
@@ -820,12 +820,15 @@
     <ClCompile Include="..\..\isofs.cpp" />
     <ClCompile Include="..\..\logging.cpp" />
     <ClCompile Include="..\..\luascript.cpp" />
+    <ClCompile Include="..\..\mame\a2410.cpp" />
+    <ClCompile Include="..\..\mame\tm34010\tms34010.cpp" />
     <ClCompile Include="..\..\ncr9x_scsi.cpp" />
     <ClCompile Include="..\..\newcpu_common.cpp" />
     <ClCompile Include="..\..\pci.cpp" />
     <ClCompile Include="..\..\ppc\ppc.cpp" />
     <ClCompile Include="..\..\ppc\ppcd.cpp" />
     <ClCompile Include="..\..\qemuvga\cirrus_vga.cpp" />
+    <ClCompile Include="..\..\qemuvga\es1370.cpp" />
     <ClCompile Include="..\..\qemuvga\esp.cpp" />
     <ClCompile Include="..\..\qemuvga\lsi53c710.cpp" />
     <ClCompile Include="..\..\qemuvga\lsi53c895a.cpp" />

diff --git a/od-win32/winuae_msvc14/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc14/winuae_msvc.vcxproj.filters
index ea4cbcc44cc8a72f841b8206ac0b6fb18bad7b23..43a5ecac6351228128e1ab8aec38798be259c2d5 100644 (file)
--- a/od-win32/winuae_msvc14/winuae_msvc.vcxproj.filters
+++ b/od-win32/winuae_msvc14/winuae_msvc.vcxproj.filters
@@ -748,6 +748,15 @@
     <ClCompile Include="..\..\qemuvga\ne2000.cpp">
       <Filter>qemu</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\qemuvga\es1370.cpp">
+      <Filter>qemu</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mame\tm34010\tms34010.cpp">
+      <Filter>mame</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\mame\a2410.cpp">
+      <Filter>mame</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\resources\35floppy.ico">