From 70b155535ec40e8a653b8afd7866edb181e7899e Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Tue, 2 Jan 2018 12:45:52 +0900 Subject: [PATCH] ARM: sc8830: fdl: remove build warnings Remove build warnings. Change-Id: I6137ee6a831317a9c300c223cc94ff87931c2a64 Signed-off-by: Seung-Woo Kim --- arch/arm/include/asm/arch-sc8830/fdl_channel.h | 6 +++--- drivers/serial/serial_sc8800x.c | 2 +- nand_fdl/common/src/dl_engine.c | 2 +- nand_fdl/common/src/drv_usb.c | 5 ++++- nand_fdl/common/src/fdl_channel.c | 3 +-- nand_fdl/common/src/fdl_crc.c | 3 ++- nand_fdl/common/src/fdl_stdio.c | 4 +--- nand_fdl/common/src/packet.c | 7 ++++--- nand_fdl/common/src/usb_boot.c | 5 +++-- nand_fdl/common/src/virtual_com.c | 4 ++-- 10 files changed, 22 insertions(+), 19 deletions(-) diff --git a/arch/arm/include/asm/arch-sc8830/fdl_channel.h b/arch/arm/include/asm/arch-sc8830/fdl_channel.h index 8ff753b..5f8ed48 100644 --- a/arch/arm/include/asm/arch-sc8830/fdl_channel.h +++ b/arch/arm/include/asm/arch-sc8830/fdl_channel.h @@ -5,7 +5,7 @@ typedef struct FDL_ChannelHandler { int (*Open) (struct FDL_ChannelHandler *channel, unsigned int baudrate); - int (*Read) (struct FDL_ChannelHandler *channel, const unsigned char *buf, unsigned int len); + int (*Read) (struct FDL_ChannelHandler *channel, unsigned char *buf, unsigned int len); char (*GetChar) (struct FDL_ChannelHandler *channel); int (*GetSingleChar) (struct FDL_ChannelHandler *channel); int (*Write) (struct FDL_ChannelHandler *channel, const unsigned char *buf, unsigned int len); @@ -15,6 +15,6 @@ typedef struct FDL_ChannelHandler void *priv; } FDL_ChannelHandler_T; -struct FDL_ChannelHandler *FDL_ChannelGet(); +struct FDL_ChannelHandler *FDL_ChannelGet(void); -#endif \ No newline at end of file +#endif diff --git a/drivers/serial/serial_sc8800x.c b/drivers/serial/serial_sc8800x.c index b442127..3624ceb 100644 --- a/drivers/serial/serial_sc8800x.c +++ b/drivers/serial/serial_sc8800x.c @@ -149,7 +149,7 @@ LOCAL int SIO_Open (struct FDL_ChannelHandler *channel, unsigned int baudrate) return 0; } -LOCAL int SIO_Read (struct FDL_ChannelHandler *channel, const unsigned char *buf, unsigned int len) +LOCAL int SIO_Read (struct FDL_ChannelHandler *channel, unsigned char *buf, unsigned int len) { #ifndef CONFIG_NAND_SPL unsigned char *pstart = (unsigned char *) buf; diff --git a/nand_fdl/common/src/dl_engine.c b/nand_fdl/common/src/dl_engine.c index 823e9b6..b80eaef 100644 --- a/nand_fdl/common/src/dl_engine.c +++ b/nand_fdl/common/src/dl_engine.c @@ -16,7 +16,7 @@ typedef struct _CMDPROC_TAB void *arg; } CMDPROC_TAB, *PCMDPROC_TAB; -CMDPROC_TAB g_proctab[BSL_CMD_TYPE_MAX - BSL_CMD_TYPE_MIN] = {0, 0}; +CMDPROC_TAB g_proctab[BSL_CMD_TYPE_MAX - BSL_CMD_TYPE_MIN] = {{0, 0}}; #define IS_VALID_CMD(cmd) ((cmd >= BSL_CMD_TYPE_MIN) && (cmd < BSL_CMD_TYPE_MAX)) #define CMD_IND(cmd) ((cmd) - BSL_CMD_TYPE_MIN) diff --git a/nand_fdl/common/src/drv_usb.c b/nand_fdl/common/src/drv_usb.c index e4cc460..cea7167 100644 --- a/nand_fdl/common/src/drv_usb.c +++ b/nand_fdl/common/src/drv_usb.c @@ -21,6 +21,9 @@ PUBLIC void Dcache_InvalRegion(unsigned int addr, unsigned int length); PUBLIC void Dcache_CleanRegion(unsigned int addr, unsigned int length); +extern uint8 *UCOM_Get_DevDesc(void); +extern uint8 *UCOM_Get_CfgDesc(void); + static __inline void usb_handler (void); /**---------------------------------------------------------------------------* ** Compiler Flag * @@ -698,7 +701,7 @@ int VCOM_GetSingleChar (void) return (int)usb_out_endpoint_buf[nIndex][readIndex++]; } -int VCOM_Read(const unsigned char* buf, unsigned int len) +int VCOM_Read(unsigned char* buf, unsigned int len) { unsigned char *src, *dest = buf; unsigned escape_flag = 0; diff --git a/nand_fdl/common/src/fdl_channel.c b/nand_fdl/common/src/fdl_channel.c index 4d2b765..4d3b077 100644 --- a/nand_fdl/common/src/fdl_channel.c +++ b/nand_fdl/common/src/fdl_channel.c @@ -16,10 +16,9 @@ extern uint32 FDL_GetBootMode (void); // Author: junqiang.wang // Note: /******************************************************************************/ -PUBLIC struct FDL_ChannelHandler *FDL_ChannelGet() +PUBLIC struct FDL_ChannelHandler *FDL_ChannelGet(void) { uint32 bootMode = 0; - char ch; struct FDL_ChannelHandler *channel; bootMode = FDL_GetBootMode(); diff --git a/nand_fdl/common/src/fdl_crc.c b/nand_fdl/common/src/fdl_crc.c index fa8ed36..4dffe3b 100644 --- a/nand_fdl/common/src/fdl_crc.c +++ b/nand_fdl/common/src/fdl_crc.c @@ -11,6 +11,7 @@ extern "C" /////////////////////////////////////////////////////////////////// //CRC Table /////////////////////////////////////////////////////////////////// +#if 0 /** CRC table for the CRC-16. The poly is 0x8005 (x^16 + x^15 + x^2 + 1) */ static uint16 const crc16_table[256] = { @@ -47,7 +48,7 @@ static uint16 const crc16_table[256] = 0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641, 0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040 }; - +#endif /*********************************************************************/ unsigned int crc_16_l_calc (char *buf_ptr,unsigned int len) diff --git a/nand_fdl/common/src/fdl_stdio.c b/nand_fdl/common/src/fdl_stdio.c index 7715a96..ed77845 100644 --- a/nand_fdl/common/src/fdl_stdio.c +++ b/nand_fdl/common/src/fdl_stdio.c @@ -3,12 +3,10 @@ void *FDL_memcpy (void *dst, const void *src, unsigned int count) { void *ret = dst; +#if ((defined(SC8800S_LITTLE_ENDIAN) && defined(_BIG_ENDIAN))) || (defined(FDL_ENDIAN_SWITCH))//temp for data swap in fdl1 unsigned int *tmp_dst = (unsigned int *) dst; - unsigned int word_num, i; unsigned int value; - -#if ((defined(SC8800S_LITTLE_ENDIAN) && defined(_BIG_ENDIAN))) || (defined(FDL_ENDIAN_SWITCH))//temp for data swap in fdl1 count = count / 4; while (count-->0) diff --git a/nand_fdl/common/src/packet.c b/nand_fdl/common/src/packet.c index 510c553..e024fd9 100644 --- a/nand_fdl/common/src/packet.c +++ b/nand_fdl/common/src/packet.c @@ -1,3 +1,4 @@ +#include #include #include #include @@ -11,7 +12,7 @@ extern void FDL_SendAckPacket (cmd_pkt_type pkt_type); - +extern uint32 FDL_GetBootMode (void); struct FDL_ChannelHandler *gFdlUsedChannel; @@ -180,7 +181,7 @@ end: packet_ptr->pkt_state = PKT_RECV; //check the packet. CRC should be 0 #ifndef CONFIG_FRMCHECK - crc = crc_16_l_calc((unsigned short *)&packet_ptr->packet_body, packet_ptr->data_size); + crc = crc_16_l_calc((char *)&packet_ptr->packet_body, packet_ptr->data_size); #else crc = frm_chk((unsigned short *)&packet_ptr->packet_body, packet_ptr->data_size); #endif @@ -274,7 +275,7 @@ uint32 FDL_DataProcess (PACKET_T *packet_ptr_src, PACKET_T *packet_ptr_dest) /*src CRC calculation*/ #ifndef CONFIG_FRMCHECK - crc = crc_16_l_calc ( (const unsigned short *) (& (packet_ptr_src->packet_body)), size + PACKET_HEADER_SIZE); + crc = crc_16_l_calc ( (char *) (& (packet_ptr_src->packet_body)), size + PACKET_HEADER_SIZE); #else crc = frm_chk ( (const unsigned short *) (& (packet_ptr_src->packet_body)), size + PACKET_HEADER_SIZE); diff --git a/nand_fdl/common/src/usb_boot.c b/nand_fdl/common/src/usb_boot.c index 13b9cbd..b8e029d 100644 --- a/nand_fdl/common/src/usb_boot.c +++ b/nand_fdl/common/src/usb_boot.c @@ -59,6 +59,7 @@ extern "C" LOCAL __align(32) uint8 s_usb_snd_buff[USB_BUFF_SIZE]; /*--------------------------- Global Data -----------------------------------*/ /*--------------------------- External Data ---------------------------------*/ +extern void usb_core_init (void); /*----------------------------------------------------------------------------* ** Local Function Prototype * **---------------------------------------------------------------------------*/ @@ -150,13 +151,13 @@ void usb_write (unsigned char *write_buf,unsigned int write_len) } extern char VCOM_GetChar (void); extern int VCOM_GetSingleChar (void); -extern int VCOM_Read(const unsigned char *buf, unsigned int len); +extern int VCOM_Read(unsigned char *buf, unsigned int len); static int FDL_UsbOpen (struct FDL_ChannelHandler *channel, unsigned int baudrate) { return 0; } -static int FDL_UsbRead (struct FDL_ChannelHandler *channel, const unsigned char *buf, unsigned int len) +static int FDL_UsbRead (struct FDL_ChannelHandler *channel, unsigned char *buf, unsigned int len) { return VCOM_Read(buf, len); } diff --git a/nand_fdl/common/src/virtual_com.c b/nand_fdl/common/src/virtual_com.c index b3381db..fae5758 100644 --- a/nand_fdl/common/src/virtual_com.c +++ b/nand_fdl/common/src/virtual_com.c @@ -52,7 +52,7 @@ __align (4) const uint8 ConfigDescrSerial_64[] = // Author: Daniel.Ding // Note: /*****************************************************************************/ -uint8 *UCOM_Get_DevDesc() +uint8 *UCOM_Get_DevDesc(void) { return (uint8 *) DeviceDescrSerial; } @@ -63,7 +63,7 @@ uint8 *UCOM_Get_DevDesc() // Note: /*****************************************************************************/ -uint8 *UCOM_Get_CfgDesc() +uint8 *UCOM_Get_CfgDesc(void) { return (uint8 *) ConfigDescrSerial_64; } -- 2.7.4