From 3b8769e4f87a6e50d1127ba91ea18593e14e97d8 Mon Sep 17 00:00:00 2001 From: naga sureshkumar relli Date: Tue, 9 Jun 2015 11:24:05 +0530 Subject: [PATCH] xilflash_v4_1: Fix warnings. This patch fixes the warnings. Signed-off-by: naga sureshkumar relli --- lib/sw_services/xilflash/src/xilflash_amd.c | 38 +++++++++---------- lib/sw_services/xilflash/src/xilflash_intel.c | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/sw_services/xilflash/src/xilflash_amd.c b/lib/sw_services/xilflash/src/xilflash_amd.c index 3e40c3e7..933903f1 100644 --- a/lib/sw_services/xilflash/src/xilflash_amd.c +++ b/lib/sw_services/xilflash/src/xilflash_amd.c @@ -282,7 +282,7 @@ int XFlashAmd_Initialize(XFlash * InstancePtr) /* * Setup alignment of the write buffer. */ - if (InstancePtr->Properties.ProgCap.WriteBufferSize != NULL) { + if (InstancePtr->Properties.ProgCap.WriteBufferSize != 0) { InstancePtr->Properties.ProgCap.WriteBufferAlignmentMask = InstancePtr->Properties.ProgCap.WriteBufferSize - 1; } @@ -481,7 +481,7 @@ int XFlashAmd_Read(XFlash *InstancePtr, u32 Offset, u32 Bytes, void *DestPtr) return (XST_FAILURE); } - if(Bytes == NULL) { + if(Bytes == 0) { return (XST_FAILURE); } @@ -929,7 +929,7 @@ int XFlashAmd_Unlock(XFlash * InstancePtr, u32 Offset, u32 Bytes) (void) XFlashGeometry_ToAbsolute(GeomPtr, Region, Block, 0, &GroupAddress); - if (XFlashAmd_Lock(InstancePtr, GroupAddress, NULL) != + if (XFlashAmd_Lock(InstancePtr, GroupAddress, 0) != XST_SUCCESS ) { return XST_FAILURE; } @@ -1118,7 +1118,7 @@ int XFlashAmd_EraseChip(XFlash * InstancePtr) /* * Wait until Program/Erase Controller starts. */ - Status = DevDataPtr->PollSR(GeomPtr->BaseAddress, NULL); + Status = DevDataPtr->PollSR(GeomPtr->BaseAddress, 0); (void) XFlashAmd_Reset(InstancePtr); if (Status != XFLASH_READY) { return (Status); @@ -1565,9 +1565,9 @@ static int WriteBuffer8(XFlash * InstancePtr, void *DestPtr, XFL_AMD_CMD_UNLOCK_BYPASS); Index = 0; - while (Bytes != NULL) { + while (Bytes != 0) { DevDataPtr->WriteFlash(BaseAddress, - NULL, XFL_AMD_CMD_PROGRAM); + 0, XFL_AMD_CMD_PROGRAM); DevDataPtr->WriteFlash(BaseAddress, (u32)DestinationPtr, SourcePtr[Index]); @@ -1587,9 +1587,9 @@ static int WriteBuffer8(XFlash * InstancePtr, void *DestPtr, /* * Unlock Bypass Reset. */ - DevDataPtr->WriteFlash(BaseAddress, NULL, + DevDataPtr->WriteFlash(BaseAddress, 0, XFL_AMD_CMD_UNLOCK_BYPASS_RESET1); - DevDataPtr->WriteFlash(BaseAddress,NULL, + DevDataPtr->WriteFlash(BaseAddress,0, XFL_AMD_CMD_UNLOCK_BYPASS_RESET2); return (XST_SUCCESS); @@ -1671,7 +1671,7 @@ static int WriteBufferSpansion(XFlash * InstancePtr, void *DestPtr, XFlashVendorData_Amd *DevDataPtr = GET_PARTDATA(InstancePtr); u32 BufferSize = InstancePtr->Properties.ProgCap.WriteBufferSize; - while (Bytes != NULL) + while (Bytes != 0) { /* Bytes to write should not exceed the buffer size. */ if (Bytes > BufferSize) @@ -1738,9 +1738,9 @@ static int WriteBufferAmd(XFlash * InstancePtr, void *DestPtr, XFL_AMD_CMD_UNLOCK_BYPASS); Index = 0; - while (Bytes != NULL) { + while (Bytes != 0) { DevDataPtr->WriteFlash(BaseAddress, - NULL, XFL_AMD_CMD_PROGRAM); + 0, XFL_AMD_CMD_PROGRAM); DevDataPtr->WriteFlash(BaseAddress, (u32)DestinationPtr, SourcePtr[Index]); @@ -1758,9 +1758,9 @@ static int WriteBufferAmd(XFlash * InstancePtr, void *DestPtr, } /* Unlock Bypass Reset. */ - DevDataPtr->WriteFlash(BaseAddress, NULL, + DevDataPtr->WriteFlash(BaseAddress, 0, XFL_AMD_CMD_UNLOCK_BYPASS_RESET1); - DevDataPtr->WriteFlash(BaseAddress, NULL, + DevDataPtr->WriteFlash(BaseAddress, 0, XFL_AMD_CMD_UNLOCK_BYPASS_RESET2); return (XST_SUCCESS); @@ -1835,7 +1835,7 @@ int WriteSingleBuffer(XFlash * InstancePtr, void *DestPtr, Index = 0; /* Write Data to Buffer. */ - while (WordCount != NULL) { + while (WordCount != 0) { DevDataPtr->WriteFlash(BaseAddress, (u32)DestinationPtr, SourcePtr[Index]); DestinationPtr++; @@ -1909,9 +1909,9 @@ static int WriteBuffer32(XFlash * InstancePtr, void *DestPtr, XFL_AMD_CMD1_ADDR, XFL_AMD_CMD_UNLOCK_BYPASS); Index = 0; - while (Bytes != NULL) { + while (Bytes != 0) { DevDataPtr->WriteFlash(BaseAddress, - NULL, XFL_AMD_CMD_PROGRAM); + 0, XFL_AMD_CMD_PROGRAM); DevDataPtr->WriteFlash(BaseAddress, (u32)DestinationPtr, SourcePtr[Index]); @@ -1931,9 +1931,9 @@ static int WriteBuffer32(XFlash * InstancePtr, void *DestPtr, /* * Unlock Bypass Reset. */ - DevDataPtr->WriteFlash(BaseAddress, NULL, + DevDataPtr->WriteFlash(BaseAddress, 0, XFL_AMD_CMD_UNLOCK_BYPASS_RESET1); - DevDataPtr->WriteFlash(BaseAddress,NULL, + DevDataPtr->WriteFlash(BaseAddress,0, XFL_AMD_CMD_UNLOCK_BYPASS_RESET2); return (XST_SUCCESS); @@ -2527,7 +2527,7 @@ static void ExitExtendedBlockMode(XFlash * InstancePtr) XFL_AMD_CMD1_ADDR, XFL_AMD_CMD_EXIT_EXT_MODE); DevDataPtr->WriteFlash(InstancePtr->Geometry.BaseAddress, - NULL, NULL); + 0, 0); } /*****************************************************************************/ diff --git a/lib/sw_services/xilflash/src/xilflash_intel.c b/lib/sw_services/xilflash/src/xilflash_intel.c index 1e6f6248..044ffe3d 100644 --- a/lib/sw_services/xilflash/src/xilflash_intel.c +++ b/lib/sw_services/xilflash/src/xilflash_intel.c @@ -264,7 +264,7 @@ int XFlashIntel_Initialize(XFlash *InstancePtr) /* * Setup alignment of the write buffer. */ - if (InstancePtr->Properties.ProgCap.WriteBufferSize != NULL) { + if (InstancePtr->Properties.ProgCap.WriteBufferSize != 0) { InstancePtr->Properties.ProgCap.WriteBufferAlignmentMask = InstancePtr->Properties.ProgCap.WriteBufferSize - 1; }