From b9d9b45472ac2b5043943979487ae619a70bf6e6 Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Mon, 7 Dec 2009 14:54:47 -0700 Subject: [PATCH] Changes so this checkout exactly matches CVS at -r release_tinyos_2_0_2_2. --- tos/lib/{tosboot => TOSBoot}/Deluge.h | 0 tos/lib/{tosboot => TOSBoot}/Exec.nc | 0 tos/lib/{tosboot => TOSBoot}/ExtFlash.nc | 0 tos/lib/{tosboot => TOSBoot}/Hardware.nc | 0 tos/lib/{tosboot => TOSBoot}/Leds.nc | 0 tos/lib/{tosboot => TOSBoot}/Makefile | 0 tos/lib/{tosboot => TOSBoot}/ProgFlash.nc | 0 tos/lib/{tosboot => TOSBoot}/TOSBoot.h | 0 tos/lib/{tosboot => TOSBoot}/TOSBoot.nc | 0 tos/lib/{tosboot => TOSBoot}/TOSBootM.nc | 24 ++++++------------- tos/lib/{tosboot => TOSBoot}/Voltage.nc | 0 .../{tosboot => TOSBoot}/at45db/ExtFlashC.nc | 0 tos/lib/{tosboot => TOSBoot}/avr/HardwareC.nc | 0 .../avr/InternalFlashC.nc | 0 .../{tosboot => TOSBoot}/avr/ProgFlashM.nc | 0 tos/lib/{tosboot => TOSBoot}/avr/boot.h | 0 tos/lib/{tosboot => TOSBoot}/crc.h | 0 tos/lib/{tosboot => TOSBoot}/lib/ExecC.nc | 0 tos/lib/{tosboot => TOSBoot}/lib/LedsC.nc | 0 tos/lib/{tosboot => TOSBoot}/micaz/ExecC.nc | 0 .../micaz/InternalFlash.h | 0 tos/lib/{tosboot => TOSBoot}/micaz/PluginC.nc | 0 .../micaz/TOSBoot_platform.h | 0 .../{tosboot => TOSBoot}/micaz/VoltageC.nc | 0 .../{tosboot => TOSBoot}/micaz/avrhardware.h | 6 +---- tos/lib/{tosboot => TOSBoot}/micaz/hardware.h | 0 .../{tosboot => TOSBoot}/msp430/HPLUSART0M.nc | 0 .../msp430/HPLUSARTControl.nc | 0 .../{tosboot => TOSBoot}/msp430/HardwareC.nc | 0 .../msp430/InternalFlashC.nc | 0 .../{tosboot => TOSBoot}/msp430/ProgFlashM.nc | 0 .../{tosboot => TOSBoot}/msp430/VoltageC.nc | 0 .../{tosboot => TOSBoot}/stm25p/ExtFlashC.nc | 0 .../{tosboot => TOSBoot}/stm25p/ExtFlashM.nc | 0 .../telosb/InternalFlash.h | 0 .../telosb/InternalFlash.nc | 0 .../{tosboot => TOSBoot}/telosb/PluginC.nc | 0 .../{tosboot => TOSBoot}/telosb/PowerOffM.nc | 0 .../telosb/TOSBoot_platform.h | 0 .../{tosboot => TOSBoot}/telosb/hardware.h | 0 tos/platforms/btnode3/.platform | 2 +- tos/platforms/btnode3/hardware.h | 1 - 42 files changed, 9 insertions(+), 24 deletions(-) rename tos/lib/{tosboot => TOSBoot}/Deluge.h (100%) rename tos/lib/{tosboot => TOSBoot}/Exec.nc (100%) rename tos/lib/{tosboot => TOSBoot}/ExtFlash.nc (100%) rename tos/lib/{tosboot => TOSBoot}/Hardware.nc (100%) rename tos/lib/{tosboot => TOSBoot}/Leds.nc (100%) rename tos/lib/{tosboot => TOSBoot}/Makefile (100%) rename tos/lib/{tosboot => TOSBoot}/ProgFlash.nc (100%) rename tos/lib/{tosboot => TOSBoot}/TOSBoot.h (100%) rename tos/lib/{tosboot => TOSBoot}/TOSBoot.nc (100%) rename tos/lib/{tosboot => TOSBoot}/TOSBootM.nc (94%) rename tos/lib/{tosboot => TOSBoot}/Voltage.nc (100%) rename tos/lib/{tosboot => TOSBoot}/at45db/ExtFlashC.nc (100%) rename tos/lib/{tosboot => TOSBoot}/avr/HardwareC.nc (100%) rename tos/lib/{tosboot => TOSBoot}/avr/InternalFlashC.nc (100%) rename tos/lib/{tosboot => TOSBoot}/avr/ProgFlashM.nc (100%) rename tos/lib/{tosboot => TOSBoot}/avr/boot.h (100%) rename tos/lib/{tosboot => TOSBoot}/crc.h (100%) rename tos/lib/{tosboot => TOSBoot}/lib/ExecC.nc (100%) rename tos/lib/{tosboot => TOSBoot}/lib/LedsC.nc (100%) rename tos/lib/{tosboot => TOSBoot}/micaz/ExecC.nc (100%) rename tos/lib/{tosboot => TOSBoot}/micaz/InternalFlash.h (100%) rename tos/lib/{tosboot => TOSBoot}/micaz/PluginC.nc (100%) rename tos/lib/{tosboot => TOSBoot}/micaz/TOSBoot_platform.h (100%) rename tos/lib/{tosboot => TOSBoot}/micaz/VoltageC.nc (100%) rename tos/lib/{tosboot => TOSBoot}/micaz/avrhardware.h (98%) rename tos/lib/{tosboot => TOSBoot}/micaz/hardware.h (100%) rename tos/lib/{tosboot => TOSBoot}/msp430/HPLUSART0M.nc (100%) rename tos/lib/{tosboot => TOSBoot}/msp430/HPLUSARTControl.nc (100%) rename tos/lib/{tosboot => TOSBoot}/msp430/HardwareC.nc (100%) rename tos/lib/{tosboot => TOSBoot}/msp430/InternalFlashC.nc (100%) rename tos/lib/{tosboot => TOSBoot}/msp430/ProgFlashM.nc (100%) rename tos/lib/{tosboot => TOSBoot}/msp430/VoltageC.nc (100%) rename tos/lib/{tosboot => TOSBoot}/stm25p/ExtFlashC.nc (100%) rename tos/lib/{tosboot => TOSBoot}/stm25p/ExtFlashM.nc (100%) rename tos/lib/{tosboot => TOSBoot}/telosb/InternalFlash.h (100%) rename tos/lib/{tosboot => TOSBoot}/telosb/InternalFlash.nc (100%) rename tos/lib/{tosboot => TOSBoot}/telosb/PluginC.nc (100%) rename tos/lib/{tosboot => TOSBoot}/telosb/PowerOffM.nc (100%) rename tos/lib/{tosboot => TOSBoot}/telosb/TOSBoot_platform.h (100%) rename tos/lib/{tosboot => TOSBoot}/telosb/hardware.h (100%) diff --git a/tos/lib/tosboot/Deluge.h b/tos/lib/TOSBoot/Deluge.h similarity index 100% rename from tos/lib/tosboot/Deluge.h rename to tos/lib/TOSBoot/Deluge.h diff --git a/tos/lib/tosboot/Exec.nc b/tos/lib/TOSBoot/Exec.nc similarity index 100% rename from tos/lib/tosboot/Exec.nc rename to tos/lib/TOSBoot/Exec.nc diff --git a/tos/lib/tosboot/ExtFlash.nc b/tos/lib/TOSBoot/ExtFlash.nc similarity index 100% rename from tos/lib/tosboot/ExtFlash.nc rename to tos/lib/TOSBoot/ExtFlash.nc diff --git a/tos/lib/tosboot/Hardware.nc b/tos/lib/TOSBoot/Hardware.nc similarity index 100% rename from tos/lib/tosboot/Hardware.nc rename to tos/lib/TOSBoot/Hardware.nc diff --git a/tos/lib/tosboot/Leds.nc b/tos/lib/TOSBoot/Leds.nc similarity index 100% rename from tos/lib/tosboot/Leds.nc rename to tos/lib/TOSBoot/Leds.nc diff --git a/tos/lib/tosboot/Makefile b/tos/lib/TOSBoot/Makefile similarity index 100% rename from tos/lib/tosboot/Makefile rename to tos/lib/TOSBoot/Makefile diff --git a/tos/lib/tosboot/ProgFlash.nc b/tos/lib/TOSBoot/ProgFlash.nc similarity index 100% rename from tos/lib/tosboot/ProgFlash.nc rename to tos/lib/TOSBoot/ProgFlash.nc 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/TOSBoot.nc similarity index 100% rename from tos/lib/tosboot/TOSBoot.nc rename to tos/lib/TOSBoot/TOSBoot.nc diff --git a/tos/lib/tosboot/TOSBootM.nc b/tos/lib/TOSBoot/TOSBootM.nc similarity index 94% rename from tos/lib/tosboot/TOSBootM.nc rename to tos/lib/TOSBoot/TOSBootM.nc index 8b4eba70..b5098a1a 100644 --- a/tos/lib/tosboot/TOSBootM.nc +++ b/tos/lib/TOSBoot/TOSBootM.nc @@ -136,19 +136,12 @@ implementation { secLength = extFlashReadAddr(); curAddr = curAddr + 8; -#if defined(PLATFORM_TELOSB) + // check that the image starts on the correct boundary if (intAddr != TOSBOOT_END) { -#elif defined(PLATFORM_MICAZ) - if (intAddr != 0) { -#else - #error "Target platform is not currently supported by Deluge T2" -#endif call ExtFlash.stopRead(); return R_INVALID_IMAGE_ERROR; } - - call ExtFlash.stopRead(); // MIKE_LIANG - + while ( secLength ) { pageAddr = newPageAddr = intAddr / TOSBOOT_INT_PAGE_SIZE; @@ -158,10 +151,8 @@ implementation { do { // check if secLength is all ones - if ( secLength == 0xffffffff ) { - call ExtFlash.stopRead(); // MIKE_LIANG + if ( secLength == 0xffffffff ) return FAIL; - } buf[(uint16_t)intAddr % TOSBOOT_INT_PAGE_SIZE] = call ExtFlash.readByte(); intAddr++; curAddr++; @@ -182,9 +173,9 @@ implementation { // write out page if (call ProgFlash.write(pageAddr*TOSBOOT_INT_PAGE_SIZE, buf, - TOSBOOT_INT_PAGE_SIZE) == FAIL) { + TOSBOOT_INT_PAGE_SIZE) == FAIL) return R_PROGRAMMING_ERROR; - } + } return R_SUCCESS; @@ -209,7 +200,7 @@ implementation { startupLeds(); runApp(); } - + // get current value of counter call IntFlash.read((uint8_t*)TOSBOOT_ARGS_ADDR, &args, sizeof(args)); @@ -222,9 +213,8 @@ implementation { // if the golden image is invalid, forget about reprogramming // if an error happened during reprogramming, reboot and try again // not much else we can do :-/ - if (programImage(TOSBOOT_GOLDEN_IMG_ADDR) == R_PROGRAMMING_ERROR) { + if (programImage(TOSBOOT_GOLDEN_IMG_ADDR) == R_PROGRAMMING_ERROR) call Hardware.reboot(); - } } else { // update gesture counter diff --git a/tos/lib/tosboot/Voltage.nc b/tos/lib/TOSBoot/Voltage.nc similarity index 100% rename from tos/lib/tosboot/Voltage.nc rename to tos/lib/TOSBoot/Voltage.nc diff --git a/tos/lib/tosboot/at45db/ExtFlashC.nc b/tos/lib/TOSBoot/at45db/ExtFlashC.nc similarity index 100% rename from tos/lib/tosboot/at45db/ExtFlashC.nc rename to tos/lib/TOSBoot/at45db/ExtFlashC.nc diff --git a/tos/lib/tosboot/avr/HardwareC.nc b/tos/lib/TOSBoot/avr/HardwareC.nc similarity index 100% rename from tos/lib/tosboot/avr/HardwareC.nc rename to tos/lib/TOSBoot/avr/HardwareC.nc diff --git a/tos/lib/tosboot/avr/InternalFlashC.nc b/tos/lib/TOSBoot/avr/InternalFlashC.nc similarity index 100% rename from tos/lib/tosboot/avr/InternalFlashC.nc rename to tos/lib/TOSBoot/avr/InternalFlashC.nc diff --git a/tos/lib/tosboot/avr/ProgFlashM.nc b/tos/lib/TOSBoot/avr/ProgFlashM.nc similarity index 100% rename from tos/lib/tosboot/avr/ProgFlashM.nc rename to tos/lib/TOSBoot/avr/ProgFlashM.nc diff --git a/tos/lib/tosboot/avr/boot.h b/tos/lib/TOSBoot/avr/boot.h similarity index 100% rename from tos/lib/tosboot/avr/boot.h rename to tos/lib/TOSBoot/avr/boot.h diff --git a/tos/lib/tosboot/crc.h b/tos/lib/TOSBoot/crc.h similarity index 100% rename from tos/lib/tosboot/crc.h rename to tos/lib/TOSBoot/crc.h diff --git a/tos/lib/tosboot/lib/ExecC.nc b/tos/lib/TOSBoot/lib/ExecC.nc similarity index 100% rename from tos/lib/tosboot/lib/ExecC.nc rename to tos/lib/TOSBoot/lib/ExecC.nc diff --git a/tos/lib/tosboot/lib/LedsC.nc b/tos/lib/TOSBoot/lib/LedsC.nc similarity index 100% rename from tos/lib/tosboot/lib/LedsC.nc rename to tos/lib/TOSBoot/lib/LedsC.nc diff --git a/tos/lib/tosboot/micaz/ExecC.nc b/tos/lib/TOSBoot/micaz/ExecC.nc similarity index 100% rename from tos/lib/tosboot/micaz/ExecC.nc rename to tos/lib/TOSBoot/micaz/ExecC.nc diff --git a/tos/lib/tosboot/micaz/InternalFlash.h b/tos/lib/TOSBoot/micaz/InternalFlash.h similarity index 100% rename from tos/lib/tosboot/micaz/InternalFlash.h rename to tos/lib/TOSBoot/micaz/InternalFlash.h diff --git a/tos/lib/tosboot/micaz/PluginC.nc b/tos/lib/TOSBoot/micaz/PluginC.nc similarity index 100% rename from tos/lib/tosboot/micaz/PluginC.nc rename to tos/lib/TOSBoot/micaz/PluginC.nc diff --git a/tos/lib/tosboot/micaz/TOSBoot_platform.h b/tos/lib/TOSBoot/micaz/TOSBoot_platform.h similarity index 100% rename from tos/lib/tosboot/micaz/TOSBoot_platform.h rename to tos/lib/TOSBoot/micaz/TOSBoot_platform.h diff --git a/tos/lib/tosboot/micaz/VoltageC.nc b/tos/lib/TOSBoot/micaz/VoltageC.nc similarity index 100% rename from tos/lib/tosboot/micaz/VoltageC.nc rename to tos/lib/TOSBoot/micaz/VoltageC.nc diff --git a/tos/lib/tosboot/micaz/avrhardware.h b/tos/lib/TOSBoot/micaz/avrhardware.h similarity index 98% rename from tos/lib/tosboot/micaz/avrhardware.h rename to tos/lib/TOSBoot/micaz/avrhardware.h index 15a3e87d..4263d56b 100644 --- a/tos/lib/tosboot/micaz/avrhardware.h +++ b/tos/lib/TOSBoot/micaz/avrhardware.h @@ -52,12 +52,8 @@ #ifdef TOSH_NEW_AVRLIBC #include -#if __AVR_LIBC_VERSION__ >= 10400UL -#include -#else -#include #include -#endif +#include #include #include #include diff --git a/tos/lib/tosboot/micaz/hardware.h b/tos/lib/TOSBoot/micaz/hardware.h similarity index 100% rename from tos/lib/tosboot/micaz/hardware.h rename to tos/lib/TOSBoot/micaz/hardware.h diff --git a/tos/lib/tosboot/msp430/HPLUSART0M.nc b/tos/lib/TOSBoot/msp430/HPLUSART0M.nc similarity index 100% rename from tos/lib/tosboot/msp430/HPLUSART0M.nc rename to tos/lib/TOSBoot/msp430/HPLUSART0M.nc diff --git a/tos/lib/tosboot/msp430/HPLUSARTControl.nc b/tos/lib/TOSBoot/msp430/HPLUSARTControl.nc similarity index 100% rename from tos/lib/tosboot/msp430/HPLUSARTControl.nc rename to tos/lib/TOSBoot/msp430/HPLUSARTControl.nc diff --git a/tos/lib/tosboot/msp430/HardwareC.nc b/tos/lib/TOSBoot/msp430/HardwareC.nc similarity index 100% rename from tos/lib/tosboot/msp430/HardwareC.nc rename to tos/lib/TOSBoot/msp430/HardwareC.nc diff --git a/tos/lib/tosboot/msp430/InternalFlashC.nc b/tos/lib/TOSBoot/msp430/InternalFlashC.nc similarity index 100% rename from tos/lib/tosboot/msp430/InternalFlashC.nc rename to tos/lib/TOSBoot/msp430/InternalFlashC.nc diff --git a/tos/lib/tosboot/msp430/ProgFlashM.nc b/tos/lib/TOSBoot/msp430/ProgFlashM.nc similarity index 100% rename from tos/lib/tosboot/msp430/ProgFlashM.nc rename to tos/lib/TOSBoot/msp430/ProgFlashM.nc diff --git a/tos/lib/tosboot/msp430/VoltageC.nc b/tos/lib/TOSBoot/msp430/VoltageC.nc similarity index 100% rename from tos/lib/tosboot/msp430/VoltageC.nc rename to tos/lib/TOSBoot/msp430/VoltageC.nc diff --git a/tos/lib/tosboot/stm25p/ExtFlashC.nc b/tos/lib/TOSBoot/stm25p/ExtFlashC.nc similarity index 100% rename from tos/lib/tosboot/stm25p/ExtFlashC.nc rename to tos/lib/TOSBoot/stm25p/ExtFlashC.nc diff --git a/tos/lib/tosboot/stm25p/ExtFlashM.nc b/tos/lib/TOSBoot/stm25p/ExtFlashM.nc similarity index 100% rename from tos/lib/tosboot/stm25p/ExtFlashM.nc rename to tos/lib/TOSBoot/stm25p/ExtFlashM.nc diff --git a/tos/lib/tosboot/telosb/InternalFlash.h b/tos/lib/TOSBoot/telosb/InternalFlash.h similarity index 100% rename from tos/lib/tosboot/telosb/InternalFlash.h rename to tos/lib/TOSBoot/telosb/InternalFlash.h diff --git a/tos/lib/tosboot/telosb/InternalFlash.nc b/tos/lib/TOSBoot/telosb/InternalFlash.nc similarity index 100% rename from tos/lib/tosboot/telosb/InternalFlash.nc rename to tos/lib/TOSBoot/telosb/InternalFlash.nc diff --git a/tos/lib/tosboot/telosb/PluginC.nc b/tos/lib/TOSBoot/telosb/PluginC.nc similarity index 100% rename from tos/lib/tosboot/telosb/PluginC.nc rename to tos/lib/TOSBoot/telosb/PluginC.nc diff --git a/tos/lib/tosboot/telosb/PowerOffM.nc b/tos/lib/TOSBoot/telosb/PowerOffM.nc similarity index 100% rename from tos/lib/tosboot/telosb/PowerOffM.nc rename to tos/lib/TOSBoot/telosb/PowerOffM.nc diff --git a/tos/lib/tosboot/telosb/TOSBoot_platform.h b/tos/lib/TOSBoot/telosb/TOSBoot_platform.h similarity index 100% rename from tos/lib/tosboot/telosb/TOSBoot_platform.h rename to tos/lib/TOSBoot/telosb/TOSBoot_platform.h diff --git a/tos/lib/tosboot/telosb/hardware.h b/tos/lib/TOSBoot/telosb/hardware.h similarity index 100% rename from tos/lib/tosboot/telosb/hardware.h rename to tos/lib/TOSBoot/telosb/hardware.h diff --git a/tos/platforms/btnode3/.platform b/tos/platforms/btnode3/.platform index ac67392e..439fdd74 100644 --- a/tos/platforms/btnode3/.platform +++ b/tos/platforms/btnode3/.platform @@ -17,7 +17,7 @@ push( @includes, qw( %T/platforms/mica %T/platforms/mica2 %T/platforms/mica2/chips/cc1000 - %T/chips/cc1000 + %T/chips/cc1000_lpl %T/chips/atm128 %T/chips/atm128/adc %T/chips/atm128/i2c diff --git a/tos/platforms/btnode3/hardware.h b/tos/platforms/btnode3/hardware.h index 18062b8b..37732a76 100644 --- a/tos/platforms/btnode3/hardware.h +++ b/tos/platforms/btnode3/hardware.h @@ -51,7 +51,6 @@ #include #include -#include // A/D constants (channels, etc) enum { -- 2.39.2