Changeset 1459

Timestamp:

02/25/12 18:57:16 (15 months ago)

Author:

thomas

Message:

use callback functions in radio drivers (fully interrupt-driven)

Location:

trunk/firmware/openos

Files:

• bsp/radio.h (modified) (2 diffs)
• bsp/radiotimer.h (modified) (2 diffs)
• bsp/telosb/radio.c (modified) (1 diff)
• bsp/telosb/radiotimer.c (modified) (3 diffs)
• projects/telosb/01-bsp/01bsp_radio.c (modified) (4 diffs)

trunk/firmware/openos/bsp/radio.h

@@ -7 +7 @@
 #ifndef __RADIO_H
 #define __RADIO_H
+
+#include "radiotimer.h"
 
 //=========================== define ==========================================
@@ -19 +21 @@
 void radio_reset();
 void radio_startTimer(uint16_t period);
+void radio_setOverflowCb(radiotimer_compare_cbt cb);
+void radio_setCompareCb(radiotimer_compare_cbt cb);
+void radio_setStartFrameCb(radiotimer_capture_cbt cb);
+void radio_setEndFrameCb(radiotimer_capture_cbt cb);
 void radio_setFrequency(uint8_t frequency);
 void radio_rfOn();

trunk/firmware/openos/bsp/radiotimer.h

@@ -14 +14 @@
 //=========================== typedef =========================================
 
-typedef void (*radiotimer_overflow_cbt)();
-typedef void (*radiotimer_frame_cbt)(uint16_t timestamp);
+typedef void (*radiotimer_compare_cbt)();
+typedef void (*radiotimer_capture_cbt)(uint16_t timestamp);
 
 //=========================== variables =======================================
@@ -22 +22 @@
 
 void     radiotimer_init();
+void     radiotimer_setOverflowCb(radiotimer_compare_cbt cb);
+void     radiotimer_setCompareCb(radiotimer_compare_cbt cb);
+void     radiotimer_setStartFrameCb(radiotimer_capture_cbt cb);
+void     radiotimer_setEndFrameCb(radiotimer_capture_cbt cb);
 void     radiotimer_start(uint16_t period); 
 void     radiotimer_schedule(uint16_t offset);

trunk/firmware/openos/bsp/telosb/radio.c

@@ -50 +50 @@
 void radio_startTimer(uint16_t period) {
    radiotimer_start(period);
+}
+
+void radio_setOverflowCb(radiotimer_compare_cbt cb) {
+   radiotimer_setOverflowCb(cb);
+}
+
+void radio_setCompareCb(radiotimer_compare_cbt cb) {
+   radiotimer_setCompareCb(cb);
+}
+
+void radio_setStartFrameCb(radiotimer_capture_cbt cb) {
+   radiotimer_setStartFrameCb(cb);
+}
+
+void radio_setEndFrameCb(radiotimer_capture_cbt cb) {
+   radiotimer_setEndFrameCb(cb);
 }
 

trunk/firmware/openos/bsp/telosb/radiotimer.c

@@ -13 +13 @@
 
 typedef struct {
-   radiotimer_overflow_cbt   overflowCb;
-   radiotimer_frame_cbt      startOfFrameCb;
-   radiotimer_frame_cbt      endOfFrameCb;
+   radiotimer_compare_cbt    overflowCb;
+   radiotimer_compare_cbt    compareCb;
+   radiotimer_capture_cbt    startFrameCb;
+   radiotimer_capture_cbt    endFrameCb;
 } radiotimer_vars_t;
 
@@ -29 +30 @@
 }
 
-void radiotimer_setOverflowCb(radiotimer_overflow_cbt cb) {
-   radiotimer_vars.overflowCb = cb;
+void radiotimer_setOverflowCb(radiotimer_compare_cbt cb) {
+   radiotimer_vars.overflowCb     = cb;
 }
 
-void radiotimer_setStartOfFrameCb(radiotimer_frame_cbt cb) {
-   radiotimer_vars.startOfFrameCb = cb;
+void radiotimer_setCompareCb(radiotimer_compare_cbt cb) {
+   radiotimer_vars.compareCb      = cb;
 }
 
-void radiotimer_setEndOfFrameCb(radiotimer_frame_cbt cb) {
-   radiotimer_vars.endOfFrameCb   = cb;
+void radiotimer_setStartFrameCb(radiotimer_capture_cbt cb) {
+   radiotimer_vars.startFrameCb = cb;
+}
+
+void radiotimer_setEndFrameCb(radiotimer_capture_cbt cb) {
+   radiotimer_vars.endFrameCb   = cb;
 }
 
@@ -105 +110 @@
          if (TBCCR1 & CCI) {
             // SFD pin is high: this was the start of a frame
-            if (radiotimer_vars.startOfFrameCb!=NULL) {
-               radiotimer_vars.startOfFrameCb(TBCCR1);
+            if (radiotimer_vars.startFrameCb!=NULL) {
+               radiotimer_vars.startFrameCb(TBCCR1);
             }
          } else {
             // SFD pin is low: this was the end of a frame
-            if (radiotimer_vars.endOfFrameCb!=NULL) {
-               radiotimer_vars.endOfFrameCb(TBCCR1);
+            if (radiotimer_vars.endFrameCb!=NULL) {
+               radiotimer_vars.endFrameCb(TBCCR1);
             }
          }
          break;
       case 0x0004: // CCR2 fires
+         if (radiotimer_vars.compareCb!=NULL) {
+            radiotimer_vars.compareCb();
+         }
          break;
       case 0x0006: // CCR3 fires

trunk/firmware/openos/projects/telosb/01-bsp/01bsp_radio.c

@@ -6 +6 @@
 
 #include "stdint.h"
+#include "string.h"
 #include "board.h"
 #include "radio.h"
 #include "leds.h"
 
+//=========================== defines =========================================
+
 #define LENGTH_PACKET 100
 #define CHANNEL       11
+
+//=========================== variables =======================================
+
+void cb_radioTimerOverflows();
+void cb_radioTimerCompare();
+void cb_startFrame(uint16_t timestamp);
+void cb_endFrame(uint16_t timestamp);
+
+typedef struct {
+   uint8_t radio_busy;
+   uint8_t num_overflow;
+   uint8_t num_compare;
+   uint8_t num_startFrame;
+   uint8_t num_endFrame;
+} app_vars_t;
+
+app_vars_t app_vars;
+
+//=========================== main ============================================
 
 /**
@@ -21 +43 @@
    uint8_t i;
    
-   // initialize
+   // clear local variables
+   memset(&app_vars,0,sizeof(app_vars_t));
+   
+   // initialize board
    board_init();
+   
+   // add callback functions from radio
+   radio_setOverflowCb(cb_radioTimerOverflows);
+   radio_setCompareCb(cb_radioTimerCompare);
+   radio_setStartFrameCb(cb_startFrame);
+   radio_setEndFrameCb(cb_endFrame);
    
    // prepare packet
@@ -35 +66 @@
    radio_txEnable();
    radio_txNow();
-   radio_waitTxDone();
+   app_vars.radio_busy = 1;
+   while (app_vars.radio_busy==1);
    radio_rfOff();
    led_radio_toggle();
@@ -42 +74 @@
    board_sleep();
 }
+
+//=========================== callbacks =======================================
+
+void cb_radioTimerOverflows() {
+   app_vars.num_overflow++;
+}
+
+void cb_radioTimerCompare() {
+   app_vars.num_compare++;
+}
+
+void cb_startFrame(uint16_t timestamp) {
+   app_vars.num_startFrame++;
+}
+
+void cb_endFrame(uint16_t timestamp) {
+   app_vars.radio_busy = 0;
+   app_vars.num_endFrame++;
+}