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 2e61d5cb06c268400e776c13dba0a1d8905e6a6a..8d1b618bd7646c157e3a1d94620ef3f8032a3a82 100644 (file)
--- 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 1228c2a19c4f314441e4d77039eb13da49e4d60f..f13e03c2cc3cc503568d9e12864fca1e64d16e8e 100644 (file)
--- 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 <rsmckown@gmail.com>
  */
 
-generic module SharedArbiterP(uint8_t p_dfltOwnerId) {
+generic module SharedArbiterP() {
   provides {
     interface Init;
     interface Resource[uint8_t id];