]> oss.titaniummirror.com Git - tinyos-2.x.git/commitdiff
*** empty log message ***
authorrarseverino <rarseverino>
Wed, 2 Sep 2009 16:48:55 +0000 (16:48 +0000)
committerrarseverino <rarseverino>
Wed, 2 Sep 2009 16:48:55 +0000 (16:48 +0000)
tos/lib/net/zigbee/Wrapper/WrapperC.nc [deleted file]
tos/lib/net/zigbee/Wrapper/WrapperM.nc [deleted file]
tos/lib/net/zigbee/apps/Test_APL/Makefile

diff --git a/tos/lib/net/zigbee/Wrapper/WrapperC.nc b/tos/lib/net/zigbee/Wrapper/WrapperC.nc
deleted file mode 100644 (file)
index 36926fd..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
- /*
- * 
- * 
- * @author: Ricardo Severino <rars@isep.ipp.pt>
- * ========================================================================
- */ 
-
-
-configuration WrapperC
-{
-  provides
-  {
-    interface OPENZB_MLME_RESET;
-    interface OPENZB_MLME_START;
-  
-    interface OPENZB_MLME_GET;
-    interface OPENZB_MLME_SET;
-  
-    interface OPENZB_MLME_BEACON_NOTIFY;
-    interface OPENZB_MLME_GTS;
-  
-    interface OPENZB_MLME_ASSOCIATE;
-    interface OPENZB_MLME_DISASSOCIATE;
-  
-    interface OPENZB_MLME_ORPHAN;
-    interface OPENZB_MLME_SYNC;
-    interface OPENZB_MLME_SYNC_LOSS;
-    interface OPENZB_MLME_SCAN;
-    
-    interface OPENZB_MCPS_DATA;
-
-
-  }
-
-}
-
-implementation
-{
-
-  //components Ieee802154BeaconEnabledC as MAC; 
-  components WrapperM;
-
-/*
-  WrapperM.MLME_RESET -> MAC;
-  WrapperM.MLME_START -> MAC;
-  
-  WrapperM.MLME_GET -> MAC;
-  WrapperM.MLME_SET -> MAC;
-  
-  WrapperM.MLME_BEACON_NOTIFY -> MAC;
-  //WrapperM.MLME_GTS -> MAC;
-  
-  WrapperM.MLME_ASSOCIATE -> MAC;
-  WrapperM.MLME_DISASSOCIATE -> MAC;
-  
-  WrapperM.MLME_ORPHAN -> MAC;
-  WrapperM.MLME_SYNC -> MAC;
-  WrapperM.MLME_SYNC_LOSS -> MAC;
-  WrapperM.MLME_SCAN -> MAC;
-    
-  WrapperM.MCPS_DATA -> MAC;
-*/
-  OPENZB_MLME_RESET = WrapperM;
-  OPENZB_MLME_START = WrapperM;
-
-  OPENZB_MLME_GET = WrapperM;
-  OPENZB_MLME_SET = WrapperM;
-
-  OPENZB_MLME_BEACON_NOTIFY = WrapperM;
-  OPENZB_MLME_GTS = WrapperM;
-
-  OPENZB_MLME_ASSOCIATE = WrapperM;
-  OPENZB_MLME_DISASSOCIATE = WrapperM;
-
-  OPENZB_MLME_ORPHAN = WrapperM;
-  OPENZB_MLME_SYNC = WrapperM;
-  OPENZB_MLME_SYNC_LOSS = WrapperM;
-  OPENZB_MLME_SCAN = WrapperM;
-
-  OPENZB_MCPS_DATA = WrapperM;
-
-
-
-
-
-}
\ No newline at end of file
diff --git a/tos/lib/net/zigbee/Wrapper/WrapperM.nc b/tos/lib/net/zigbee/Wrapper/WrapperM.nc
deleted file mode 100644 (file)
index 403683f..0000000
+++ /dev/null
@@ -1,254 +0,0 @@
-module WrapperM
-{
-  uses {
-    interface MLME_START;
-    interface MLME_SET;
-    interface MLME_GET;
-    
-    interface MLME_ASSOCIATE;
-    interface MLME_DISASSOCIATE;
-    
-    interface MLME_BEACON_NOTIFY;
-    interface MLME_GTS;
-    
-    interface MLME_ORPHAN;
-
-    interface MLME_SYNC;
-    interface MLME_SYNC_LOSS;
-    
-    interface MLME_RESET;
-    
-    interface MLME_SCAN;
-    
-    //MCPS
-    interface MCPS_DATA;
-    interface MCPS_PURGE;
-  }
-
-  provides
-  {
-    interface OPENZB_MLME_RESET;
-    interface OPENZB_MLME_START;
-  
-    interface OPENZB_MLME_GET;
-    interface OPENZB_MLME_SET;
-  
-    interface OPENZB_MLME_BEACON_NOTIFY;
-    interface OPENZB_MLME_GTS;
-  
-    interface OPENZB_MLME_ASSOCIATE;
-    interface OPENZB_MLME_DISASSOCIATE;
-  
-    interface OPENZB_MLME_ORPHAN;
-    interface OPENZB_MLME_SYNC;
-    interface OPENZB_MLME_SYNC_LOSS;
-    interface OPENZB_MLME_SCAN;
-    
-    interface OPENZB_MCPS_DATA;
-  }
-  
-}
-implementation
-{
-
-/******************************************************************
- ***************       TKN154 INTERFACES       *******************
-******************************************************************/
-
-  event void MLME_RESET.confirm(ieee154_status_t status)
-  {
-  
-  
-  }
-
-
-  event void MLME_ASSOCIATE.indication (
-                          uint64_t DeviceAddress,
-                          ieee154_CapabilityInformation_t CapabilityInformation,
-                          ieee154_security_t *security
-                        )
-  {
-  }
-
-  event void MLME_ASSOCIATE.confirm    (
-                          uint16_t AssocShortAddress,
-                          uint8_t status,
-                          ieee154_security_t *security
-                        )
-  {
-  }
-
-  event void MLME_DISASSOCIATE.indication (
-                          uint64_t DeviceAddress,
-                          ieee154_disassociation_reason_t DisassociateReason,
-                          ieee154_security_t *security
-                        )
-  {
-  }
-
-
-  event void MLME_DISASSOCIATE.confirm    (
-                          ieee154_status_t status,
-                          uint8_t DeviceAddrMode,
-                          uint16_t DevicePANID,
-                          ieee154_address_t DeviceAddress
-                        )
-  {
-  }
-
- event void MLME_START.confirm    (
-                          ieee154_status_t status
-                        )
-
-  {
-  }
-
-
-  event void MLME_SCAN.confirm    (
-                          ieee154_status_t status,
-                          uint8_t ScanType,
-                          uint8_t ChannelPage,
-                          uint32_t UnscannedChannels,
-                          uint8_t EnergyDetectNumResults,
-                          int8_t* EnergyDetectList,
-                          uint8_t PANDescriptorListNumResults,
-                          ieee154_PANDescriptor_t* PANDescriptorList
-                        )
-
-  {
-  }
-
-
-  event message_t* MLME_BEACON_NOTIFY.indication ( message_t *beaconFrame )
-
-  {
-  }
-
-
-
-  event void MLME_ORPHAN.indication (
-                          uint64_t OrphanAddress,
-                          ieee154_security_t *security
-                        )
-
-  {
-  }
-
-
-  event void MLME_SYNC_LOSS.indication (
-                          ieee154_status_t lossReason,
-                          uint16_t PANId,
-                          uint8_t LogicalChannel,
-                          uint8_t ChannelPage,
-                          ieee154_security_t *security
-                        )
-  {
-  }
-
-
-  event void MLME_GTS.confirm    (
-                          uint8_t GtsCharacteristics,
-                          ieee154_status_t status
-                        )
-  {
-  }
-
-
-  event void MLME_GTS.indication (
-                          uint16_t DeviceAddress,
-                          uint8_t GtsCharacteristics,
-                          ieee154_security_t *security
-                        )
-  {
-  }
-
-
-  event void MCPS_DATA.confirm    (  
-                          message_t *frame,
-                          uint8_t msduHandle,
-                          ieee154_status_t status,
-                          uint32_t Timestamp
-                        )
-  {
-  }
-
-  event message_t* MCPS_DATA.indication ( message_t* frame )
-  {
-  }
-
-
-
-
-/******************************************************************
- ***************       OPEN-ZB INTERFACES      *******************
-******************************************************************/
-
-  command error_t OPENZB_MLME_RESET.request(uint8_t set_default_PIB)
-  {
-    printfUART("MLME_RESET.request\n", "");
-
-    return SUCCESS;
-  }
-
-  
-
-
-  command error_t OPENZB_MLME_START.request(uint32_t PANId, uint8_t LogicalChannel, uint8_t beacon_order, uint8_t superframe_order,bool pan_coodinator,bool BatteryLifeExtension,bool CoordRealignment,bool securityenable,uint32_t StartTime)
-  {
-  }
-
-
-
-  command error_t OPENZB_MLME_SYNC.request(uint8_t logical_channel,uint8_t track_beacon)
-  {
-         
-
-  return SUCCESS;
-  }
-
-  command error_t OPENZB_MLME_SET.request(uint8_t PIBAttribute,uint8_t PIBAttributeValue[])
-  {
-  }
-
-  command error_t OPENZB_MLME_GET.request(uint8_t PIBAttribute)
-  {
-  }
-
-  command error_t OPENZB_MLME_SCAN.request(uint8_t ScanType, uint32_t ScanChannels, uint8_t ScanDuration)
-  {
-  //pag 93
-  }
-
-
-  command error_t OPENZB_MLME_ORPHAN.response(uint32_t OrphanAddress[1],uint16_t ShortAddress,uint8_t AssociatedMember, uint8_t security_enabled)
-  {
-  }
-
-
-  command error_t OPENZB_MCPS_DATA.request(uint8_t SrcAddrMode, uint16_t SrcPANId, uint32_t SrcAddr[], uint8_t DstAddrMode, uint16_t DestPANId, uint32_t DstAddr[], uint8_t msduLength, uint8_t msdu[],uint8_t msduHandle, uint8_t TxOptions)
-  {
-  }
-
-  command error_t OPENZB_MLME_ASSOCIATE.request(uint8_t LogicalChannel,uint8_t CoordAddrMode,uint16_t CoordPANId,uint32_t CoordAddress[],uint8_t CapabilityInformation,bool securityenable)
-  {
-  }
-
-  command error_t OPENZB_MLME_ASSOCIATE.response(uint32_t DeviceAddress[], uint16_t AssocShortAddress, uint8_t status, bool securityenable)
-  {
-  }
-  command error_t OPENZB_MLME_DISASSOCIATE.request(uint32_t DeviceAddress[], uint8_t disassociate_reason, bool securityenable)
-  {
-  }
-
-  command error_t OPENZB_MLME_GTS.request(uint8_t GTSCharacteristics, bool security_enable)
-  {
-  }
-
-
-}
-
-
-
-
index 9372b0dfaa509bb319bea1c86c07560d23d397cf..93e039a493a035404c231862969e37683eba8641 100644 (file)
@@ -25,8 +25,8 @@ PFLAGS += -I$(TOSROOT)/tos/lib/mac/tkn154 \
        -I$(TOSROOT)/tos/lib/mac/tkn154/interfaces/private \
        -I$(TOSROOT)/tos/lib/mac/tkn154/interfaces/public\
 \
--I$(TOSROOT)/tos/lib/net/zigbee/Wrapper\
--I$(TOSROOT)/tos/lib/net/zigbee/Wrapper/interfaces/mac\
+-I$(TOSROOT)/tos/lib/net/zigbee/wrapper\
+-I$(TOSROOT)/tos/lib/net/zigbee/wrapper/interfaces/mac\
 -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/includes \
 -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/interfaces/nwk \
  -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/nwk