sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAMv71-XULT: Fix MRF24J40 interrupt GPIO number.

Browse Source
This commit is contained in:
Gregory Nutt 2017-08-15 11:43:31 -06:00
parent b274a97840
commit 8033f8ae5b
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configs/samv71-xult/README.txt
View File

@ -1483,13 +1483,13 @@ Click Shield
AD7 PC12 *** Not used *** AD7 PC12 *** Not used ***
D0 PD28 (both) HDR_RX PD28 URXD3 GPIO_UART3_RXD D0 PD28 (both) HDR_RX PD28 URXD3 GPIO_UART3_RXD
D1 PD30 (both) HDR_TX PD30 UTXD3 GPIO_UART3_TXD_1 D1 PD30 (both) HDR_TX PD30 UTXD3 GPIO_UART3_TXD_1
D2 PA5 microBUS1 GPIO interrupt input PA5 D2 PA0 microBUS1 GPIO interrupt input PA0
D3 PA6 microBUS2 GPIO interrupt input PA6 D3 PA6 microBUS2 GPIO interrupt input PA6
D4 PD27 *** Not used *** D4 PD27 *** Not used ***
D5 PD11 microBUS2 PWMB PD11 PWMC0_H0 D5 PD11 microBUS2 PWMB PD11 PWMC0_H0
D6 PC19 microBUS1 PWMA PC19 PWMC0_H2 D6 PC19 microBUS1 PWMA PC19 PWMC0_H2
D7 PA2 *** Not used *** D7 PA2 *** Not used ***
D8 PA17 *** Not used *** D8 PA5 *** Not used ***
D9 PC9 microBUS2 CS GPIO output PC9 D9 PC9 microBUS2 CS GPIO output PC9
D10 PD25 microBUS1 CS GPIO output PD25 SPI0_NPCS1 D10 PD25 microBUS1 CS GPIO output PD25 SPI0_NPCS1
D11 PD21 (both) SPI-MOSI PD21 SPI0_MOSI GPIO_SPI0_MOSI D11 PD21 (both) SPI-MOSI PD21 SPI0_MOSI GPIO_SPI0_MOSI

1
configs/samv71-xult/mrf24j40-starhub/defconfig
View File

@ -80,7 +80,6 @@ CONFIG_NETDEV_STATISTICS=y
CONFIG_NETDEV_WIRELESS_IOCTL=y CONFIG_NETDEV_WIRELESS_IOCTL=y
CONFIG_NETUTILS_TELNETC=y CONFIG_NETUTILS_TELNETC=y
CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
CONFIG_NETUTILS_WEBCLIENT=y CONFIG_NETUTILS_WEBCLIENT=y
CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_DESCRIPTORS=8
CONFIG_NFILE_STREAMS=8 CONFIG_NFILE_STREAMS=8

4
configs/samv71-xult/src/sam_mrf24j40.c
View File

@ -271,7 +271,7 @@ static int sam_mrf24j40_devsetup(FAR struct sam_priv_s *priv)
#ifdef CONFIG_IEEE802154_NETDEV #ifdef CONFIG_IEEE802154_NETDEV
/* Use the IEEE802.15.4 MAC interface instance to create a 6LoWPAN /* Use the IEEE802.15.4 MAC interface instance to create a 6LoWPAN
* network interface by wrapping the MAC intrface instance in a * network interface by wrapping the MAC interface instance in a
* network device driver via mac802154dev_register(). * network device driver via mac802154dev_register().
*/ */
@ -286,7 +286,7 @@ static int sam_mrf24j40_devsetup(FAR struct sam_priv_s *priv)
#ifdef CONFIG_IEEE802154_MACDEV #ifdef CONFIG_IEEE802154_MACDEV
/* If want to call these APIs from userspace, you have to wrap the MAC /* If want to call these APIs from userspace, you have to wrap the MAC
* interface in a character device viamac802154dev_register(). * interface in a character device via mac802154dev_register().
*/ */
ret = mac802154dev_register(mac, 0); ret = mac802154dev_register(mac, 0);

8
configs/samv71-xult/src/samv71-xult.h
View File

@ -573,13 +573,13 @@
* AD7 PC12 *** Not used *** * AD7 PC12 *** Not used ***
* D0 PD28 (both) HDR_RX PD28 URXD3 GPIO_UART3_RXD * D0 PD28 (both) HDR_RX PD28 URXD3 GPIO_UART3_RXD
* D1 PD30 (both) HDR_TX PD30 UTXD3 GPIO_UART3_TXD_1 * D1 PD30 (both) HDR_TX PD30 UTXD3 GPIO_UART3_TXD_1
* D2 PA5 microBUS1 GPIO interrupt input PA5 * D2 PA0 microBUS1 GPIO interrupt input PA0
* D3 PA6 microBUS2 GPIO interrupt input PA6 * D3 PA6 microBUS2 GPIO interrupt input PA6
* D4 PD27 *** Not used *** * D4 PD27 *** Not used ***
* D5 PD11 microBUS2 PWMB PD11 PWMC0_H0 * D5 PD11 microBUS2 PWMB PD11 PWMC0_H0
* D6 PC19 microBUS1 PWMA PC19 PWMC0_H2 * D6 PC19 microBUS1 PWMA PC19 PWMC0_H2
* D7 PA2 *** Not used *** * D7 PA2 *** Not used ***
* D8 PA17 *** Not used *** * D8 PA5 *** Not used ***
* D9 PC9 microBUS2 CS GPIO output PC9 * D9 PC9 microBUS2 CS GPIO output PC9
* D10 PD25 microBUS1 CS GPIO output PD25 SPI0_NPCS1 * D10 PD25 microBUS1 CS GPIO output PD25 SPI0_NPCS1
* D11 PD21 (both) SPI-MOSI PD21 SPI0_MOSI GPIO_SPI0_MOSI * D11 PD21 (both) SPI-MOSI PD21 SPI0_MOSI GPIO_SPI0_MOSI
@ -597,11 +597,11 @@
/* Interrupts. No pull-ups on the BEE; assumig active low. */ /* Interrupts. No pull-ups on the BEE; assumig active low. */
#define CLICK_MB1_INTR (GPIO_INPUT | GPIO_CFG_PULLUP | GPIO_CFG_DEGLITCH | \ #define CLICK_MB1_INTR (GPIO_INPUT | GPIO_CFG_PULLUP | GPIO_CFG_DEGLITCH | \
GPIO_INT_FALLING | GPIO_PORT_PIOA | GPIO_PIN5) GPIO_INT_FALLING | GPIO_PORT_PIOA | GPIO_PIN0)
#define CLICK_MB2_INTR (GPIO_INPUT | GPIO_CFG_PULLUP | GPIO_CFG_DEGLITCH | \ #define CLICK_MB2_INTR (GPIO_INPUT | GPIO_CFG_PULLUP | GPIO_CFG_DEGLITCH | \
GPIO_INT_FALLING | GPIO_PORT_PIOA | GPIO_PIN6) GPIO_INT_FALLING | GPIO_PORT_PIOA | GPIO_PIN6)
#define IRQ_MB1 SAM_IRQ_PA5 #define IRQ_MB1 SAM_IRQ_PA0
#define IRQ_MB2 SAM_IRQ_PA6 #define IRQ_MB2 SAM_IRQ_PA6
/* SP chip selects */ /* SP chip selects */

8
drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.c
View File

@ -65,7 +65,7 @@ void mrf24j40_setreg(FAR struct spi_dev_s *spi, uint32_t addr, uint8_t val)
uint8_t buf[3]; uint8_t buf[3];
int len; int len;
if (!(addr&0x80000000)) if (!(addr & 0x80000000))
{ {
addr &= 0x3F; /* 6-bit address */ addr &= 0x3F; /* 6-bit address */
addr <<= 1; addr <<= 1;
@ -106,7 +106,7 @@ uint8_t mrf24j40_getreg(FAR struct spi_dev_s *spi, uint32_t addr)
uint8_t rx[3]; uint8_t rx[3];
int len; int len;
if (!(addr&0x80000000)) if (!(addr & 0x80000000))
{ {
/* 6-bit address */ /* 6-bit address */
@ -159,7 +159,7 @@ int mrf24j40_regdump(FAR struct mrf24j40_radio_s *dev)
{ {
if ((i & 15) == 0) if ((i & 15) == 0)
{ {
len=sprintf(buf, "%02x: ",i&0xFF); len=sprintf(buf, "%02x: ", i & 0xFF);
} }
len += sprintf(buf+len, "%02x ", mrf24j40_getreg(dev->spi, i)); len += sprintf(buf+len, "%02x ", mrf24j40_getreg(dev->spi, i));
@ -176,7 +176,7 @@ int mrf24j40_regdump(FAR struct mrf24j40_radio_s *dev)
{ {
if ((i & 15) == 0) if ((i & 15) == 0)
{ {
len=sprintf(buf, "%02x: ",i&0xFF); len=sprintf(buf, "%02x: ", i & 0xFF);
} }
len += sprintf(buf+len, "%02x ", mrf24j40_getreg(dev->spi, i)); len += sprintf(buf+len, "%02x ", mrf24j40_getreg(dev->spi, i));