From: R. Steve McKown Date: Sun, 19 Sep 2010 15:20:16 +0000 (-0600) Subject: SharedArbiterP doesn't need to know the number of clients. X-Git-Tag: release/2.1.1-4.4~5 X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=ae0ac21f5f88b0b8cc8e6a3a440be198d3a74bd6 SharedArbiterP doesn't need to know the number of clients. That's being handled indrectly by the BitVectors. --- diff --git a/tos/system/SharedArbiterC.nc b/tos/system/SharedArbiterC.nc index 2e61d5cb..8d1b618b 100644 --- a/tos/system/SharedArbiterC.nc +++ b/tos/system/SharedArbiterC.nc @@ -45,7 +45,7 @@ generic configuration SharedArbiterC(char resourceName[]) { implementation { enum { CLIENTS = uniqueCount(resourceName) }; - components new SharedArbiterP(CLIENTS); + components new SharedArbiterP(); Resource = SharedArbiterP; ResourceDefaultOwner = SharedArbiterP; ArbiterInfo = SharedArbiterP; diff --git a/tos/system/SharedArbiterP.nc b/tos/system/SharedArbiterP.nc index 1228c2a1..f13e03c2 100644 --- a/tos/system/SharedArbiterP.nc +++ b/tos/system/SharedArbiterP.nc @@ -33,12 +33,10 @@ * switched subsystem. For example, a communications bus that can handle IO * for multiple clients simultaneously, but is powered down when not in use. * - * p_dfltOwnerId = uniqueCount() use by the resource. see SharedArbiterC - * * @author R. Steve McKown */ -generic module SharedArbiterP(uint8_t p_dfltOwnerId) { +generic module SharedArbiterP() { provides { interface Init; interface Resource[uint8_t id];