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 #882 from rousselk/cc2420_driver_fixes

Browse Source 
CC2420 radio transceiver's driver fixes
This commit is contained in:
Oleg Hahm 2014-03-18 18:14:33 +01:00
commit 1b95d6850d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/cc2420/cc2420.c
View File

@ -128,7 +128,7 @@ radio_address_t cc2420_set_address(radio_address_t addr)
buf[0] = (uint8_t)(addr & 0xFF); buf[0] = (uint8_t)(addr & 0xFF);
buf[1] = (uint8_t)(addr >> 8); buf[1] = (uint8_t)(addr >> 8);
cc2420_write_ram(CC2420_RAM_SHORTADR, buf, 2); cc2420_write_ram(CC2420_RAM_SHORTADR, buf, 2);
cc2420_set_address_long(0x00FF & addr); cc2420_set_address_long(0xFFFF & addr);
return addr; return addr;
} }
@ -149,7 +149,7 @@ uint64_t cc2420_set_address_long(uint64_t addr)
radio_address_t cc2420_get_address(void) radio_address_t cc2420_get_address(void)
{ {
uint16_t addr; radio_address_t addr;
cc2420_read_ram(CC2420_RAM_SHORTADR, (uint8_t *)&addr, sizeof(addr)); cc2420_read_ram(CC2420_RAM_SHORTADR, (uint8_t *)&addr, sizeof(addr));
return addr; return addr;
} }
@ -173,6 +173,6 @@ uint16_t cc2420_set_pan(uint16_t pan)
uint16_t cc2420_get_pan(void) uint16_t cc2420_get_pan(void)
{ {
uint16_t pan; uint16_t pan;
cc2420_read_ram(CC2420_RAM_SHORTADR, (uint8_t *)&pan, sizeof(pan)); cc2420_read_ram(CC2420_RAM_PANID, (uint8_t *)&pan, sizeof(pan));
return pan; return pan;
} }

4
drivers/cc2420/cc2420_spi.c
View File

@ -29,8 +29,8 @@ uint16_t cc2420_read_reg(uint8_t addr) {
cc2420_spi_select(); cc2420_spi_select();
cc2420_txrx(addr | CC2420_READ_ACCESS); cc2420_txrx(addr | CC2420_READ_ACCESS);
result = cc2420_txrx(NOBYTE); result = cc2420_txrx(NOBYTE);
result = result << 8; result <<= 8;
result = cc2420_txrx(NOBYTE); result |= cc2420_txrx(NOBYTE);
cc2420_spi_unselect(); cc2420_spi_unselect();
restoreIRQ(cpsr); restoreIRQ(cpsr);
return result; return result;