Commit 0eed21bd by Ed Falis Committed by Arnaud Charlet

a-einuoc.ads, [...]: Code clean up.

2009-06-19  Ed Falis  <falis@adacore.com>

	* a-einuoc.ads, s-osinte-vxworks.ads, s-vxwext.ads, s-vxwext-kernel.adb,
	s-vxwext-kernel.ads, s-vxwext-rtp.ads: Code clean up.

From-SVN: r148698
parent 93c3fca7
2009-06-19 Ed Falis <falis@adacore.com>
* a-einuoc.ads, s-osinte-vxworks.ads, s-vxwext.ads, s-vxwext-kernel.adb,
s-vxwext-kernel.ads, s-vxwext-rtp.ads: Code clean up.
2009-06-19 Eric Botcazou <ebotcazou@adacore.com> 2009-06-19 Eric Botcazou <ebotcazou@adacore.com>
* einfo.ads (Handling of Type'Size Values): Fix Object_Size values. * einfo.ads (Handling of Type'Size Values): Fix Object_Size values.
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 2000-2009 Free Software Foundation, Inc. -- -- Copyright (C) 2000-2009, Free Software Foundation, Inc. --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -36,5 +36,6 @@ ...@@ -36,5 +36,6 @@
function Ada.Exceptions.Is_Null_Occurrence function Ada.Exceptions.Is_Null_Occurrence
(X : Exception_Occurrence) (X : Exception_Occurrence)
return Boolean; return Boolean;
pragma Preelaborate (Ada.Exceptions.Is_Null_Occurrence);
-- This function yields True if X is Null_Occurrence, and False otherwise -- This function yields True if X is Null_Occurrence, and False otherwise
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 1991-1994, Florida State University -- -- Copyright (C) 1991-1994, Florida State University --
-- Copyright (C) 1995-2008, Free Software Foundation, Inc. -- -- Copyright (C) 1995-2009, Free Software Foundation, Inc. --
-- -- -- --
-- GNARL is free software; you can redistribute it and/or modify it under -- -- GNARL is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -406,7 +406,7 @@ package System.OS_Interface is ...@@ -406,7 +406,7 @@ package System.OS_Interface is
-- semTake() timeout with ticks > NO_WAIT -- semTake() timeout with ticks > NO_WAIT
S_objLib_OBJ_TIMEOUT : constant := M_objLib + 4; S_objLib_OBJ_TIMEOUT : constant := M_objLib + 4;
type SEM_ID is new System.Address; subtype SEM_ID is System.VxWorks.Ext.SEM_ID;
-- typedef struct semaphore *SEM_ID; -- typedef struct semaphore *SEM_ID;
-- We use two different kinds of VxWorks semaphores: mutex and binary -- We use two different kinds of VxWorks semaphores: mutex and binary
...@@ -420,8 +420,8 @@ package System.OS_Interface is ...@@ -420,8 +420,8 @@ package System.OS_Interface is
function semMCreate (options : int) return SEM_ID; function semMCreate (options : int) return SEM_ID;
pragma Import (C, semMCreate, "semMCreate"); pragma Import (C, semMCreate, "semMCreate");
function semDelete (Sem : SEM_ID) return int; function semDelete (Sem : SEM_ID) return int
pragma Import (C, semDelete, "semDelete"); renames System.VxWorks.Ext.semDelete;
-- Delete a semaphore -- Delete a semaphore
function semGive (Sem : SEM_ID) return int; function semGive (Sem : SEM_ID) return int;
......
...@@ -52,4 +52,11 @@ package body System.VxWorks.Ext is ...@@ -52,4 +52,11 @@ package body System.VxWorks.Ext is
function Int_Unlock return int renames intUnlock; function Int_Unlock return int renames intUnlock;
---------------
-- semDelete --
---------------
function semDelete (Sem : SEM_ID) return int;
pragma Import (C, semDelete, "semDelete");
end System.VxWorks.Ext; end System.VxWorks.Ext;
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 2009, Free Software Foundation, Inc. -- -- Copyright (C) 2008-2009, Free Software Foundation, Inc. --
-- -- -- --
-- GNARL is free software; you can redistribute it and/or modify it under -- -- GNARL is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -36,6 +36,9 @@ with Interfaces.C; ...@@ -36,6 +36,9 @@ with Interfaces.C;
package System.VxWorks.Ext is package System.VxWorks.Ext is
pragma Preelaborate; pragma Preelaborate;
subtype SEM_ID is Long_Integer;
-- typedef struct semaphore *SEM_ID;
type t_id is new Long_Integer; type t_id is new Long_Integer;
subtype int is Interfaces.C.int; subtype int is Interfaces.C.int;
...@@ -60,6 +63,9 @@ package System.VxWorks.Ext is ...@@ -60,6 +63,9 @@ package System.VxWorks.Ext is
(intNum : int) return Interrupt_Vector; (intNum : int) return Interrupt_Vector;
pragma Import (C, Interrupt_Number_To_Vector, "__gnat_inum_to_ivec"); pragma Import (C, Interrupt_Number_To_Vector, "__gnat_inum_to_ivec");
function semDelete (Sem : SEM_ID) return int;
pragma Convention (C, semDelete);
function Task_Cont (tid : t_id) return int; function Task_Cont (tid : t_id) return int;
pragma Import (C, Task_Cont, "taskCont"); pragma Import (C, Task_Cont, "taskCont");
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 2009, Free Software Foundation, Inc. -- -- Copyright (C) 2008-2009, Free Software Foundation, Inc. --
-- -- -- --
-- GNARL is free software; you can redistribute it and/or modify it under -- -- GNARL is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -36,6 +36,9 @@ with Interfaces.C; ...@@ -36,6 +36,9 @@ with Interfaces.C;
package System.VxWorks.Ext is package System.VxWorks.Ext is
pragma Preelaborate; pragma Preelaborate;
subtype SEM_ID is Long_Integer;
-- typedef struct semaphore *SEM_ID;
type t_id is new Long_Integer; type t_id is new Long_Integer;
subtype int is Interfaces.C.int; subtype int is Interfaces.C.int;
...@@ -60,6 +63,9 @@ package System.VxWorks.Ext is ...@@ -60,6 +63,9 @@ package System.VxWorks.Ext is
(intNum : int) return Interrupt_Vector; (intNum : int) return Interrupt_Vector;
pragma Convention (C, Interrupt_Number_To_Vector); pragma Convention (C, Interrupt_Number_To_Vector);
function semDelete (Sem : SEM_ID) return int;
pragma Import (C, semDelete, "semDelete");
function Task_Cont (tid : t_id) return int; function Task_Cont (tid : t_id) return int;
pragma Import (C, Task_Cont, "taskResume"); pragma Import (C, Task_Cont, "taskResume");
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 2009, Free Software Foundation, Inc. -- -- Copyright (C) 2008-2009, Free Software Foundation, Inc. --
-- -- -- --
-- GNARL is free software; you can redistribute it and/or modify it under -- -- GNARL is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -36,6 +36,9 @@ with Interfaces.C; ...@@ -36,6 +36,9 @@ with Interfaces.C;
package System.VxWorks.Ext is package System.VxWorks.Ext is
pragma Preelaborate; pragma Preelaborate;
type SEM_ID is new Long_Integer;
-- typedef struct semaphore *SEM_ID;
type t_id is new Long_Integer; type t_id is new Long_Integer;
subtype int is Interfaces.C.int; subtype int is Interfaces.C.int;
...@@ -60,6 +63,9 @@ package System.VxWorks.Ext is ...@@ -60,6 +63,9 @@ package System.VxWorks.Ext is
(intNum : int) return Interrupt_Vector; (intNum : int) return Interrupt_Vector;
pragma Import (C, Interrupt_Number_To_Vector, "__gnat_inum_to_ivec"); pragma Import (C, Interrupt_Number_To_Vector, "__gnat_inum_to_ivec");
function semDelete (Sem : SEM_ID) return int;
pragma Import (C, semDelete, "semDelete");
function Task_Cont (tid : t_id) return int; function Task_Cont (tid : t_id) return int;
pragma Import (C, Task_Cont, "taskResume"); pragma Import (C, Task_Cont, "taskResume");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment