Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-29 04:19:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merged in merlin17/nuttx (pull request #485)

Browse Source 
drivers/xbee: Fixes a few warnings

* drivers/xbee: Fixes a few warnings

* configs/clicker2-stm32: Updates sections about i8sak usage in the README

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino
2017-09-15 19:41:24 +00:00
committed by Gregory Nutt
parent 9eebd4b0f4
commit 046a94e363
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/clicker2-stm32/README.txt
+20 -18
View File
@@ -362,7 +362,7 @@ Configurations
1. Configure the Coordinator. On coordinator device do: 1. Configure the Coordinator. On coordinator device do:
nsh> i8 /dev/ieee0 startpan nsh> i8 /dev/ieee0 startpan cd:ab
nsh> i8 acceptassoc nsh> i8 acceptassoc
2. Assocate an endpoint device with the WPAN. On the endpoint 2. Assocate an endpoint device with the WPAN. On the endpoint
@@ -432,10 +432,12 @@ Configurations
5. IPv6 networking is enabled with TCP/IP, UDP, 6LoWPAN, and NSH 5. IPv6 networking is enabled with TCP/IP, UDP, 6LoWPAN, and NSH
Telnet support. Telnet support.
6. Configuration instructions: Basic PAN configuration is the same as 6. Configuration instructions: Basic PAN configuration is similar to the
for the ieee802154-mac configuration with the exception that after mrf24j40-mac configuration with the exception that you use the network
the PAN has been configured with the i8sak utility, you must interface name 'wpan0'. This tells the i8sak app to use a socket
explicity bring the network up on each node: instead of a character device to perform the IOCTL operations with the
MAC. Additionally, after the PAN has been configured with the i8sak
utility, you must explicity bring the network up on each node:
nsh> ifup wpan0 nsh> ifup wpan0
@@ -459,9 +461,9 @@ Configurations
Cheat Sheet. Here is a concise summary of all all the steps needed to Cheat Sheet. Here is a concise summary of all all the steps needed to
run the UDP test (C=Coordinator; E=Endpoint): run the UDP test (C=Coordinator; E=Endpoint):
C: nsh> i8 /dev/ieee0 startpan C: nsh> i8 wpan0 startpan cd:ab
C: nsh> 8 acceptassoc C: nsh> i8 acceptassoc
E: nsh> i8 assoc E: nsh> i8 wpan0 assoc
C: nsh> ifup wpan0 C: nsh> ifup wpan0
C: nsh> ifconfig <-- To get the <server-ip> C: nsh> ifconfig <-- To get the <server-ip>
E: nsh> ifup wpan0 E: nsh> ifup wpan0
@@ -491,9 +493,9 @@ Configurations
Cheat Sheet. Here is a concise summary of all all the steps needed to Cheat Sheet. Here is a concise summary of all all the steps needed to
run the TCP test (C=Coordinator; E=Endpoint): run the TCP test (C=Coordinator; E=Endpoint):
C: nsh> i8 /dev/ieee0 startpan C: nsh> i8 wpan0 startpan cd:ab
C: nsh> 8 acceptassoc C: nsh> i8 acceptassoc
E: nsh> i8 assoc E: nsh> i8 wpan0 assoc
C: nsh> ifup wpan0 C: nsh> ifup wpan0
C: nsh> ifconfig <-- To get the <server-ip> C: nsh> ifconfig <-- To get the <server-ip>
E: nsh> ifup wpan0 E: nsh> ifup wpan0
@@ -531,9 +533,9 @@ Configurations
Cheat Sheet. Here is a concise summary of all all the steps needed to Cheat Sheet. Here is a concise summary of all all the steps needed to
run the TCP test (C=Coordinator; E=Endpoint): run the TCP test (C=Coordinator; E=Endpoint):
C: nsh> i8 /dev/ieee0 startpan C: nsh> i8 wpan0 startpan
C: nsh> 8 acceptassoc C: nsh> i8 acceptassoc
E: nsh> i8 assoc E: nsh> i8 wpan0 assoc
C: nsh> ifup wpan0 C: nsh> ifup wpan0
C: nsh> ifconfig <-- To get the <server-ip> C: nsh> ifconfig <-- To get the <server-ip>
E: nsh> ifup wpan0 E: nsh> ifup wpan0
@@ -633,10 +635,10 @@ Configurations
representing the two star endpoints and C: representing the representing the two star endpoints and C: representing the
coordinator/hub. coordinator/hub.
C: nsh> i8 /dev/ieee0 startpan C: nsh> i8 wpan0 startpan cd:ab
C: nsh> 8 acceptassoc C: nsh> i8 acceptassoc
E1: nsh> i8 assoc E1: nsh> i8 wpan0 assoc
E2: nsh> i8 assoc E2: nsh> i8 wpan0 assoc
C: nsh> ifup wpan0 C: nsh> ifup wpan0
E1: nsh> ifup wpan0 E1: nsh> ifup wpan0
E1: nsh> ifconfig <-- To get the IP address of E1 endpoint E1: nsh> ifconfig <-- To get the IP address of E1 endpoint
drivers/wireless/ieee802154/xbee/xbee.c
+2 -2
View File
@@ -155,7 +155,7 @@ static void xbee_attnworker(FAR void *arg)
FAR struct iob_s *iobhead = NULL; FAR struct iob_s *iobhead = NULL;
FAR struct iob_s *iob = NULL; FAR struct iob_s *iob = NULL;
FAR struct iob_s *previob = NULL; FAR struct iob_s *previob = NULL;
uint16_t rxframelen; uint16_t rxframelen = 0;
DEBUGASSERT(priv); DEBUGASSERT(priv);
DEBUGASSERT(priv->spi); DEBUGASSERT(priv->spi);
@@ -911,7 +911,7 @@ void xbee_send_apiframe(FAR struct xbee_priv_s *priv,
FAR struct iob_s *iob; FAR struct iob_s *iob;
FAR struct iob_s *previob; FAR struct iob_s *previob;
FAR struct iob_s *iobhead; FAR struct iob_s *iobhead;
uint16_t rxframelen; uint16_t rxframelen = 0;
int i; int i;
/* Get access to SPI bus, set relevant settings */ /* Get access to SPI bus, set relevant settings */
drivers/wireless/ieee802154/xbee/xbee_mac.c
+2 -1
View File
@@ -264,8 +264,9 @@ int xbee_req_data(XBEEHANDLE xbee,
int index; int index;
uint16_t apiframelen; uint16_t apiframelen;
uint8_t frametype; uint8_t frametype;
#ifdef CONFIG_DEBUG_ASSERTIONS
int prevoffs = frame->io_offset; int prevoffs = frame->io_offset;
#endif
/* Figure out how much room we need to place the API frame header */ /* Figure out how much room we need to place the API frame header */