Mercurial > ecos
changeset 3080:df7356548951
* src/can_at91sam7.c: CYGNUM_CAN_EVENT_OVERRUN_RX_HW instead of
CYGNUM_CAN_EVENT_OVERRUN_RX. CYGNUM_CAN_MODE_LISTEN_ONLY_ENTER &
CYGNUM_CAN_MODE_LISTEN_ONLY_EXIT return -EINVAL. [ Bugzilla 1001453 ]
| author | sergeig |
|---|---|
| date | Thu, 09 Feb 2012 21:40:13 +0000 |
| parents | b8d91bac2ba8 |
| children | a18d3fded36e |
| files | packages/devs/can/arm/at91/at91sam7/current/ChangeLog packages/devs/can/arm/at91/at91sam7/current/src/can_at91sam7.c |
| diffstat | 2 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/devs/can/arm/at91/at91sam7/current/ChangeLog +++ b/packages/devs/can/arm/at91/at91sam7/current/ChangeLog @@ -1,3 +1,9 @@ +2012-01-25 Bernard Fouché <bernard.fouche@kuantic.com> + + * src/can_at91sam7.c: CYGNUM_CAN_EVENT_OVERRUN_RX_HW instead of + CYGNUM_CAN_EVENT_OVERRUN_RX. CYGNUM_CAN_MODE_LISTEN_ONLY_ENTER & + CYGNUM_CAN_MODE_LISTEN_ONLY_EXIT return -EINVAL. [ Bugzilla 1001453 ] + 2007-03-23 Uwe Kindler <uwe_kindler@web.de> * AT91SAM7 CAN driver package created
--- a/packages/devs/can/arm/at91/at91sam7/current/src/can_at91sam7.c +++ b/packages/devs/can/arm/at91/at91sam7/current/src/can_at91sam7.c @@ -947,6 +947,8 @@ static Cyg_ErrNo at91sam7_can_set_config case CYGNUM_CAN_MODE_START : at91sam7_start_module(chan); break; case CYGNUM_CAN_MODE_STANDBY : at91sam7_enter_lowpower_mode(chan); break; case CYGNUM_CAN_MODE_CONFIG : at91sam7_enter_lowpower_mode(chan); break; + case CYGNUM_CAN_MODE_LISTEN_ONLY_ENTER: return -EINVAL; + case CYGNUM_CAN_MODE_LISTEN_ONLY_EXIT: return -EINVAL; } } break; // case CYG_IO_SET_CONFIG_CAN_MODE : @@ -1132,7 +1134,7 @@ static bool at91sam7_can_getevent(can_ch pevent->flags |= CYGNUM_CAN_EVENT_RX; if (msr & MSR_MSG_IGNORED) { - pevent->flags |= CYGNUM_CAN_EVENT_OVERRUN_RX; + pevent->flags |= CYGNUM_CAN_EVENT_OVERRUN_RX_HW; } //