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

Removed __ prefixes on symbols, which are reserved for C implementation; updated to new radio.h types

Browse source
This commit is contained in:
adamdunkels 2007-05-25 08:06:15 +00:00
parent c8eecc5b02
commit f373c63532
2 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/dev/simple-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: simple-cc2420.c,v 1.7 2007/05/22 20:51:30 adamdunkels Exp $ * @(#)$Id: simple-cc2420.c,v 1.8 2007/05/25 08:06:15 adamdunkels 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.
@ -60,12 +60,25 @@
#else #else
#define PRINTF(...) do {} while (0) #define PRINTF(...) do {} while (0)
#endif #endif
void simple_cc2420_arch_init(void);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS(simple_cc2420_process, "CC2420 driver"); PROCESS(simple_cc2420_process, "CC2420 driver");
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void (* receiver_callback)(const struct radio_driver *); static void (* receiver_callback)(const struct radio_driver *);
int simple_cc2420_on(void);
int simple_cc2420_off(void);
u16_t simple_cc2420_read(u8_t *buf, u16_t bufsize);
int simple_cc2420_send(const u8_t *data, u16_t len);
void simple_cc2420_set_receiver(void (* recv)(const struct radio_driver *d));
signed char simple_cc2420_last_rssi; signed char simple_cc2420_last_rssi;
u8_t simple_cc2420_last_correlation; u8_t simple_cc2420_last_correlation;
@ -171,7 +184,7 @@ simple_cc2420_init(void)
u16_t reg; u16_t reg;
{ {
int s = splhigh(); int s = splhigh();
__cc2420_arch_init(); /* Initalize ports and SPI. */ simple_cc2420_arch_init(); /* Initalize ports and SPI. */
DISABLE_FIFOP_INT(); DISABLE_FIFOP_INT();
FIFOP_INT_INIT(); FIFOP_INT_INIT();
splx(s); splx(s);
@ -383,7 +396,7 @@ simple_cc2420_set_chan_pan_addr(unsigned channel, /* 11 - 26 */
*/ */
static volatile rtimer_clock_t interrupt_time; static volatile rtimer_clock_t interrupt_time;
int int
__cc2420_intr(void) simple_cc2420_interrupt(void)
{ {
interrupt_time = rtimer_arch_now(); interrupt_time = rtimer_arch_now();
@ -454,7 +467,7 @@ simple_cc2420_read(u8_t *buf, u16_t bufsize)
len = 2; len = 2;
RIMESTATS_ADD(toolong); RIMESTATS_ADD(toolong);
} else { } else {
rtimer_clock_t t; // rtimer_clock_t t;
// FASTSPI_READ_FIFO_NO_WAIT(&t, 2); /* Time stamp */ // FASTSPI_READ_FIFO_NO_WAIT(&t, 2); /* Time stamp */
FASTSPI_READ_FIFO_NO_WAIT(buf, len - 2); FASTSPI_READ_FIFO_NO_WAIT(buf, len - 2);
/* PRINTF("simple_cc2420_read: data\n");*/ /* PRINTF("simple_cc2420_read: data\n");*/

19
core/dev/simple-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: simple-cc2420.h,v 1.3 2007/05/15 07:53:09 adamdunkels Exp $ * $Id: simple-cc2420.h,v 1.4 2007/05/25 08:06:15 adamdunkels Exp $
*/ */
/** /**
@ -44,18 +44,9 @@
#include "contiki.h" #include "contiki.h"
#include "dev/radio.h" #include "dev/radio.h"
#define SIMPLE_CC2420_MAX_PACKET_LEN 127
void simple_cc2420_init(void); void simple_cc2420_init(void);
int simple_cc2420_on(void); #define SIMPLE_CC2420_MAX_PACKET_LEN 127
int simple_cc2420_off(void);
u16_t simple_cc2420_read(u8_t *buf, u16_t bufsize);
int simple_cc2420_send(const u8_t *data, u16_t len);
void simple_cc2420_set_receiver(void (* recv)(const struct radio_driver *d));
void simple_cc2420_set_chan_pan_addr(unsigned channel, /* 11 - 26 */ void simple_cc2420_set_chan_pan_addr(unsigned channel, /* 11 - 26 */
unsigned pan, unsigned pan,
@ -72,4 +63,10 @@ extern const struct radio_driver simple_cc2420_driver;
*/ */
void simple_cc2420_set_txpower(u8_t power); void simple_cc2420_set_txpower(u8_t power);
/**
* Interrupt function, called from the simple-cc2420-arch driver.
*
*/
int simple_cc2420_interrupt(void);
#endif /* __SIMPLE_CC2420_H__ */ #endif /* __SIMPLE_CC2420_H__ */