Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-01 07:45:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Slightly improved debug output

Browse Source
This commit is contained in:
Gregory Nutt
2013-09-24 13:47:03 -06:00
parent 0b998887f4
commit 2de3781ebf
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/armv7-a/arm_assert.c
+12 -2
View File
@@ -200,6 +200,13 @@ static void up_dumpstate(void)
* stack? * stack?
*/ */
if (sp > istackbase || sp <= istackbase - istacksize)
{
if (up_interrupt_context())
{
lldbg("ERROR: Stack pointer is not within interrupt stack\n");
}
}
if (sp <= istackbase && sp > istackbase - istacksize) if (sp <= istackbase && sp > istackbase - istacksize)
{ {
/* Yes.. dump the interrupt stack */ /* Yes.. dump the interrupt stack */
@@ -231,9 +238,12 @@ static void up_dumpstate(void)
if (sp > ustackbase || sp <= ustackbase - ustacksize) if (sp > ustackbase || sp <= ustackbase - ustacksize)
{ {
#if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4 #if defined(CONFIG_ARCH_INTERRUPTSTACK) && CONFIG_ARCH_INTERRUPTSTACK > 3
lldbg("ERROR: Stack pointer is not within allocated stack\n"); if (!up_interrupt_context())
#endif #endif
{
lldbg("ERROR: Stack pointer is not within allocated stack\n");
}
} }
else else
{ {
arch/arm/src/sama5/sam_udphs.c
+5 -3
View File
@@ -956,7 +956,8 @@ static void sam_dma_wrsetup(struct sam_usbdev_s *priv, struct sam_ep_s *privep,
/* How many bytes remain to be transferred in the request? */ /* How many bytes remain to be transferred in the request? */
remaining = privreq->req.len - privreq->req.xfrd; remaining = (int)privreq->req.len - (int)privreq->req.xfrd;
DEBUGASSERT(remaining >= 0 && remaining <= (int)privreq->req.len);
/* If there are no bytes to send, then send a zero length packet */ /* If there are no bytes to send, then send a zero length packet */
@@ -1020,8 +1021,9 @@ static void sam_dma_rdsetup(struct sam_usbdev_s *priv,
/* How many more bytes can we append to the request buffer? */ /* How many more bytes can we append to the request buffer? */
remaining = privreq->req.len - privreq->req.xfrd; remaining = (int)privreq->req.len - (int)privreq->req.xfrd;
DEBUGASSERT(remaining > 0 && privep->epstate == UDPHS_EPSTATE_RECEIVING); DEBUGASSERT(remaining > 0 && remaining <= (int)privreq->req.len &&
privep->epstate == UDPHS_EPSTATE_RECEIVING);
/* Clip the DMA transfer size to the size available in the user buffer */ /* Clip the DMA transfer size to the size available in the user buffer */