X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Fprintf%2FPrintfP.nc;fp=tos%2Flib%2Fprintf%2FPrintfP.nc;h=78595a8db9f19189352fdad01fa28be6717729d6;hb=7e3e9dc68fd8299266a07e07357853271d424cdb;hp=5f4ae23110d7587cd358de7dd79c4e229f2a6be4;hpb=f44d6d35052f388b3dd92252f299df85a96d3fac;p=tinyos-2.x.git diff --git a/tos/lib/printf/PrintfP.nc b/tos/lib/printf/PrintfP.nc index 5f4ae231..78595a8d 100644 --- a/tos/lib/printf/PrintfP.nc +++ b/tos/lib/printf/PrintfP.nc @@ -19,6 +19,37 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR * MODIFICATIONS." */ + + /* + * Copyright (c) 2007 Stanford University. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * - Neither the name of the Stanford University nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL STANFORD + * UNIVERSITY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ /** * This is the PrintfP component. It provides the printf service for printing @@ -38,10 +69,11 @@ * (i.e. telos, eyes) and atmega128 based motes (i.e. mica2, micaz). On the * atmega platforms, avr-libc version 1.4 or above mus tbe used. * - * - * @author Kevin Klues (klueska@cs.wustl.edu) - * @version $Revision$ - * @date $Date$ + */ + +/** + * @author Kevin Klues + * @date September 18, 2007 */ #include "printf.h" @@ -53,95 +85,68 @@ static FILE atm128_stdout = FDEV_SETUP_STREAM(uart_putchar, NULL, _FDEV_SETUP_WR module PrintfP { provides { - interface SplitControl as PrintfControl; - interface PrintfFlush; + interface Boot; } uses { + interface Boot as MainBoot; interface SplitControl as SerialControl; + interface PrintfQueue as Queue; + interface AMSend; interface Packet; + interface Leds; } } implementation { enum { - S_STARTED, S_STOPPED, + S_STARTED, S_FLUSHING, }; message_t printfMsg; - nx_uint8_t buffer[PRINTF_BUFFER_SIZE]; - norace nx_uint8_t* next_byte; uint8_t state = S_STOPPED; - uint32_t bytes_left_to_flush; - uint8_t length_to_send; - - task void retrySend() { - if(call AMSend.send(AM_BROADCAST_ADDR, &printfMsg, sizeof(printf_msg_t)) != SUCCESS) - post retrySend(); - } - void sendNext() { - printf_msg_t* m = (printf_msg_t*)call Packet.getPayload(&printfMsg, sizeof(printf_msg_t)); - length_to_send = (bytes_left_to_flush < sizeof(printf_msg_t)) ? bytes_left_to_flush : sizeof(printf_msg_t); - memset(m->buffer, 0, sizeof(printf_msg_t)); - memcpy(m->buffer, (nx_uint8_t*)next_byte, length_to_send); - if(call AMSend.send(AM_BROADCAST_ADDR, &printfMsg, sizeof(printf_msg_t)) != SUCCESS) - post retrySend(); - else { - bytes_left_to_flush -= length_to_send; - next_byte += length_to_send; - } - } - - command error_t PrintfControl.start() { - if(state == S_STOPPED) - return call SerialControl.start(); - return FAIL; - } - - command error_t PrintfControl.stop() { - if(state == S_STARTED) - return call SerialControl.stop(); - return FAIL; + event void MainBoot.booted() { + call SerialControl.start(); } event void SerialControl.startDone(error_t error) { - if(error != SUCCESS) { - signal PrintfControl.startDone(error); - return; - } #ifdef _H_atmega128hardware_H stdout = &atm128_stdout; #endif - atomic { - memset(buffer, 0, sizeof(buffer)); - next_byte = buffer; - bytes_left_to_flush = 0; - length_to_send = 0; - state = S_STARTED; - } - signal PrintfControl.startDone(error); + atomic state = S_STARTED; + signal Boot.booted(); } event void SerialControl.stopDone(error_t error) { - if(error != SUCCESS) { - signal PrintfControl.stopDone(error); - return; - } atomic state = S_STOPPED; - signal PrintfControl.stopDone(error); } - command error_t PrintfFlush.flush() { + task void retrySend() { + if(call AMSend.send(AM_BROADCAST_ADDR, &printfMsg, sizeof(printf_msg_t)) != SUCCESS) + post retrySend(); + } + + void sendNext() { + int i; + printf_msg_t* m = (printf_msg_t*)call Packet.getPayload(&printfMsg, sizeof(printf_msg_t)); + uint16_t length_to_send = (call Queue.size() < sizeof(printf_msg_t)) ? call Queue.size() : sizeof(printf_msg_t); + memset(m->buffer, 0, sizeof(printf_msg_t)); + for(i=0; ibuffer[i] = call Queue.dequeue(); + if(call AMSend.send(AM_BROADCAST_ADDR, &printfMsg, sizeof(printf_msg_t)) != SUCCESS) + post retrySend(); + } + + int printfflush() @C() @spontaneous() { atomic { - if(state == S_STARTED && (next_byte > buffer)) { - state = S_FLUSHING; - bytes_left_to_flush = next_byte - buffer; - next_byte = buffer; - } - else return FAIL; + if(state == S_FLUSHING) + return SUCCESS; + if(call Queue.empty()) + return FAIL; + state = S_FLUSHING; } sendNext(); return SUCCESS; @@ -149,17 +154,11 @@ implementation { event void AMSend.sendDone(message_t* msg, error_t error) { if(error == SUCCESS) { - if(bytes_left_to_flush > 0) + if(call Queue.size() > 0) sendNext(); - else { - next_byte = buffer; - bytes_left_to_flush = 0; - length_to_send = 0; - atomic state = S_STARTED; - signal PrintfFlush.flushDone(error); + else state = S_STARTED; } - } - else post retrySend(); + else post retrySend(); } #ifdef _H_msp430hardware_h @@ -168,11 +167,13 @@ implementation { #ifdef _H_atmega128hardware_H int uart_putchar(char c, FILE *stream) __attribute__((noinline)) @C() @spontaneous() { #endif + if((state == S_STARTED) && (call Queue.size() >= 5*sizeof(printf_msg_t))) { + state = S_FLUSHING; + sendNext(); + } atomic { - if(state == S_STARTED && ((next_byte-buffer) < PRINTF_BUFFER_SIZE)) { - *(next_byte++) = c; + if(call Queue.enqueue(c) == SUCCESS) return 0; - } else return -1; } }