From 296eca4fb733230daeded052ca601de4d008db7d Mon Sep 17 00:00:00 2001 From: razvanm Date: Wed, 27 Aug 2008 20:14:49 +0000 Subject: [PATCH] Remove some redundant InternalFlash files. --- .../net/Deluge/extra/msp430/InternalFlashC.nc | 2 - .../net/Deluge/extra/telos/InternalFlash.h | 45 ------------------- .../net/Deluge/extra/telos/InternalFlash.nc | 37 --------------- tos/lib/tosboot/msp430/InternalFlashC.nc | 2 - tos/lib/tosboot/msp430f1611/InternalFlash.h | 45 ------------------- tos/lib/tosboot/msp430f1611/InternalFlash.nc | 37 --------------- 6 files changed, 168 deletions(-) delete mode 100644 tos/lib/net/Deluge/extra/telos/InternalFlash.h delete mode 100644 tos/lib/net/Deluge/extra/telos/InternalFlash.nc delete mode 100644 tos/lib/tosboot/msp430f1611/InternalFlash.h delete mode 100644 tos/lib/tosboot/msp430f1611/InternalFlash.nc diff --git a/tos/lib/net/Deluge/extra/msp430/InternalFlashC.nc b/tos/lib/net/Deluge/extra/msp430/InternalFlashC.nc index 563720fa..c41e13a6 100644 --- a/tos/lib/net/Deluge/extra/msp430/InternalFlashC.nc +++ b/tos/lib/net/Deluge/extra/msp430/InternalFlashC.nc @@ -39,8 +39,6 @@ * @author Jonathan Hui */ -includes InternalFlash; - module InternalFlashC { provides interface InternalFlash; } diff --git a/tos/lib/net/Deluge/extra/telos/InternalFlash.h b/tos/lib/net/Deluge/extra/telos/InternalFlash.h deleted file mode 100644 index eca36678..00000000 --- a/tos/lib/net/Deluge/extra/telos/InternalFlash.h +++ /dev/null @@ -1,45 +0,0 @@ -// $Id$ - -/* - * - * - * "Copyright (c) 2000-2004 The Regents of the University of California. - * All rights reserved. - * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose, without fee, and without written agreement is - * hereby granted, provided that the above copyright notice, the following - * two paragraphs and the author appear in all copies of this software. - * - * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT - * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF - * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS." - * - */ - -/** - * InternalFlash.h - Internal flash implementation for telos msp - * platform. On the msp, the flash must first be erased before a value - * can be written. However, the msp can only erase the flash at a - * segment granularity (128 bytes for the information section). This - * module allows transparent read/write of individual bytes to the - * information section by dynamically switching between the two - * provided segments in the information section. - * - * Valid address range is 0x1000 - 0x107E (0x107F is used to store the - * version number of the information segment). - * - * @author Jonathan Hui - */ - -#ifndef __INTERNAL_FLASH_H__ -#define __INTERNAL_FLASH_H__ - -#endif diff --git a/tos/lib/net/Deluge/extra/telos/InternalFlash.nc b/tos/lib/net/Deluge/extra/telos/InternalFlash.nc deleted file mode 100644 index d41d52b5..00000000 --- a/tos/lib/net/Deluge/extra/telos/InternalFlash.nc +++ /dev/null @@ -1,37 +0,0 @@ -// $Id$ - -/* - * - * - * "Copyright (c) 2000-2004 The Regents of the University of California. - * All rights reserved. - * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose, without fee, and without written agreement is - * hereby granted, provided that the above copyright notice, the following - * two paragraphs and the author appear in all copies of this software. - * - * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT - * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF - * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS." - * - */ - -/** - * InternalFlash.nc - A generic interface to read and store values in - * the internal flash of a microcontroller. - * - * @author Jonathan Hui - */ - -interface InternalFlash { - command error_t write(void* addr, void* buf, uint16_t size); - command error_t read(void* addr, void* buf, uint16_t size); -} diff --git a/tos/lib/tosboot/msp430/InternalFlashC.nc b/tos/lib/tosboot/msp430/InternalFlashC.nc index 563720fa..c41e13a6 100644 --- a/tos/lib/tosboot/msp430/InternalFlashC.nc +++ b/tos/lib/tosboot/msp430/InternalFlashC.nc @@ -39,8 +39,6 @@ * @author Jonathan Hui */ -includes InternalFlash; - module InternalFlashC { provides interface InternalFlash; } diff --git a/tos/lib/tosboot/msp430f1611/InternalFlash.h b/tos/lib/tosboot/msp430f1611/InternalFlash.h deleted file mode 100644 index eca36678..00000000 --- a/tos/lib/tosboot/msp430f1611/InternalFlash.h +++ /dev/null @@ -1,45 +0,0 @@ -// $Id$ - -/* - * - * - * "Copyright (c) 2000-2004 The Regents of the University of California. - * All rights reserved. - * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose, without fee, and without written agreement is - * hereby granted, provided that the above copyright notice, the following - * two paragraphs and the author appear in all copies of this software. - * - * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT - * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF - * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS." - * - */ - -/** - * InternalFlash.h - Internal flash implementation for telos msp - * platform. On the msp, the flash must first be erased before a value - * can be written. However, the msp can only erase the flash at a - * segment granularity (128 bytes for the information section). This - * module allows transparent read/write of individual bytes to the - * information section by dynamically switching between the two - * provided segments in the information section. - * - * Valid address range is 0x1000 - 0x107E (0x107F is used to store the - * version number of the information segment). - * - * @author Jonathan Hui - */ - -#ifndef __INTERNAL_FLASH_H__ -#define __INTERNAL_FLASH_H__ - -#endif diff --git a/tos/lib/tosboot/msp430f1611/InternalFlash.nc b/tos/lib/tosboot/msp430f1611/InternalFlash.nc deleted file mode 100644 index d41d52b5..00000000 --- a/tos/lib/tosboot/msp430f1611/InternalFlash.nc +++ /dev/null @@ -1,37 +0,0 @@ -// $Id$ - -/* - * - * - * "Copyright (c) 2000-2004 The Regents of the University of California. - * All rights reserved. - * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose, without fee, and without written agreement is - * hereby granted, provided that the above copyright notice, the following - * two paragraphs and the author appear in all copies of this software. - * - * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT - * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF - * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS." - * - */ - -/** - * InternalFlash.nc - A generic interface to read and store values in - * the internal flash of a microcontroller. - * - * @author Jonathan Hui - */ - -interface InternalFlash { - command error_t write(void* addr, void* buf, uint16_t size); - command error_t read(void* addr, void* buf, uint16_t size); -} -- 2.39.2