[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/atm128 Atm128UartP.nc,
1.1.2.1, 1.1.2.2 HplAtm128UartP.nc, 1.1.2.5, 1.1.2.6
Phil Levis
scipio at users.sourceforge.net
Tue Oct 17 12:04:48 PDT 2006
Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29211
Modified Files:
Tag: tinyos-2_0_devel-BRANCH
Atm128UartP.nc HplAtm128UartP.nc
Log Message:
Be sure to turn on RX.
Index: Atm128UartP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/Attic/Atm128UartP.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Atm128UartP.nc 10 Oct 2006 19:18:42 -0000 1.1.2.1
--- Atm128UartP.nc 17 Oct 2006 19:04:45 -0000 1.1.2.2
***************
*** 69,72 ****
--- 69,73 ----
command error_t StdControl.start(){
call HplUartTxControl.start();
+ call HplUartRxControl.start();
return SUCCESS;
}
***************
*** 74,77 ****
--- 75,79 ----
command error_t StdControl.stop(){
call HplUartTxControl.stop();
+ call HplUartRxControl.stop();
return SUCCESS;
}
Index: HplAtm128UartP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/HplAtm128UartP.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** HplAtm128UartP.nc 10 Oct 2006 19:18:42 -0000 1.1.2.5
--- HplAtm128UartP.nc 17 Oct 2006 19:04:45 -0000 1.1.2.6
***************
*** 81,85 ****
uses interface Atm128Calibrate;
uses interface McuPowerState;
-
}
implementation {
--- 81,84 ----
***************
*** 107,115 ****
command error_t Uart0TxControl.start() {
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR0B;
! ctrl.bits.txcie = 1;
! ctrl.bits.txen = 1;
! UCSR0B = ctrl.flat;
call McuPowerState.update();
return SUCCESS;
--- 106,111 ----
command error_t Uart0TxControl.start() {
! SET_BIT(UCSR0B, TXCIE);
! SET_BIT(UCSR0B, TXEN);
call McuPowerState.update();
return SUCCESS;
***************
*** 117,125 ****
command error_t Uart0TxControl.stop() {
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR0B;
! ctrl.bits.txcie = 0;
! ctrl.bits.txen = 0;
! UCSR0B = ctrl.flat;
call McuPowerState.update();
return SUCCESS;
--- 113,118 ----
command error_t Uart0TxControl.stop() {
! CLR_BIT(UCSR0B, TXCIE);
! CLR_BIT(UCSR0B, TXEN);
call McuPowerState.update();
return SUCCESS;
***************
*** 127,135 ****
command error_t Uart0RxControl.start() {
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR0B;
! ctrl.bits.rxcie = 1;
! ctrl.bits.rxen = 1;
! UCSR0B = ctrl.flat;
call McuPowerState.update();
return SUCCESS;
--- 120,125 ----
command error_t Uart0RxControl.start() {
! SET_BIT(UCSR0B, RXCIE);
! SET_BIT(UCSR0B, RXEN);
call McuPowerState.update();
return SUCCESS;
***************
*** 137,145 ****
command error_t Uart0RxControl.stop() {
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR0B;
! ctrl.bits.rxcie = 0;
! ctrl.bits.rxen = 0;
! UCSR0B = ctrl.flat;
call McuPowerState.update();
return SUCCESS;
--- 127,132 ----
command error_t Uart0RxControl.stop() {
! CLR_BIT(UCSR0B, RXCIE);
! CLR_BIT(UCSR0B, RXEN);
call McuPowerState.update();
return SUCCESS;
***************
*** 147,178 ****
async command error_t HplUart0.enableTxIntr() {
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR0B;
! ctrl.bits.txen = 1;
! UCSR0B = ctrl.flat;
return SUCCESS;
}
async command error_t HplUart0.disableTxIntr(){
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR0B;
! ctrl.bits.txen = 0;
! UCSR0B = ctrl.flat;
return SUCCESS;
}
async command error_t HplUart0.enableRxIntr(){
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR0B;
! ctrl.bits.rxen = 1;
! UCSR0B = ctrl.flat;
return SUCCESS;
}
async command error_t HplUart0.disableRxIntr(){
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR0B;
! ctrl.bits.rxen = 0;
! UCSR0B = ctrl.flat;
return SUCCESS;
}
--- 134,153 ----
async command error_t HplUart0.enableTxIntr() {
! SET_BIT(UCSR0B, TXEN);
return SUCCESS;
}
async command error_t HplUart0.disableTxIntr(){
! CLR_BIT(UCSR0B, TXEN);
return SUCCESS;
}
async command error_t HplUart0.enableRxIntr(){
! SET_BIT(UCSR0B, RXEN);
return SUCCESS;
}
async command error_t HplUart0.disableRxIntr(){
! CLR_BIT(UCSR0B, RXEN);
return SUCCESS;
}
***************
*** 198,203 ****
AVR_ATOMIC_HANDLER(SIG_UART0_RECV) {
! if (READ_BIT(UCSR0A, RXC))
signal HplUart0.rxDone(UDR0);
}
--- 173,179 ----
AVR_ATOMIC_HANDLER(SIG_UART0_RECV) {
! if (READ_BIT(UCSR0A, RXC)) {
signal HplUart0.rxDone(UDR0);
+ }
}
***************
*** 211,215 ****
Atm128UartControl_t ctrl;
uint16_t ubrr1;
!
ctrl.bits = (struct Atm128_UCSRB_t) {rxcie:0, txcie:0, rxen:0, txen:0};
stts.bits = (struct Atm128_UCSRA_t) {u2x:1};
--- 187,191 ----
Atm128UartControl_t ctrl;
uint16_t ubrr1;
!
ctrl.bits = (struct Atm128_UCSRB_t) {rxcie:0, txcie:0, rxen:0, txen:0};
stts.bits = (struct Atm128_UCSRA_t) {u2x:1};
***************
*** 227,235 ****
command error_t Uart1TxControl.start() {
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR1B;
! ctrl.bits.txcie = 1;
! ctrl.bits.txen = 1;
! UCSR1B = ctrl.flat;
call McuPowerState.update();
return SUCCESS;
--- 203,208 ----
command error_t Uart1TxControl.start() {
! SET_BIT(UCSR1B, TXCIE);
! SET_BIT(UCSR1B, TXEN);
call McuPowerState.update();
return SUCCESS;
***************
*** 237,245 ****
command error_t Uart1TxControl.stop() {
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR1B;
! ctrl.bits.txcie = 0;
! ctrl.bits.txen = 0;
! UCSR1B = ctrl.flat;
call McuPowerState.update();
return SUCCESS;
--- 210,215 ----
command error_t Uart1TxControl.stop() {
! CLR_BIT(UCSR1B, TXCIE);
! CLR_BIT(UCSR1B, TXEN);
call McuPowerState.update();
return SUCCESS;
***************
*** 247,255 ****
command error_t Uart1RxControl.start() {
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR1B;
! ctrl.bits.rxcie = 1;
! ctrl.bits.rxen = 1;
! UCSR1B = ctrl.flat;
call McuPowerState.update();
return SUCCESS;
--- 217,222 ----
command error_t Uart1RxControl.start() {
! SET_BIT(UCSR1B, RXCIE);
! SET_BIT(UCSR1B, RXEN);
call McuPowerState.update();
return SUCCESS;
***************
*** 257,265 ****
command error_t Uart1RxControl.stop() {
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR1B;
! ctrl.bits.rxcie = 0;
! ctrl.bits.rxen = 0;
! UCSR1B = ctrl.flat;
call McuPowerState.update();
return SUCCESS;
--- 224,229 ----
command error_t Uart1RxControl.stop() {
! CLR_BIT(UCSR1B, RXCIE);
! CLR_BIT(UCSR1B, RXEN);
call McuPowerState.update();
return SUCCESS;
***************
*** 267,301 ****
async command error_t HplUart1.enableTxIntr() {
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR1B;
! ctrl.bits.txen = 1;
! UCSR1B = ctrl.flat;
return SUCCESS;
}
!
! async command error_t HplUart1.disableTxIntr() {
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR1B;
! ctrl.bits.txen = 0;
! UCSR1B = ctrl.flat;
return SUCCESS;
}
!
! async command error_t HplUart1.enableRxIntr() {
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR1B;
! ctrl.bits.rxen = 1;
! UCSR1B = ctrl.flat;
return SUCCESS;
}
! async command error_t HplUart1.disableRxIntr() {
! Atm128UartControl_t ctrl;
! ctrl.flat = UCSR1B;
! ctrl.bits.rxen = 0;
! UCSR1B = ctrl.flat;
return SUCCESS;
}
!
async command bool HplUart1.isTxEmpty() {
return READ_BIT(UCSR1A, TXC);
--- 231,253 ----
async command error_t HplUart1.enableTxIntr() {
! SET_BIT(UCSR1B, TXEN);
return SUCCESS;
}
!
! async command error_t HplUart1.disableTxIntr(){
! CLR_BIT(UCSR1B, TXEN);
return SUCCESS;
}
!
! async command error_t HplUart1.enableRxIntr(){
! SET_BIT(UCSR1B, RXEN);
return SUCCESS;
}
! async command error_t HplUart1.disableRxIntr(){
! CLR_BIT(UCSR1B, RXEN);
return SUCCESS;
}
!
async command bool HplUart1.isTxEmpty() {
return READ_BIT(UCSR1A, TXC);
More information about the Tinyos-2-commits
mailing list