RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

fixes naming conflict with uart.(c|h)

Browse Source
This commit is contained in:
Thomas Eichinger 2014-01-20 12:35:19 +01:00
parent d41b92094a
commit 10cf348a6e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/openwsn/patch.txt
View File

@ -27457,7 +27457,7 @@ diff -crB openwsn/board_ow.c ../../../sys/net/openwsn/board_ow.c
! #include "board_ow.h"
!
! #include "leds.h"
! #include "uart.h"
! #include "uart_ow.h"
! #include "spi.h"
! //#include "bsp_timer.h"
! #include "radio.h"
@ -32996,7 +32996,7 @@ diff -crB openwsn/openserial.c ../../../sys/net/openwsn/openserial.c
! #include "openbridge.h"
! #include "leds.h"
! #include "schedule.h"
! #include "uart.h"
! #include "uart_ow.h"
! #include "opentimers.h"
! #include "openhdlc.h"
!
@ -38113,9 +38113,9 @@ diff -crB openwsn/spi.h ../../../sys/net/openwsn/spi.h
! kick_scheduler_t spi_isr(void);
!
! #endif
diff -crB openwsn/uart.c ../../../sys/net/openwsn/uart.c
*** openwsn/uart.c Thu Mar 21 21:36:59 2013
--- ../../../sys/net/openwsn/uart.c Wed Jan 15 13:48:27 2014
diff -crB openwsn/uart_ow.c ../../../sys/net/openwsn/uart_ow.c
*** openwsn/uart_ow.c Thu Mar 21 21:36:59 2013
--- ../../../sys/net/openwsn/uart_ow.c Wed Jan 15 13:48:27 2014
***************
*** 1,94 ****
! /**
@ -38221,7 +38221,7 @@ diff -crB openwsn/uart.c ../../../sys/net/openwsn/uart.c
! */
!
! #include "msp430f1611.h"
! #include "uart.h"
! #include "uart_ow.h"
! #include "board_ow.h"
!
! //=========================== defines =========================================
@ -38309,9 +38309,9 @@ diff -crB openwsn/uart.c ../../../sys/net/openwsn/uart.c
! return DO_NOT_KICK_SCHEDULER;
}
\ No newline at end of file
diff -crB openwsn/uart.h ../../../sys/net/openwsn/uart.h
*** openwsn/uart.h Thu Mar 21 21:36:59 2013
--- ../../../sys/net/openwsn/uart.h Wed Jan 15 13:48:27 2014
diff -crB openwsn/uart_ow.h ../../../sys/net/openwsn/uart_ow.h
*** openwsn/uart_ow.h Thu Mar 21 21:36:59 2013
--- ../../../sys/net/openwsn/uart_ow.h Wed Jan 15 13:48:27 2014
***************
*** 1,42 ****
! /**

4
pkg/openwsn/structure_changes.sh
View File

@ -6,7 +6,7 @@ mv openwsn-fw-RB-1.4/firmware/openos/openwsn/ ./
# and all needed hw dependent files too
mv openwsn-fw-RB-1.4/firmware/openos/bsp/boards/telosb/spi.c openwsn
mv openwsn-fw-RB-1.4/firmware/openos/bsp/boards/telosb/uart.c openwsn
mv openwsn-fw-RB-1.4/firmware/openos/bsp/boards/telosb/uart.c openwsn/uart_ow.c
mv openwsn-fw-RB-1.4/firmware/openos/bsp/boards/telosb/leds.c openwsn
mv openwsn-fw-RB-1.4/firmware/openos/bsp/boards/telosb/board.c openwsn/board_ow.c
mv openwsn-fw-RB-1.4/firmware/openos/bsp/boards/telosb/board_info.h openwsn
@ -19,7 +19,7 @@ mv openwsn-fw-RB-1.4/firmware/openos/bsp/boards/eui64.h openwsn
mv openwsn-fw-RB-1.4/firmware/openos/bsp/boards/leds.h openwsn
mv openwsn-fw-RB-1.4/firmware/openos/bsp/boards/radio.h openwsn
mv openwsn-fw-RB-1.4/firmware/openos/bsp/boards/radiotimer.h openwsn
mv openwsn-fw-RB-1.4/firmware/openos/bsp/boards/uart.h openwsn
mv openwsn-fw-RB-1.4/firmware/openos/bsp/boards/uart.h openwsn/uart_ow.h
mv openwsn-fw-RB-1.4/firmware/openos/bsp/chips/spi.h openwsn
mv openwsn-fw-RB-1.4/firmware/openos/bsp/chips/cc2420/radio.c openwsn
mv openwsn-fw-RB-1.4/firmware/openos/bsp/chips/cc2420/cc2420.h openwsn