Changeset 42 for branches/simple/Devices/Console.pas

Timestamp:

Sep 8, 2023, 11:20:27 PM (9 months ago)

Author:

chronos

Message:

• Modified: Improved simple virtual machine.

Location:

branches/simple/Devices

Files:

• . (added)
• Console.pas (moved) (moved from branches/simple/Console.pas ) (4 diffs)

branches/simple/Devices/Console.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Device, DeviceMapper;
+  Classes, SysUtils, Device, DeviceManager, Channel;
 
 type
-  { TConsole }
 
-  TConsole = class(TDevice16)
+  { TConsole8 }
+
+  TConsole8 = class(TDevice8)
   private
     FOnRead: TReadEvent8;
@@ -16 +17 @@
     function Read8: Byte;
   public
-    procedure RegisterMapper8(Mapper: TDeviceMapper8); override;
-    procedure RegisterMapper16(Mapper: TDeviceMapper16); override;
+    function GetHandlerCount: Integer; override;
+    function GetHandler(Address: Integer): TChannel8; override;
+    property OnWrite: TWriteEvent8 read FOnWrite write FOnWrite;
+    property OnRead: TReadEvent8 read FOnRead write FOnRead;
+  end;
+
+  { TConsole16 }
+
+  TConsole16 = class(TDevice16)
+  private
+    FOnRead: TReadEvent8;
+    FOnWrite: TWriteEvent8;
+    procedure Write8(Data: Byte);
+    function Read8: Byte;
+  public
+    function GetHandlerCount: Integer; override;
+    function GetHandler(Address: Integer): TChannel16; override;
     property OnWrite: TWriteEvent8 read FOnWrite write FOnWrite;
     property OnRead: TReadEvent8 read FOnRead write FOnRead;
@@ -25 +41 @@
 implementation
 
-{ TConsole }
+{ TConsole8 }
 
-procedure TConsole.RegisterMapper8(Mapper: TDeviceMapper8);
-begin
-  Mapper.RegisterReadHandler(Read8);
-  Mapper.RegisterWriteHandler(Write8);
-end;
-
-procedure TConsole.RegisterMapper16(Mapper: TDeviceMapper16);
-begin
-  Mapper.RegisterReadHandler(Read8, nil);
-  Mapper.RegisterWriteHandler(Write8, nil);
-end;
-
-procedure TConsole.Write8(Data: Byte);
+procedure TConsole8.Write8(Data: Byte);
 begin
   if Assigned(FOnWrite) then FOnWrite(Data);
 end;
 
-function TConsole.Read8: Byte;
+function TConsole8.Read8: Byte;
 begin
   if Assigned(FOnRead) then Result := FOnRead
@@ -50 +54 @@
 end;
 
+function TConsole8.GetHandlerCount: Integer;
+begin
+  Result := 1;
+end;
+
+function TConsole8.GetHandler(Address: Integer): TChannel8;
+begin
+  if Address = 0 then begin
+    Result := TChannel8.Create;
+    Result.Read8 := Read8;
+    Result.Write8 := Write8;
+  end;
+end;
+
+{ TConsole16 }
+
+procedure TConsole16.Write8(Data: Byte);
+begin
+  if Assigned(FOnWrite) then FOnWrite(Data);
+end;
+
+function TConsole16.Read8: Byte;
+begin
+  if Assigned(FOnRead) then Result := FOnRead
+    else Result := 0;
+end;
+
+function TConsole16.GetHandlerCount: Integer;
+begin
+  Result := 1;
+end;
+
+function TConsole16.GetHandler(Address: Integer): TChannel16;
+begin
+  if Address = 0 then begin
+    Result := TChannel16.Create;
+    Result.Read8 := Read8;
+    Result.Write8 := Write8;
+  end;
+end;
 
 end.