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

- Fixed the MAC/RF interface problems, now correctly working with sicslowmac. Tested with rf_test_tx and rf_test_rx. Still needs more thorough testing.

Browse source 
- Corrected a Makefile bug, was complaining about *.d missing
This commit is contained in:
zdshelby 2009-10-15 12:43:53 +00:00
parent a0347487dc
commit c89b700631
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cpu/cc2430/Makefile.cc2430
View file

@ -38,6 +38,7 @@ CUSTOM_RULE_ALLOBJS_TO_TARGETLIB=1
ifdef CUSTOM_RULE_C_TO_OBJECTDIR_O ifdef CUSTOM_RULE_C_TO_OBJECTDIR_O
$(OBJECTDIR)/%.o: %.c $(OBJECTDIR)/%.o: %.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
$(CC) $(CFLAGS) -MM -c $< > $(@:.o=.d)
@$(FINALIZE_DEPENDENCY) @$(FINALIZE_DEPENDENCY)
endif endif

20
cpu/cc2430/dev/cc2430_rf.c
View file

@ -43,7 +43,7 @@ void cc2430_rf_init(void);
#include "lib/crc16.h" #include "lib/crc16.h"
#define CHECKSUM_LEN 2 #define CHECKSUM_LEN 2
#else #else
#define CHECKSUM_LEN 0 #define CHECKSUM_LEN 2
#endif /* CC2430_CONF_CHECKSUM */ #endif /* CC2430_CONF_CHECKSUM */
#define RF_RX_LED_ON() leds_on(LEDS_RED); #define RF_RX_LED_ON() leds_on(LEDS_RED);
@ -189,17 +189,21 @@ cc2430_rf_send(const void *payload, unsigned short payload_len)
RIMESTATS_ADD(lltx); RIMESTATS_ADD(lltx);
/* Send */
cc2430_rf_command(ISFLUSHTX); cc2430_rf_command(ISFLUSHTX);
RFD = payload_len;
PRINTF("cc2430_rf: sent = "); PRINTF("cc2430_rf: sent = ");
/* Send the phy length byte first */
RFD = payload_len+CHECKSUM_LEN; /* Payload plus FCS */
PRINTF("(%d)", payload_len+CHECKSUM_LEN);
for(i = 0 ; i < payload_len; i++) { for(i = 0 ; i < payload_len; i++) {
RFD = ((unsigned char*)(payload))[i]; RFD = ((unsigned char*)(payload))[i];
PRINTF("%02X", ((unsigned char*)(payload))[i]); PRINTF("%02X", ((unsigned char*)(payload))[i]);
} }
PRINTF("\n"); PRINTF("\n");
/* Leave space for the FCS */
RFD = 0;
RFD = 0;
if(cc2430_rf_cca_check(0,0) == -1) { if(cc2430_rf_cca_check(0,0) == -1) {
return -1; return -1;
} }
@ -228,7 +232,7 @@ cc2430_rf_send(const void *payload, unsigned short payload_len)
int int
cc2430_rf_read(void *buf, unsigned short bufsize) cc2430_rf_read(void *buf, unsigned short bufsize)
{ {
uint8_t i, len, type; uint8_t i, len;
#if CC2420_CONF_CHECKSUM #if CC2420_CONF_CHECKSUM
uint16_t checksum; uint16_t checksum;
#endif /* CC2420_CONF_CHECKSUM */ #endif /* CC2420_CONF_CHECKSUM */
@ -237,7 +241,6 @@ cc2430_rf_read(void *buf, unsigned short bufsize)
/* Check the length */ /* Check the length */
len = RFD; len = RFD;
len &= 0x7f;
PRINTF("cc2430_rf: received %d bytes\n", len); PRINTF("cc2430_rf: received %d bytes\n", len);
/* Check for validity */ /* Check for validity */
@ -265,7 +268,8 @@ cc2430_rf_read(void *buf, unsigned short bufsize)
/* Read the buffer */ /* Read the buffer */
PRINTF("cc2430_rf: read = "); PRINTF("cc2430_rf: read = ");
for(i = 1; i < (len + 1 - CHECKSUM_LEN); i++) { PRINTF("(%d)", len);
for(i = 0; i < (len - CHECKSUM_LEN); i++) {
((unsigned char*)(buf))[i] = RFD; ((unsigned char*)(buf))[i] = RFD;
PRINTF("%02X", ((unsigned char*)(buf))[i]); PRINTF("%02X", ((unsigned char*)(buf))[i]);
} }
@ -273,6 +277,8 @@ cc2430_rf_read(void *buf, unsigned short bufsize)
#if CC2430_CONF_CHECKSUM #if CC2430_CONF_CHECKSUM
/* Deal with the checksum */ /* Deal with the checksum */
checksum = RFD * 256;
checksum += RFD;
#endif /* CC2430_CONF_CHECKSUM */ #endif /* CC2430_CONF_CHECKSUM */
packetbuf_set_attr(PACKETBUF_ATTR_RSSI, ((int8_t) RFD) - 45); packetbuf_set_attr(PACKETBUF_ATTR_RSSI, ((int8_t) RFD) - 45);