[Tinyos-contrib-commits]
CVS: tinyos-1.x/contrib/diku/evb13192/tos/lib/freescale802154
Freescale802154M.nc, 1.13, 1.14 endianconv.h, 1.2,
1.3 Freescale802154C.nc, 1.10, 1.11 PibAttributeM.nc, 1.10,
1.11 AddressM.nc, 1.1, 1.2
Jan Flora
janflora at users.sourceforge.net
Wed Aug 23 02:55:51 PDT 2006
- Previous message: [Tinyos-contrib-commits]
CVS: tinyos-1.x/contrib/diku/evb13192/tos/lib/freescale802154/old
.platform, 1.1, NONE hardware.h, 1.1, NONE
- Next message: [Tinyos-contrib-commits]
CVS: tinyos-1.x/contrib/diku/evb13192/tos/interfaces
BufferManDebug.nc, NONE, 1.1 LocalTime.nc, 1.2, 1.3 Debug.nc,
1.5, 1.6 QueueTypes.h, 1.1, 1.2 FIFOQueue.nc, 1.4,
1.5 SyncAlarm.nc, 1.1, 1.2 AsyncAlarm.nc, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/freescale802154
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18494/tos/lib/freescale802154
Modified Files:
Freescale802154M.nc endianconv.h Freescale802154C.nc
PibAttributeM.nc AddressM.nc
Log Message:
Freescale 802.15.4 library updates
Index: Freescale802154M.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/freescale802154/Freescale802154M.nc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Freescale802154M.nc 27 Feb 2006 22:13:01 -0000 1.13
--- Freescale802154M.nc 23 Aug 2006 09:55:48 -0000 1.14
***************
*** 84,88 ****
interface IeeeIndication<Mlme_DisassociateIndication> as MlmeIndicationDisassociate;
interface IeeeRequestConfirm<Mlme_DisassociateRequestConfirm> as MlmeRequestConfirmDisassociate;
! interface IeeeRequestConfirm<Mlme_GetRequestConfirm> as MlmeRequestConfirmGet;
interface IeeeIndication<Mlme_GtsIndication> as MlmeIndicationGts;
interface IeeeRequestConfirm<Mlme_GtsRequestConfirm> as MlmeRequestConfirmGts;
--- 84,88 ----
interface IeeeIndication<Mlme_DisassociateIndication> as MlmeIndicationDisassociate;
interface IeeeRequestConfirm<Mlme_DisassociateRequestConfirm> as MlmeRequestConfirmDisassociate;
! interface IeeeSyncRequestConfirm<Mlme_GetRequestConfirm> as MlmeRequestConfirmGet;
interface IeeeIndication<Mlme_GtsIndication> as MlmeIndicationGts;
interface IeeeRequestConfirm<Mlme_GtsRequestConfirm> as MlmeRequestConfirmGts;
***************
*** 92,96 ****
interface IeeeRequestConfirm<Mlme_RxEnableRequestConfirm> as MlmeRequestConfirmRxEnable;
interface IeeeRequestConfirm<Mlme_ScanRequestConfirm> as MlmeRequestConfirmScan;
! interface IeeeRequestConfirm<Mlme_SetRequestConfirm> as MlmeRequestConfirmSet;
interface IeeeRequestConfirm<Mlme_StartRequestConfirm> as MlmeRequestConfirmStart;
interface IeeeIndication<Mlme_SyncLossIndication> as MlmeIndicationSyncLoss;
--- 92,96 ----
interface IeeeRequestConfirm<Mlme_RxEnableRequestConfirm> as MlmeRequestConfirmRxEnable;
interface IeeeRequestConfirm<Mlme_ScanRequestConfirm> as MlmeRequestConfirmScan;
! interface IeeeSyncRequestConfirm<Mlme_SetRequestConfirm> as MlmeRequestConfirmSet;
interface IeeeRequestConfirm<Mlme_StartRequestConfirm> as MlmeRequestConfirmStart;
interface IeeeIndication<Mlme_SyncLossIndication> as MlmeIndicationSyncLoss;
***************
*** 388,392 ****
}
}
! DBG_STR("MLME_SAPHandler",1);
return gSuccess_c;
}
--- 388,392 ----
}
}
! //DBG_STR("MLME_SAPHandler",1);
return gSuccess_c;
}
***************
*** 487,491 ****
}
//asm("bgnd");
! DBG_STR("MCPS_SAPHandler",1);
return gSuccess_c;
}
--- 487,491 ----
}
//asm("bgnd");
! //DBG_STR("MCPS_SAPHandler",1);
return gSuccess_c;
}
***************
*** 538,542 ****
}
! inline command result_t McpsRequestConfirmPurge.request(Mcps_PurgeRequestConfirm request)
{
if(MSG_Send(NWK_MCPS, request) != gSuccess_c) {
--- 538,542 ----
}
! command result_t McpsRequestConfirmPurge.request(Mcps_PurgeRequestConfirm request)
{
if(MSG_Send(NWK_MCPS, request) != gSuccess_c) {
***************
*** 564,568 ****
***********************************************************/
! inline command result_t MlmeRequestConfirmAssociate.request(Mlme_AssociateRequestConfirm request)
{
if(MSG_Send(NWK_MLME, request) != gSuccess_c) {
--- 564,568 ----
***********************************************************/
! command result_t MlmeRequestConfirmAssociate.request(Mlme_AssociateRequestConfirm request)
{
if(MSG_Send(NWK_MLME, request) != gSuccess_c) {
***************
*** 572,576 ****
}
! inline command result_t MlmeIndicationResponseAssociate.response( Mlme_AssociateIndicationResponse response )
{
response->msg.response.msgType = gMlmeAssociateRes_c;
--- 572,576 ----
}
! command result_t MlmeIndicationResponseAssociate.response( Mlme_AssociateIndicationResponse response )
{
response->msg.response.msgType = gMlmeAssociateRes_c;
***************
*** 589,593 ****
}
! command result_t MlmeRequestConfirmGet.request(Mlme_GetRequestConfirm request)
{
uint8_t pibAttribute = ((MlmeRequestConfirmGetSet_t*)request)->primitive.msg.request.msgData.getReq.pibAttribute;
--- 589,593 ----
}
! command Mlme_GetRequestConfirm MlmeRequestConfirmGet.request(Mlme_GetRequestConfirm request)
{
uint8_t pibAttribute = ((MlmeRequestConfirmGetSet_t*)request)->primitive.msg.request.msgData.getReq.pibAttribute;
***************
*** 599,603 ****
post getConfirm();
! return SUCCESS;
}
--- 599,603 ----
post getConfirm();
! return getPrimitive;
}
***************
*** 610,614 ****
}
! inline command result_t MlmeIndicationResponseOrphan.response( Mlme_OrphanIndicationResponse response )
{
response->msg.response.msgType = gMlmeOrphanRes_c;
--- 610,614 ----
}
! command result_t MlmeIndicationResponseOrphan.response( Mlme_OrphanIndicationResponse response )
{
response->msg.response.msgType = gMlmeOrphanRes_c;
***************
*** 652,656 ****
}
! command result_t MlmeRequestConfirmSet.request(Mlme_SetRequestConfirm request)
{
uint8_t pibAttribute;
--- 652,656 ----
}
! command Mlme_SetRequestConfirm MlmeRequestConfirmSet.request(Mlme_SetRequestConfirm request)
{
uint8_t pibAttribute;
***************
*** 661,665 ****
post setConfirm();
! return SUCCESS;
}
--- 661,665 ----
post setConfirm();
! return setPrimitive;
}
Index: endianconv.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/freescale802154/endianconv.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** endianconv.h 14 Dec 2005 10:45:46 -0000 1.2
--- endianconv.h 23 Aug 2006 09:55:48 -0000 1.3
***************
*** 2,6 ****
#define _ENDIANCONV_H_
! static inline void NTOUHCPY64(uint8_t *src, uint8_t *dst)
{
dst[0] = src[7];
--- 2,6 ----
#define _ENDIANCONV_H_
! static void NTOUHCPY64(uint8_t *src, uint8_t *dst)
{
dst[0] = src[7];
***************
*** 14,18 ****
}
! static inline void NTOUHCPY32(uint8_t *src, uint8_t *dst)
{
dst[0] = src[3];
--- 14,18 ----
}
! static void NTOUHCPY32(uint8_t *src, uint8_t *dst)
{
dst[0] = src[3];
***************
*** 22,26 ****
}
! static inline void NTOUHCPY16(uint8_t *src, uint8_t *dst)
{
dst[0] = src[1];
--- 22,26 ----
}
! static void NTOUHCPY16(uint8_t *src, uint8_t *dst)
{
dst[0] = src[1];
***************
*** 28,32 ****
}
! static inline uint32_t NTOUH32(uint32_t n)
{
char* base = (char*)&n;
--- 28,32 ----
}
! static uint32_t NTOUH32(uint32_t n)
{
char* base = (char*)&n;
***************
*** 37,41 ****
}
! static inline uint16_t NTOUH16(uint16_t n)
{
char* base = (char*)&n;
--- 37,41 ----
}
! static uint16_t NTOUH16(uint16_t n)
{
char* base = (char*)&n;
Index: Freescale802154C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/freescale802154/Freescale802154C.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Freescale802154C.nc 23 Dec 2005 05:05:36 -0000 1.10
--- Freescale802154C.nc 23 Aug 2006 09:55:48 -0000 1.11
***************
*** 45,49 ****
interface IeeeIndication<Mlme_DisassociateIndication> as MlmeIndicationDisassociate;
interface IeeeRequestConfirm<Mlme_DisassociateRequestConfirm> as MlmeRequestConfirmDisassociate;
! interface IeeeRequestConfirm<Mlme_GetRequestConfirm> as MlmeRequestConfirmGet;
interface IeeeIndication<Mlme_GtsIndication> as MlmeIndicationGts;
interface IeeeRequestConfirm<Mlme_GtsRequestConfirm> as MlmeRequestConfirmGts;
--- 45,49 ----
interface IeeeIndication<Mlme_DisassociateIndication> as MlmeIndicationDisassociate;
interface IeeeRequestConfirm<Mlme_DisassociateRequestConfirm> as MlmeRequestConfirmDisassociate;
! interface IeeeSyncRequestConfirm<Mlme_GetRequestConfirm> as MlmeRequestConfirmGet;
interface IeeeIndication<Mlme_GtsIndication> as MlmeIndicationGts;
interface IeeeRequestConfirm<Mlme_GtsRequestConfirm> as MlmeRequestConfirmGts;
***************
*** 53,57 ****
interface IeeeRequestConfirm<Mlme_RxEnableRequestConfirm> as MlmeRequestConfirmRxEnable;
interface IeeeRequestConfirm<Mlme_ScanRequestConfirm> as MlmeRequestConfirmScan;
! interface IeeeRequestConfirm<Mlme_SetRequestConfirm> as MlmeRequestConfirmSet;
interface IeeeRequestConfirm<Mlme_StartRequestConfirm> as MlmeRequestConfirmStart;
interface IeeeIndication<Mlme_SyncLossIndication> as MlmeIndicationSyncLoss;
--- 53,57 ----
interface IeeeRequestConfirm<Mlme_RxEnableRequestConfirm> as MlmeRequestConfirmRxEnable;
interface IeeeRequestConfirm<Mlme_ScanRequestConfirm> as MlmeRequestConfirmScan;
! interface IeeeSyncRequestConfirm<Mlme_SetRequestConfirm> as MlmeRequestConfirmSet;
interface IeeeRequestConfirm<Mlme_StartRequestConfirm> as MlmeRequestConfirmStart;
interface IeeeIndication<Mlme_SyncLossIndication> as MlmeIndicationSyncLoss;
Index: PibAttributeM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/freescale802154/PibAttributeM.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PibAttributeM.nc 23 Dec 2005 05:05:36 -0000 1.10
--- PibAttributeM.nc 23 Aug 2006 09:55:48 -0000 1.11
***************
*** 23,30 ****
}
! command result_t IeeePibAttribute.destroy( uint8_t size, Ieee_PibAttribute pibAttribute )
{
if (pibAttribute->destroyable) {
! return call BufferMng.release(size+2, (uint8_t*)pibAttribute);
}
return FAIL;
--- 23,30 ----
}
! command result_t IeeePibAttribute.destroy( Ieee_PibAttribute pibAttribute )
{
if (pibAttribute->destroyable) {
! return call BufferMng.release(0, (uint8_t*)pibAttribute);
}
return FAIL;
Index: AddressM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/tos/lib/freescale802154/AddressM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AddressM.nc 14 Dec 2005 10:45:46 -0000 1.1
--- AddressM.nc 23 Aug 2006 09:55:48 -0000 1.2
***************
*** 61,67 ****
}
! command uint8_t *IeeeAddress.getAddress( Ieee_Address addr )
{
! return addr->address;
}
}
--- 61,67 ----
}
! command void IeeeAddress.getAddress( Ieee_Address addr, uint8_t *myAddress )
{
! memcpy(myAddress, addr->address, 8);
}
}
- Previous message: [Tinyos-contrib-commits]
CVS: tinyos-1.x/contrib/diku/evb13192/tos/lib/freescale802154/old
.platform, 1.1, NONE hardware.h, 1.1, NONE
- Next message: [Tinyos-contrib-commits]
CVS: tinyos-1.x/contrib/diku/evb13192/tos/interfaces
BufferManDebug.nc, NONE, 1.1 LocalTime.nc, 1.2, 1.3 Debug.nc,
1.5, 1.6 QueueTypes.h, 1.1, 1.2 FIFOQueue.nc, 1.4,
1.5 SyncAlarm.nc, 1.1, 1.2 AsyncAlarm.nc, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Tinyos-contrib-commits
mailing list