]> git.unchartedbackwaters.co.uk Git - francis/winuae.git/commitdiff
3610
authorToni Wilen <twilen@winuae.net>
Sun, 4 Mar 2018 17:31:00 +0000 (19:31 +0200)
committerToni Wilen <twilen@winuae.net>
Sun, 4 Mar 2018 17:31:00 +0000 (19:31 +0200)
ncr_scsi.cpp
od-win32/direct3d11.cpp
od-win32/makeexe.cmd
od-win32/resources/winuae_minimal.rc
od-win32/win32.h
od-win32/winuaechangelog.txt
od-win32/wix/Product.wxs
od-win32/wix/makemsi.cmd
qemuvga/lsi53c710.cpp

index 72b25b9c3f47bc181c837c339a194f2b8ffa34a3..27ad170d1b52acde123a5157a57cb057ec6115da 100644 (file)
@@ -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) {
index 66681b9687a08ee191746a545d2ffb6ac1b5542a..0dd619fdeef6dc995d2f2d3f865bba2a41f019f9 100644 (file)
@@ -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);
index e39bfd149f631dcb543d427a5ed40a339019725e..699c5beac1d8ec391e028449edb84242bd3b98a1 100644 (file)
@@ -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 ..
index 6a1c8d62f4659e4e6bf9a0127f8e923a4482f2f9..0ab07e42954cb3552bb6571fb3189307887112e8 100644 (file)
@@ -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"
index 12fc8077694aad1400656a0c66eb3f3fcde19b01..35eee3361e1861af167e4cddb90f77b07f30d398 100644 (file)
 #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")
index f6b480c756409b9bbcdce60dc34b23c0a68c17f1..ba5de9561b078ffc4ac69da32c6545097cf5e4ae 100644 (file)
@@ -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)\r
 \r
 \r
+3.6.1\r
+\r
+- 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.\r
+\r
 Beta 7:\r
 \r
 - Added resident struct to UAE boot ROM filesystem, enables c:version <directory filesystem device name>: to report name and version.\r
index 24093e5fbb3a85c6821a05ab84cd71fbcca9ae78..c8d1c043760983ec929bc9e1e59e832a2e745053 100644 (file)
@@ -2,8 +2,8 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <?define ProductName = "WinUAE" ?>
-  <?define ProductVersion = "3.6.0" ?>
-  <?define ProductFullVersion = "3.6.0.0" ?>
+  <?define ProductVersion = "3.6.1" ?>
+  <?define ProductFullVersion = "3.6.1.0" ?>
   <?define ProductAuthor = "Arabuusimiehet" ?>
 
   <?if $(var.Platform) = x64 ?>
index af3abb295ca57158dfcf9ea197e522754ef9a2d5..97d4892db56af53384069555434f52660356888d 100644 (file)
@@ -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
index 0690e938b6030b7531fb7cb33dd8cb55e9d8bc75..36da44828caa1612102477de1c946cb12b14ce76 100644 (file)
@@ -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