From: Toni Wilen Date: Sun, 4 Mar 2018 17:31:00 +0000 (+0200) Subject: 3610 X-Git-Tag: 4000~157 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=6849b9c1c2d21243c088ef59c3b80e99bd9c8ad6;p=francis%2Fwinuae.git 3610 --- diff --git a/ncr_scsi.cpp b/ncr_scsi.cpp index 72b25b9c..27ad170d 100644 --- a/ncr_scsi.cpp +++ b/ncr_scsi.cpp @@ -835,12 +835,14 @@ bool ncr710_a4091_autoconfig_init (struct autoconfig_info *aci) uae_u8 *rom = NULL; struct zfile *z = read_device_from_romconfig(aci->rc, ROMTYPE_A4091); if (z) { - rom = xmalloc(uae_u8, A4091_ROM_SIZE * 4); + rom = xcalloc(uae_u8, A4091_ROM_SIZE * 4); for (int i = 0; i < A4091_ROM_SIZE; i++) { uae_u8 b; zfile_fread(&b, 1, 1, z); rom[i * 4 + 0] = b | 0x0f; + rom[i * 4 + 1] = 0xff; rom[i * 4 + 2] = (b << 4) | 0x0f; + rom[i * 4 + 3] = 0xff; if (i < 0x20) { aci->autoconfig_raw[i * 4 + 0] = b; } else if (i >= 0x40 && i < 0x60) { diff --git a/od-win32/direct3d11.cpp b/od-win32/direct3d11.cpp index 66681b96..0dd619fd 100644 --- a/od-win32/direct3d11.cpp +++ b/od-win32/direct3d11.cpp @@ -4423,7 +4423,6 @@ static void resizemode(struct d3d11struct *d3d) static void xD3D11_resize(int activate) { static int recursive; - HRESULT hr; struct d3d11struct *d3d = &d3d11data[0]; write_log(_T("D3D11_resize %d %d %d (%d)\n"), activate, d3d->fsmodechange, d3d->fsmode, d3d->guimode); diff --git a/od-win32/makeexe.cmd b/od-win32/makeexe.cmd index e39bfd14..699c5bea 100644 --- a/od-win32/makeexe.cmd +++ b/od-win32/makeexe.cmd @@ -1,16 +1,17 @@ del *.zip -copy d:\amiga\winuae.exe c:\projects\winuae\distribution -cd c:\projects\winuae\distribution -copy docs\windows\translation.txt d:\amiga +cd ..\..\distribution +copy d:\amiga\winuae.exe /y zip -9 -r c:\projects\winuae\src\od-win32\winuae.zip * cd c:\projects\winuae\src\od-win32 copy winuae.zip d:\amiga\WinUAE%1.zip -copy c:\projects\winuae\src\od-win32\wix\bin\winuae.msi d:\amiga\InstallWinUAE%1.msi -copy c:\projects\winuae\src\od-win32\wix\bin\winuae64.msi d:\amiga\InstallWinUAE%1_x64.msi -#;copy resourcedll\release\resourcedll.dll d:\amiga\WinUAE_default.dll -cdd d:\amiga +copy resourcedll\release\resourcedll.dll bin\WinUAE_default.dll +cd bin +copy d:\amiga\winuae.exe /y +copy d:\amiga\winuae64.exe /y zip -9 WinUAE%1_x64.zip winuae64.exe -#;zip -9 WinUAE%1_translation WinUAE_default.dll translation.txt -#;del translation.txt -cdd c:\projects\winuae\src\od-win32 +zip -9 WinUAE%1_translation WinUAE_default.dll +copy WinUAE%1_x64.zip d:\amiga +copy WinUAE%1_translation d:\amiga +del translation.txt del *.zip +cd .. diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc index 6a1c8d62..0ab07e42 100644 --- a/od-win32/resources/winuae_minimal.rc +++ b/od-win32/resources/winuae_minimal.rc @@ -952,8 +952,8 @@ BEGIN COMBOBOX IDC_HDF_CONTROLLER_TYPE,113,111,110,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_HDF_FEATURE_LEVEL,7,152,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_HDF_CONTROLLER,7,132,216,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Add hard drive",IDOK,237,195,73,14,WS_DISABLED - PUSHBUTTON "Cancel",IDCANCEL,316,195,73,14 + DEFPUSHBUTTON "Add hard drive",IDOK,237,190,73,14,WS_DISABLED + PUSHBUTTON "Cancel",IDCANCEL,316,190,73,14 CONTROL "Lock",IDC_HDF_LOCK,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,233,90,55,10 DEFPUSHBUTTON "Create hard disk image file",IDC_HARDDRIVE_IMAGE,5,88,158,14,WS_DISABLED CONTROL "Manual geometry",IDC_HDF_PHYSGEOMETRY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,299,90,87,10 @@ -968,6 +968,8 @@ BEGIN COMBOBOX IDC_PATH_GEOMETRY,49,29,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_PATH_GEOMETRY_SELECTOR,377,28,11,15,WS_DISABLED RTEXT "Geometry:",IDC_STATIC,3,31,41,10 + CONTROL "Identity",IDC_HDF_IDENTITY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,233,110,55,10 + EDITTEXT IDC_HDFINFO3,7,173,217,12,ES_CENTER | ES_READONLY END IDD_MISC2 DIALOGEX 0, 0, 396, 278 @@ -1198,12 +1200,12 @@ BEGIN CONTROL "",IDC_P96MEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,88,31,103,20 EDITTEXT IDC_P96RAM,201,34,40,12,ES_CENTER | ES_READONLY CONTROL "Match host and RTG color depth if possible",IDC_RTG_MATCH_DEPTH, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,54,212,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,54,177,10 CONTROL "Scale if smaller than display size setting",IDC_RTG_SCALE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,67,212,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,67,175,10 CONTROL "Always scale in windowed mode",IDC_RTG_SCALE_ALLOW, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,80,212,10 - CONTROL "Always center",IDC_RTG_CENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,93,212,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,80,170,10 + CONTROL "Always center",IDC_RTG_CENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,93,169,10 CONTROL "Hardware vertical blank interrupt",IDC_RTG_VBINTERRUPT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,106,157,10 CONTROL "Hardware sprite emulation",IDC_RTG_HWSPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,207,106,148,10 @@ -1219,6 +1221,7 @@ BEGIN COMBOBOX IDC_RTG_BUFFERCNT,153,162,84,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP CTEXT "Aspect ratio:",IDC_STATIC,282,149,83,10,SS_CENTERIMAGE COMBOBOX IDC_RTG_SCALE_ASPECTRATIO,282,162,84,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "Multithreaded",IDC_RTG_THREAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,207,93,83,10 END IDD_INPUTMAP DIALOGEX 0, 0, 421, 341 @@ -1367,8 +1370,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,0,0 - PRODUCTVERSION 3,6,0,0 + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1384,12 +1387,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "WinUAE" - VALUE "FileVersion", "3.6.0.0" + VALUE "FileVersion", "3.6.1.0" VALUE "InternalName", "WinUAE" VALUE "LegalCopyright", "© 1996-2018 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" - VALUE "ProductVersion", "3.6.0.0" + VALUE "ProductVersion", "3.6.1.0" END END BLOCK "VarFileInfo" @@ -1486,6 +1489,7 @@ BEGIN END END + ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO @@ -1595,7 +1599,6 @@ BEGIN IDD_HARDDRIVE, DIALOG BEGIN RIGHTMARGIN, 396 - BOTTOMMARGIN, 195 END IDD_MISC2, DIALOG @@ -1781,7 +1784,7 @@ BEGIN IDS_SELECTFILESYSROOT "Please select the root directory of the file system..." IDS_DEFAULTMIDIOUT "Default MIDI-Out Device" IDS_CONTRIBUTORS1 "Bernd Schmidt - The Grand-Master\nSam Jordan - Custom-chip, floppy-DMA, etc.\nMathias Ortmann - Original WinUAE Main Guy, BSD Socket support\nBrian King - Picasso96 Support, Integrated GUI for WinUAE, previous WinUAE Main Guy\nToni Wilen - Core updates, WinUAE Main Guy\nGustavo Goedert/Peter Remmers/Michael Sontheimer/Tomi Hakala/Tim Gunn/Nemo Pohle - DOS Port Stuff\nSamuel Devulder/Olaf Barthel/Sam Jordan - Amiga Ports\nKrister Bergman - XFree86 and OS/2 Port\nA. Blanchard/Ernesto Corvi - MacOS Port\nChristian Bauer - BeOS Port\nIan Stephenson - NextStep Port\nPeter Teichmann - Acorn/RiscOS Port\nStefan Reinauer - ZorroII/III AutoConfig, Serial Support\nChristian Schmitt/Chris Hames - Serial Support\nHerman ten Brugge - 68020/68881 Emulation Code\nTauno Taipaleenmaki - Various UAE-Control/UAE-Library Support\nBrett Eden/Tim Gunn/Paolo Besser/Nemo Pohle - Various Docs and Web-Sites\nGeorg Veichtlbauer - Help File coordinator, German GUI\nFulvio Leonardi - Italian translator for WinUAE\n" - IDS_CONTRIBUTORS2 "Arnljot Arntsen, Bill Panagouleas, Cloanto - Hardware support\nSpecial thanks to Alexander Kneer and Tobias Abt (The Picasso96 Team)\nSteven Weiser - Postscript printing emulation idea and testing.\nPéter Tóth /Balázs Rátkai/Iván Herczeg/András Arató - Hungarian translation.\nKarsten Bock, Gavin Fance, Dirk Trowe and Christian Schindler - Freezer cartridge hardware support.\nMikko Nieminen - Demo compatibility testing.\nArabuusimiehet - [This information is on a need-to-know basis]" + IDS_CONTRIBUTORS2 "Arnljot Arntsen, Bill Panagouleas, Cloanto, Zak Jennings - Hardware support\nSpecial thanks to Alexander Kneer and Tobias Abt (The Picasso96 Team)\nSteven Weiser - Postscript printing emulation idea and testing.\nPéter Tóth /Balázs Rátkai/Iván Herczeg/András Arató - Hungarian translation.\nKarsten Bock, Gavin Fance, Dirk Trowe and Christian Schindler - Freezer cartridge hardware support.\nMikko Nieminen - Demo compatibility testing.\nArabuusimiehet - [This information is on a need-to-know basis]" IDS_INVALIDPRTPORT "The printer you have in this configuration is not valid on this machine.\n" IDS_RESTOREUSS "Restore a WinUAE snapshot file" IDS_USS "WinUAE snapshot files" diff --git a/od-win32/win32.h b/od-win32/win32.h index 12fc8077..35eee336 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -15,17 +15,17 @@ #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100) #define GETBDD(x) ((x) % 100) -#define WINUAEPUBLICBETA 1 +#define WINUAEPUBLICBETA 0 #define LANG_DLL 1 #define LANG_DLL_FULL_VERSION_MATCH 1 #if WINUAEPUBLICBETA -#define WINUAEBETA _T("7") +#define WINUAEBETA _T("") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2018, 2, 26) +#define WINUAEDATE MAKEBD(2018, 3, 4) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index f6b480c7..ba5de956 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -5,6 +5,10 @@ JIT Direct current rules are less complex now. It automatically switches off onl Note that in 64-bit version RTG VRAM must be inside of reserved natmem space. (Outside = error message and return back to GUI) +3.6.1 + +- 3200b15 "Support DSKLEN writes while disk DMA is active" didn't check if new DSKLEN write had write bit set. Fixes Amax II disk formatting. + Beta 7: - Added resident struct to UAE boot ROM filesystem, enables c:version : to report name and version. diff --git a/od-win32/wix/Product.wxs b/od-win32/wix/Product.wxs index 24093e5f..c8d1c043 100644 --- a/od-win32/wix/Product.wxs +++ b/od-win32/wix/Product.wxs @@ -2,8 +2,8 @@ - - + + diff --git a/od-win32/wix/makemsi.cmd b/od-win32/wix/makemsi.cmd index af3abb29..97d4892d 100644 --- a/od-win32/wix/makemsi.cmd +++ b/od-win32/wix/makemsi.cmd @@ -4,10 +4,10 @@ copy d:\amiga\text\winuaechangelog.txt c:\projects\winuae\distribution\docs "C:\Program Files (x86)\WiX Toolset v3.11\bin\candle.exe" -d"DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\\" -dSolutionDir=C:\projects\winuae\src\od-win32\winuae_msvc15\ -dSolutionExt=.sln -dSolutionFileName=winuae_msvc.sln -dSolutionName=winuae_msvc -dSolutionPath=C:\projects\winuae\src\od-win32\winuae_msvc15\winuae_msvc.sln -dConfiguration=Release -dOutDir=bin\Release\ -dPlatform=x86 -dProjectDir=C:\projects\winuae\src\od-win32\wix\ -dProjectExt=.wixproj -dProjectFileName=wix.wixproj -dProjectName=wix -dProjectPath=C:\projects\winuae\src\od-win32\wix\wix.wixproj -dTargetDir=C:\projects\winuae\src\od-win32\wix\bin\Release\ -dTargetExt=.msi -dTargetFileName=winuae.msi -dTargetName=winuae -dTargetPath=C:\projects\winuae\src\od-win32\wix\bin\Release\winuae.msi -dwinuae.Configuration=Release -d"winuae.FullConfiguration=Release|Win32" -dwinuae.Platform=Win32 -dwinuae.ProjectDir=C:\projects\winuae\src\od-win32\winuae_msvc14\ -dwinuae.ProjectExt=.vcxproj -dwinuae.ProjectFileName=winuae_msvc.vcxproj -dwinuae.ProjectName=winuae_msvc -dwinuae.ProjectPath=C:\projects\winuae\src\od-win32\winuae_msvc14\winuae_msvc.vcxproj -dwinuae.TargetDir=d:\amiga\ -dwinuae.TargetExt=.exe -dwinuae.TargetFileName=winuae.exe -dwinuae.TargetName=winuae -dwinuae.TargetPath=d:\amiga\winuae.exe -out obj\Release\ -arch x86 -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" Product.wxs WixUI_FeatureTree_NL.wxs -"C:\Program Files (x86)\WiX Toolset v3.11\bin\Light.exe" -out C:\projects\winuae\src\od-win32\wix\bin\winuae.msi -pdbout C:\projects\winuae\src\od-win32\wix\bin\Release\winuae.wixpdb -cultures:null -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" -contentsfile obj\Release\wix.wixproj.BindContentsFileListnull.txt -outputsfile obj\Release\wix.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj\Release\wix.wixproj.BindBuiltOutputsFileListnull.txt -wixprojectfile C:\projects\winuae\src\od-win32\wix\wix.wixproj obj\Release\Product.wixobj obj\Release\WixUI_FeatureTree_NL.wixobj +"C:\Program Files (x86)\WiX Toolset v3.11\bin\Light.exe" -out d:\amiga\InstallWinUAE%1.msi -pdbout C:\projects\winuae\src\od-win32\wix\bin\Release\winuae.wixpdb -cultures:null -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" -contentsfile obj\Release\wix.wixproj.BindContentsFileListnull.txt -outputsfile obj\Release\wix.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj\Release\wix.wixproj.BindBuiltOutputsFileListnull.txt -wixprojectfile C:\projects\winuae\src\od-win32\wix\wix.wixproj obj\Release\Product.wixobj obj\Release\WixUI_FeatureTree_NL.wixobj "C:\Program Files (x86)\WiX Toolset v3.11\bin\candle.exe" -d"DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\\" -dSolutionDir=C:\projects\winuae\src\od-win32\winuae_msvc15\ -dSolutionExt=.sln -dSolutionFileName=winuae_msvc.sln -dSolutionName=winuae_msvc -dSolutionPath=C:\projects\winuae\src\od-win32\winuae_msvc15\winuae_msvc.sln -dConfiguration=Release -dOutDir=bin\Release\ -dPlatform=x64 -dProjectDir=C:\projects\winuae\src\od-win32\wix\ -dProjectExt=.wixproj -dProjectFileName=wix.wixproj -dProjectName=wix -dProjectPath=C:\projects\winuae\src\od-win32\wix\wix.wixproj -dTargetDir=C:\projects\winuae\src\od-win32\wix\bin\Release\ -dTargetExt=.msi -dTargetFileName=winuae.msi -dTargetName=winuae -dTargetPath=C:\projects\winuae\src\od-win32\wix\bin\Release\winuae.msi -dwinuae.Configuration=Release -d"winuae.FullConfiguration=Release|x64" -dwinuae.Platform=x64 -dwinuae.ProjectDir=C:\projects\winuae\src\od-win32\winuae_msvc14\ -dwinuae.ProjectExt=.vcxproj -dwinuae.ProjectFileName=winuae_msvc.vcxproj -dwinuae.ProjectName=winuae_msvc -dwinuae.ProjectPath=C:\projects\winuae\src\od-win32\winuae_msvc14\winuae_msvc.vcxproj -dwinuae.TargetDir=d:\amiga\ -dwinuae.TargetExt=.exe -dwinuae.TargetFileName=winuae64.exe -dwinuae.TargetName=winuae64 -dwinuae.TargetPath=d:\amiga\winuae64.exe -out obj\Release\ -arch x64 -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" Product.wxs WixUI_FeatureTree_NL.wxs -"C:\Program Files (x86)\WiX Toolset v3.11\bin\Light.exe" -out C:\projects\winuae\src\od-win32\wix\bin\winuae64.msi -pdbout C:\projects\winuae\src\od-win32\wix\bin\Release\winuae.wixpdb -cultures:null -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" -contentsfile obj\Release\wix.wixproj.BindContentsFileListnull.txt -outputsfile obj\Release\wix.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj\Release\wix.wixproj.BindBuiltOutputsFileListnull.txt -wixprojectfile C:\projects\winuae\src\od-win32\wix\wix.wixproj obj\Release\Product.wixobj obj\Release\WixUI_FeatureTree_NL.wixobj +"C:\Program Files (x86)\WiX Toolset v3.11\bin\Light.exe" -out d:\amiga\InstallWinUAE%1_x64.msi -pdbout C:\projects\winuae\src\od-win32\wix\bin\Release\winuae.wixpdb -cultures:null -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" -contentsfile obj\Release\wix.wixproj.BindContentsFileListnull.txt -outputsfile obj\Release\wix.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj\Release\wix.wixproj.BindBuiltOutputsFileListnull.txt -wixprojectfile C:\projects\winuae\src\od-win32\wix\wix.wixproj obj\Release\Product.wixobj obj\Release\WixUI_FeatureTree_NL.wixobj diff --git a/qemuvga/lsi53c710.cpp b/qemuvga/lsi53c710.cpp index 0690e938..36da4482 100644 --- a/qemuvga/lsi53c710.cpp +++ b/qemuvga/lsi53c710.cpp @@ -1750,18 +1750,11 @@ static void lsi_reg_writeb(LSIState710 *s, int offset, uint8_t val) #if 0 switch (offset) { - case 0x00: - case 0x01: - case 0x04: - case 0x05: - case 0x14: - case 0x18: - case 0x19: - case 0x1a: - case 0x1b: - case 0x22: - case 0x38: + case 0x05: // XFERP TP0=4, TP1=5, TP2=6 + case 0x0b: // SSCF SSCF0=0 SSCF1=1 + case 0x3b: // CF CF0=6, CF1=7 write_log("710 config reg %02x = %02x\n", offset, val); + //activate_debugger(); break; } #endif