kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-26 06:53:52 +01:00
Code Releases Activity

* misc merge fixes

Browse Source
This commit is contained in:
Kaspar Schleiser 2010-12-06 17:15:00 +01:00
parent 5ce95c155b
commit 86a70393b4
5 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
board/msba2-common/Jamfile
View File

@ -1,6 +1,7 @@
SubDir TOP board msba2-common ;
Module board_common : board_common_init.c ;
Module config : config.c ;
SubInclude TOP board msba2-common drivers ;

35
board/msba2-common/board_common_init.c
View File

@ -51,12 +51,6 @@ and the mailinglist (subscription via web site)
#define PCRTC BIT9
#define CL_CPU_DIV 4
config_t sysconfig = {
0, ///< default ID
0, ///< default radio address
0, ///< default radio channel
};
/*---------------------------------------------------------------------------*/
/**
* @brief Enabling MAM and setting number of clocks used for Flash memory fetch
@ -129,32 +123,3 @@ void bl_init_clks(void)
init_mam();
}
void loop_delay(void) {
volatile uint16_t i, j;
for (i = 1; i < 30; i++) {
for (j = 1; j != 0; j++) {
asm volatile (" nop ");
}
}
}
/*void bl_blink(void) {
LED_RED_ON;
LED_GREEN_ON;
loop_delay();
LED_RED_OFF;
LED_GREEN_OFF;
}*/
// void bl_config_init(void) {
// extern char configmem[];
// if (*((uint16_t*) configmem) == CONFIG_KEY) {
// memcpy(&sysconfig, (configmem + sizeof(CONFIG_KEY)), sizeof(sysconfig));
// LED_GREEN_TOGGLE;
// }
// else {
// config_save();
// }
// }

3
board/msba2-common/drivers/Jamfile
View File

@ -1,5 +1,6 @@
SubDir TOP board msba2-common drivers ;
Module board_cc1100 : msba2-cc1100.c ;
Module board_cc1100 : msba2-cc1100.c : cc110x_spi gpioint ;
Module board_ltc4150 : msba2-ltc4150.c : gpioint ;
Module board_uart : msba2-uart0.c : chardev_thread ringbuffer ;

2
board/msba2/Jamfile
View File

@ -30,7 +30,5 @@ SubDir TOP board $(BOARD) ;
Module board : board_init.c : board_common board_uart ;
UseModule board ;
Module config : config.c ;
SubInclude TOP board $(BOARD)-common ;
SubInclude TOP cpu $(CPU) ;

2
drivers/cc110x_ng/Jamfile
View File

@ -29,6 +29,6 @@ SubDir TOP drivers cc110x_ng ;
HDRS += $(TOP)/drivers/cc110x_ng ;
Module cc110x_ng : cc1100.c cc1100-rx.c cc1100-tx.c cc1100-defaultSettings.c : hwtimer board_cc1100 ;
Module cc110x_ng : cc1100.c cc1100-rx.c cc1100-tx.c cc1100-defaultSettings.c : hwtimer board_cc1100 config ;
Module cc110x_spi : cc1100_spi.c ;
Module cc110x_cc430 : cc1100_cc430.c ;