From 7bcba666c95ca4d881d208eb757c6819a7fdec79 Mon Sep 17 00:00:00 2001 From: pipeng Date: Thu, 15 Feb 2007 10:39:07 +0000 Subject: [PATCH] Remove some files which don't work. --- tos/sensorboards/mts300/AccelReadP.nc | 26 --------- tos/sensorboards/mts300/AccelReadStreamP.nc | 29 ---------- tos/sensorboards/mts300/AccelXC.nc | 25 --------- tos/sensorboards/mts300/AccelXStreamC.nc | 30 ---------- tos/sensorboards/mts300/AccelYC.nc | 25 --------- tos/sensorboards/mts300/AccelYStreamC.nc | 30 ---------- .../mts300/ArbitratedPhotoDeviceP.nc | 13 ----- tos/sensorboards/mts300/DemoSensorC.nc | 23 -------- tos/sensorboards/mts300/DemoSensorStreamC.nc | 23 -------- tos/sensorboards/mts300/Mts300Sounder.nc | 4 -- tos/sensorboards/mts300/PhotoConfigP.nc | 6 -- tos/sensorboards/mts300/PhotoTempControlP.nc | 55 ------------------- tos/sensorboards/mts300/PhotoTempDeviceC.nc | 45 --------------- tos/sensorboards/mts300/PhotoTempSetupP.nc | 25 --------- tos/sensorboards/mts300/WireAccelP.nc | 35 ------------ 15 files changed, 394 deletions(-) delete mode 100644 tos/sensorboards/mts300/AccelReadP.nc delete mode 100644 tos/sensorboards/mts300/AccelReadStreamP.nc delete mode 100644 tos/sensorboards/mts300/AccelXC.nc delete mode 100644 tos/sensorboards/mts300/AccelXStreamC.nc delete mode 100644 tos/sensorboards/mts300/AccelYC.nc delete mode 100644 tos/sensorboards/mts300/AccelYStreamC.nc delete mode 100644 tos/sensorboards/mts300/ArbitratedPhotoDeviceP.nc delete mode 100644 tos/sensorboards/mts300/DemoSensorC.nc delete mode 100644 tos/sensorboards/mts300/DemoSensorStreamC.nc delete mode 100644 tos/sensorboards/mts300/Mts300Sounder.nc delete mode 100644 tos/sensorboards/mts300/PhotoConfigP.nc delete mode 100644 tos/sensorboards/mts300/PhotoTempControlP.nc delete mode 100644 tos/sensorboards/mts300/PhotoTempDeviceC.nc delete mode 100644 tos/sensorboards/mts300/PhotoTempSetupP.nc delete mode 100644 tos/sensorboards/mts300/WireAccelP.nc diff --git a/tos/sensorboards/mts300/AccelReadP.nc b/tos/sensorboards/mts300/AccelReadP.nc deleted file mode 100644 index 9425973c..00000000 --- a/tos/sensorboards/mts300/AccelReadP.nc +++ /dev/null @@ -1,26 +0,0 @@ -configuration AccelReadP -{ - provides { - interface Read as ReadX[uint8_t client]; - interface Read as ReadY[uint8_t client]; - } -} -implementation -{ - components AccelConfigP, - new MultiplexedReadC(uint16_t) as MultiplexX, - new MultiplexedReadC(uint16_t) as MultiplexY, - new AdcReadClientC() as AdcX, - new AdcReadClientC() as AdcY; - - ReadX = MultiplexX; - MultiplexX.Resource -> AccelConfigP; - MultiplexX.Service -> AdcX; - AdcX.Atm128AdcConfig -> AccelConfigP.ConfigX; - - ReadY = MultiplexY; - MultiplexY.Resource -> AccelConfigP; - MultiplexY.Service -> AdcY; - AdcY.Atm128AdcConfig -> AccelConfigP.ConfigY; -} - diff --git a/tos/sensorboards/mts300/AccelReadStreamP.nc b/tos/sensorboards/mts300/AccelReadStreamP.nc deleted file mode 100644 index 3db96e83..00000000 --- a/tos/sensorboards/mts300/AccelReadStreamP.nc +++ /dev/null @@ -1,29 +0,0 @@ -configuration AccelReadStreamP -{ - provides { - interface ReadStream as ReadStreamX[uint8_t client]; - interface ReadStream as ReadStreamY[uint8_t client]; - } - uses { - interface ReadStream as ActualX[uint8_t client]; - interface ReadStream as ActualY[uint8_t client]; - } -} -implementation -{ - enum { - NACCEL_CLIENTS = uniqueCount(UQ_ACCEL_RESOURCE) - }; - components AccelConfigP, - new ArbitratedReadStreamC(NACCEL_CLIENTS, uint16_t) as MultiplexX, - new ArbitratedReadStreamC(NACCEL_CLIENTS, uint16_t) as MultiplexY; - - ReadStreamX = MultiplexX; - MultiplexX.Resource -> AccelConfigP; - MultiplexX.Service = ActualX; - - ReadStreamY = MultiplexY; - MultiplexY.Resource -> AccelConfigP; - MultiplexY.Service = ActualY; -} - diff --git a/tos/sensorboards/mts300/AccelXC.nc b/tos/sensorboards/mts300/AccelXC.nc deleted file mode 100644 index 3d28e0b7..00000000 --- a/tos/sensorboards/mts300/AccelXC.nc +++ /dev/null @@ -1,25 +0,0 @@ -/* $Id$ - * Copyright (c) 2006 Intel Corporation - * All rights reserved. - * - * This file is distributed under the terms in the attached INTEL-LICENSE - * file. If you do not find these files, copies can be found by writing to - * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, - * 94704. Attention: Intel License Inquiry. - */ -/** - * Acceldiode of the basicsb sensor board. - * - * @author David Gay - */ - -#include "mts300.h" - -generic configuration AccelXC() { - provides interface Read; -} -implementation { - components AccelReadP; - - Read = AccelReadP.ReadX[unique(UQ_ACCEL_RESOURCE)]; -} diff --git a/tos/sensorboards/mts300/AccelXStreamC.nc b/tos/sensorboards/mts300/AccelXStreamC.nc deleted file mode 100644 index ee0efbe4..00000000 --- a/tos/sensorboards/mts300/AccelXStreamC.nc +++ /dev/null @@ -1,30 +0,0 @@ -/* $Id$ - * Copyright (c) 2006 Intel Corporation - * All rights reserved. - * - * This file is distributed under the terms in the attached INTEL-LICENSE - * file. If you do not find these files, copies can be found by writing to - * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, - * 94704. Attention: Intel License Inquiry. - */ -/** - * AccelXdiode of the basicsb sensor board. - * - * @author David Gay - */ - -#include "mts300.h" - -generic configuration AccelXStreamC() { - provides interface ReadStream; -} -implementation { - enum { - ID = unique(UQ_ACCEL_RESOURCE) - }; - components AccelReadStreamP, AccelConfigP, new AdcReadStreamClientC(); - - ReadStream = AccelReadStreamP.ReadStreamX[ID]; - AccelReadStreamP.ActualX[ID] -> AdcReadStreamClientC; - AdcReadStreamClientC.Atm128AdcConfig -> AccelConfigP.ConfigX; -} diff --git a/tos/sensorboards/mts300/AccelYC.nc b/tos/sensorboards/mts300/AccelYC.nc deleted file mode 100644 index 74c6e946..00000000 --- a/tos/sensorboards/mts300/AccelYC.nc +++ /dev/null @@ -1,25 +0,0 @@ -/* $Id$ - * Copyright (c) 2006 Intel Corporation - * All rights reserved. - * - * This file is distributed under the terms in the attached INTEL-LICENSE - * file. If you do not find these files, copies can be found by writing to - * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, - * 94704. Attention: Intel License Inquiry. - */ -/** - * Acceldiode of the basicsb sensor board. - * - * @author David Gay - */ - -#include "mts300.h" - -generic configuration AccelXC() { - provides interface Read; -} -implementation { - components AccelReadP; - - Read = AccelReadP.ReadY[unique(UQ_ACCEL_RESOURCE)]; -} diff --git a/tos/sensorboards/mts300/AccelYStreamC.nc b/tos/sensorboards/mts300/AccelYStreamC.nc deleted file mode 100644 index 51182130..00000000 --- a/tos/sensorboards/mts300/AccelYStreamC.nc +++ /dev/null @@ -1,30 +0,0 @@ -/* $Id$ - * Copyright (c) 2006 Intel Corporation - * All rights reserved. - * - * This file is distributed under the terms in the attached INTEL-LICENSE - * file. If you do not find these files, copies can be found by writing to - * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, - * 94704. Attention: Intel License Inquiry. - */ -/** - * AccelXdiode of the basicsb sensor board. - * - * @author David Gay - */ - -#include "mts300.h" - -generic configuration AccelYStreamC() { - provides interface ReadStream; -} -implementation { - enum { - ID = unique(UQ_ACCEL_RESOURCE) - }; - components AccelReadStreamP, AccelConfigP, new AdcReadStreamClientC(); - - ReadStream = AccelReadStreamP.ReadStreamY[ID]; - AccelReadStreamP.ActualY[ID] -> AdcReadStreamClientC; - AdcReadStreamClientC.Atm128AdcConfig -> AccelConfigP.ConfigY; -} diff --git a/tos/sensorboards/mts300/ArbitratedPhotoDeviceP.nc b/tos/sensorboards/mts300/ArbitratedPhotoDeviceP.nc deleted file mode 100644 index d0c7f8ac..00000000 --- a/tos/sensorboards/mts300/ArbitratedPhotoDeviceP.nc +++ /dev/null @@ -1,13 +0,0 @@ -configuration ArbitratedPhotoDeviceP -{ - provides interface Read[uint8_t client]; -} -implementation -{ - components PhotoTempDeviceC, - new ArbitratedReadC(uint16_t) as ArbitrateRead; - - Read = ArbitrateRead; - ArbitrateRead.Service -> PhotoTempDeviceC.ReadPhoto; - ArbitrateRead.Resource -> PhotoTempDeviceC.PhotoResource; -} diff --git a/tos/sensorboards/mts300/DemoSensorC.nc b/tos/sensorboards/mts300/DemoSensorC.nc deleted file mode 100644 index 3e67b8e2..00000000 --- a/tos/sensorboards/mts300/DemoSensorC.nc +++ /dev/null @@ -1,23 +0,0 @@ -/* $Id$ - * Copyright (c) 2005 Intel Corporation - * All rights reserved. - * - * This file is distributed under the terms in the attached INTEL-LICENSE - * file. If you do not find these files, copies can be found by writing to - * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, - * 94704. Attention: Intel License Inquiry. - */ -/** - * Demo sensor for basicsb sensorboard. - * - * @author David Gay - */ - -generic configuration DemoSensorC() { - provides interface Read; -} -implementation { - components new PhotoC() as Sensor; - - Read = Sensor; -} diff --git a/tos/sensorboards/mts300/DemoSensorStreamC.nc b/tos/sensorboards/mts300/DemoSensorStreamC.nc deleted file mode 100644 index cb763a78..00000000 --- a/tos/sensorboards/mts300/DemoSensorStreamC.nc +++ /dev/null @@ -1,23 +0,0 @@ -/* $Id$ - * Copyright (c) 2005 Intel Corporation - * All rights reserved. - * - * This file is distributed under the terms in the attached INTEL-LICENSE - * file. If you do not find these files, copies can be found by writing to - * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, - * 94704. Attention: Intel License Inquiry. - */ -/** - * Demo sensor for basicsb sensorboard. - * - * @author David Gay - */ - -generic configuration DemoSensorStreamC() { - provides interface ReadStream; -} -implementation { - components new PhotoStreamC() as SensorStream; - - ReadStream = SensorStream; -} diff --git a/tos/sensorboards/mts300/Mts300Sounder.nc b/tos/sensorboards/mts300/Mts300Sounder.nc deleted file mode 100644 index 6f39bff0..00000000 --- a/tos/sensorboards/mts300/Mts300Sounder.nc +++ /dev/null @@ -1,4 +0,0 @@ -interface Mts300Sounder -{ - command void beep(uint16_t length); -} diff --git a/tos/sensorboards/mts300/PhotoConfigP.nc b/tos/sensorboards/mts300/PhotoConfigP.nc deleted file mode 100644 index 52367a30..00000000 --- a/tos/sensorboards/mts300/PhotoConfigP.nc +++ /dev/null @@ -1,6 +0,0 @@ -configuration PhotoConfigP -{ -} -implementation -{ -} diff --git a/tos/sensorboards/mts300/PhotoTempControlP.nc b/tos/sensorboards/mts300/PhotoTempControlP.nc deleted file mode 100644 index 4a688a3f..00000000 --- a/tos/sensorboards/mts300/PhotoTempControlP.nc +++ /dev/null @@ -1,55 +0,0 @@ -generic module PhotoTempControlP() -{ - provides { - interface SplitControl; - interface Read[uint8_t client]; - } - uses { - interface Resource as PhotoTempResource; - interface Timer; - interface GeneralIO as Power; - interface Read as ActualRead; - } -} -implementation -{ - command error_t SplitControl.start() { - call PhotoTempResource.request(); - return SUCCESS; - } - - event void PhotoTempResource.granted() { - call Power.makeOutput(); - call Power.set(); - call Timer.startOneShot(10); - } - - event void Timer.fired() { - signal SplitControl.startDone(SUCCESS); - } - - task void stopDone() { - call PhotoTempResource.release(); - signal SplitControl.stopDone(SUCCESS); - } - - command error_t SplitControl.stop() { - call Power.clr(); - call Power.makeInput(); - post stopDone(); - return SUCCESS; - } - - uint8_t id; - - command error_t Read.read[uint8_t client]() { - id = client; - return call ActualRead.read(); - } - - event void ActualRead.readDone(error_t result, uint16_t val) { - signal Read.readDone[id](result, val); - } - - default event void Read.readDone[uint8_t x](error_t result, uint16_t val) { } -} diff --git a/tos/sensorboards/mts300/PhotoTempDeviceC.nc b/tos/sensorboards/mts300/PhotoTempDeviceC.nc deleted file mode 100644 index 28c1520b..00000000 --- a/tos/sensorboards/mts300/PhotoTempDeviceC.nc +++ /dev/null @@ -1,45 +0,0 @@ -#include "mts300.h" - -configuration PhotoTempDeviceC -{ - provides interface Resource as PhotoResource[uint8_t client]; - provides interface Resource as TempResource[uint8_t client]; - provides interface Read as ReadPhoto[uint8_t client]; - provides interface Read as ReadTemp[uint8_t client]; -} -implementation -{ - components MicaBusC, PhotoTempP, - new RoundRobinArbiterC(UQ_PHOTOTEMP_RESOURCE) as SharingArbiter, - new RoundRobinArbiterC(UQ_PHOTO_RESOURCE) as PhotoArbiter, - new RoundRobinArbiterC(UQ_TEMP_RESOURCE) as TempArbiter, - new SplitControlPowerManagerC() as PhotoPower, - new SplitControlPowerManagerC() as TempPower, - new PhotoTempControlP() as PhotoControl, - new PhotoTempControlP() as TempControl, - new TimerMilliC() as WarmupTimer, - new AdcReadClientC() as Adc; - - PhotoResource = PhotoArbiter; - PhotoPower.ResourceDefaultOwner -> PhotoArbiter; - PhotoPower.ArbiterInfo -> PhotoArbiter; - PhotoPower.SplitControl -> PhotoControl; - PhotoControl.PhotoTempResource -> SharingArbiter.Resource[unique(UQ_PHOTOTEMP_RESOURCE)]; - PhotoControl.Timer -> WarmupTimer; - PhotoControl.Power -> MicaBusC.Int1; - ReadPhoto = PhotoControl; - PhotoControl.ActualRead -> Adc; - - TempResource = TempArbiter; - TempPower.ResourceDefaultOwner -> TempArbiter; - TempPower.ArbiterInfo -> TempArbiter; - TempPower.SplitControl -> TempControl; - TempControl.PhotoTempResource -> SharingArbiter.Resource[unique(UQ_PHOTOTEMP_RESOURCE)]; - TempControl.Timer -> WarmupTimer; - TempControl.Power -> MicaBusC.Int2; - ReadTemp = TempControl; - TempControl.ActualRead -> Adc; - - Adc.Atm128AdcConfig -> PhotoTempP; - PhotoTempP.PhotoTempAdc -> MicaBusC.Adc1; -} diff --git a/tos/sensorboards/mts300/PhotoTempSetupP.nc b/tos/sensorboards/mts300/PhotoTempSetupP.nc deleted file mode 100644 index 7b9c9673..00000000 --- a/tos/sensorboards/mts300/PhotoTempSetupP.nc +++ /dev/null @@ -1,25 +0,0 @@ -generic configuration PhotoTempSetupP(const char *resname) -{ - provides interface Resource[uint8_t client]; - uses { - interface Timer; - interface Resource as SharingResource; - interface GeneralIO as Power; - } -} -implementation -{ - components - new RoundRobinArbiterC(resname) as Arbiter, - new SplitControlPowerManager() as Power, - new PhotoTempControlP() as Control; - - Resource = Arbiter; - Power.ResourceDefaultOwner -> Arbiter; - Power.ArbiterInfo -> Arbiter; - Power.SplitControl -> Control; - - Control.Resource = SharingResource; - Control.Power = Power; - Control.Timer = Timer; -} diff --git a/tos/sensorboards/mts300/WireAccelP.nc b/tos/sensorboards/mts300/WireAccelP.nc deleted file mode 100644 index 7fa60c58..00000000 --- a/tos/sensorboards/mts300/WireAccelP.nc +++ /dev/null @@ -1,35 +0,0 @@ -/* $Id$ - * Copyright (c) 2006 Intel Corporation - * All rights reserved. - * - * This file is distributed under the terms in the attached INTEL-LICENSE - * file. If you do not find these files, copies can be found by writing to - * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, - * 94704. Attention: Intel License Inquiry. - */ -/** - * Internal component for basicsb photodiode. Arbitrates access to the photo - * diode and automatically turns it on or off based on user requests. - * - * @author David Gay - */ - -configuration WireAccelP { - provides interface Resource[uint8_t client]; -} -implementation { - components AccelP, MicaBusC, new TimerMilliC() as WarmupTimer, - new RounRobinArbiterC(UQ_ACCEL_RESOURCE) as Arbiter, - new SplitControlPowerManagerC() as PowerManager; - - Resource = Arbiter; - - PowerManager.ResourceDefaultOwner -> Arbiter; - PowerManager.ArbiterInfo -> Arbiter; - PowerManager.SplitControl -> AccelP; - - AccelP.Timer -> WarmupTimer; - AccelP.AccelPin -> MicaBusC.PW4; - AccelP.AccelAdcX -> MicaBusC.Adc3; - AccelP.AccelAdcY -> MicaBusC.Adc4; -} -- 2.39.2