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

pm: misc cleanup and fixes #6344

Merged
merged 8 commits into from
Jan 24, 2017
Merged

Conversation

haukepetersen
Copy link
Contributor

Follow up on #6160

This PR contains some collected cleanup and fixes for the PM, mostly some code re-organization, doxygen fixes and removal of un-used modules/includes.

@haukepetersen haukepetersen added Area: pm Area: (Low) power management Platform: ARM Platform: This PR/issue effects ARM-based platforms Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation Area: doc Area: Documentation labels Jan 13, 2017
@haukepetersen haukepetersen added this to the Release 2017.01 milestone Jan 13, 2017
@kaspar030 kaspar030 added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Jan 13, 2017
@haukepetersen haukepetersen added the Community: Hack'n'ACK candidate This PR is a candidate for review and discussion during one of RIOT's monthly Hack'n'ACK parties label Jan 18, 2017
@miri64
Copy link
Member

miri64 commented Jan 18, 2017

Needs rebase

@haukepetersen
Copy link
Contributor Author

rebased

@haukepetersen
Copy link
Contributor Author

reabased again.

@haukepetersen
Copy link
Contributor Author

@kaspar030 mind to take a look at this?

@haukepetersen
Copy link
Contributor Author

@kaspar030 ping?!

Or @PeterKietzmann, @miri64, @kYc0o: would you guys mind to take a look?!

@miri64
Copy link
Member

miri64 commented Jan 24, 2017

I'm fine with the code, but I don't have enough insight to test this at the moment.

*
* pm_reboot()
* pm_off()
* This interface *must* be implemented for every platform in RIOT.
Copy link
Member

Choose a reason for hiding this comment

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

Is this already the case?

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, at least rudimentary.

Copy link
Member

Choose a reason for hiding this comment

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

I was wondering about pm_off() but before, I haven't seen there is fall-back code.

@@ -1,2 +1,4 @@
# include module specific includes
export INCLUDES += -I$(RIOTCPU)/cortexm_common/include

USEMODULE += cortexm_common_periph
Copy link
Member

Choose a reason for hiding this comment

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

Shouln't be USEMODULE += pm_layered included here as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope. The decision if the layered module should be used is up to a CPU. Some cortexm CPUs might want to use it (e.g. stms), but others might opt out (e.g. nrf5x)...

@kYc0o
Copy link
Contributor

kYc0o commented Jan 24, 2017

It looks OK for me too and Murdock agreed, so I'd give my ACK.

@kYc0o
Copy link
Contributor

kYc0o commented Jan 24, 2017

Why Jenkins shows red?

@PeterKietzmann
Copy link
Member

So, I'm fine with this PR but I'd prefer @kaspar030 to hit the button. In worst case I will do, this afternoon.

@PeterKietzmann
Copy link
Member

Just restarted the Jenkins build. Looks fine now.


void pm_reboot(void)
{
/* force an hardware reboot ("Power-Up Clear"), by writing
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm ok here, but in general, copy&pasting code doesn't remove copyright. :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ups, this was not on purpose -> simply forgot to copy the old copyright into my template file... Sorry!

Copy link
Contributor

@kaspar030 kaspar030 left a comment

Choose a reason for hiding this comment

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

ACK.

@kaspar030 kaspar030 merged commit d1db946 into RIOT-OS:master Jan 24, 2017
@haukepetersen haukepetersen deleted the opt_pm_misc branch January 24, 2017 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: doc Area: Documentation Area: pm Area: (Low) power management CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Community: Hack'n'ACK candidate This PR is a candidate for review and discussion during one of RIOT's monthly Hack'n'ACK parties Platform: ARM Platform: This PR/issue effects ARM-based platforms Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants