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

boards: remove header guard under scores #3056

Merged
merged 6 commits into from
Jun 28, 2015

Conversation

OlegHahm
Copy link
Member

This replaces #2858

@OlegHahm OlegHahm added CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation labels May 25, 2015
#define M (((PLL0CFG_Val ) & 0x7FFF) + 1)
#define N (((PLL0CFG_Val >> 16) & 0x00FF) + 1)
#define FCCO(__F_IN) ((2ULL * M * __F_IN) / N)
#define CCLK_DIV (((CCLKCFG_Val ) & 0x00FF) + 1)
Copy link
Member

Choose a reason for hiding this comment

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

False positives?

Copy link
Member Author

Choose a reason for hiding this comment

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

Because it's not a header guard? But we don't want leading underscores in any macro, right? So, I would just update the commit message.

Copy link
Member

Choose a reason for hiding this comment

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

Partly, yes, partly because I have now idea about mbed_lpc1768. These look like board-lib vars.

Copy link
Member Author

Choose a reason for hiding this comment

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

They are defined here.

Copy link
Contributor

Choose a reason for hiding this comment

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

+1 for this change.

Copy link
Member

Choose a reason for hiding this comment

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

#define-ing one letter names like N etc leads to incredibly difficult to understand compile problems when a new user writes their program to use the variable N for something.

Copy link
Member

Choose a reason for hiding this comment

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

nevermind, this is inside a .c file, not a header.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, I took this into account. :)

@haukepetersen
Copy link
Contributor

found some more forgotten stuff and inconsistencies. Also I marked some parts with broken comment styling. I know they are not really part of this PR, but why not fix them while you are at it...

@OlegHahm
Copy link
Member Author

Addressed comments.

@haukepetersen
Copy link
Contributor

Looks good to me. ACK when Travis is happy.

@miri64
Copy link
Member

miri64 commented May 26, 2015

(Needs squashing first)

@@ -27,7 +27,7 @@
extern "C" {
#endif

#define F_CPU (24000000) ///< CPU target speed in Hz
#define F_CPU (24000000) /* /< CPU target speed in Hz */
Copy link
Member

Choose a reason for hiding this comment

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

Doxygen opening tag messed up

@jnohlgard
Copy link
Member

I went through all changes and commented where I could spot any mistakes. This should be ready after my comments are addressed.

@OlegHahm
Copy link
Member Author

OlegHahm commented Jun 3, 2015

addressed comments

@miri64
Copy link
Member

miri64 commented Jun 12, 2015

Please squash.

@miri64 miri64 assigned jnohlgard and unassigned miri64 Jun 13, 2015
@@ -19,4 +19,4 @@ void init_display_putchar(void);
}
#endif

#endif /* __DISPLAY_PUTCHAR_H */
#endif /* DISPLAY_PUTCHAR_H */
Copy link
Member

Choose a reason for hiding this comment

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

Nitpick: wrong macro name in comment

@jnohlgard
Copy link
Member

I can only find small nitpicks now. I think this is ready for merging. ACK, please squash. Merge when Travis is happy.

@OlegHahm
Copy link
Member Author

Addressed @gebart's nitpicking. 😉

@jnohlgard
Copy link
Member

ACK, squash and go when Travis is fine.

BigDaddyD and others added 6 commits June 24, 2015 15:54
* also added a trailing underscore to header guards for consistency

Commit for PR 2623, repairing header file include guards.
This PR is intended to fix the include guards in files under RIOT/boards

SQUASH ME: fix underscore removal overdos

SQUASH ME: consistent macro naming

SQUASH ME: missed that one

SQUASH ME: fixed overdo

SQUASH ME: consistency
@OlegHahm OlegHahm force-pushed the board_leading_underscore_removal branch from c4737bd to 8c203a6 Compare June 24, 2015 13:55
@OlegHahm OlegHahm added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable labels Jun 24, 2015
@OlegHahm
Copy link
Member Author

Squashed.

@jnohlgard
Copy link
Member

kicked Travis

@Kijewski
Copy link
Contributor

ACK

OlegHahm added a commit that referenced this pull request Jun 28, 2015
@OlegHahm OlegHahm merged commit e634b8c into RIOT-OS:master Jun 28, 2015
@OlegHahm OlegHahm deleted the board_leading_underscore_removal branch June 28, 2015 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR 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.

6 participants