mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-05-31 05:42:34 +02:00
* Char -> AnsiChar
This commit is contained in:
parent
5aa6bbbe79
commit
93c650b7ff
@ -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
|
||||
|
@ -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
|
||||
|
@ -95,7 +95,7 @@ procedure DeleteExtIO ();
|
||||
begin
|
||||
end;
|
||||
|
||||
function Createport(name : PChar; pri : longint): integer;
|
||||
function Createport(name : PAnsiChar; pri : longint): integer;
|
||||
begin
|
||||
result := -1;
|
||||
end;
|
||||
@ -258,7 +258,7 @@ procedure AddDevice(str : String);
|
||||
begin
|
||||
end;
|
||||
|
||||
function MakeDeviceName(str : pchar): string;
|
||||
function MakeDeviceName(str : PAnsiChar): string;
|
||||
begin
|
||||
result := '';
|
||||
end;
|
||||
|
@ -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);
|
||||
|
@ -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}
|
||||
|
@ -21,8 +21,8 @@ unit esp32;
|
||||
procedure PASCALMAIN; external name 'PASCALMAIN';
|
||||
|
||||
procedure esp_deep_sleep_start;external;
|
||||
procedure putchar(c : char);external;
|
||||
function getchar : char;external;
|
||||
procedure putchar(c : AnsiChar);external;
|
||||
function getchar : AnsiChar;external;
|
||||
function __getreent : pointer;external;
|
||||
procedure fflush(f : pointer);external;
|
||||
procedure vTaskDelay(xTicksToDelay: uint32); external;
|
||||
@ -55,14 +55,14 @@ unit esp32;
|
||||
end;
|
||||
|
||||
|
||||
function WriteChar(ACh: char; AUserData: pointer): boolean;
|
||||
function WriteChar(ACh: AnsiChar; AUserData: pointer): boolean;
|
||||
begin
|
||||
WriteChar:=true;
|
||||
putchar(ACh);
|
||||
end;
|
||||
|
||||
|
||||
function ReadChar(var ACh: char; AUserData: pointer): boolean;
|
||||
function ReadChar(var ACh: AnsiChar; AUserData: pointer): boolean;
|
||||
begin
|
||||
ReadChar:=true;
|
||||
ACh:=getchar;
|
||||
|
@ -18,8 +18,8 @@ unit esp8266;
|
||||
operatingsystem_result: longint; external name 'operatingsystem_result';
|
||||
|
||||
procedure PASCALMAIN; external name 'PASCALMAIN';
|
||||
procedure putchar(c : char);external;
|
||||
function uart_rx_one_char(pRxChar: PChar): longint; external;
|
||||
procedure putchar(c : AnsiChar);external;
|
||||
function uart_rx_one_char(pRxChar: PAnsiChar): longint; external;
|
||||
function __getreent : pointer;external;
|
||||
procedure fflush(f : pointer);external;
|
||||
procedure vTaskDelay(xTicksToDelay: uint32); external;
|
||||
@ -50,13 +50,13 @@ unit esp8266;
|
||||
_FPC_haltproc;
|
||||
end;
|
||||
|
||||
function WriteChar(ACh: char; AUserData: pointer): boolean;
|
||||
function WriteChar(ACh: AnsiChar; AUserData: pointer): boolean;
|
||||
begin
|
||||
WriteChar:=true;
|
||||
putchar(ACh);
|
||||
end;
|
||||
|
||||
function ReadChar(var ACh: char; AUserData: pointer): boolean;
|
||||
function ReadChar(var ACh: AnsiChar; AUserData: pointer): boolean;
|
||||
begin
|
||||
ReadChar := true;
|
||||
ACh := #0;
|
||||
|
Loading…
Reference in New Issue
Block a user