diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-01-23 09:53:06 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-01-29 06:58:28 +0100 |
commit | bc96f3b4b889891cb685c4bbcaf12166ca08331c (patch) | |
tree | f83b796d2dcc1bfbad1501d8e40a3c4277695e86 /cpukit/include/adainclude | |
parent | ada: Fix RTEMS.Time_t (diff) | |
download | rtems-bc96f3b4b889891cb685c4bbcaf12166ca08331c.tar.bz2 |
ada: Introduce RTEMS.Size type
Some time ago the Classic API object size related parameters were
changed to use size_t. Reflect this in the Ada bindings.
Update #3082.
Diffstat (limited to 'cpukit/include/adainclude')
-rw-r--r-- | cpukit/include/adainclude/rtems-message_queue.adb | 22 | ||||
-rw-r--r-- | cpukit/include/adainclude/rtems-message_queue.ads | 10 | ||||
-rw-r--r-- | cpukit/include/adainclude/rtems-partition.adb | 8 | ||||
-rw-r--r-- | cpukit/include/adainclude/rtems-partition.ads | 4 | ||||
-rw-r--r-- | cpukit/include/adainclude/rtems-region.adb | 32 | ||||
-rw-r--r-- | cpukit/include/adainclude/rtems-region.ads | 14 | ||||
-rw-r--r-- | cpukit/include/adainclude/rtems-tasks.adb | 4 | ||||
-rw-r--r-- | cpukit/include/adainclude/rtems-tasks.ads | 2 | ||||
-rw-r--r-- | cpukit/include/adainclude/rtems-timer.adb | 4 | ||||
-rw-r--r-- | cpukit/include/adainclude/rtems-timer.ads | 2 | ||||
-rw-r--r-- | cpukit/include/adainclude/rtems.adb | 7 | ||||
-rw-r--r-- | cpukit/include/adainclude/rtems.ads | 4 |
12 files changed, 60 insertions, 53 deletions
diff --git a/cpukit/include/adainclude/rtems-message_queue.adb b/cpukit/include/adainclude/rtems-message_queue.adb index 67abf48baf..7437670554 100644 --- a/cpukit/include/adainclude/rtems-message_queue.adb +++ b/cpukit/include/adainclude/rtems-message_queue.adb @@ -27,7 +27,7 @@ package body RTEMS.Message_Queue is procedure Create (Name : in RTEMS.Name; Count : in RTEMS.Unsigned32; - Max_Message_Size : in RTEMS.Unsigned32; + Max_Message_Size : in RTEMS.Size; Attribute_Set : in RTEMS.Attribute; ID : out RTEMS.ID; Result : out RTEMS.Status_Codes) @@ -36,7 +36,7 @@ package body RTEMS.Message_Queue is function Create_Base (Name : RTEMS.Name; Count : RTEMS.Unsigned32; - Max_Message_Size : RTEMS.Unsigned32; + Max_Message_Size : RTEMS.Size; Attribute_Set : RTEMS.Attribute; ID : access RTEMS.ID) return RTEMS.Status_Codes; @@ -101,13 +101,13 @@ package body RTEMS.Message_Queue is procedure Send (ID : in RTEMS.ID; Buffer : in RTEMS.Address; - Size : in RTEMS.Unsigned32; + Size : in RTEMS.Size; Result : out RTEMS.Status_Codes) is function Send_Base (ID : RTEMS.ID; Buffer : RTEMS.Address; - Size : RTEMS.Unsigned32) + Size : RTEMS.Size) return RTEMS.Status_Codes; pragma Import (C, Send_Base, "rtems_message_queue_send"); begin @@ -119,13 +119,13 @@ package body RTEMS.Message_Queue is procedure Urgent (ID : in RTEMS.ID; Buffer : in RTEMS.Address; - Size : in RTEMS.Unsigned32; + Size : in RTEMS.Size; Result : out RTEMS.Status_Codes) is function Urgent_Base (ID : RTEMS.ID; Buffer : RTEMS.Address; - Size : RTEMS.Unsigned32) + Size : RTEMS.Size) return RTEMS.Status_Codes; pragma Import (C, @@ -140,14 +140,14 @@ package body RTEMS.Message_Queue is procedure Broadcast (ID : in RTEMS.ID; Buffer : in RTEMS.Address; - Size : in RTEMS.Unsigned32; + Size : in RTEMS.Size; Count : out RTEMS.Unsigned32; Result : out RTEMS.Status_Codes) is function Broadcast_Base (ID : RTEMS.ID; Buffer : RTEMS.Address; - Size : RTEMS.Unsigned32; + Size : RTEMS.Size; Count : access RTEMS.Unsigned32) return RTEMS.Status_Codes; pragma Import @@ -168,13 +168,13 @@ package body RTEMS.Message_Queue is Buffer : in RTEMS.Address; Option_Set : in RTEMS.Option; Timeout : in RTEMS.Interval; - Size : in out RTEMS.Unsigned32; + Size : in out RTEMS.Size; Result : out RTEMS.Status_Codes) is function Receive_Base (ID : RTEMS.ID; Buffer : RTEMS.Address; - Size : access RTEMS.Unsigned32; + Size : access RTEMS.Size; Option_Set : RTEMS.Option; Timeout : RTEMS.Interval) return RTEMS.Status_Codes; @@ -182,7 +182,7 @@ package body RTEMS.Message_Queue is (C, Receive_Base, "rtems_message_queue_receive"); - Size_Base : aliased RTEMS.Unsigned32; + Size_Base : aliased RTEMS.Size; begin Size_Base := Size; diff --git a/cpukit/include/adainclude/rtems-message_queue.ads b/cpukit/include/adainclude/rtems-message_queue.ads index d5efe54ffe..929b659d75 100644 --- a/cpukit/include/adainclude/rtems-message_queue.ads +++ b/cpukit/include/adainclude/rtems-message_queue.ads @@ -28,7 +28,7 @@ package RTEMS.Message_Queue is procedure Create ( Name : in RTEMS.Name; Count : in RTEMS.Unsigned32; - Max_Message_Size : in RTEMS.Unsigned32; + Max_Message_Size : in RTEMS.Size; Attribute_Set : in RTEMS.Attribute; ID : out RTEMS.ID; Result : out RTEMS.Status_Codes @@ -49,21 +49,21 @@ package RTEMS.Message_Queue is procedure Send ( ID : in RTEMS.ID; Buffer : in RTEMS.Address; - Size : in RTEMS.Unsigned32; + Size : in RTEMS.Size; Result : out RTEMS.Status_Codes ); procedure Urgent ( ID : in RTEMS.ID; Buffer : in RTEMS.Address; - Size : in RTEMS.Unsigned32; + Size : in RTEMS.Size; Result : out RTEMS.Status_Codes ); procedure Broadcast ( ID : in RTEMS.ID; Buffer : in RTEMS.Address; - Size : in RTEMS.Unsigned32; + Size : in RTEMS.Size; Count : out RTEMS.Unsigned32; Result : out RTEMS.Status_Codes ); @@ -73,7 +73,7 @@ package RTEMS.Message_Queue is Buffer : in RTEMS.Address; Option_Set : in RTEMS.Option; Timeout : in RTEMS.Interval; - Size : in out RTEMS.Unsigned32; + Size : in out RTEMS.Size; Result : out RTEMS.Status_Codes ); diff --git a/cpukit/include/adainclude/rtems-partition.adb b/cpukit/include/adainclude/rtems-partition.adb index 84455d79cd..3530092334 100644 --- a/cpukit/include/adainclude/rtems-partition.adb +++ b/cpukit/include/adainclude/rtems-partition.adb @@ -27,8 +27,8 @@ package body RTEMS.Partition is procedure Create (Name : in RTEMS.Name; Starting_Address : in RTEMS.Address; - Length : in RTEMS.Unsigned32; - Buffer_Size : in RTEMS.Unsigned32; + Length : in RTEMS.Size; + Buffer_Size : in RTEMS.Size; Attribute_Set : in RTEMS.Attribute; ID : out RTEMS.ID; Result : out RTEMS.Status_Codes) @@ -36,8 +36,8 @@ package body RTEMS.Partition is function Create_Base (Name : RTEMS.Name; Starting_Address : RTEMS.Address; - Length : RTEMS.Unsigned32; - Buffer_Size : RTEMS.Unsigned32; + Length : RTEMS.Size; + Buffer_Size : RTEMS.Size; Attribute_Set : RTEMS.Attribute; ID : access RTEMS.Event_Set) return RTEMS.Status_Codes; diff --git a/cpukit/include/adainclude/rtems-partition.ads b/cpukit/include/adainclude/rtems-partition.ads index 6e3ea44a9d..3972fe957c 100644 --- a/cpukit/include/adainclude/rtems-partition.ads +++ b/cpukit/include/adainclude/rtems-partition.ads @@ -28,8 +28,8 @@ package RTEMS.Partition is procedure Create ( Name : in RTEMS.Name; Starting_Address : in RTEMS.Address; - Length : in RTEMS.Unsigned32; - Buffer_Size : in RTEMS.Unsigned32; + Length : in RTEMS.Size; + Buffer_Size : in RTEMS.Size; Attribute_Set : in RTEMS.Attribute; ID : out RTEMS.ID; Result : out RTEMS.Status_Codes diff --git a/cpukit/include/adainclude/rtems-region.adb b/cpukit/include/adainclude/rtems-region.adb index d03ca6a2b1..e1425b8496 100644 --- a/cpukit/include/adainclude/rtems-region.adb +++ b/cpukit/include/adainclude/rtems-region.adb @@ -27,8 +27,8 @@ package body RTEMS.Region is procedure Create (Name : in RTEMS.Name; Starting_Address : in RTEMS.Address; - Length : in RTEMS.Unsigned32; - Page_Size : in RTEMS.Unsigned32; + Length : in RTEMS.Size; + Page_Size : in RTEMS.Size; Attribute_Set : in RTEMS.Attribute; ID : out RTEMS.ID; Result : out RTEMS.Status_Codes) @@ -36,8 +36,8 @@ package body RTEMS.Region is function Create_Base (Name : RTEMS.Name; Starting_Address : RTEMS.Address; - Length : RTEMS.Unsigned32; - Page_Size : RTEMS.Unsigned32; + Length : RTEMS.Size; + Page_Size : RTEMS.Size; Attribute_Set : RTEMS.Attribute; ID : access RTEMS.ID) return RTEMS.Status_Codes; @@ -90,13 +90,13 @@ package body RTEMS.Region is procedure Extend (ID : in RTEMS.ID; Starting_Address : in RTEMS.Address; - Length : in RTEMS.Unsigned32; + Length : in RTEMS.Size; Result : out RTEMS.Status_Codes) is function Extend_Base (ID : RTEMS.ID; Starting_Address : RTEMS.Address; - Length : RTEMS.Unsigned32) + Length : RTEMS.Size) return RTEMS.Status_Codes; pragma Import (C, Extend_Base, "rtems_region_extend"); begin @@ -107,7 +107,7 @@ package body RTEMS.Region is procedure Get_Segment (ID : in RTEMS.ID; - Size : in RTEMS.Unsigned32; + Size : in RTEMS.Size; Option_Set : in RTEMS.Option; Timeout : in RTEMS.Interval; Segment : out RTEMS.Address; @@ -115,7 +115,7 @@ package body RTEMS.Region is is function Get_Segment_Base (ID : RTEMS.ID; - Size : RTEMS.Unsigned32; + Size : RTEMS.Size; Option_Set : RTEMS.Option; Timeout : RTEMS.Interval; Segment : access RTEMS.Address) @@ -138,19 +138,19 @@ package body RTEMS.Region is procedure Get_Segment_Size (ID : in RTEMS.ID; Segment : in RTEMS.Address; - Size : out RTEMS.Unsigned32; + Size : out RTEMS.Size; Result : out RTEMS.Status_Codes) is function Get_Segment_Size_Base (ID : RTEMS.ID; Segment : RTEMS.Address; - Size : access RTEMS.Unsigned32) + Size : access RTEMS.Size) return RTEMS.Status_Codes; pragma Import (C, Get_Segment_Size_Base, "rtems_region_get_segment_size"); - Size_Base : aliased RTEMS.Unsigned32; + Size_Base : aliased RTEMS.Size; begin Result := Get_Segment_Size_Base (ID, Segment, Size_Base'Access); @@ -180,21 +180,21 @@ package body RTEMS.Region is procedure Resize_Segment (ID : in RTEMS.ID; Segment : in RTEMS.Address; - Size : in RTEMS.Unsigned32; - Old_Size : out RTEMS.Unsigned32; + Size : in RTEMS.Size; + Old_Size : out RTEMS.Size; Result : out RTEMS.Status_Codes) is function Resize_Segment_Base (ID : RTEMS.ID; Segment : RTEMS.Address; - Size : RTEMS.Unsigned32; - Old_Size : access RTEMS.Unsigned32) + Size : RTEMS.Size; + Old_Size : access RTEMS.Size) return RTEMS.Status_Codes; pragma Import (C, Resize_Segment_Base, "rtems_region_resize_segment"); - Old_Size_Base : aliased RTEMS.Unsigned32; + Old_Size_Base : aliased RTEMS.Size; begin Result := diff --git a/cpukit/include/adainclude/rtems-region.ads b/cpukit/include/adainclude/rtems-region.ads index d75a939b8b..753588d7a8 100644 --- a/cpukit/include/adainclude/rtems-region.ads +++ b/cpukit/include/adainclude/rtems-region.ads @@ -28,8 +28,8 @@ package RTEMS.Region is procedure Create ( Name : in RTEMS.Name; Starting_Address : in RTEMS.Address; - Length : in RTEMS.Unsigned32; - Page_Size : in RTEMS.Unsigned32; + Length : in RTEMS.Size; + Page_Size : in RTEMS.Size; Attribute_Set : in RTEMS.Attribute; ID : out RTEMS.ID; Result : out RTEMS.Status_Codes @@ -49,13 +49,13 @@ package RTEMS.Region is procedure Extend ( ID : in RTEMS.ID; Starting_Address : in RTEMS.Address; - Length : in RTEMS.Unsigned32; + Length : in RTEMS.Size; Result : out RTEMS.Status_Codes ); procedure Get_Segment ( ID : in RTEMS.ID; - Size : in RTEMS.Unsigned32; + Size : in RTEMS.Size; Option_Set : in RTEMS.Option; Timeout : in RTEMS.Interval; Segment : out RTEMS.Address; @@ -65,7 +65,7 @@ package RTEMS.Region is procedure Get_Segment_Size ( ID : in RTEMS.ID; Segment : in RTEMS.Address; - Size : out RTEMS.Unsigned32; + Size : out RTEMS.Size; Result : out RTEMS.Status_Codes ); @@ -78,8 +78,8 @@ package RTEMS.Region is procedure Resize_Segment ( ID : in RTEMS.ID; Segment : in RTEMS.Address; - Size : in RTEMS.Unsigned32; - Old_Size : out RTEMS.Unsigned32; + Size : in RTEMS.Size; + Old_Size : out RTEMS.Size; Result : out RTEMS.Status_Codes ); diff --git a/cpukit/include/adainclude/rtems-tasks.adb b/cpukit/include/adainclude/rtems-tasks.adb index 1fc7fcdd1e..bc34af681b 100644 --- a/cpukit/include/adainclude/rtems-tasks.adb +++ b/cpukit/include/adainclude/rtems-tasks.adb @@ -27,7 +27,7 @@ package body RTEMS.Tasks is procedure Create (Name : in RTEMS.Name; Initial_Priority : in Priority; - Stack_Size : in RTEMS.Unsigned32; + Stack_Size : in RTEMS.Size; Initial_Modes : in RTEMS.Mode; Attribute_Set : in RTEMS.Attribute; ID : out RTEMS.ID; @@ -36,7 +36,7 @@ package body RTEMS.Tasks is function Create_Base (Name : RTEMS.Name; Initial_Priority : Priority; - Stack_Size : RTEMS.Unsigned32; + Stack_Size : RTEMS.Size; Initial_Modes : RTEMS.Mode; Attribute_Set : RTEMS.Attribute; ID : access RTEMS.ID) diff --git a/cpukit/include/adainclude/rtems-tasks.ads b/cpukit/include/adainclude/rtems-tasks.ads index cdd95ea309..ca249961b5 100644 --- a/cpukit/include/adainclude/rtems-tasks.ads +++ b/cpukit/include/adainclude/rtems-tasks.ads @@ -42,7 +42,7 @@ package RTEMS.Tasks is procedure Create ( Name : in RTEMS.Name; Initial_Priority : in Priority; - Stack_Size : in Unsigned32; + Stack_Size : in RTEMS.Size; Initial_Modes : in RTEMS.Mode; Attribute_Set : in RTEMS.Attribute; ID : out RTEMS.ID; diff --git a/cpukit/include/adainclude/rtems-timer.adb b/cpukit/include/adainclude/rtems-timer.adb index 706b07cb4f..c6f115d863 100644 --- a/cpukit/include/adainclude/rtems-timer.adb +++ b/cpukit/include/adainclude/rtems-timer.adb @@ -184,13 +184,13 @@ package body RTEMS.Timer is procedure Initiate_Server (Server_Priority : in RTEMS.Tasks.Priority; - Stack_Size : in RTEMS.Unsigned32; + Stack_Size : in RTEMS.Size; Attribute_Set : in RTEMS.Attribute; Result : out RTEMS.Status_Codes) is function Initiate_Server_Base (Server_Priority : RTEMS.Tasks.Priority; - Stack_Size : RTEMS.Unsigned32; + Stack_Size : RTEMS.Size; Attribute_Set : RTEMS.Attribute) return RTEMS.Status_Codes; pragma Import diff --git a/cpukit/include/adainclude/rtems-timer.ads b/cpukit/include/adainclude/rtems-timer.ads index a6d1f9b0f8..de00c3f305 100644 --- a/cpukit/include/adainclude/rtems-timer.ads +++ b/cpukit/include/adainclude/rtems-timer.ads @@ -98,7 +98,7 @@ package RTEMS.Timer is procedure Initiate_Server ( Server_Priority : in RTEMS.Tasks.Priority; - Stack_Size : in Unsigned32; + Stack_Size : in RTEMS.Size; Attribute_Set : in RTEMS.Attribute; Result : out RTEMS.Status_Codes ); diff --git a/cpukit/include/adainclude/rtems.adb b/cpukit/include/adainclude/rtems.adb index e717f42bab..d88f1827b4 100644 --- a/cpukit/include/adainclude/rtems.adb +++ b/cpukit/include/adainclude/rtems.adb @@ -229,4 +229,11 @@ package body RTEMS is Shutdown_Executive_Base (Status); end Shutdown_Executive; + function Minimum_Stack_Size return RTEMS.Size is + size : RTEMS.Unsigned32; + pragma Import (C, size, "rtems_minimum_stack_size"); + begin + return RTEMS.Size (size); + end Minimum_Stack_Size; + end RTEMS; diff --git a/cpukit/include/adainclude/rtems.ads b/cpukit/include/adainclude/rtems.ads index 470d67dc7d..5069c36011 100644 --- a/cpukit/include/adainclude/rtems.ads +++ b/cpukit/include/adainclude/rtems.ads @@ -46,6 +46,7 @@ pragma Elaborate_Body (RTEMS); subtype Address is System.Address; subtype Single is Interfaces.C.C_float; subtype Double is Interfaces.C.Double; + subtype Size is Interfaces.C.size_t; -- -- The following define the size of each of the base types in @@ -206,8 +207,7 @@ pragma Elaborate_Body (RTEMS); ) return RTEMS.Mode; pragma Import (C, Interrupt_Level, "rtems_interrupt_level_body"); - Minimum_Stack_Size : RTEMS.Unsigned32; - pragma Import (C, Minimum_Stack_Size, "rtems_minimum_stack_size"); + function Minimum_Stack_Size return RTEMS.Size; -- -- Notepad index constants |