--- rpl/src/instructions_o1.c 2013/03/20 22:24:36 1.66 +++ rpl/src/instructions_o1.c 2013/09/26 15:37:12 1.72 @@ -1,6 +1,6 @@ /* ================================================================================ - RPL/2 (R) version 4.1.13 + RPL/2 (R) version 4.1.16 Copyright (C) 1989-2013 Dr. BERTRAND Joël This file is part of RPL/2. @@ -907,6 +907,7 @@ instruction_open(struct_processus *s_eta int buffer_reception; int drapeau; int priorite; + int prochain_descripteur; int protocole_numerique; int timeout_emission; int timeout_reception; @@ -973,7 +974,6 @@ instruction_open(struct_processus *s_eta unsigned long i; unsigned long nombre_elements; - unsigned long prochain_descripteur; unsigned long unite; # define d_BIND_TO_DEVICE 0 @@ -1028,7 +1028,8 @@ instruction_open(struct_processus *s_eta "\"file name\" } \"protection\" } OPEN\n"); printf(" { \"filetype\" \"access\" \"format\" { \"name\" " "\"file name\" } \n" - " { \"stty\" { \"stty parameters\" ... } } } OPEN\n"); + " { \"stty\" \"speed,bits,parity,stop\"\n" + " { \"stty parameters\" ... } } } OPEN\n"); printf(" { \"sockettype\" { \"name\" \"local name\" } } OPEN\n"); printf(" { \"sockettype\" \"socketdomain\" \"protection\" } OPEN\n"); printf(" \"/semaphore\" OPEN\n\n"); @@ -1078,7 +1079,7 @@ instruction_open(struct_processus *s_eta printf(" { \"STREAM\" \"READWRITE\" } OPEN\n"); printf(" { \"FOREIGN\" \"DATAGRAM\" } OPEN\n"); printf(" { \"LOCAL\" { \"NAME\" \"socket.sock\" } } OPEN\n"); - printf(" { { \"NAME\" \"/dev/ttyS1\" } { \"STTY\" { \"9600,8,N,1\" " + printf(" { { \"NAME\" \"/dev/ttyS1\" } { \"STTY\" \"9600,8,N,1\" " "\n { \"NO ICANON\" \"IGNBRK\" } } } OPEN\n"); return; @@ -2143,7 +2144,6 @@ instruction_open(struct_processus *s_eta { type_arguments = 'S'; } - else if (type_arguments == 'F') { liberation(s_etat_processus, s_objet_argument); @@ -4309,7 +4309,7 @@ instruction_open(struct_processus *s_eta return; } - prochain_descripteur = i; + prochain_descripteur = (int) i; /* * Ajout d'un élément à la fin de la liste chaînée