Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for topic-counters branch #12634

Merged

Conversation

nordic-krch
Copy link
Contributor

It's the intermediate step before #11572 goes in. It fixes compilation of test for nrf peripherals (together with #12617).

@nordic-krch nordic-krch force-pushed the topic-counters-fix branch 2 times, most recently from 29b4488 to 9fdaff5 Compare January 22, 2019 08:26
Test was not aligned with changes in the API.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
counter_callback_t has been previously prefixed with __deprecated
but it is used in prototype of deprecated function (counter_set_alarm).
It seems that compiler generates the warning even though function is
not used. Removed __deprecated prefix from the typedef, keeping it for
the function only.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
@codecov-io
Copy link

codecov-io commented Jan 22, 2019

Codecov Report

Merging #12634 into topic-counters will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff               @@
##           topic-counters   #12634   +/-   ##
===============================================
  Coverage           53.94%   53.94%           
===============================================
  Files                 242      242           
  Lines               27654    27654           
  Branches             6717     6717           
===============================================
  Hits                14917    14917           
  Misses               9932     9932           
  Partials             2805     2805

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 12436cc...b52068f. Read the comment docs.

nrf_rtc_timer was selecting counter RTC1 instance even though it
is not using counter API at all.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
Copy link
Collaborator

@pabigot pabigot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine except for what happened during the rebase, which this also fixes.

@@ -154,7 +154,6 @@ config NRF_RTC_TIMER
default y
depends on CLOCK_CONTROL_NRF
select TICKLESS_CAPABLE
select COUNTER_RTC1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How did this come back?! This was removed in #12475 by 85d10e0.

It came back because a rebase later added 5ef145d by repeating fragments from a really old commit.

Rewrites of the base branch must be carefully monitored to confirm they do not discard material from merged commits or we'll have no idea what we've got in the implementation.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, not sure exactly but it's definitely my fault. Lesson learnt is to never push directly (not through PR), event if it's just rebasing on master.

@nordic-krch nordic-krch removed the request for review from anangl January 22, 2019 12:29
@nordic-krch
Copy link
Contributor Author

removing @anangl as he is away this week.

@nashif nashif merged commit f81e4d7 into zephyrproject-rtos:topic-counters Jan 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants