Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RIOT
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

d610e435

Commit d610e435 authored 11 years ago by Oleg Hahm

Downloads
- Plain Diff

Merge pull request #453 from authmillenon/fix_uart_shell_conflict

Fix uart/shell conflict

parents 01e50dd0 68f7b909

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

boards/msba2-common/drivers/include/uart0.h 0 additions, 2 deletions

boards/msba2-common/drivers/include/uart0.h
cpu/lpc2387/include/cpu-conf.h 5 additions, 0 deletions

cpu/lpc2387/include/cpu-conf.h
cpu/mc1322x/include/cpu-conf.h 4 additions, 0 deletions

cpu/mc1322x/include/cpu-conf.h
cpu/msp430-common/include/cpu-conf.h 4 additions, 0 deletions

cpu/msp430-common/include/cpu-conf.h
cpu/native/include/cpu-conf.h 5 additions, 0 deletions

cpu/native/include/cpu-conf.h
sys/include/board_uart0.h 2 additions, 0 deletions

sys/include/board_uart0.h
sys/include/shell.h 5 additions, 3 deletions

sys/include/shell.h
sys/shell/shell.c 8 additions, 6 deletions

sys/shell/shell.c
sys/uart0/uart0.c 12 additions, 8 deletions

sys/uart0/uart0.c

with 45 additions and 19 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment