Merge pull request #1250 from valeriyvan/fixmemcpy

BernardXiong · web-flow · commit bb2eb41b447d · 2018-03-04T17:38:44.000+08:00
Fix wrong memcpy parameter
diff --git a/bsp/lpc54608-LPCXpresso/SDK_2.2_LPCXpresso54608/devices/LPC54608/drivers/fsl_mcan.c b/bsp/lpc54608-LPCXpresso/SDK_2.2_LPCXpresso54608/devices/LPC54608/drivers/fsl_mcan.c
@@ -415,7 +415,7 @@ void MCAN_SetSTDFilterElement(CAN_Type *base,
 {
     uint8_t *elementAddress = 0;
     elementAddress = (uint8_t *)(MCAN_GetMsgRAMBase(base) + config->address + idx * 4U);
-    memcpy(elementAddress, filter, sizeof(filter));
+    memcpy(elementAddress, filter, sizeof(*filter));
 }
 
 void MCAN_SetEXTFilterElement(CAN_Type *base,
@@ -425,7 +425,7 @@ void MCAN_SetEXTFilterElement(CAN_Type *base,
 {
     uint8_t *elementAddress = 0;
     elementAddress = (uint8_t *)(MCAN_GetMsgRAMBase(base) + config->address + idx * 8U);
-    memcpy(elementAddress, filter, sizeof(filter));
+    memcpy(elementAddress, filter, sizeof(*filter));
 }
 
 static uint32_t MCAN_GetRxFifo0ElementAddress(CAN_Type *base)

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ void MCAN_SetSTDFilterElement(CAN_Type *base,`
`415`	`415`	`{`
`416`	`416`	`uint8_t *elementAddress = 0;`
`417`	`417`	`elementAddress = (uint8_t )(MCAN_GetMsgRAMBase(base) + config->address + idx 4U);`
`418`		`- memcpy(elementAddress, filter, sizeof(filter));`
	`418`	`+ memcpy(elementAddress, filter, sizeof(*filter));`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`void MCAN_SetEXTFilterElement(CAN_Type *base,`
`@@ -425,7 +425,7 @@ void MCAN_SetEXTFilterElement(CAN_Type *base,`
`425`	`425`	`{`
`426`	`426`	`uint8_t *elementAddress = 0;`
`427`	`427`	`elementAddress = (uint8_t )(MCAN_GetMsgRAMBase(base) + config->address + idx 8U);`
`428`		`- memcpy(elementAddress, filter, sizeof(filter));`
	`428`	`+ memcpy(elementAddress, filter, sizeof(*filter));`
`429`	`429`	`}`
`430`	`430`
`431`	`431`	`static uint32_t MCAN_GetRxFifo0ElementAddress(CAN_Type *base)`