From 622893623b38edfd9e183f4d31a48ba742ae0d22 Mon Sep 17 00:00:00 2001 From: razvanm Date: Wed, 23 Sep 2009 18:29:20 +0000 Subject: [PATCH] Make tosboot compliant with TEP3. --- tos/lib/tosboot/Makefile | 2 +- tos/lib/tosboot/{TOSBoot.h => TosBoot.h} | 0 tos/lib/tosboot/{TOSBoot.nc => TosBootC.nc} | 34 +++++++++---------- tos/lib/tosboot/{TOSBootM.nc => TosBootP.nc} | 6 ++-- tos/lib/tosboot/avr/InternalFlashC.nc | 2 +- .../avr/{ProgFlashM.nc => ProgFlashC.nc} | 2 +- tos/lib/tosboot/epic/ExtFlashC.nc | 12 +++---- .../epic/{ExtFlashM.nc => ExtFlashP.nc} | 20 +++++------ .../iris/{ProgFlashM.nc => ProgFlashC.nc} | 2 +- .../m16c62p/{ProgFlashM.nc => ProgFlashC.nc} | 2 +- .../msp430/{HPLUSART0M.nc => HplUsart0C.nc} | 24 ++++++------- ...{HPLUSARTControl.nc => HplUsartControl.nc} | 4 +-- .../msp430/{ProgFlashM.nc => ProgFlashC.nc} | 2 +- tos/lib/tosboot/msp430f1611/PluginC.nc | 8 ++--- .../{PowerOffM.nc => PowerOffC.nc} | 2 +- tos/lib/tosboot/stm25p/ExtFlashC.nc | 12 +++---- .../stm25p/{ExtFlashM.nc => ExtFlashP.nc} | 28 +++++++-------- 17 files changed, 81 insertions(+), 81 deletions(-) rename tos/lib/tosboot/{TOSBoot.h => TosBoot.h} (100%) rename tos/lib/tosboot/{TOSBoot.nc => TosBootC.nc} (73%) rename tos/lib/tosboot/{TOSBootM.nc => TosBootP.nc} (99%) rename tos/lib/tosboot/avr/{ProgFlashM.nc => ProgFlashC.nc} (98%) rename tos/lib/tosboot/epic/{ExtFlashM.nc => ExtFlashP.nc} (85%) rename tos/lib/tosboot/iris/{ProgFlashM.nc => ProgFlashC.nc} (98%) rename tos/lib/tosboot/m16c62p/{ProgFlashM.nc => ProgFlashC.nc} (98%) rename tos/lib/tosboot/msp430/{HPLUSART0M.nc => HplUsart0C.nc} (81%) rename tos/lib/tosboot/msp430/{HPLUSARTControl.nc => HplUsartControl.nc} (96%) rename tos/lib/tosboot/msp430/{ProgFlashM.nc => ProgFlashC.nc} (99%) rename tos/lib/tosboot/msp430f1611/{PowerOffM.nc => PowerOffC.nc} (99%) rename tos/lib/tosboot/stm25p/{ExtFlashM.nc => ExtFlashP.nc} (79%) diff --git a/tos/lib/tosboot/Makefile b/tos/lib/tosboot/Makefile index 605bbbb4..cebcf9cb 100644 --- a/tos/lib/tosboot/Makefile +++ b/tos/lib/tosboot/Makefile @@ -28,7 +28,7 @@ # @author Jonathan Hui # -COMPONENT=TOSBoot +COMPONENT=TosBootC TINYOS_NP= PFLAGS += -DNESC_BUILD_BINARY diff --git a/tos/lib/tosboot/TOSBoot.h b/tos/lib/tosboot/TosBoot.h similarity index 100% rename from tos/lib/tosboot/TOSBoot.h rename to tos/lib/tosboot/TosBoot.h diff --git a/tos/lib/tosboot/TOSBoot.nc b/tos/lib/tosboot/TosBootC.nc similarity index 73% rename from tos/lib/tosboot/TOSBoot.nc rename to tos/lib/tosboot/TosBootC.nc index 9bd5c2bf..83172506 100644 --- a/tos/lib/tosboot/TOSBoot.nc +++ b/tos/lib/tosboot/TosBootC.nc @@ -28,35 +28,35 @@ * @author Jonathan Hui */ -includes Deluge; -includes DelugePageTransfer; -includes TOSBoot; +#include +#include +#include "TosBoot.h" -configuration TOSBoot { +configuration TosBootC { } implementation { components - TOSBootM, + TosBootP, ExecC, ExtFlashC, HardwareC, InternalFlashC as IntFlash, LedsC, PluginC, - ProgFlashM as ProgFlash, + ProgFlashC as ProgFlash, VoltageC; - TOSBootM.SubInit -> ExtFlashC; - TOSBootM.SubControl -> ExtFlashC.StdControl; - TOSBootM.SubControl -> PluginC; - - TOSBootM.Exec -> ExecC; - TOSBootM.ExtFlash -> ExtFlashC; - TOSBootM.Hardware -> HardwareC; - TOSBootM.IntFlash -> IntFlash; - TOSBootM.Leds -> LedsC; - TOSBootM.ProgFlash -> ProgFlash; - TOSBootM.Voltage -> VoltageC; + TosBootP.SubInit -> ExtFlashC; + TosBootP.SubControl -> ExtFlashC.StdControl; + TosBootP.SubControl -> PluginC; + + TosBootP.Exec -> ExecC; + TosBootP.ExtFlash -> ExtFlashC; + TosBootP.Hardware -> HardwareC; + TosBootP.IntFlash -> IntFlash; + TosBootP.Leds -> LedsC; + TosBootP.ProgFlash -> ProgFlash; + TosBootP.Voltage -> VoltageC; } diff --git a/tos/lib/tosboot/TOSBootM.nc b/tos/lib/tosboot/TosBootP.nc similarity index 99% rename from tos/lib/tosboot/TOSBootM.nc rename to tos/lib/tosboot/TosBootP.nc index b24b1762..9340772c 100644 --- a/tos/lib/tosboot/TOSBootM.nc +++ b/tos/lib/tosboot/TosBootP.nc @@ -29,10 +29,10 @@ * @author Razvan Musaloiu-E. */ -includes crc; -includes hardware; +#include "crc.h" +#include -module TOSBootM { +module TosBootP { uses { interface Exec; interface ExtFlash; diff --git a/tos/lib/tosboot/avr/InternalFlashC.nc b/tos/lib/tosboot/avr/InternalFlashC.nc index 558f2426..3b8803eb 100644 --- a/tos/lib/tosboot/avr/InternalFlashC.nc +++ b/tos/lib/tosboot/avr/InternalFlashC.nc @@ -28,7 +28,7 @@ * @author Jonathan Hui */ -includes InternalFlash; +#include module InternalFlashC { provides interface InternalFlash; diff --git a/tos/lib/tosboot/avr/ProgFlashM.nc b/tos/lib/tosboot/avr/ProgFlashC.nc similarity index 98% rename from tos/lib/tosboot/avr/ProgFlashM.nc rename to tos/lib/tosboot/avr/ProgFlashC.nc index 898ebc64..a3796eef 100644 --- a/tos/lib/tosboot/avr/ProgFlashM.nc +++ b/tos/lib/tosboot/avr/ProgFlashC.nc @@ -28,7 +28,7 @@ * @author Jonathan Hui */ -module ProgFlashM { +module ProgFlashC { provides { interface ProgFlash; } diff --git a/tos/lib/tosboot/epic/ExtFlashC.nc b/tos/lib/tosboot/epic/ExtFlashC.nc index 9f7d5347..34ada4e1 100644 --- a/tos/lib/tosboot/epic/ExtFlashC.nc +++ b/tos/lib/tosboot/epic/ExtFlashC.nc @@ -39,13 +39,13 @@ configuration ExtFlashC { implementation { components - ExtFlashM, - HPLUSART0M; + ExtFlashP, + HplUsart0C; - Init = ExtFlashM; - StdControl = ExtFlashM; - ExtFlash = ExtFlashM; + Init = ExtFlashP; + StdControl = ExtFlashP; + ExtFlash = ExtFlashP; - ExtFlashM.USARTControl -> HPLUSART0M; + ExtFlashP.UsartControl -> HplUsart0C; } diff --git a/tos/lib/tosboot/epic/ExtFlashM.nc b/tos/lib/tosboot/epic/ExtFlashP.nc similarity index 85% rename from tos/lib/tosboot/epic/ExtFlashM.nc rename to tos/lib/tosboot/epic/ExtFlashP.nc index a80ecabe..621ead10 100644 --- a/tos/lib/tosboot/epic/ExtFlashM.nc +++ b/tos/lib/tosboot/epic/ExtFlashP.nc @@ -26,14 +26,14 @@ * @author Razvan Musaloiu-E. */ -module ExtFlashM { +module ExtFlashP { provides { interface StdControl; interface Init; interface ExtFlash; } uses { - interface HPLUSARTControl as USARTControl; + interface HplUsartControl as UsartControl; } } @@ -44,7 +44,7 @@ implementation { command error_t Init.init() { TOSH_MAKE_FLASH_CS_OUTPUT(); TOSH_SET_FLASH_CS_PIN(); - call USARTControl.setModeSPI(); + call UsartControl.setModeSPI(); return SUCCESS; } @@ -53,7 +53,7 @@ implementation { } command error_t StdControl.stop() { - call USARTControl.disableSPI(); + call UsartControl.disableSPI(); return SUCCESS; } @@ -74,8 +74,8 @@ implementation { TOSH_CLR_FLASH_CS_PIN(); for ( i = 0; i < sizeof(cmd); i++ ) { - call USARTControl.tx(cmd[i]); - while(call USARTControl.isTxEmpty() != SUCCESS); + call UsartControl.tx(cmd[i]); + while(call UsartControl.isTxEmpty() != SUCCESS); } } @@ -85,10 +85,10 @@ implementation { call ExtFlash.startRead(addr); } addr++; - call USARTControl.rx(); - call USARTControl.tx(0); - while(call USARTControl.isRxIntrPending() != SUCCESS); - return call USARTControl.rx(); + call UsartControl.rx(); + call UsartControl.tx(0); + while(call UsartControl.isRxIntrPending() != SUCCESS); + return call UsartControl.rx(); } command void ExtFlash.stopRead() { diff --git a/tos/lib/tosboot/iris/ProgFlashM.nc b/tos/lib/tosboot/iris/ProgFlashC.nc similarity index 98% rename from tos/lib/tosboot/iris/ProgFlashM.nc rename to tos/lib/tosboot/iris/ProgFlashC.nc index 34c60183..3861a538 100644 --- a/tos/lib/tosboot/iris/ProgFlashM.nc +++ b/tos/lib/tosboot/iris/ProgFlashC.nc @@ -29,7 +29,7 @@ */ #include -module ProgFlashM { +module ProgFlashC { provides { interface ProgFlash; } diff --git a/tos/lib/tosboot/m16c62p/ProgFlashM.nc b/tos/lib/tosboot/m16c62p/ProgFlashC.nc similarity index 98% rename from tos/lib/tosboot/m16c62p/ProgFlashM.nc rename to tos/lib/tosboot/m16c62p/ProgFlashC.nc index 64669891..131171e2 100644 --- a/tos/lib/tosboot/m16c62p/ProgFlashM.nc +++ b/tos/lib/tosboot/m16c62p/ProgFlashC.nc @@ -40,7 +40,7 @@ * * @author Henrik Makitaavola */ -configuration ProgFlashM +configuration ProgFlashC { provides interface ProgFlash; } diff --git a/tos/lib/tosboot/msp430/HPLUSART0M.nc b/tos/lib/tosboot/msp430/HplUsart0C.nc similarity index 81% rename from tos/lib/tosboot/msp430/HPLUSART0M.nc rename to tos/lib/tosboot/msp430/HplUsart0C.nc index 34e4422c..e47ec505 100644 --- a/tos/lib/tosboot/msp430/HPLUSART0M.nc +++ b/tos/lib/tosboot/msp430/HplUsart0C.nc @@ -28,12 +28,12 @@ * @author Jonathan Hui */ -module HPLUSART0M { - provides interface HPLUSARTControl; +module HplUsart0C { + provides interface HplUsartControl; } implementation { - command void HPLUSARTControl.disableSPI() { + command void HplUsartControl.disableSPI() { // USART0 SPI module disable //ME1 &= ~USPIE0; @@ -44,7 +44,7 @@ implementation { U0RCTL = 0; } - command void HPLUSARTControl.setModeSPI() { + command void HplUsartControl.setModeSPI() { //U0CTL = SWRST; @@ -68,7 +68,7 @@ implementation { } - command void HPLUSARTControl.disableI2C() { + command void HplUsartControl.disableI2C() { /* U0CTL = 1; U0TCTL = 1; @@ -77,10 +77,10 @@ implementation { U0CTL &= ~I2CEN; U0CTL &= ~I2C; I2CTCTL = 0; - call HPLUSARTControl.disableSPI(); + call HplUsartControl.disableSPI(); } - command void HPLUSARTControl.setModeI2C() { + command void HplUsartControl.setModeI2C() { // Recommended init procedure U0CTL = I2C + SYNC + MST; @@ -94,14 +94,14 @@ implementation { return; } - command error_t HPLUSARTControl.isTxEmpty(){ + command error_t HplUsartControl.isTxEmpty(){ if (U0TCTL & TXEPT) { return SUCCESS; } return FAIL; } - command error_t HPLUSARTControl.isTxIntrPending(){ + command error_t HplUsartControl.isTxIntrPending(){ if (IFG1 & UTXIFG0){ IFG1 &= ~UTXIFG0; return SUCCESS; @@ -109,7 +109,7 @@ implementation { return FAIL; } - command error_t HPLUSARTControl.isRxIntrPending(){ + command error_t HplUsartControl.isRxIntrPending(){ if (IFG1 & URXIFG0){ IFG1 &= ~URXIFG0; return SUCCESS; @@ -117,11 +117,11 @@ implementation { return FAIL; } - command void HPLUSARTControl.tx(uint8_t data){ + command void HplUsartControl.tx(uint8_t data){ U0TXBUF = data; } - command uint8_t HPLUSARTControl.rx(){ + command uint8_t HplUsartControl.rx(){ return U0RXBUF; } diff --git a/tos/lib/tosboot/msp430/HPLUSARTControl.nc b/tos/lib/tosboot/msp430/HplUsartControl.nc similarity index 96% rename from tos/lib/tosboot/msp430/HPLUSARTControl.nc rename to tos/lib/tosboot/msp430/HplUsartControl.nc index c0254b17..02feb351 100644 --- a/tos/lib/tosboot/msp430/HPLUSARTControl.nc +++ b/tos/lib/tosboot/msp430/HplUsartControl.nc @@ -28,9 +28,9 @@ * @author Jonathan Hui */ -includes msp430usart; +#include -interface HPLUSARTControl { +interface HplUsartControl { command void disableSPI(); command void setModeSPI(); diff --git a/tos/lib/tosboot/msp430/ProgFlashM.nc b/tos/lib/tosboot/msp430/ProgFlashC.nc similarity index 99% rename from tos/lib/tosboot/msp430/ProgFlashM.nc rename to tos/lib/tosboot/msp430/ProgFlashC.nc index aa0adcca..2c87c6f9 100644 --- a/tos/lib/tosboot/msp430/ProgFlashM.nc +++ b/tos/lib/tosboot/msp430/ProgFlashC.nc @@ -28,7 +28,7 @@ * @author Jonathan Hui */ -module ProgFlashM { +module ProgFlashC { provides { interface ProgFlash; } diff --git a/tos/lib/tosboot/msp430f1611/PluginC.nc b/tos/lib/tosboot/msp430f1611/PluginC.nc index 860b2486..738bcae5 100644 --- a/tos/lib/tosboot/msp430f1611/PluginC.nc +++ b/tos/lib/tosboot/msp430f1611/PluginC.nc @@ -36,11 +36,11 @@ configuration PluginC { implementation { - components ExtFlashC, LedsC, PowerOffM; + components ExtFlashC, LedsC, PowerOffC; - StdControl = PowerOffM; + StdControl = PowerOffC; - PowerOffM.Leds -> LedsC; - PowerOffM.SubControl -> ExtFlashC; + PowerOffC.Leds -> LedsC; + PowerOffC.SubControl -> ExtFlashC; } diff --git a/tos/lib/tosboot/msp430f1611/PowerOffM.nc b/tos/lib/tosboot/msp430f1611/PowerOffC.nc similarity index 99% rename from tos/lib/tosboot/msp430f1611/PowerOffM.nc rename to tos/lib/tosboot/msp430f1611/PowerOffC.nc index 94d8dc37..e998cc30 100644 --- a/tos/lib/tosboot/msp430f1611/PowerOffM.nc +++ b/tos/lib/tosboot/msp430f1611/PowerOffC.nc @@ -28,7 +28,7 @@ * @author Jonathan Hui */ -module PowerOffM { +module PowerOffC { provides { interface Init; interface StdControl; diff --git a/tos/lib/tosboot/stm25p/ExtFlashC.nc b/tos/lib/tosboot/stm25p/ExtFlashC.nc index 9f7d5347..34ada4e1 100644 --- a/tos/lib/tosboot/stm25p/ExtFlashC.nc +++ b/tos/lib/tosboot/stm25p/ExtFlashC.nc @@ -39,13 +39,13 @@ configuration ExtFlashC { implementation { components - ExtFlashM, - HPLUSART0M; + ExtFlashP, + HplUsart0C; - Init = ExtFlashM; - StdControl = ExtFlashM; - ExtFlash = ExtFlashM; + Init = ExtFlashP; + StdControl = ExtFlashP; + ExtFlash = ExtFlashP; - ExtFlashM.USARTControl -> HPLUSART0M; + ExtFlashP.UsartControl -> HplUsart0C; } diff --git a/tos/lib/tosboot/stm25p/ExtFlashM.nc b/tos/lib/tosboot/stm25p/ExtFlashP.nc similarity index 79% rename from tos/lib/tosboot/stm25p/ExtFlashM.nc rename to tos/lib/tosboot/stm25p/ExtFlashP.nc index b9909b29..f1a62175 100644 --- a/tos/lib/tosboot/stm25p/ExtFlashM.nc +++ b/tos/lib/tosboot/stm25p/ExtFlashP.nc @@ -25,14 +25,14 @@ * @author Jonathan Hui */ -module ExtFlashM { +module ExtFlashP { provides { interface StdControl; interface Init; interface ExtFlash; } uses { - interface HPLUSARTControl as USARTControl; + interface HplUsartControl as UsartControl; } } @@ -42,7 +42,7 @@ implementation { TOSH_MAKE_FLASH_HOLD_OUTPUT(); TOSH_MAKE_FLASH_CS_OUTPUT(); TOSH_SET_FLASH_HOLD_PIN(); - call USARTControl.setModeSPI(); + call UsartControl.setModeSPI(); return SUCCESS; } @@ -54,12 +54,12 @@ implementation { TOSH_CLR_FLASH_CS_PIN(); - call USARTControl.tx(0xb9); - while(call USARTControl.isTxEmpty() != SUCCESS); + call UsartControl.tx(0xb9); + while(call UsartControl.isTxEmpty() != SUCCESS); TOSH_SET_FLASH_CS_PIN(); - call USARTControl.disableSPI(); + call UsartControl.disableSPI(); return SUCCESS; @@ -73,8 +73,8 @@ implementation { // command byte + 3 dummy bytes + signature for ( i = 0; i < 5; i++ ) { - call USARTControl.tx(0xab); - while(call USARTControl.isTxIntrPending() != SUCCESS); + call UsartControl.tx(0xab); + while(call UsartControl.isTxIntrPending() != SUCCESS); } TOSH_SET_FLASH_CS_PIN(); @@ -94,17 +94,17 @@ implementation { // address for ( i = 4; i > 0; i-- ) { - call USARTControl.tx((addr >> (i-1)*8) & 0xff); - while(call USARTControl.isTxIntrPending() != SUCCESS); + call UsartControl.tx((addr >> (i-1)*8) & 0xff); + while(call UsartControl.isTxIntrPending() != SUCCESS); } } command uint8_t ExtFlash.readByte() { - call USARTControl.rx(); - call USARTControl.tx(0); - while(call USARTControl.isRxIntrPending() != SUCCESS); - return call USARTControl.rx(); + call UsartControl.rx(); + call UsartControl.tx(0); + while(call UsartControl.isRxIntrPending() != SUCCESS); + return call UsartControl.rx(); } command void ExtFlash.stopRead() { -- 2.39.2