Skip to content

cc110x: port to gnrc_netif2#7414

Merged
miri64 merged 1 commit intoRIOT-OS:gnrc_netif2_integration/masterfrom
miri64:gnrc_netif2/feat/cc110x
Nov 15, 2017
Merged

cc110x: port to gnrc_netif2#7414
miri64 merged 1 commit intoRIOT-OS:gnrc_netif2_integration/masterfrom
miri64:gnrc_netif2/feat/cc110x

Conversation

@miri64
Copy link
Copy Markdown
Member

@miri64 miri64 commented Jul 26, 2017 •
edited
Loading

(unintrusive) port of cc110x to gnrc_netif2

Depends on #7370.

This PR is part of the network layer remodelling effort:
PR dependencies

@miri64 miri64 added GNRC Area: network Area: Networking labels Jul 26, 2017
@miri64 miri64 requested a review from kaspar030 July 26, 2017 11:52
@miri64 miri64 added the State: waiting for other PR State: The PR requires another PR to be merged first label Jul 26, 2017
@miri64 miri64 force-pushed the gnrc_netif2/feat/cc110x branch 2 times, most recently from 666c445 to cffa250 Compare July 30, 2017 18:42
@miri64 miri64 force-pushed the gnrc_netif2/feat/cc110x branch from cffa250 to e2190c9 Compare August 21, 2017 10:54
miri64 added a commit to miri64/RIOT that referenced this pull request Aug 21, 2017
@miri64
Merge branch 'gnrc_netif2/feat/new-netif-api-for-gnrc'i (RIOT-OS#7370)…
264f4b2 
… into RIOT-OS#7414
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Aug 21, 2017

Rebased to current master and current dependencies

@miri64 miri64 force-pushed the gnrc_netif2/feat/cc110x branch from e2190c9 to c4dea27 Compare October 10, 2017 09:48
@miri64 miri64 added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed State: waiting for other PR State: The PR requires another PR to be merged first labels Oct 10, 2017
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Oct 10, 2017

Rebased to current master, no longer waiting for other PR

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Oct 10, 2017

@kaspar030 made some comments about my usage of LOG_ERROR() in #7410. I will remove them here and in the other PRs.

@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented Oct 10, 2017

Anybody ever tested gnrc_cc110x successfully?

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Oct 10, 2017

When it was introduced ^^

@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented Oct 10, 2017

Sure?

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Oct 10, 2017

I hope so. :D

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Oct 10, 2017

(aka no, I'm not sure)

@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented Oct 10, 2017

;-)

@miri64 miri64 changed the base branch from master to gnrc_netif2_integration/master October 27, 2017 15:28
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Oct 27, 2017

I changed the base branch now to the freshly created gnrc_netif2_integration/master branch.

This was referenced Nov 1, 2017
Merged
Closed
Merged
@miri64 miri64 mentioned this pull request Nov 11, 2017
Merged
@miri64 miri64 force-pushed the gnrc_netif2/feat/cc110x branch from 8da2c4a to 37d7b50 Compare November 13, 2017 14:51
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 13, 2017

Rebased to current #7925.

@miri64 miri64 force-pushed the gnrc_netif2/feat/cc110x branch from b1170b7 to 52e5613 Compare November 14, 2017 08:55
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 14, 2017 •
edited
Loading

Rebased to current #7925 (again). cc110x is broken (I think the issue for this is #6857, but I'm not really sure) for multiple reasons (one is fixed in #8026), but if one activates DEBUG in drivers/cc110x/cc110x-netdev.c they can at least see, that the commands of the glue code will reach the driver.

@miri64 miri64 force-pushed the gnrc_netif2/feat/cc110x branch from 52e5613 to f5887c7 Compare November 14, 2017 11:02
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 14, 2017

And yet another rebase. With this the only tests that should fail on Murdock are tests/driver_xbee (see #7898) and tests/slip (see #7462).

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 14, 2017

@kaspar030: ready for review.

bergzand
bergzand reviewed Nov 14, 2017
View reviewed changes
drivers/cc110x/gnrc_cc110x/gnrc_netdev_cc110x.c Outdated
#include "net/gnrc/netif2.h"
#else
#include "net/gnrc/netdev.h"
#endif
Copy link
Copy Markdown
Member

@bergzand bergzand Nov 14, 2017

Choose a reason for hiding this comment

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

Does it still make sense here to check for netif2/netdev?

Copy link
Copy Markdown
Member Author

@miri64 miri64 Nov 14, 2017

Choose a reason for hiding this comment

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

Ooops, that is legacy code I still haven't removed. Fixed!

@miri64 miri64 mentioned this pull request Nov 14, 2017
Merged
@miri64 miri64 force-pushed the gnrc_netif2/feat/cc110x branch from 3ff2054 to 6d124d5 Compare November 14, 2017 12:40
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 14, 2017

Rebased again.

@miri64 miri64 force-pushed the gnrc_netif2/feat/cc110x branch from e51b0c1 to 6d124d5 Compare November 14, 2017 21:52
@miri64 miri64 mentioned this pull request Nov 15, 2017
Merged
@miri64 miri64 force-pushed the gnrc_netif2/feat/cc110x branch 2 times, most recently from b696ba6 to ff5732a Compare November 15, 2017 15:26
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 15, 2017

Rebased and squashed to current #7925. With this PR, Murdock should now finally succeed on that branch!

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 15, 2017 

-- Building PR#7414 https://github.com/RIOT-OS/RIOT/pull/7414 head: ff5732a69c5ad4925275d15fd846dc150dd718d6...
-- processing results ...
- running script "/opt/murdock2/scripts/post-build.d/00sizes.py"
-- done processing results

--- result: BUILD SUCCESSFUL.

💃

@miri64 miri64 mentioned this pull request Nov 15, 2017
Merged
kaspar030
kaspar030 approved these changes Nov 15, 2017
View reviewed changes
Copy link
Copy Markdown
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.

Looks ok. ACK.

@kaspar030
Copy link
Copy Markdown
Contributor

kaspar030 commented Nov 15, 2017

needs rebase

@miri64 miri64 force-pushed the gnrc_netif2/feat/cc110x branch from 94177a8 to e3ef428 Compare November 15, 2017 21:57
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Nov 15, 2017

Rebased and squashed. Thanks for the review!

@miri64 miri64 merged commit cb3c27d into RIOT-OS:gnrc_netif2_integration/master Nov 15, 2017
@miri64 miri64 deleted the gnrc_netif2/feat/cc110x branch November 15, 2017 22:04
@PeterKietzmann PeterKietzmann mentioned this pull request Nov 22, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bergzand bergzand bergzand left review comments

@kaspar030 kaspar030 kaspar030 approved these changes

Assignees

@kaspar030 kaspar030

Labels

Area: network Area: Networking CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@miri64 @OlegHahm @kaspar030 @bergzand