Re: [Ada] Fix serial port baud rate setting on GNU/Linux
Hi Pierre-Marie, > On Wed, Dec 16, 2020 at 1:18 PM Pierre-Marie de Rodat > wrote: >> Thank you. I can reproduce the issue: at this point I suspect that my >> testing hasn’t detected this because of some inconsistency with my >> incremental builds. The actual correction is a few patches later in my >> porting queue: I’m about to commit it. Sorry for the trouble! > > The fix is now in master > (https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=cbe22e189a355f19eb1344fcaf91bc2bb0b95f36), > so the bootstrap for Ada should now be fixed. I’ll update the PR: > should I wait for confirmation before moving it to RESOLVED? The ICANON part matches almost exactly what I used to restore Linux/x86_64 bootstrap. I'd suggest you close the PR: in case there are unexpected problems, it can always be reopened. Thanks. Rainer -- - Rainer Orth, Center for Biotechnology, Bielefeld University
Re: [Ada] Fix serial port baud rate setting on GNU/Linux
On Wed, Dec 16, 2020 at 1:18 PM Pierre-Marie de Rodat wrote: > Thank you. I can reproduce the issue: at this point I suspect that my > testing hasn’t detected this because of some inconsistency with my > incremental builds. The actual correction is a few patches later in my > porting queue: I’m about to commit it. Sorry for the trouble! The fix is now in master (https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=cbe22e189a355f19eb1344fcaf91bc2bb0b95f36), so the bootstrap for Ada should now be fixed. I’ll update the PR: should I wait for confirmation before moving it to RESOLVED? -- Pierre-Marie de Rodat
Re: [Ada] Fix serial port baud rate setting on GNU/Linux
Hello all, On Wed, Dec 16, 2020 at 9:31 AM Martin Liška wrote: > I've just create PR for it: > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98312 Thank you. I can reproduce the issue: at this point I suspect that my testing hasn’t detected this because of some inconsistency with my incremental builds. The actual correction is a few patches later in my porting queue: I’m about to commit it. Sorry for the trouble! -- Pierre-Marie de Rodat
Re: [Ada] Fix serial port baud rate setting on GNU/Linux
Rainer Orth wrote: Rainer Orth wrote: Hi Pierre-Marie, This fixes an issue when setting the baud rate. The baud rate is set using the cfsetospeed and cfsetispeed system calls. The code is using speed_t for clarity. The non-blocking status is only reset when Block is True. And serial blocking mode is now properly set according to termios manual. Add documentation about a way to debug and test a serial port on GNU/Linux without the need for a physical serial port. Tested on x86_64-pc-linux-gnu, committed on trunk this patch broke Linux/x86_64 bootstrap (Fedora 29): also Darwin (which seems to be using g-sercom-linux.adb) ah. In hindsight, I'd wondered why my Solaris builds weren't affected. termios is common to all POSIX targets after all. Actually, the linux file seems to contain quite a bit more advanced than SUSv3, it might be worth having a Posix_susv3 version (there are quite a few targets qualified to SUSv3, but it seems not many [1?] qualified to UNIX7). Iain
Re: [Ada] Fix serial port baud rate setting on GNU/Linux
Hi Iain, > Rainer Orth wrote: > >> Hi Pierre-Marie, >> >>> This fixes an issue when setting the baud rate. The baud rate is set >>> using the cfsetospeed and cfsetispeed system calls. The code is using >>> speed_t for clarity. The non-blocking status is only reset when Block is >>> True. And serial blocking mode is now properly set according to termios >>> manual. >>> >>> Add documentation about a way to debug and test a serial port on >>> GNU/Linux without the need for a physical serial port. >>> >>> Tested on x86_64-pc-linux-gnu, committed on trunk >> >> this patch broke Linux/x86_64 bootstrap (Fedora 29): > > also Darwin (which seems to be using g-sercom-linux.adb) ah. In hindsight, I'd wondered why my Solaris builds weren't affected. termios is common to all POSIX targets after all. Rainer -- - Rainer Orth, Center for Biotechnology, Bielefeld University
Re: [Ada] Fix serial port baud rate setting on GNU/Linux
On 12/16/20 8:56 AM, Iain Sandoe via Gcc-patches wrote: Rainer Orth wrote: Hi Pierre-Marie, This fixes an issue when setting the baud rate. The baud rate is set using the cfsetospeed and cfsetispeed system calls. The code is using speed_t for clarity. The non-blocking status is only reset when Block is True. And serial blocking mode is now properly set according to termios manual. Add documentation about a way to debug and test a serial port on GNU/Linux without the need for a physical serial port. Tested on x86_64-pc-linux-gnu, committed on trunk this patch broke Linux/x86_64 bootstrap (Fedora 29): also Darwin (which seems to be using g-sercom-linux.adb) g-sercom.adb:307:53: "ICANON" is undefined make[7]: *** [../gcc-interface/Makefile:299: g-sercom.o] Error 1 I suspect s-oscons-tmplt.c needs a change to define ICANON. Rainer Iain I've just create PR for it: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98312 Martin
Re: [Ada] Fix serial port baud rate setting on GNU/Linux
Rainer Orth wrote: Hi Pierre-Marie, This fixes an issue when setting the baud rate. The baud rate is set using the cfsetospeed and cfsetispeed system calls. The code is using speed_t for clarity. The non-blocking status is only reset when Block is True. And serial blocking mode is now properly set according to termios manual. Add documentation about a way to debug and test a serial port on GNU/Linux without the need for a physical serial port. Tested on x86_64-pc-linux-gnu, committed on trunk this patch broke Linux/x86_64 bootstrap (Fedora 29): also Darwin (which seems to be using g-sercom-linux.adb) g-sercom.adb:307:53: "ICANON" is undefined make[7]: *** [../gcc-interface/Makefile:299: g-sercom.o] Error 1 I suspect s-oscons-tmplt.c needs a change to define ICANON. Rainer Iain
Re: [Ada] Fix serial port baud rate setting on GNU/Linux
Hi Pierre-Marie, > This fixes an issue when setting the baud rate. The baud rate is set > using the cfsetospeed and cfsetispeed system calls. The code is using > speed_t for clarity. The non-blocking status is only reset when Block is > True. And serial blocking mode is now properly set according to termios > manual. > > Add documentation about a way to debug and test a serial port on > GNU/Linux without the need for a physical serial port. > > Tested on x86_64-pc-linux-gnu, committed on trunk this patch broke Linux/x86_64 bootstrap (Fedora 29): g-sercom.adb:307:53: "ICANON" is undefined make[7]: *** [../gcc-interface/Makefile:299: g-sercom.o] Error 1 I suspect s-oscons-tmplt.c needs a change to define ICANON. Rainer -- - Rainer Orth, Center for Biotechnology, Bielefeld University
[Ada] Fix serial port baud rate setting on GNU/Linux
This fixes an issue when setting the baud rate. The baud rate is set using the cfsetospeed and cfsetispeed system calls. The code is using speed_t for clarity. The non-blocking status is only reset when Block is True. And serial blocking mode is now properly set according to termios manual. Add documentation about a way to debug and test a serial port on GNU/Linux without the need for a physical serial port. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * libgnat/g-sercom__linux.adb (Set): Use cfsetospeed and cfsetispeed to set the baud rate. Clear non-blocking serial port status when blocking is requested.diff --git a/gcc/ada/libgnat/g-sercom__linux.adb b/gcc/ada/libgnat/g-sercom__linux.adb --- a/gcc/ada/libgnat/g-sercom__linux.adb +++ b/gcc/ada/libgnat/g-sercom__linux.adb @@ -30,6 +30,33 @@ -- -- This is the GNU/Linux implementation of this package +-- +-- Testing on GNU/Linux can be done with socat & stty tools. +-- +-- First in a terminal create a virtual serial port: +-- +-- * First solution, the terminal is one of the side of the channel +--characters written with Write into the port will be displayed +--there and characters typed into the terminal will be send to the +--channel and will be received by a Read call. +-- +-- $ socat PTY,link=/tmp/virtual-tty,raw,echo=1 - +-- +-- * Second solution, the virtual channel contains two side and the +--program can Read and Write date to it. +-- +-- $ socat PTY,link=/tmp/virtual-tty,raw,echo=1 \ +-- PTY,link=/tmp/virtual-tty,raw,echo=1 +-- +-- Connect to this virtual serial port with: +-- +-- Open (Port => P, Name => "/tmp/virtual-tty"); +-- +-- Do any settings using the Set routine below, then you can check +-- the serial port configuration with: +-- +-- $ stty --file /tmp/virtual-tty +-- with Ada.Streams; use Ada.Streams; @@ -52,6 +79,34 @@ package body GNAT.Serial_Communications is function fcntl (fd : int; cmd : int; value : int) return int; pragma Import (C, fcntl, "fcntl"); + C_Data_Rate : constant array (Data_Rate) of unsigned := + (B75 => OSC.B75, +B110 => OSC.B110, +B150 => OSC.B150, +B300 => OSC.B300, +B600 => OSC.B600, +B1200=> OSC.B1200, +B2400=> OSC.B2400, +B4800=> OSC.B4800, +B9600=> OSC.B9600, +B19200 => OSC.B19200, +B38400 => OSC.B38400, +B57600 => OSC.B57600, +B115200 => OSC.B115200, +B230400 => OSC.B230400, +B460800 => OSC.B460800, +B50 => OSC.B50, +B576000 => OSC.B576000, +B921600 => OSC.B921600, +B100 => OSC.B100, +B1152000 => OSC.B1152000, +B150 => OSC.B150, +B200 => OSC.B200, +B250 => OSC.B250, +B300 => OSC.B300, +B350 => OSC.B350, +B400 => OSC.B400); + C_Bits : constant array (Data_Bits) of unsigned := (CS7 => OSC.CS7, CS8 => OSC.CS8); @@ -162,6 +217,8 @@ package body GNAT.Serial_Communications is is use OSC; + subtype speed_t is unsigned; + type termios is record c_iflag : unsigned; c_oflag : unsigned; @@ -169,8 +226,8 @@ package body GNAT.Serial_Communications is c_lflag : unsigned; c_line : unsigned_char; c_cc : Interfaces.C.char_array (0 .. 31); - c_ispeed : unsigned; - c_ospeed : unsigned; + c_ispeed : speed_t; + c_ospeed : speed_t; end record; pragma Convention (C, termios); @@ -184,9 +241,15 @@ package body GNAT.Serial_Communications is function tcflush (fd : int; queue_selector : int) return int; pragma Import (C, tcflush, "tcflush"); + function cfsetospeed (termios_p : Address; speed : speed_t) return int; + pragma Import (C, cfsetospeed, "cfsetospeed"); + + function cfsetispeed (termios_p : Address; speed : speed_t) return int; + pragma Import (C, cfsetispeed, "cfsetispeed"); + Current : termios; - Res : int; + Res : int := 0; pragma Warnings (Off, Res); -- Warnings off, since we don't always test the result @@ -205,6 +268,7 @@ package body GNAT.Serial_Communications is or C_Stop_Bits (Stop_Bits) or C_Parity (Parity) or CREAD; + Current.c_iflag := 0; Current.c_lflag := 0; Current.c_of
