diff --git a/ChangeLog.txt b/ChangeLog.txt index 717d893aec..f1803c7588 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,14 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2014-01-09 20:04 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * contrib/hbct/ctcom1.c + ! fixed typo reported by Rolf + + * src/rtl/hbcom.c + + added support for 1000000 baudrate setting in *nix builds covered + by B1000000 macro + 2014-01-09 19:15 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/rtl/tgetint.prg ! allow to accept complex expressions passed as string to __Get() diff --git a/contrib/hbct/ctcom1.c b/contrib/hbct/ctcom1.c index 245ca93771..750f38d586 100644 --- a/contrib/hbct/ctcom1.c +++ b/contrib/hbct/ctcom1.c @@ -149,7 +149,7 @@ HB_FUNC( COM_RTS ) iClr = HB_COM_MCR_RTS; } hb_comMCR( hb_parni( 1 ), &iMCR, iClr, iSet ); - hb_retl( ( iMCR & HB_COM_MCR_DTR ) != 0 ); + hb_retl( ( iMCR & HB_COM_MCR_RTS ) != 0 ); } /* com_DTR( , [] ) -> diff --git a/src/rtl/hbcom.c b/src/rtl/hbcom.c index cf6e037d82..28db48df44 100644 --- a/src/rtl/hbcom.c +++ b/src/rtl/hbcom.c @@ -1181,6 +1181,9 @@ int hb_comInit( int iPort, int iBaud, int iParity, int iSize, int iStop ) #endif #ifdef B921600 case 921600: iBaud = B921600; break; +#endif +#ifdef B1000000 + case 1000000: iBaud = B1000000; break; #endif default: iResult = -1;