Commit 52ea13f2 by Arnaud Charlet

[multiple changes]

2015-05-12  Thomas Quinot  <quinot@adacore.com>

	* g-sercom.ads, g-sercom-linux.adb (GNAT.Serial_Communications.
	Data_Rate): New literals B75, B110, B150, B300, B600.

2015-05-12  Doug Rupp  <rupp@adacore.com>

	* init.c (__gnat_init_float) [vxworks]: For e500v2,
	do nothing and leave the responsibility to install the handler
	and enable the exceptions to the BSP.

From-SVN: r223062
parent 6876e5bc
2015-05-12 Thomas Quinot <quinot@adacore.com>
* g-sercom.ads, g-sercom-linux.adb (GNAT.Serial_Communications.
Data_Rate): New literals B75, B110, B150, B300, B600.
2015-05-12 Doug Rupp <rupp@adacore.com>
* init.c (__gnat_init_float) [vxworks]: For e500v2,
do nothing and leave the responsibility to install the handler
and enable the exceptions to the BSP.
2015-05-12 Robert Dewar <dewar@adacore.com> 2015-05-12 Robert Dewar <dewar@adacore.com>
* sem_ch9.adb, einfo.ads, exp_intr.adb: Minor reformatting. * sem_ch9.adb, einfo.ads, exp_intr.adb: Minor reformatting.
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2007-2013, AdaCore -- -- Copyright (C) 2007-2015, AdaCore --
-- -- -- --
-- 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- --
...@@ -58,7 +58,12 @@ package body GNAT.Serial_Communications is ...@@ -58,7 +58,12 @@ package body GNAT.Serial_Communications is
pragma Import (C, fcntl, "fcntl"); pragma Import (C, fcntl, "fcntl");
C_Data_Rate : constant array (Data_Rate) of unsigned := C_Data_Rate : constant array (Data_Rate) of unsigned :=
(B1200 => OSC.B1200, (B75 => OSC.B75,
B110 => OSC.B110,
B150 => OSC.B150,
B300 => OSC.B300,
B600 => OSC.B600,
B1200 => OSC.B1200,
B2400 => OSC.B2400, B2400 => OSC.B2400,
B4800 => OSC.B4800, B4800 => OSC.B4800,
B9600 => OSC.B9600, B9600 => OSC.B9600,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
-- Copyright (C) 2007-2014, AdaCore -- -- Copyright (C) 2007-2015, AdaCore --
-- -- -- --
-- 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- --
...@@ -50,7 +50,8 @@ package GNAT.Serial_Communications is ...@@ -50,7 +50,8 @@ package GNAT.Serial_Communications is
-- cases, an explicit port name can be passed directly to Open. -- cases, an explicit port name can be passed directly to Open.
type Data_Rate is type Data_Rate is
(B1200, B2400, B4800, B9600, B19200, B38400, B57600, B115200); (B75, B110, B150, B300, B600, B1200, B2400, B4800, B9600,
B19200, B38400, B57600, B115200);
-- Speed of the communication -- Speed of the communication
type Data_Bits is (CS8, CS7); type Data_Bits is (CS8, CS7);
...@@ -122,7 +123,12 @@ private ...@@ -122,7 +123,12 @@ private
end record; end record;
Data_Rate_Value : constant array (Data_Rate) of Interfaces.C.unsigned := Data_Rate_Value : constant array (Data_Rate) of Interfaces.C.unsigned :=
(B1200 => 1_200, (B75 => 75,
B110 => 110,
B150 => 150,
B300 => 300,
B600 => 600,
B1200 => 1_200,
B2400 => 2_400, B2400 => 2_400,
B4800 => 4_800, B4800 => 4_800,
B9600 => 9_600, B9600 => 9_600,
......
...@@ -2017,11 +2017,8 @@ __gnat_init_float (void) ...@@ -2017,11 +2017,8 @@ __gnat_init_float (void)
#if defined (_ARCH_PPC) && !defined (_SOFT_FLOAT) && (!defined (VTHREADS) || defined (__VXWORKSMILS__)) #if defined (_ARCH_PPC) && !defined (_SOFT_FLOAT) && (!defined (VTHREADS) || defined (__VXWORKSMILS__))
#if defined (__SPE__) #if defined (__SPE__)
{ {
const unsigned long spefscr_mask = 0xfffffff3; /* For e500v2, do nothing and leave the responsibility to install the
unsigned long spefscr; handler and enable the exceptions to the BSP. */
asm ("mfspr %0, 512" : "=r" (spefscr));
spefscr = spefscr & spefscr_mask;
asm ("mtspr 512, %0\n\tisync" : : "r" (spefscr));
} }
#else #else
asm ("mtfsb0 25"); asm ("mtfsb0 25");
......
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