Changeset 407 for PinConnection/UCommFrame.pas

Timestamp:

Aug 14, 2012, 10:31:30 AM (12 years ago)

Author:

chronos

Message:

• Modified: PinConnection package now use for data parameters TListByte instead of TStream class contained in TemplateGenerics package. TStream have Position property which has no meaning for forwarding plain byte memory block. There is TBinarySerializer class used for serializing data instead of TStreamHelper class.

File:

• PinConnection/UCommFrame.pas (modified) (13 diffs)

PinConnection/UCommFrame.pas

@@ -6 +6 @@
 
 uses
-  Classes, UStreamHelper, Dialogs, SysUtils,
+  Classes, UStreamHelper, Dialogs, SysUtils, SpecializedList, UBinarySerializer,
   UCommPin;
 
@@ -17 +17 @@
   private
     LastCharIsSpecialChar: Boolean;
-    ReceiveBuffer: TStreamHelper;
+    ReceiveBuffer: TBinarySerializer;
     FrameState: TFrameState;
     FFrameErrorCount: Integer;
     FCRCErrorCount: Integer;
-    function GetStreamCRC8(Stream: TStream): Byte;
+    function GetStreamCRC8(Stream: TListByte): Byte;
+    procedure RawDataReceive(Sender: TCommPin; Stream: TListByte);
+    procedure RawSetStatus(Sender: TCommPin; Status: Integer);
+    procedure FrameDataReceive(Sender: TCommPin; Stream: TListByte);
+    procedure FrameSetStatus(Sender: TCommPin; Status: Integer);
   public
     RawDataPin: TCommPin;
@@ -30 +34 @@
     ControlCodeFrameEnd: Byte;
     ControlCodeSpecialChar: Byte;
-    procedure RawDataReceive(Sender: TCommPin; Stream: TStream);
-    procedure RawSetStatus(Sender: TCommPin; Status: Integer);
-    procedure FrameDataReceive(Sender: TCommPin; Stream: TStream);
-    procedure FrameSetStatus(Sender: TCommPin; Status: Integer);
-    function ComputeRawSize(DataStream: TStream): Integer;
+    function ComputeRawSize(DataStream: TListByte): Integer;
     constructor Create;
     destructor Destroy; override;
@@ -48 +48 @@
 constructor TCommFrame.Create;
 begin
-  ReceiveBuffer := TStreamHelper.Create;
+  ReceiveBuffer := TBinarySerializer.Create;
+  ReceiveBuffer.List := TListByte.Create;
+  ReceiveBuffer.OwnsList := True;
   RawDataPin := TCommPin.Create;
   RawDataPin.OnReceive := RawDataReceive;
@@ -68 +70 @@
 end;
 
-procedure TCommFrame.FrameDataReceive(Sender: TCommPin; Stream: TStream);
-var
-  RawData: TStreamHelper;
+procedure TCommFrame.FrameDataReceive(Sender: TCommPin; Stream: TListByte);
+var
+  RawData: TBinarySerializer;
   I: Integer;
   Character: Byte;
@@ -76 +78 @@
 begin
   // Write CRC code to end of frame
-  Stream.Position := 0;
   CRC := GetStreamCRC8(Stream);
 
   // Byte stuffing
-  Stream.Position := 0;
   try
-    RawData := TStreamHelper.Create;
+    RawData := TBinarySerializer.Create;
+    RawData.List := TListByte.Create;
+    RawData.OwnsList := True;
     RawData.WriteByte(SpecialChar);
     RawData.WriteByte(ControlCodeFrameStart);
-    for I := 0 to Stream.Size - 1 do begin
-      Character := Stream.ReadByte;
+    for I := 0 to Stream.Count - 1 do begin
+      Character := Stream[I];
       if Character = SpecialChar then begin
         RawData.WriteByte(SpecialChar);
@@ -102 +104 @@
     RawData.WriteByte(ControlCodeFrameEnd);
     if Random >= PacketLoss then
-      RawDataPin.Send(RawData);
+      RawDataPin.Send(RawData.List);
 
   finally
@@ -114 +116 @@
 end;
 
-function TCommFrame.ComputeRawSize(DataStream: TStream): Integer;
+function TCommFrame.ComputeRawSize(DataStream: TListByte): Integer;
+var
+  I: Integer;
 begin
   Result := 5; // FrameStart + CRC + FrameEnd
-  DataStream.Position := 0;
-  while DataStream.Position < DataStream.Size do
-    if DataStream.ReadByte = SpecialChar then Inc(Result, 2)
+  for I := 0 to DataStream.Count - 1 do
+    if DataStream[I] = SpecialChar then Inc(Result, 2)
       else Inc(Result, 1);
 end;
 
-procedure TCommFrame.RawDataReceive(Sender: TCommPin; Stream: TStream);
+procedure TCommFrame.RawDataReceive(Sender: TCommPin; Stream: TListByte);
 var
   Character: Byte;
@@ -130 +133 @@
   I: Integer;
 begin
-  for I := 0 to Stream.Size - 1 do begin
-    Character := Stream.ReadByte;
+  for I := 0 to Stream.Count - 1 do begin
+    Character := Stream[I];
     if LastCharIsSpecialChar then begin
       if Character = ControlCodeSpecialChar then begin
@@ -139 +142 @@
           if FrameState = fsInside then
             Inc(FFrameErrorCount);
-          ReceiveBuffer.Size := 0;
+          ReceiveBuffer.List.Count := 0;
+          ReceiveBuffer.Position := 0;
           FrameState := fsInside;
         end else
@@ -145 +149 @@
           if FrameState = fsInside then begin
             // Check CRC
-            if ReceiveBuffer.Size > 0 then begin
-              ReceiveBuffer.Position := ReceiveBuffer.Size - 1;
+            if ReceiveBuffer.List.Count > 0 then begin
+              ReceiveBuffer.Position := ReceiveBuffer.List.Count - 1;
               CRC := ReceiveBuffer.ReadByte;
-              ReceiveBuffer.Size := ReceiveBuffer.Size - 1;
-              ExpectedCRC := GetStreamCRC8(ReceiveBuffer);
+              ReceiveBuffer.List.Count := ReceiveBuffer.List.Count - 1;
+              ExpectedCRC := GetStreamCRC8(ReceiveBuffer.List);
 
               if ExpectedCRC <> CRC then Inc(FCRCErrorCount)
                 else begin
                   //if Random >= PacketLoss then
-                    FrameDataPin.Send(ReceiveBuffer);
+                    FrameDataPin.Send(ReceiveBuffer.List);
                 end;
             end else Inc(FCRCErrorCount);
@@ -173 +177 @@
 end;
 
-function TCommFrame.GetStreamCRC8(Stream: TStream): Byte;
+function TCommFrame.GetStreamCRC8(Stream: TListByte): Byte;
 var
   I: Integer;
@@ -182 +186 @@
 begin
   Pom := 0;
-  Stream.Position := 0;
   Result := 0;
-  for I := 0 to Stream.Size - 1 do begin
-    Stream.Read(Pom, 1);
+  for I := 0 to Stream.Count - 1 do begin
+    Pom := Stream[I];
     for B := 0 to 7 do begin
-      if ((Result xor Pom) and 1) = 1 then Result := ((Result xor Polynom) shr 1) or $80
+      if ((Result xor Pom) and 1) = 1 then
+        Result := ((Result xor Polynom) shr 1) or $80
         else Result := Result shr 1;
       Pom := (Pom shr 1) or ((Pom shl 7) and $80); // Rotace vpravo