riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8620 from smlng/fix/sys/can

Browse Source 
sys/can: fix compiler warning due to usage of potentially uninitialized variables
This commit is contained in:
Kaspar Schleiser 2018-02-22 22:04:47 +01:00 committed by GitHub
commit de75eb8111
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/can/device.c
View File

@ -473,11 +473,10 @@ int can_device_calc_bittiming(uint32_t clock, const struct can_bittiming_const *
uint32_t spt_error; uint32_t spt_error;
uint32_t min_spt_error = UINT32_MAX; uint32_t min_spt_error = UINT32_MAX;
uint32_t best_brp = 0; uint32_t best_brp = 0;
uint32_t tseg; uint32_t tseg = 0;
uint32_t tseg1; uint32_t tseg1 = 0;
uint32_t tseg2; uint32_t tseg2 = 0;
uint32_t best_tseg = 0; uint32_t best_tseg = 0;
uint32_t rate; /* current bitrate */
uint32_t rate_error; uint32_t rate_error;
uint32_t min_rate_error; uint32_t min_rate_error;
@ -515,8 +514,8 @@ int can_device_calc_bittiming(uint32_t clock, const struct can_bittiming_const *
DEBUG("invalid brp\n"); DEBUG("invalid brp\n");
continue; continue;
} }
/* current bitrate */
rate = clock / (brp * nbt); uint32_t rate = clock / (brp * nbt);
rate_error = max(timing->bitrate, rate) - min(timing->bitrate, rate); rate_error = max(timing->bitrate, rate) - min(timing->bitrate, rate);
if (rate_error > min_rate_error) { if (rate_error > min_rate_error) {
DEBUG("timing->rate=%" PRIu32 ", rate=%" PRIu32 ", rate_error=%" PRIu32 " > min_rate_error=%" PRIu32 ", continuing\n", DEBUG("timing->rate=%" PRIu32 ", rate=%" PRIu32 ", rate_error=%" PRIu32 " > min_rate_error=%" PRIu32 ", continuing\n",