From e3d72e74e85c27dbb1b80fd577c305759cc717c1 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 7 Jul 2011 14:57:30 +0000 Subject: switch to macro --- kernel/kernel.c | 2 +- kernel/uart.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/kernel.c b/kernel/kernel.c index ad21de3..8492425 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -67,7 +67,7 @@ ISR(SCHEDULE, ISR_NAKED) TIMSK &= ~_BV(OCIE1A); /* turn off output compare 1A */ - if (TIFR & _BV(TOV1)) { + if (bit_is_set(TIFR, TOV1)) { TIFR |= _BV(TOV1); /* reset flag */ ++kernel.cycles; } diff --git a/kernel/uart.c b/kernel/uart.c index a952758..cdfaf73 100644 --- a/kernel/uart.c +++ b/kernel/uart.c @@ -45,16 +45,16 @@ uart_getchar(void) { char c; -#if BLOCKING +#if 0 /* BLOCKING */ loop_until_bit_is_set(UCSRA, RXC); #else if (bit_is_clear(UCSRA, RXC)) return 0; #endif - if (UCSRA & _BV(FE)) + if (bit_is_set(UCSRA, FE)) return -2; /* EOF */ - if (UCSRA & _BV(DOR)) + if (bit_is_set(UCSRA, DOR)) return -1; /* ERR */ c = UDR; -- cgit v1.2.3