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

Spirit: Enable AutoACK, TX retries, and RX timeouts in the network driver.

Browse Source
This commit is contained in:
Gregory Nutt 2017-08-04 13:16:07 -06:00
parent 25e4fb2886
commit 8027d1bf18
2 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configs/b-l475e-iot01a/README.txt
View File

@ -390,9 +390,13 @@ Configuration sub-directories
correctly gets the source node address and uncompresses the source
IP address.
With these changes, the UDP test is now fully functional. There are
issues with the TCP test. This appears to be data loss: The TCP
client sends 18 packets, but the server only receives 5.
With these changes, the UDP test is now fully functional.
There are issues with the TCP test. This appears to be data loss:
The TCP client sends 18 packets, but the server only receives 5. I
assume that this because of data overrun. I enabled the AutoAck,
TX retries, the RX timeout options. This seems to reduce the packet
loss but the TCP test still does not fun perfectly.
Test Matrix:
The following configurations have been tested successfully (with

44
drivers/wireless/spirit/drivers/spirit_netdev.c
View File

@ -154,9 +154,13 @@
#define SPIRIT_WDDELAY (1*CLK_TCK)
/* TX timeout = 1 minute */
/* TX timeout = 5 seconds */
#define SPIRIT_TXTIMEOUT (60*CLK_TCK)
#define SPIRIT_TXTIMEOUT (5*CLK_TCK)
/* RX timeout = 1.5 seconds */
#define SPIRIT_RXTIMEOUT 1500.0
/* Return values from spirit_transmit() */
@ -198,6 +202,8 @@ struct spirit_driver_s
bool ifup; /* Spirit is on and interface is up */
bool needpoll; /* Timer poll needed */
uint8_t state; /* See enum spirit_driver_state_e */
uint8_t counter; /* Count used with TX timeout */
uint8_t prescaler; /* Prescaler used with TX timeout */
};
/****************************************************************************
@ -309,7 +315,7 @@ static const struct spirit_pktstack_init_s g_pktstack_init =
static const struct spirit_pktstack_llp_s g_llp_init =
{
S_DISABLE, /* autoack */
S_ENABLE, /* autoack */
S_DISABLE, /* piggyback */
PKT_N_RETX_3 /* maxretx */
};
@ -648,6 +654,16 @@ static int spirit_transmit(FAR struct spirit_driver_s *priv)
iob_free(iob);
/* Start the RX timeout */
ret = spirit_timer_setup_rxtimeout(spirit, priv->counter,
priv->prescaler);
if (ret < 0)
{
wlerr("ERROR: spirit_timer_setup_rxtimeout failed: %d\n", ret);
goto errout_with_iob;
}
/* Put the SPIRIT1 into TX state. This starts the transmission */
ret = spirit_command(spirit, COMMAND_TX);
@ -947,7 +963,8 @@ static void spirit_interrupt_work(FAR void *arg)
/* Send any pending packets */
spirit_csma_enable(spirit, S_DISABLE);
DEBUGVERIFY(spirit_timer_set_rxtimeout_counter(spirit, 0));
DEBUGVERIFY(spirit_csma_enable(spirit, S_DISABLE));
spirit_schedule_transmit_work(priv);
}
@ -962,7 +979,8 @@ static void spirit_interrupt_work(FAR void *arg)
/* Send any pending packets */
spirit_csma_enable(spirit, S_DISABLE);
DEBUGVERIFY(spirit_timer_set_rxtimeout_counter(spirit, 0));
DEBUGVERIFY(spirit_csma_enable(spirit, S_DISABLE));
spirit_schedule_transmit_work(priv);
}
@ -977,7 +995,12 @@ static void spirit_interrupt_work(FAR void *arg)
DEBUGVERIFY(spirit_command(spirit, CMD_RX));
NETDEV_TXDONE(&priv->radio.r_dev);
spirit_csma_enable(spirit, S_DISABLE);
DEBUGVERIFY(spirit_timer_set_rxtimeout_counter(spirit, 0));
DEBUGVERIFY(spirit_csma_enable(spirit, S_DISABLE));
/* Disable the RX timeout */
DEBUGVERIFY(spirit_timer_set_rxtimeout_counter(spirit, 0));
/* Check if there are more packets to send */
@ -2180,6 +2203,13 @@ int spirit_hw_initialize(FAR struct spirit_driver_s *priv,
return ret;
}
/* Initialize counter and prescaler values that will be used with
* with RX timeouts for ACKs.
*/
spirit_timer_calc_rxtimeout_values(spirit, SPIRIT_RXTIMEOUT,
&priv->counter, &priv->prescaler);
ret = spirit_timer_set_rxtimeout_stopcondition(spirit,
SQI_ABOVE_THRESHOLD);
if (ret < 0)
@ -2188,7 +2218,7 @@ int spirit_hw_initialize(FAR struct spirit_driver_s *priv,
return ret;
}
ret = spirit_timer_set_rxtimeout_counter(spirit, 0); /* 0=No timeout */
ret = spirit_timer_set_rxtimeout_counter(spirit, 0); /* 0=Disables timeout */
if (ret < 0)
{
wlerr("ERROR: spirit_timer_set_rxtimeout_counter failed: %d\n", ret);