RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #138 from OlegHahm/minor_transceiver_fix

Browse Source 
removed duplicated paragraph
This commit is contained in:
Oleg Hahm 2013-08-14 13:21:12 -07:00
commit 5ed58e8242
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/include/transceiver.h
View File

@ -1,27 +1,27 @@
#ifndef TRANSCEIVER_H #ifndef TRANSCEIVER_H
#define TRANSCEIVER_H #define TRANSCEIVER_H
#include <radio/types.h> #include "radio/types.h"
/* supported transceivers * /* supported transceivers *
* NOTE: necessary to include here again due to * NOTE: necessary to include here again due to
* https://github.com/RIOT-OS/RIOT/issues/117 */ * https://github.com/RIOT-OS/RIOT/issues/117 */
#ifdef MODULE_CC110X #ifdef MODULE_CC110X
#include <cc1100-interface.h> #include "cc1100-interface.h"
#endif #endif
#ifdef MODULE_CC110X_NG #ifdef MODULE_CC110X_NG
#include <cc110x_ng.h> #include "cc110x_ng.h"
#endif #endif
#ifdef MODULE_CC2420 #ifdef MODULE_CC2420
#include <cc2420.h> #include "cc2420.h"
#endif #endif
#ifdef MODULE_MC1322X #ifdef MODULE_MC1322X
#include <mc1322x.h> #include "mc1322x.h"
#include <maca.h> #include "maca.h"
#include <maca_packet.h> #include "maca_packet.h"
#endif #endif
/* Stack size for transceiver thread */ /* Stack size for transceiver thread */
@ -29,22 +29,6 @@
#define TRANSCEIVER_STACK_SIZE (512) #define TRANSCEIVER_STACK_SIZE (512)
#endif #endif
#ifndef PAYLOAD_SIZE
#define PAYLOAD_SIZE (0)
#endif
#ifdef MODULE_CC110X
#if (CC1100_MAX_DATA_LENGTH > PAYLOAD_SIZE)
#undef PAYLOAD_SIZE
#define PAYLOAD_SIZE (CC1100_MAX_DATA_LENGTH)
#endif
#endif
#ifdef MODULE_CC110X_NG
#if (CC1100_MAX_DATA_LENGTH > PAYLOAD_SIZE)
#undef PAYLOAD_SIZE
#define PAYLOAD_SIZE (CC1100_MAX_DATA_LENGTH)
#endif
#endif
#define PAYLOAD_SIZE (0) #define PAYLOAD_SIZE (0)
#ifdef MODULE_CC110X #ifdef MODULE_CC110X
#if (CC1100_MAX_DATA_LENGTH > PAYLOAD_SIZE) #if (CC1100_MAX_DATA_LENGTH > PAYLOAD_SIZE)