diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-09 10:53:26 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-09 10:53:26 +0000 |
| commit | 88e7532fabbfaecedb81f70dc241570febbf2311 (patch) | |
| tree | 22e08a8db76105dd797cbebd0f9701b27eaea7f1 | |
| parent | e5be15688b4a17ef5126863e2a3e93a42ba8f3f5 (diff) | |
| download | ATCD-88e7532fabbfaecedb81f70dc241570febbf2311.tar.gz | |
ChangeLogTag: Thu Nov 9 10:48:52 UTC 2006 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/examples/IPC_SAP/DEV_SAP/reader/reader.cpp | 13 | ||||
| -rw-r--r-- | ACE/examples/IPC_SAP/DEV_SAP/writer/writer.cpp | 2 |
3 files changed, 16 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 52d23cc00af..284141b2668 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Thu Nov 9 10:48:52 UTC 2006 Olli Savia <ops@iki.fi> + + * examples/IPC_SAP/DEV_SAP/reader/reader.cpp: + * examples/IPC_SAP/DEV_SAP/writer/writer.cpp: + Changed used baudrate to 19200. Extended reader example to handle + timeout. + Thu Nov 9 10:50:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Timer_Heap_T.{h,cpp}: diff --git a/ACE/examples/IPC_SAP/DEV_SAP/reader/reader.cpp b/ACE/examples/IPC_SAP/DEV_SAP/reader/reader.cpp index 348db5e27e7..60bfa446c2f 100644 --- a/ACE/examples/IPC_SAP/DEV_SAP/reader/reader.cpp +++ b/ACE/examples/IPC_SAP/DEV_SAP/reader/reader.cpp @@ -25,11 +25,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) 1); ACE_TTY_IO::Serial_Params myparams; - myparams.baudrate = 9600; + myparams.baudrate = 19200; myparams.xonlim = 0; myparams.xofflim = 0; myparams.readmincharacters = 0; - myparams.readtimeoutmsec = 10000; + myparams.readtimeoutmsec = 10*1000; // 10 seconds myparams.paritymode = "EVEN"; myparams.ctsenb = false; myparams.rtsenb = 0; @@ -56,9 +56,12 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) read_dev.recv ((void *) &readback, 1); if (bytes_read == 1) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("read: %c\n"), - readback)); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("read: %c\n"), + readback)); + else if (bytes_read == 0) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("timeout!\n"))); else if (bytes_read == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p recv\n"), diff --git a/ACE/examples/IPC_SAP/DEV_SAP/writer/writer.cpp b/ACE/examples/IPC_SAP/DEV_SAP/writer/writer.cpp index 44fc262ed61..a61b8ca2b8d 100644 --- a/ACE/examples/IPC_SAP/DEV_SAP/writer/writer.cpp +++ b/ACE/examples/IPC_SAP/DEV_SAP/writer/writer.cpp @@ -24,7 +24,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) 1); ACE_TTY_IO::Serial_Params myparams; - myparams.baudrate = 9600; + myparams.baudrate = 19200; myparams.xonlim = 0; myparams.xofflim = 0; myparams.readmincharacters = 0; |