Changeset 460

Timestamp:

Nov 28, 2012, 8:11:43 AM (11 years ago)

Author:

chronos

Message:

• Modified: Thread locking in TCommSerialPort in PinConnection package.
• Added: Missing PersistentForm file in Common package.

Files:

• Common/UPersistentForm.pas (added)
• PersistentForm (deleted)
• PinConnection/UCommSerialPort.pas (modified) (6 diffs)

PinConnection/UCommSerialPort.pas

@@ -23 +23 @@
   public
     SerialPort: TSerialPort;
-    Lock: TCriticalSection;
     Pin: TCommPin;
     destructor Destroy; override;
@@ -44 +43 @@
   inherited;
   SerialPort.Active := AValue;
+  FActive := SerialPort.Active;
 end;
 
@@ -56 +56 @@
 begin
   try
-    Lock.Acquire;
+    SerialPort.Lock.Acquire;
     if (AValue and 1) = 1 then SerialPort.Parity := paMark
       else SerialPort.Parity := paSpace;
   finally
-    Lock.Release;
+    SerialPort.Lock.Release;
   end;
 end;
@@ -69 +69 @@
   SerialPort := TSerialPort.Create;
   SerialPort.OnReceiveData := ReceiveData;
-  Lock := TCriticalSection.Create;
   Pin := TCommPin.Create;
   Pin.OnReceive := Receive;
@@ -79 +78 @@
 begin
   SerialPort.OnReceiveData := nil;
-  Pin.Free;
-  Lock.Free;
-  SerialPort.Free;
+  FreeAndNil(Pin);
+  FreeAndNil(SerialPort);
   inherited;
 end;
@@ -96 +94 @@
       repeat
         try
-          Lock.Acquire;
+          SerialPort.Lock.Acquire;
           if SerialPort.CanWrite(0) then
             SerialPort.SendStreamRaw(S);
         finally
-          Lock.Release;
+          SerialPort.Lock.Release;
         end;
         if S.Position <> S.Size then