* Char -> AnsiChar

This commit is contained in:
Michael VAN CANNEYT 2022-12-22 11:20:44 +01:00 committed by Michaël Van Canneyt
parent 57353df68f
commit 3ec4c5ffcb
9 changed files with 37 additions and 37 deletions

View File

@ -38,14 +38,14 @@ asm
b .Lhalt
end;
function RaspiWrite(ACh: char; AUserData: pointer): boolean;
function RaspiWrite(ACh: AnsiChar; AUserData: pointer): boolean;
begin
UARTPuts(PeripheralBase, ACh);
RaspiWrite := true;
end;
function RaspiRead(var ACh: char; AUserData: pointer): boolean;
function RaspiRead(var ACh: AnsiChar; AUserData: pointer): boolean;
begin
ACh := UARTGet(PeripheralBase);

View File

@ -31,8 +31,8 @@ unit raspiuart;
interface
procedure UARTInit(BaseAddr: DWord); public name 'UARTInit';
procedure UARTPuts(BaseAddr: DWord; C: Char);
function UARTGet(BaseAddr: DWord): Char;
procedure UARTPuts(BaseAddr: DWord; C: AnsiChar);
function UARTGet(BaseAddr: DWord): AnsiChar;
procedure UARTFlush(BaseAddr: DWord);
implementation
@ -108,7 +108,7 @@ begin
PUT32(BaseAddr + UART0_CR, $301);
end;
procedure UARTPuts(BaseAddr: DWord; C: Char);
procedure UARTPuts(BaseAddr: DWord; C: AnsiChar);
begin
while True do
begin
@ -119,7 +119,7 @@ begin
PUT32(BaseAddr + UART0_DR, DWord(C));
end;
function UARTGet(BaseAddr: DWord): Char;
function UARTGet(BaseAddr: DWord): AnsiChar;
begin
while True do
begin
@ -127,7 +127,7 @@ begin
if (GET32(BaseAddr + UART0_FR) and $10) = 0 then break;
end;
UARTGet := Char(GET32(BaseAddr + UART0_DR));
UARTGet := AnsiChar(GET32(BaseAddr + UART0_DR));
end;
procedure UARTFlush(BaseAddr: DWord);

View File

@ -240,11 +240,11 @@ type
TITM_Port = 0..31;
procedure ITM_SendData(Port: TITM_Port; Data: char); inline;
procedure ITM_SendData(Port: TITM_Port; Data: AnsiChar); inline;
implementation
procedure ITM_SendData(Port: TITM_Port; Data: char);
procedure ITM_SendData(Port: TITM_Port; Data: AnsiChar);
begin
if (((ITM.TCR and 1) <> 0) and ((ITM.TER and 1) <> 0)) then
begin

View File

@ -75,7 +75,7 @@ begin
UARTLCR := GET32(AUX_MU_LCR_REG);
end;
procedure UARTPuts(C: Char);
procedure UARTPuts(C: AnsiChar);
begin
while True do
begin
@ -85,14 +85,14 @@ begin
PUT32(AUX_MU_IO_REG, DWord(C));
end;
function UARTGet(): Char;
function UARTGet(): AnsiChar;
begin
while True do
begin
if (GET32(AUX_MU_LSR_REG) and $01) > 0 then break;
end;
UARTGet := Char(GET32(AUX_MU_IO_REG) and $FF);
UARTGet := AnsiChar(GET32(AUX_MU_IO_REG) and $FF);
end;
procedure UARTFlush();
@ -103,14 +103,14 @@ begin
end;
end;
function RaspiWrite(ACh: char; AUserData: pointer): boolean;
function RaspiWrite(ACh: AnsiChar; AUserData: pointer): boolean;
begin
UARTPuts(ACh);
RaspiWrite := true;
end;
function RaspiRead(var ACh: char; AUserData: pointer): boolean;
function RaspiRead(var ACh: AnsiChar; AUserData: pointer): boolean;
begin
if (GET32(AUX_MU_LSR_REG) and $01) > 0 then
begin

View File

@ -119,14 +119,14 @@ unit avrsim;
end;
function WriteChar(ACh: char; AUserData: pointer): boolean;
function WriteChar(ACh: AnsiChar; AUserData: pointer): boolean;
begin
WriteChar:=true;
OUTPUTREG:=ord(ACh);
end;
function ReadChar(var ACh: char; AUserData: pointer): boolean;
function ReadChar(var ACh: AnsiChar; AUserData: pointer): boolean;
begin
ReadChar:=true;
ACh:=#0;

View File

@ -17,8 +17,8 @@ Unit consoleio;
interface
type
TWriteCharFunc = function(ACh: char; AUserData: pointer): boolean;
TReadCharFunc = function(var ACh: char; AUserData: pointer): boolean;
TWriteCharFunc = function(ACh: AnsiChar; AUserData: pointer): boolean;
TReadCharFunc = function(var ACh: AnsiChar; AUserData: pointer): boolean;
procedure OpenIO(var f: Text; AWrite: TWriteCharFunc; ARead: TReadCharFunc; AMode: word; AUserData: pointer);
@ -34,12 +34,12 @@ Unit consoleio;
UserData: Pointer;
end;
function EmptyWrite(ACh: char; AUserData: pointer): boolean;
function EmptyWrite(ACh: AnsiChar; AUserData: pointer): boolean;
begin
EmptyWrite:=true;
end;
function EmptyRead(var ACh: char; AUserData: pointer): boolean;
function EmptyRead(var ACh: AnsiChar; AUserData: pointer): boolean;
begin
EmptyRead:=true;
ACh:=#0;
@ -49,9 +49,9 @@ Unit consoleio;
begin
end;
function ReadData(Func: TReadCharFunc; UserData: pointer; Buffer: pchar; count: SizeInt): SizeInt;
function ReadData(Func: TReadCharFunc; UserData: pointer; Buffer: PAnsiChar; count: SizeInt): SizeInt;
var
c: char;
c: AnsiChar;
got_linechar: boolean;
begin
ReadData:=0;
@ -75,20 +75,20 @@ Unit consoleio;
begin
userdata:=@t.UserData[1];
InOutRes:=0;
t.bufend:=ReadData(userdata^.ReadChar,userdata^.UserData,pchar(t.bufptr),t.bufsize);
t.bufend:=ReadData(userdata^.ReadChar,userdata^.UserData,PAnsiChar(t.bufptr),t.bufsize);
t.bufpos:=0;
end;
Procedure Console_Write(var t:TextRec);
var
userdata: PUserData;
p: pchar;
p: PAnsiChar;
i: SizeInt;
begin
if t.BufPos=0 then exit;
userdata:=@t.UserData[1];
i := 0;
p := pchar(t.bufptr);
p := PAnsiChar(t.bufptr);
while i < t.bufpos do
begin
if not userdata^.WriteChar(p^, userdata^.UserData) then

View File

@ -7,7 +7,7 @@ type
TMBModule = packed record
mod_start,
mod_end: PtrUInt;
name: pchar;
name: PAnsiChar;
reserved: DWord;
end;

View File

@ -27,14 +27,14 @@ begin
end;
procedure do_erase(p : pchar; pchangeable: boolean);
procedure do_erase(p : PAnsiChar; pchangeable: boolean);
begin
if assigned (@rtl_do_erase) then
rtl_do_erase(p);
end;
procedure do_rename(p1,p2 : pchar; p1changeable, p2changeable: boolean);
procedure do_rename(p1,p2 : PAnsiChar; p1changeable, p2changeable: boolean);
begin
if assigned (@rtl_do_rename) then
rtl_do_rename(p1, p2);

View File

@ -56,8 +56,8 @@ const
DriveSeparator = ':';
ExtensionSeparator = '.';
PathSeparator = ':';
AllowDirectorySeparators : set of char = ['\','/'];
AllowDriveSeparators : set of char = [':'];
AllowDirectorySeparators : set of AnsiChar = ['\','/'];
AllowDriveSeparators : set of AnsiChar = [':'];
{$endif FPC_HAS_FEATURE_FILEIO}
{ FileNameCaseSensitive and FileNameCasePreserving are defined below! }
@ -92,8 +92,8 @@ const
type
trtl_do_close = procedure (handle : longint);
trtl_do_erase = procedure (p : pchar);
trtl_do_rename = procedure (p1,p2 : pchar);
trtl_do_erase = procedure (p : PAnsiChar);
trtl_do_rename = procedure (p1,p2 : PAnsiChar);
trtl_do_write = function (h: longint; addr: pointer; len: longint) : longint;
trtl_do_read = function (h: longint; addr: pointer; len: longint) : longint;
trtl_do_filepos = function (handle: longint) : longint;
@ -101,7 +101,7 @@ type
trtl_do_seekend = function (handle: longint):longint;
trtl_do_filesize = function (handle : longint) : longint;
trtl_do_truncate = procedure (handle, pos: longint);
trtl_do_open = procedure (var f;p:pchar;flags:longint);
trtl_do_open = procedure (var f;p:PAnsiChar;flags:longint);
trtl_do_isdevice = function (handle: longint): boolean;
var
@ -121,9 +121,9 @@ var
{$ifdef FPC_HAS_FEATURE_COMMANDARGS}
var
argc: LongInt = 0;
argv: PPChar = nil;
envp: PPChar = nil;
cmdline: PChar = nil;
argv: PPAnsiChar = nil;
envp: PPAnsiChar = nil;
cmdline: PAnsiChar = nil;
{$endif FPC_HAS_FEATURE_COMMANDARGS}
{$ifndef FPUNONE}
@ -169,7 +169,7 @@ var
{ Include ELF resources }
const calculated_cmdline:Pchar=nil;
const calculated_cmdline:PAnsiChar=nil;
{$ifndef FPUNONE}
{$ifdef FPC_HAS_FEATURE_SOFTFPU}