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 #422 from OlegHahm/nobyte

Browse Source 
use CC1100_NOBYTE consistently (fixing #129)
This commit is contained in:
Oleg Hahm 2013-12-15 13:22:10 -08:00
commit 0aa240a1c0
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/cc110x/cc1100_spi.c
View File

@ -42,8 +42,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
// CC1100 SPI access
/*---------------------------------------------------------------------------*/
#define NOBYTE 0xFF
uint8_t
cc1100_spi_writeburst_reg(uint8_t addr, char *src, uint8_t count)
{
@ -71,7 +69,7 @@ cc1100_spi_readburst_reg(uint8_t addr, char *buffer, uint8_t count)
cc110x_txrx(addr | CC1100_READ_BURST);
while (i < count) {
buffer[i] = cc110x_txrx(NOBYTE);
buffer[i] = cc110x_txrx(CC1100_NOBYTE);
i++;
}
@ -96,7 +94,7 @@ uint8_t cc1100_spi_read_reg(uint8_t addr)
unsigned int cpsr = disableIRQ();
cc110x_spi_select();
cc110x_txrx(addr | CC1100_READ_SINGLE);
result = cc110x_txrx(NOBYTE);
result = cc110x_txrx(CC1100_NOBYTE);
cc110x_spi_unselect();
restoreIRQ(cpsr);
return result;
@ -108,7 +106,7 @@ uint8_t cc1100_spi_read_status(uint8_t addr)
unsigned int cpsr = disableIRQ();
cc110x_spi_select();
cc110x_txrx(addr | CC1100_READ_BURST);
result = cc110x_txrx(NOBYTE);
result = cc110x_txrx(CC1100_NOBYTE);
cc110x_spi_unselect();
restoreIRQ(cpsr);
return result;

2
drivers/cc110x_ng/include/cc110x-internal.h
View File

@ -88,7 +88,7 @@
#define CC1100_WRITE_BURST (0x40) ///< Offset for burst write.
#define CC1100_READ_SINGLE (0x80) ///< Offset for read single byte.
#define CC1100_READ_BURST (0xC0) ///< Offset for read burst.
#define CC1100_NOBYTE (0x00) ///< No command (for reading).
#define CC1100_NOBYTE (0xFF) ///< No command (for reading).
/** @} */
/**

8
drivers/cc110x_ng/spi/cc110x_spi.c
View File

@ -44,8 +44,6 @@ and Telematics group (http://cst.mi.fu-berlin.de).
// CC1100 SPI access
/*---------------------------------------------------------------------------*/
#define NOBYTE 0xFF
uint8_t cc110x_writeburst_reg(uint8_t addr, char *src, uint8_t count)
{
int i = 0;
@ -71,7 +69,7 @@ void cc110x_readburst_reg(uint8_t addr, char *buffer, uint8_t count)
cc110x_txrx(addr | CC1100_READ_BURST);
while (i < count) {
buffer[i] = cc110x_txrx(NOBYTE);
buffer[i] = cc110x_txrx(CC1100_NOBYTE);
i++;
}
@ -100,7 +98,7 @@ uint8_t cc110x_read_reg(uint8_t addr)
unsigned int cpsr = disableIRQ();
cc110x_spi_select();
cc110x_txrx(addr | CC1100_READ_SINGLE);
result = cc110x_txrx(NOBYTE);
result = cc110x_txrx(CC1100_NOBYTE);
cc110x_spi_unselect();
restoreIRQ(cpsr);
return result;
@ -112,7 +110,7 @@ uint8_t cc110x_read_status(uint8_t addr)
unsigned int cpsr = disableIRQ();
cc110x_spi_select();
cc110x_txrx(addr | CC1100_READ_BURST);
result = cc110x_txrx(NOBYTE);
result = cc110x_txrx(CC1100_NOBYTE);
cc110x_spi_unselect();
restoreIRQ(cpsr);
return result;