Mercurial > nand-ecoscentric
changeset 3000:0db3b55a4a3c
* include/can.h: EOF footer: s/SERIAL/CAN/.
* src/can.c: can_set_config(): Fixed key's name to drain output:
s{CYG_IO_GET_CONFIG_SERIAL_OUTPUT_DRAIN
}{CYG_IO_SET_CONFIG_CAN_OUTPUT_DRAIN}.
| author | jld |
|---|---|
| date | Thu, 14 Jan 2010 11:46:06 +0000 |
| parents | 7875999a1b55 |
| children | 0cdf7781a5ab |
| files | packages/io/can/current/ChangeLog packages/io/can/current/include/can.h packages/io/can/current/src/can.c |
| diffstat | 3 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/io/can/current/ChangeLog +++ b/packages/io/can/current/ChangeLog @@ -1,3 +1,10 @@ +2010-01-13 Sergei Gavrikov <sergei.gavrikov@gmail.com> + + * include/can.h: EOF footer: s/SERIAL/CAN/. + * src/can.c: can_set_config(): Fixed key's name to drain output: + s{CYG_IO_GET_CONFIG_SERIAL_OUTPUT_DRAIN + }{CYG_IO_SET_CONFIG_CAN_OUTPUT_DRAIN}. + 2007-08-23 Alexey Shusharin <mrfinch@mail.ru> * doc/can.sgml: Callback on event documentation.
--- a/packages/io/can/current/include/can.h +++ b/packages/io/can/current/include/can.h @@ -237,4 +237,4 @@ can_lowlevel_funs _l = { extern cyg_devio_table_t cyg_io_can_devio; //------------------------------------------------------------------------- -#endif // CYGONCE_SERIAL_H +#endif // CYGONCE_CAN_H
--- a/packages/io/can/current/src/can.c +++ b/packages/io/can/current/src/can.c @@ -627,7 +627,7 @@ static Cyg_ErrNo can_set_config(cyg_io_h // // wait until all messages in outbut buffer are sent // - case CYG_IO_GET_CONFIG_SERIAL_OUTPUT_DRAIN: + case CYG_IO_SET_CONFIG_CAN_OUTPUT_DRAIN: { // Wait for any pending output to complete if (out_cbuf->len == 0) @@ -647,7 +647,7 @@ static Cyg_ErrNo can_set_config(cyg_io_h cyg_drv_dsr_unlock(); cyg_drv_mutex_unlock(&out_cbuf->lock); } - break;// CYG_IO_GET_CONFIG_SERIAL_OUTPUT_DRAIN: + break;// CYG_IO_SET_CONFIG_CAN_OUTPUT_DRAIN: // // Abort any outstanding I/O, including blocked reads