aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2009-03-13 19:55:52 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2009-03-13 19:55:52 +0000
commit1b66d4edddfd059d10f7fb242ee8615fe90a5adf (patch)
tree60d6bb1dea99c163f7e99f8b967fe018dfd28588
parent5c962d5de2a14e34c39647b5693a6e74ef62a46c (diff)
downloadChibiOS-1b66d4edddfd059d10f7fb242ee8615fe90a5adf.tar.gz
ChibiOS-1b66d4edddfd059d10f7fb242ee8615fe90a5adf.tar.bz2
ChibiOS-1b66d4edddfd059d10f7fb242ee8615fe90a5adf.zip
Fixed bug 2686349.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@840 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--ports/ARM7-AT91SAM7X/sam7x_emac.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ports/ARM7-AT91SAM7X/sam7x_emac.c b/ports/ARM7-AT91SAM7X/sam7x_emac.c
index b1c0d76b3..64467b440 100644
--- a/ports/ARM7-AT91SAM7X/sam7x_emac.c
+++ b/ports/ARM7-AT91SAM7X/sam7x_emac.c
@@ -318,7 +318,9 @@ BufDescriptorEntry *EMACGetTransmitBuffer(void) {
*/
void EMACTransmit(BufDescriptorEntry *cptr, size_t size) {
- chDbgAssert(size <= EMAC_TRANSMIT_BUFFERS_SIZE, "sam7x_emac.c, EMACTransmit");
+ chDbgAssert(size <= EMAC_TRANSMIT_BUFFERS_SIZE,
+ "EMACTransmit(), #1",
+ "unexpected size");
chSysLock();
if (cptr < &tent[EMAC_TRANSMIT_BUFFERS - 1])
@@ -397,7 +399,7 @@ restart:
}
if (!overflow) {
- chDbgAssert(segsize <= 128, "sam7x_emac.c, EMACReceive()")
+ chDbgAssert(segsize <= 128, "EMACReceive(), #1", "");
memcpy(p, (void *)(rxptr->w1 & W1_R_ADDRESS_MASK), segsize);
p += segsize;
size += segsize;