deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Reverted radio API change in CC2420 (not yet fully integrated with Contiki core)

Browse source
This commit is contained in:
nifi 2010-09-23 08:26:06 +00:00
parent 9ce45ac452
commit e242fb28bf
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/dev/cc2420.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: cc2420.c,v 1.59 2010/09/22 22:01:53 adamdunkels Exp $ * @(#)$Id: cc2420.c,v 1.60 2010/09/23 08:26:06 nifi Exp $
*/ */
/* /*
* This code is almost device independent and should be easy to port. * This code is almost device independent and should be easy to port.
@ -146,8 +146,8 @@ const struct radio_driver cc2420_driver =
cc2420_transmit, cc2420_transmit,
cc2420_send, cc2420_send,
cc2420_read, cc2420_read,
cc2420_set_channel, /* cc2420_set_channel, */
detected_energy, /* detected_energy, */
cc2420_cca, cc2420_cca,
cc2420_receiving_packet, cc2420_receiving_packet,
pending_packet, pending_packet,
@ -796,11 +796,13 @@ cc2420_rssi(void)
return rssi; return rssi;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/*
static int static int
detected_energy(void) detected_energy(void)
{ {
return cc2420_rssi(); return cc2420_rssi();
} }
*/
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int int
cc2420_cca_valid(void) cc2420_cca_valid(void)

4
core/dev/cc2420.h
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: cc2420.h,v 1.12 2010/06/24 11:25:07 nifi Exp $ * $Id: cc2420.h,v 1.13 2010/09/23 08:26:06 nifi Exp $
*/ */
/** /**
@ -51,7 +51,7 @@ int cc2420_init(void);
#define CC2420_MAX_PACKET_LEN 127 #define CC2420_MAX_PACKET_LEN 127
void cc2420_set_channel(int channel); int cc2420_set_channel(int channel);
int cc2420_get_channel(void); int cc2420_get_channel(void);
void cc2420_set_pan_addr(unsigned pan, void cc2420_set_pan_addr(unsigned pan,