[Tinyos-2-commits] CVS: tinyos-2.x/tos/system/arbiters ArbiterP.nc,
1.1.2.6, 1.1.2.7 ControlledArbiterP.nc, 1.1.2.3,
1.1.2.4 ControlledFcfsArbiterC.nc, 1.1.2.1,
1.1.2.2 ControlledRoundRobinArbiterC.nc, 1.1.2.1,
1.1.2.2 FcfsArbiterC.nc, 1.1.2.3,
1.1.2.4 RoundRobinArbiterC.nc, 1.1.2.2, 1.1.2.3
Kevin Klues
klueska at users.sourceforge.net
Wed Jul 19 08:42:16 PDT 2006
Update of /cvsroot/tinyos/tinyos-2.x/tos/system/arbiters
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7545/tos/system/arbiters
Modified Files:
Tag: tos-2-resource-pm-eval-cand
ArbiterP.nc ControlledArbiterP.nc ControlledFcfsArbiterC.nc
ControlledRoundRobinArbiterC.nc FcfsArbiterC.nc
RoundRobinArbiterC.nc
Log Message:
Small changes due to erros found with further testing
Index: ArbiterP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/system/arbiters/Attic/ArbiterP.nc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** ArbiterP.nc 5 Jul 2006 12:01:27 -0000 1.1.2.6
--- ArbiterP.nc 19 Jul 2006 15:42:14 -0000 1.1.2.7
***************
*** 84,88 ****
implementation {
! enum {RES_IDLE, RES_GRANTING, RES_BUSY};
enum {NO_RES = 0xFF};
--- 84,88 ----
implementation {
! enum {RES_IDLE = 0, RES_GRANTING = 1, RES_BUSY = 2};
enum {NO_RES = 0xFF};
***************
*** 92,98 ****
task void grantedTask();
! s
async command error_t Resource.request[uint8_t id]() {
! call ResourceRequested.requested[resId]();
atomic {
if(state == RES_IDLE) {
--- 92,98 ----
task void grantedTask();
!
async command error_t Resource.request[uint8_t id]() {
! signal ResourceRequested.requested[resId]();
atomic {
if(state == RES_IDLE) {
***************
*** 107,115 ****
async command error_t Resource.immediateRequest[uint8_t id]() {
! call ResourceRequested.immediateRequested[resId]();
atomic {
if(state == RES_IDLE) {
state = RES_BUSY;
resId = id;
return SUCCESS;
}
--- 107,116 ----
async command error_t Resource.immediateRequest[uint8_t id]() {
! signal ResourceRequested.immediateRequested[resId]();
atomic {
if(state == RES_IDLE) {
state = RES_BUSY;
resId = id;
+ call ResourceConfigure.configure[resId]();
return SUCCESS;
}
***************
*** 195,201 ****
default event void Resource.granted[uint8_t id]() {
}
! default event void ResourceRequested.requested[uint8_t id]() {
}
! default event void ResourceRequested.immediateRequested[uint8_t id]() {
}
default async command void ResourceConfigure.configure[uint8_t id]() {
--- 196,202 ----
default event void Resource.granted[uint8_t id]() {
}
! default async event void ResourceRequested.requested[uint8_t id]() {
}
! default async event void ResourceRequested.immediateRequested[uint8_t id]() {
}
default async command void ResourceConfigure.configure[uint8_t id]() {
Index: ControlledArbiterP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/system/arbiters/Attic/ControlledArbiterP.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** ControlledArbiterP.nc 5 Jul 2006 12:01:27 -0000 1.1.2.3
--- ControlledArbiterP.nc 19 Jul 2006 15:42:14 -0000 1.1.2.4
***************
*** 118,123 ****
}
signal ResourceController.immediateRequested();
! if(resId == id)
return SUCCESS;
atomic state = RES_CONTROLLED;
return FAIL;
--- 118,125 ----
}
signal ResourceController.immediateRequested();
! if(resId == id) {
! call ResourceConfigure.configure[resId]();
return SUCCESS;
+ }
atomic state = RES_CONTROLLED;
return FAIL;
Index: ControlledFcfsArbiterC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/system/arbiters/Attic/ControlledFcfsArbiterC.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ControlledFcfsArbiterC.nc 21 Jun 2006 15:59:00 -0000 1.1.2.1
--- ControlledFcfsArbiterC.nc 19 Jul 2006 15:42:14 -0000 1.1.2.2
***************
*** 80,83 ****
--- 80,84 ----
provides {
interface Resource[uint8_t id];
+ interface ResourceRequested[uint8_t id];
interface ResourceController;
interface ArbiterInfo;
***************
*** 93,96 ****
--- 94,98 ----
Resource = Arbiter;
+ ResourceRequested = Arbiter;
ResourceController = Arbiter;
ArbiterInfo = Arbiter;
Index: ControlledRoundRobinArbiterC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/system/arbiters/Attic/ControlledRoundRobinArbiterC.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ControlledRoundRobinArbiterC.nc 21 Jun 2006 15:59:00 -0000 1.1.2.1
--- ControlledRoundRobinArbiterC.nc 19 Jul 2006 15:42:14 -0000 1.1.2.2
***************
*** 80,83 ****
--- 80,84 ----
provides {
interface Resource[uint8_t id];
+ interface ResourceRequested[uint8_t id];
interface ResourceController;
interface ArbiterInfo;
***************
*** 93,96 ****
--- 94,98 ----
Resource = Arbiter;
+ ResourceRequested = Arbiter;
ResourceController = Arbiter;
ArbiterInfo = Arbiter;
Index: FcfsArbiterC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/system/arbiters/Attic/FcfsArbiterC.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** FcfsArbiterC.nc 21 Jun 2006 16:03:59 -0000 1.1.2.3
--- FcfsArbiterC.nc 19 Jul 2006 15:42:14 -0000 1.1.2.4
***************
*** 74,77 ****
--- 74,78 ----
provides {
interface Resource[uint8_t id];
+ interface ResourceRequested[uint8_t id];
interface ArbiterInfo;
}
***************
*** 86,89 ****
--- 87,91 ----
Resource = Arbiter;
+ ResourceRequested = Arbiter;
ArbiterInfo = Arbiter;
ResourceConfigure = Arbiter;
Index: RoundRobinArbiterC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/system/arbiters/Attic/RoundRobinArbiterC.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** RoundRobinArbiterC.nc 21 Jun 2006 16:03:59 -0000 1.1.2.2
--- RoundRobinArbiterC.nc 19 Jul 2006 15:42:14 -0000 1.1.2.3
***************
*** 81,84 ****
--- 81,85 ----
provides {
interface Resource[uint8_t id];
+ interface ResourceRequested[uint8_t id];
interface ArbiterInfo;
}
***************
*** 93,96 ****
--- 94,98 ----
Resource = Arbiter;
+ ResourceRequested = Arbiter;
ArbiterInfo = Arbiter;
ResourceConfigure = Arbiter;
More information about the Tinyos-2-commits
mailing list