deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Minor code style fixes

Browse source
This commit is contained in:
adamdunkels 2009-02-24 21:30:20 +00:00
parent 0ded8897e6
commit e34e97cd6f
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/dev/leds.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: leds.c,v 1.6 2008/09/29 11:35:28 joxe Exp $ * @(#)$Id: leds.c,v 1.7 2009/02/24 21:30:20 adamdunkels Exp $
*/ */
#include "dev/leds.h" #include "dev/leds.h"
@ -40,23 +40,23 @@ static unsigned char leds, invert;
static void static void
show_leds(unsigned char changed) show_leds(unsigned char changed)
{ {
if (changed & LEDS_GREEN) { if(changed & LEDS_GREEN) {
/* Green did change */ /* Green did change */
if ((invert ^ leds) & LEDS_GREEN) { if((invert ^ leds) & LEDS_GREEN) {
ENERGEST_ON(ENERGEST_TYPE_LED_GREEN); ENERGEST_ON(ENERGEST_TYPE_LED_GREEN);
} else { } else {
ENERGEST_OFF(ENERGEST_TYPE_LED_GREEN); ENERGEST_OFF(ENERGEST_TYPE_LED_GREEN);
} }
} }
if (changed & LEDS_YELLOW) { if(changed & LEDS_YELLOW) {
if ((invert ^ leds) & LEDS_YELLOW) { if((invert ^ leds) & LEDS_YELLOW) {
ENERGEST_ON(ENERGEST_TYPE_LED_YELLOW); ENERGEST_ON(ENERGEST_TYPE_LED_YELLOW);
} else { } else {
ENERGEST_OFF(ENERGEST_TYPE_LED_YELLOW); ENERGEST_OFF(ENERGEST_TYPE_LED_YELLOW);
} }
} }
if (changed & LEDS_RED) { if(changed & LEDS_RED) {
if ((invert ^ leds) & LEDS_RED) { if((invert ^ leds) & LEDS_RED) {
ENERGEST_ON(ENERGEST_TYPE_LED_RED); ENERGEST_ON(ENERGEST_TYPE_LED_RED);
} else { } else {
ENERGEST_OFF(ENERGEST_TYPE_LED_RED); ENERGEST_OFF(ENERGEST_TYPE_LED_RED);
@ -113,14 +113,15 @@ leds_toggle(unsigned char ledv)
{ {
leds_invert(ledv); leds_invert(ledv);
} }
/*---------------------------------------------------------------------------*/
/* invert the invert register using the leds parameter */ /* invert the invert register using the leds parameter */
void leds_invert(unsigned char ledv) { void
leds_invert(unsigned char ledv) {
invert = invert ^ ledv; invert = invert ^ ledv;
show_leds(ledv); show_leds(ledv);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void leds_green(int o) { o?leds_on(LEDS_GREEN):leds_off(LEDS_GREEN); } void leds_green(int o) { o?leds_on(LEDS_GREEN):leds_off(LEDS_GREEN); }
void leds_yellow(int o) { o?leds_on(LEDS_YELLOW):leds_off(LEDS_YELLOW); } void leds_yellow(int o) { o?leds_on(LEDS_YELLOW):leds_off(LEDS_YELLOW); }
void leds_red(int o) { o?leds_on(LEDS_RED):leds_off(LEDS_RED); } void leds_red(int o) { o?leds_on(LEDS_RED):leds_off(LEDS_RED); }
/*---------------------------------------------------------------------------*/

7
cpu/msp430/dev/uart1.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)$Id: uart1.c,v 1.8 2009/01/31 12:46:57 joxe Exp $ * @(#)$Id: uart1.c,v 1.9 2009/02/24 21:31:10 adamdunkels Exp $
*/ */
/* /*
@ -46,7 +46,8 @@ static int (*uart1_input_handler)(unsigned char c);
static uint8_t rx_in_progress; static uint8_t rx_in_progress;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
uint8_t uint8_t
uart1_active(void) { uart1_active(void)
{
return ((~ UTCTL1) & TXEPT) | rx_in_progress; return ((~ UTCTL1) & TXEPT) | rx_in_progress;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -135,7 +136,7 @@ uart1_interrupt(void)
{ {
ENERGEST_ON(ENERGEST_TYPE_IRQ); ENERGEST_ON(ENERGEST_TYPE_IRQ);
if (!(URXIFG1 & IFG2)) { if(!(URXIFG1 & IFG2)) {
/* Edge detect if IFG not set? */ /* Edge detect if IFG not set? */
U1TCTL &= ~URXSE; /* Clear the URXS signal */ U1TCTL &= ~URXSE; /* Clear the URXS signal */
U1TCTL |= URXSE; /* Re-enable URXS - needed here?*/ U1TCTL |= URXSE; /* Re-enable URXS - needed here?*/