# HG changeset patch # User jld # Date 1263469566 0 # Node ID 0db3b55a4a3cb54e033584813ce1cb57c1c60e63 # Parent 7875999a1b55fc343f70fc3d7599c4ea118ca2e1 * 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}. diff --git a/packages/io/can/current/ChangeLog b/packages/io/can/current/ChangeLog --- a/packages/io/can/current/ChangeLog +++ b/packages/io/can/current/ChangeLog @@ -1,3 +1,10 @@ +2010-01-13 Sergei Gavrikov + + * 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 * doc/can.sgml: Callback on event documentation. diff --git a/packages/io/can/current/include/can.h b/packages/io/can/current/include/can.h --- 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 diff --git a/packages/io/can/current/src/can.c b/packages/io/can/current/src/can.c --- 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