DSP WIP 29/03

+ Added to download SDL library 2.0.4 for Windows 32/64 bits. You can also download from http://www.libsdl.org + DSK file engine - Added patches to fix the some Titus protections in Amstrad CPC + Tape file engine - General cleaning - CSW format: File opening rewrited, improves stability. - TAP format: Standardized opening files through data structures - TZX format: Standardized opening files through data structures - PZX format - Standardized opening files through data structures - Corrected data block - Properly implemented very large pulses - Spectrum + Mapped some missing special keys
leniad · Mar 28, 2016 · e7c6286 · e7c6286
1 parent e72f688
commit e7c6286
Show file tree

Hide file tree

Showing 20 changed files with 1,439 additions and 1,212 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,20 @@
 # dsp-emulator
 DSP Emulator status<br>
+<b>29/03/16 - DSP Emulator 0.16b2 WIP source and Win32 updated.</b><br><pre>
++ Added to download SDL library 2.0.4 for Windows 32/64 bits. You can also download from http://www.libsdl.org
++ DSK file engine
+    - Added patches to fix the some Titus protections in Amstrad CPC
++ Tape file engine
+    - General cleaning
+    - CSW format: File opening rewrited, improves stability.
+    - TAP format: Standardized opening files through data structures
+    - TZX format: Standardized opening files through data structures
+    - PZX format
+          - Standardized opening files through data structures
+          - Corrected data block
+          - Properly implemented very large pulses
+- Spectrum
+    + Mapped some missing special keys</pre><br>
 <b>22/03/16 - DSP Emulator 0.16b2 WIP source and Win32 updated.</b><br><pre>
 - Added to download some preview images
 - General

diff --git a/SDL2-2.0.4-windows.zip b/SDL2-2.0.4-windows.zip
diff --git a/dsp_016b2_wip_win32.zip b/dsp_016b2_wip_win32.zip
diff --git a/src/delphi/cargar_spec.dfm b/src/delphi/cargar_spec.dfm
@@ -87,7 +87,7 @@ object load_spec: Tload_spec
     object Label3: TLabel
       Left = 79
       Top = 11
-      Width = 150
+      Width = 179
       Height = 13
       AutoSize = False
     end

diff --git a/src/delphi/dsp.dproj b/src/delphi/dsp.dproj
@@ -155,9 +155,9 @@
         <BRCC_Defines>WINDOWS;$(BRCC_Defines)</BRCC_Defines>
         <VerInfo_AutoGenVersion>false</VerInfo_AutoGenVersion>
         <VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
-        <VerInfo_Build>450</VerInfo_Build>
+        <VerInfo_Build>457</VerInfo_Build>
         <VerInfo_Locale>3082</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=Leniad;FileDescription=;FileVersion=0.16.2.450;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=DSP Emulator;ProductVersion=0.16;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=Leniad;FileDescription=;FileVersion=0.16.2.457;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=DSP Emulator;ProductVersion=0.16;Comments=</VerInfo_Keys>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>

diff --git a/src/delphi/dsp.dproj.local b/src/delphi/dsp.dproj.local
diff --git a/src/delphi/dsp.identcache b/src/delphi/dsp.identcache
diff --git a/src/delphi/dsp.res b/src/delphi/dsp.res
diff --git a/src/delphi/dsp.stat b/src/delphi/dsp.stat
@@ -1,10 +1,10 @@
 [Stats]
-EditorSecs=342892
-DesignerSecs=3846
+EditorSecs=355703
+DesignerSecs=3870
 InspectorSecs=1302
-CompileSecs=3870692
-OtherSecs=14960
+CompileSecs=3951951
+OtherSecs=15474
 StartTime=17/04/2015 18:29:37
 RealKeys=0
 EffectiveKeys=0
-DebugSecs=326103
+DebugSecs=332870
diff --git a/src/delphi/principal.dfm b/src/delphi/principal.dfm
@@ -2778,7 +2778,7 @@ object principal1: Tprincipal1
     Left = 24
     Top = 64
     Bitmap = {
-      494C0101050007005C0320002000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010105000700600320002000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000800000004000000001002000000000000080
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000

diff --git a/src/delphi/principal.pas b/src/delphi/principal.pas
@@ -774,13 +774,16 @@ procedure Tprincipal1.CambiarVideo(Sender: TObject);
     main_screen.video_mode:=255;
   end;
 if main_screen.video_mode<>nuevo then main_screen.video_mode:=nuevo;
-main_screen.pantalla_completa:=(main_screen.video_mode=6);
 if main_vars.driver_ok then begin
-  cambiar_video;
-  if main_vars.tipo_maquina<7 then begin
-    fillchar(buffer_video[0],6144,1);
-    fillchar(borde.buffer[0],78000,$80);
-  end;
+    if nuevo=6 then begin
+      pasar_pantalla_completa;
+    end else begin
+      cambiar_video;
+      if main_vars.tipo_maquina<7 then begin
+        fillchar(buffer_video[0],6144,1);
+        fillchar(borde.buffer[0],78000,$80);
+      end;
+    end;
 end;
 end;
 

diff --git a/src/delphi/tape_window.dfm b/src/delphi/tape_window.dfm
@@ -121,11 +121,12 @@ object tape_window1: Ttape_window1
         FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
         FFFFFFFFFF00}
       TabOrder = 0
+      TabStop = False
       OnClick = fplaycinta
     end
     object BitBtn2: TBitBtn
       Left = 92
-      Top = 4
+      Top = 5
       Width = 37
       Height = 37
       Glyph.Data = {
@@ -192,6 +193,7 @@ object tape_window1: Ttape_window1
         FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
         FFFFFFFFFF00}
       TabOrder = 1
+      TabStop = False
       OnClick = fstopcinta
     end
     object BitBtn3: TBitBtn
@@ -299,6 +301,7 @@ object tape_window1: Ttape_window1
         FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
         FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF}
       TabOrder = 2
+      TabStop = False
       OnClick = cerrar_cinta
     end
     object BitBtn9: TBitBtn
@@ -430,6 +433,15 @@ object tape_window1: Ttape_window1
     ParentFont = False
     ScrollBars = ssNone
     TabOrder = 1
+    ColWidths = (
+      94
+      94
+      94)
+    RowHeights = (
+      15
+      15
+      15
+      15)
   end
   object StringGrid1: TStringGrid
     Left = 15
@@ -458,6 +470,14 @@ object tape_window1: Ttape_window1
     ShowHint = True
     TabOrder = 2
     OnClick = StringGrid1Click
+    ColWidths = (
+      94
+      94
+      94)
+    RowHeights = (
+      15
+      15
+      15)
   end
   object Edit1: TEdit
     Left = 15

diff --git a/src/devices/upd765.pas b/src/devices/upd765.pas
@@ -145,7 +145,7 @@ procedure read_sector;
   FDCDataLength:=1 shl (FDCCommand[5]+7);
 end else begin
   FDCDataPointer:=dsk[FDCCurrDrv].Tracks[dsk[FDCCurrDrv].cara_actual,dsk[FDCCurrDrv].track_actual].sector[dsk[FDCCurrDrv].sector_actual].posicion_data;
-  FDCDataLength:=1 shl (FDCCommand[5]+7);//1 shl (dsk[FDCCurrDrv].Tracks[dsk[FDCCurrDrv].cara_actual,dsk[FDCCurrDrv].track_actual].sector[dsk[FDCCurrDrv].sector_actual].sector_size+7);  //1 shl (FDCCommand[5]+7);
+  FDCDataLength:=1 shl (FDCCommand[5]+7);
 end;
 if FDCCommand[5]=0 then begin
   FDCDataLength:=FDCCommand[8];
@@ -396,16 +396,17 @@ function FDCExecReadCommand:byte;
           ret:=dsk[FDCCurrDrv].Tracks[dsk[FDCCurrDrv].cara_actual,dsk[fdccurrdrv].track_actual].data;
           if ret=nil then begin
             st0:=$40+$80;
-            st1:=0+$20;
+            st1:=$20;
             st2:=$1;
             GetRes7;
+            statusregister:=$d0+$20;
             exit;
           end;
           if FDCCounter>=(1 shl (dsk[FDCCurrDrv].Tracks[dsk[FDCCurrDrv].cara_actual,dsk[FDCCurrDrv].track_actual].sector[dsk[FDCCurrDrv].sector_actual].sector_size+7)) then begin
-            //Para la emulacion de speedlock en Amstrad...
-            st0:=$40+$80;
-            st1:=$4+dsk[FDCCurrDrv].Tracks[dsk[FDCCurrDrv].cara_actual,dsk[FDCCurrDrv].track_actual].sector[dsk[FDCCurrDrv].sector_actual].status1;
-            st2:=dsk[FDCCurrDrv].Tracks[dsk[FDCCurrDrv].cara_actual,dsk[FDCCurrDrv].track_actual].sector[dsk[FDCCurrDrv].sector_actual].status2;
+            //Para la emulacion de speedlock en Amstrad y de algunos de titus...
+            st0:=$40;
+            st1:=$4;
+            st2:=0;
             GetRes7;
             exit;
           end else begin