Skip to content

Commit

Permalink
Latest commits (Ultibo core 1.2.009)
Browse files Browse the repository at this point in the history 
See the forum announcements for more information
  • Loading branch information
@ultibohub
ultibohub committed Jun 2, 2016
1 parent 7a230c3 commit 3a25369
Show file tree
Hide file tree
Showing 35 changed files with 9,845 additions and 1,700 deletions.
467 changes: 344 additions & 123 deletions source/rtl/ultibo/Makefile
View file

Large diffs are not rendered by default.

131 changes: 72 additions & 59 deletions source/rtl/ultibo/Makefile.fpc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,36 @@ units=$(SYSTEMUNIT) \
dos \
ctypes \
charset \
cp1251 \
cp866 \
cp8859_5 \
cp1253 \
cp8859_1 \
cp850 \
cp437 \
cp1252 \
cp646 \
cp874 \
cp856 \
cp1250 \
cp1254 \
cp1255 \
cp1256 \
cp1257 \
cp1258 \
cp852 \
cp8859_2 \
cpall \
sysconst \
character \
fpwidestring \
$(ULTIBO_EXTRAS) \
$(ULTIBO_CPU_EXTRAS)

implicitunits=exeinfo \
cp1250 \
cp1251 \
cp1252 \
cp1253 \
cp1254 \
cp1255 \
cp1256 \
cp1257 \
cp1258 \
cp437 \
cp646 \
cp850 \
cp856 \
cp866 \
cp874 \
cp8859_1 \
cp8859_5 \
cp8859_2 \
cp852 \
unicodenumtable \
unicodedata

[require]
nortl=y

Expand Down Expand Up @@ -421,7 +427,11 @@ fgl$(PPUEXT): $(OBJPASDIR)/fgl.pp objpas$(PPUEXT) types$(PPUEXT) system$(PPUEXT)

dateutil$(PPUEXT) : $(OBJPASDIR)/dateutil.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/dateutil.pp


# let it depend on buildcollations to prevent simultaneous building of unicodedata
character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas objpas$(PPUEXT) rtlconsts$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas

#
# Mac Pascal Model
#
Expand All @@ -448,62 +458,62 @@ lineinfo$(PPUEXT) : $(INC)/lineinfo.pp strings$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
charset$(PPUEXT) : $(INC)/charset.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<

cp1251$(PPUEXT): $(RTL)/charmaps/cp1251.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1251.pas
#cp1251$(PPUEXT): $(RTL)/charmaps/cp1251.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1251.pas

cp866$(PPUEXT): $(RTL)/charmaps/cp866.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp866.pas
#cp866$(PPUEXT): $(RTL)/charmaps/cp866.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp866.pas

cp8859_5$(PPUEXT): $(RTL)/charmaps/cp8859_5.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp8859_5.pas
#cp8859_5$(PPUEXT): $(RTL)/charmaps/cp8859_5.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp8859_5.pas

cp1253$(PPUEXT): $(RTL)/charmaps/cp1253.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1253.pas
#cp1253$(PPUEXT): $(RTL)/charmaps/cp1253.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1253.pas

cp8859_1$(PPUEXT): $(RTL)/charmaps/cp8859_1.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp8859_1.pas
#cp8859_1$(PPUEXT): $(RTL)/charmaps/cp8859_1.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp8859_1.pas

cp850$(PPUEXT): $(RTL)/charmaps/cp850.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp850.pas
#cp850$(PPUEXT): $(RTL)/charmaps/cp850.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp850.pas

cp437$(PPUEXT): $(RTL)/charmaps/cp437.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp437.pas
#cp437$(PPUEXT): $(RTL)/charmaps/cp437.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp437.pas

cp1252$(PPUEXT): $(RTL)/charmaps/cp1252.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1252.pas
#cp1252$(PPUEXT): $(RTL)/charmaps/cp1252.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1252.pas

cp646$(PPUEXT): $(RTL)/charmaps/cp646.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp646.pas
#cp646$(PPUEXT): $(RTL)/charmaps/cp646.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp646.pas

cp874$(PPUEXT): $(RTL)/charmaps/cp874.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp874.pas
#cp874$(PPUEXT): $(RTL)/charmaps/cp874.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp874.pas

cp856$(PPUEXT): $(RTL)/charmaps/cp856.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp856.pas
#cp856$(PPUEXT): $(RTL)/charmaps/cp856.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp856.pas

cp1250$(PPUEXT): $(RTL)/charmaps/cp1250.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1250.pas
#cp1250$(PPUEXT): $(RTL)/charmaps/cp1250.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1250.pas

cp1254$(PPUEXT): $(RTL)/charmaps/cp1254.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1254.pas
#cp1254$(PPUEXT): $(RTL)/charmaps/cp1254.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1254.pas

cp1255$(PPUEXT): $(RTL)/charmaps/cp1255.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1255.pas
#cp1255$(PPUEXT): $(RTL)/charmaps/cp1255.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1255.pas

cp1256$(PPUEXT): $(RTL)/charmaps/cp1256.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1256.pas
#cp1256$(PPUEXT): $(RTL)/charmaps/cp1256.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1256.pas

cp1257$(PPUEXT): $(RTL)/charmaps/cp1257.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1257.pas
#cp1257$(PPUEXT): $(RTL)/charmaps/cp1257.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1257.pas

cp1258$(PPUEXT): $(RTL)/charmaps/cp1258.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1258.pas
#cp1258$(PPUEXT): $(RTL)/charmaps/cp1258.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp1258.pas

cp852$(PPUEXT): $(RTL)/charmaps/cp852.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp852.pas
#cp852$(PPUEXT): $(RTL)/charmaps/cp852.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp852.pas

cp8859_2$(PPUEXT): $(RTL)/charmaps/cp8859_2.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp8859_2.pas
#cp8859_2$(PPUEXT): $(RTL)/charmaps/cp8859_2.pas system$(PPUEXT) charset$(PPUEXT)
# $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cp8859_2.pas

cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
Expand All @@ -513,7 +523,10 @@ iso7185$(PPUEXT) : $(INC)/iso7185.pp $(SYSTEMUNIT)$(PPUEXT)

extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/extpas.pp


fpwidestring$(PPUEXT): $(OBJPASDIR)/fpwidestring.pp character$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/fpwidestring.pp

#
# Unit specific rules
#
Expand Down
39 changes: 21 additions & 18 deletions source/rtl/ultibo/core/arp.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1088,10 +1088,10 @@ function TARPTransport.AddAdapter(AAdapter:TNetworkAdapter;AConfigType:Word;AAdd

{Check Adapter}
if AAdapter = nil then Exit;
{Check Status}
if AAdapter.Status <> ADAPTER_STATUS_READY then Exit;

{Check State}
if AAdapter.State <> ADAPTER_STATE_ENABLED then Exit;

{Get Adapter}
Adapter:=TARPTransportAdapter(GetAdapterByAdapter(AAdapter,True,NETWORK_LOCK_WRITE)); {Writer due to use count}
if Adapter = nil then
Expand Down Expand Up @@ -1324,13 +1324,14 @@ function TARPTransport.BindTransport(AAdapter:TNetworkAdapter):Boolean;

{$IFDEF ARP_DEBUG}
if NETWORK_LOG_ENABLED then NetworkLogDebug(nil,'ARP: Adapter = ' + AAdapter.Name);
if NETWORK_LOG_ENABLED then NetworkLogDebug(nil,'ARP: State = ' + AdapterStateToString(AAdapter.State));
if NETWORK_LOG_ENABLED then NetworkLogDebug(nil,'ARP: Status = ' + AdapterStatusToString(AAdapter.Status));
if NETWORK_LOG_ENABLED then NetworkLogDebug(nil,'ARP: Type = ' + AdapterTypeToString(AAdapter.AdapterType));
if NETWORK_LOG_ENABLED then NetworkLogDebug(nil,'ARP: Media = ' + MediaTypeToString(AAdapter.MediaType));
{$ENDIF}
{Check Status}
if AAdapter.Status <> ADAPTER_STATUS_READY then Exit;

{Check State}
if AAdapter.State <> ADAPTER_STATE_ENABLED then Exit;

Result:=True;
finally
Expand Down Expand Up @@ -2512,9 +2513,9 @@ function TRARPTransport.AddAdapter(AAdapter:TNetworkAdapter;AConfigType:Word;AAd

{Check Adapter}
if AAdapter = nil then Exit;
{Check Status}
if AAdapter.Status <> ADAPTER_STATUS_READY then Exit;

{Check State}
if AAdapter.State <> ADAPTER_STATE_ENABLED then Exit;

{Get Adapter}
Adapter:=TRARPTransportAdapter(GetAdapterByAdapter(AAdapter,True,NETWORK_LOCK_WRITE)); {Writer due to use count}
Expand Down Expand Up @@ -2742,14 +2743,15 @@ function TRARPTransport.BindTransport(AAdapter:TNetworkAdapter):Boolean;

{$IFDEF ARP_DEBUG}
if NETWORK_LOG_ENABLED then NetworkLogDebug(nil,'RARP: Adapter = ' + AAdapter.Name);
if NETWORK_LOG_ENABLED then NetworkLogDebug(nil,'RARP: State = ' + AdapterStateToString(AAdapter.State));
if NETWORK_LOG_ENABLED then NetworkLogDebug(nil,'RARP: Status = ' + AdapterStatusToString(AAdapter.Status));
if NETWORK_LOG_ENABLED then NetworkLogDebug(nil,'RARP: Type = ' + AdapterTypeToString(AAdapter.AdapterType));
if NETWORK_LOG_ENABLED then NetworkLogDebug(nil,'RARP: Media = ' + MediaTypeToString(AAdapter.MediaType));
{$ENDIF}

{Check Status}
if AAdapter.Status <> ADAPTER_STATUS_READY then Exit;

{Check State}
if AAdapter.State <> ADAPTER_STATE_ENABLED then Exit;

Result:=True;
finally
ReaderUnlock;
Expand Down Expand Up @@ -3040,20 +3042,21 @@ procedure ARPInit;
if ARPInitialized then Exit;

{Setup ARP Transport}
if IP_TRANSPORT_ENABLED then ARP_TRANSPORT_ENABLED:=True;
if ARP_CONFIG_ENABLED then ARP_TRANSPORT_ENABLED:=True;
if NetworkSettings.GetBoolean('IP_TRANSPORT_ENABLED') then NetworkSettings.AddBoolean('ARP_TRANSPORT_ENABLED',True);
if NetworkSettings.GetBoolean('ARP_CONFIG_ENABLED') then NetworkSettings.AddBoolean('ARP_TRANSPORT_ENABLED',True);

{Setup RARP Transport}
if RARP_CONFIG_ENABLED then RARP_TRANSPORT_ENABLED:=True;
if NetworkSettings.GetBoolean('IP_TRANSPORT_ENABLED') then NetworkSettings.AddBoolean('RARP_TRANSPORT_ENABLED',True);
if NetworkSettings.GetBoolean('RARP_CONFIG_ENABLED') then NetworkSettings.AddBoolean('RARP_TRANSPORT_ENABLED',True);

{Create ARP Transport}
if ARP_TRANSPORT_ENABLED then
if NetworkSettings.GetBooleanDefault('ARP_TRANSPORT_ENABLED',ARP_TRANSPORT_ENABLED) then
begin
TARPTransport.Create(TransportManager,ARP_TRANSPORT_NAME);
end;

{Create RARP Transport}
if RARP_TRANSPORT_ENABLED then
if NetworkSettings.GetBooleanDefault('RARP_TRANSPORT_ENABLED',RARP_TRANSPORT_ENABLED) then
begin
TRARPTransport.Create(TransportManager,RARP_TRANSPORT_NAME);
end;
Expand Down
Loading

0 comments on commit 3a25369

Please sign in to comment.