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

make tx_head also visible

Browse source
This commit is contained in:
Mariano Alvira 2010-03-29 19:28:01 -04:00
parent c6fc0e4d02
commit c6d3073b9c
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/include/maca.h
View file

@ -29,7 +29,7 @@ volatile packet_t* get_free_packet(void);
void free_packet(volatile packet_t *p); void free_packet(volatile packet_t *p);
void free_all_packets(void); void free_all_packets(void);
extern volatile packet_t *rx_head; extern volatile packet_t *rx_head, *tx_head;
extern void maca_rx_callback(volatile packet_t *p) __attribute__((weak)); extern void maca_rx_callback(volatile packet_t *p) __attribute__((weak));
extern void maca_tx_callback(volatile packet_t *p) __attribute__((weak)); extern void maca_tx_callback(volatile packet_t *p) __attribute__((weak));
@ -152,6 +152,7 @@ enum {
#define MACA_KEY0 ((volatile uint32_t *) (MACA_BASE+0x164)) #define MACA_KEY0 ((volatile uint32_t *) (MACA_BASE+0x164))
#define MACA_OPTIONS ((volatile uint32_t *) (MACA_BASE+0x180)) #define MACA_OPTIONS ((volatile uint32_t *) (MACA_BASE+0x180))
/******************************************************************************/ /******************************************************************************/
/* everything under this comment is messy, needs cleaning, and will */ /* everything under this comment is messy, needs cleaning, and will */
/* probably change in the future */ /* probably change in the future */

8
lib/maca.c
View file

@ -27,12 +27,12 @@
#define reg(x) (*(volatile uint32_t *)(x)) #define reg(x) (*(volatile uint32_t *)(x))
static volatile packet_t packet_pool[NUM_PACKETS]; static volatile packet_t packet_pool[NUM_PACKETS];
static volatile packet_t *free_head, *rx_end, *tx_head, *tx_end, *dma_tx, *dma_rx = 0; static volatile packet_t *free_head, *rx_end, *tx_end, *dma_tx, *dma_rx = 0;
/* rx_head is visible to the outside */ /* rx_head and tx_head are visible to the outside */
/* so you can peek at it and see if there is data */ /* so you can peek at it and see if there is data */
/* waiting for you */ /* waiting for you, or data still to be sent */
volatile packet_t *rx_head; volatile packet_t *rx_head, *tx_head;
/* used for ack recpetion if the packet_pool goes empty */ /* used for ack recpetion if the packet_pool goes empty */
/* doesn't go back into the pool when freed */ /* doesn't go back into the pool when freed */