mirror of
https://github.com/apache/nuttx.git
synced 2026-06-04 14:53:47 +08:00
arch/arm/src/sam34: Fix some compile warnings that I introduced with a possibly overzealous recent change.
This commit is contained in:
@@ -0,0 +1,62 @@
|
|||||||
|
/************************************************************************************
|
||||||
|
* arch/arm/src/sam34/sam_start.h
|
||||||
|
*
|
||||||
|
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
|
||||||
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in
|
||||||
|
* the documentation and/or other materials provided with the
|
||||||
|
* distribution.
|
||||||
|
* 3. Neither the name NuttX nor the names of its contributors may be
|
||||||
|
* used to endorse or promote products derived from this software
|
||||||
|
* without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||||
|
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||||
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||||
|
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||||
|
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||||
|
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||||
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||||
|
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*
|
||||||
|
************************************************************************************/
|
||||||
|
|
||||||
|
#ifndef __ARCH_ARM_SRC_SAM34_SAM_START_H
|
||||||
|
#define __ARCH_ARM_SRC_SAM34_SAM_START_H
|
||||||
|
|
||||||
|
/************************************************************************************
|
||||||
|
* Included Files
|
||||||
|
************************************************************************************/
|
||||||
|
|
||||||
|
#include <nuttx/config.h>
|
||||||
|
|
||||||
|
/************************************************************************************
|
||||||
|
* Public Function Prototypes
|
||||||
|
************************************************************************************/
|
||||||
|
|
||||||
|
/************************************************************************************
|
||||||
|
* Name: sam_boardinitialize
|
||||||
|
*
|
||||||
|
* Description:
|
||||||
|
* All SAM3/4 architectures must provide the following entry point. This entry
|
||||||
|
* point is called early in the initialization -- after clocking and memory have
|
||||||
|
* been configured but before caches have been enabled and before any devices have
|
||||||
|
* been initialized.
|
||||||
|
*
|
||||||
|
************************************************************************************/
|
||||||
|
|
||||||
|
void sam_boardinitialize(void);
|
||||||
|
|
||||||
|
#endif /* __ARCH_ARM_SRC_SAM34_SAM_START_H */
|
||||||
@@ -378,6 +378,12 @@ static ssize_t ft5x06_sample(FAR struct ft5x06_dev_s *priv, FAR char *buffer,
|
|||||||
ntouches = maxtouches;
|
ntouches = maxtouches;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ntouches < 1)
|
||||||
|
{
|
||||||
|
priv->valid = false;
|
||||||
|
return 0; /* No touches read. */
|
||||||
|
}
|
||||||
|
|
||||||
/* User data buffer points (sink) */
|
/* User data buffer points (sink) */
|
||||||
|
|
||||||
sample = (FAR struct touch_sample_s *)buffer;
|
sample = (FAR struct touch_sample_s *)buffer;
|
||||||
|
|||||||
+2
-2
@@ -34,7 +34,7 @@ config FAT_MAXFNAME
|
|||||||
int "FAT maximum file name size"
|
int "FAT maximum file name size"
|
||||||
depends on FAT_LFN
|
depends on FAT_LFN
|
||||||
default 32
|
default 32
|
||||||
range 1 255
|
range 12 255
|
||||||
---help---
|
---help---
|
||||||
If FAT_LFN is defined, then the default, maximum long file
|
If FAT_LFN is defined, then the default, maximum long file
|
||||||
name is 255 bytes. This can eat up a lot of memory (especially stack
|
name is 255 bytes. This can eat up a lot of memory (especially stack
|
||||||
@@ -44,7 +44,7 @@ config FAT_MAXFNAME
|
|||||||
limit the visibility of longer file names anyway.
|
limit the visibility of longer file names anyway.
|
||||||
|
|
||||||
This setting may not exceed NAME_MAX. That will be verified at compile
|
This setting may not exceed NAME_MAX. That will be verified at compile
|
||||||
time.
|
time. The minimum values is 12 due to assumptions in internal logic.
|
||||||
|
|
||||||
config FS_FATTIME
|
config FS_FATTIME
|
||||||
bool "FAT timestamps"
|
bool "FAT timestamps"
|
||||||
|
|||||||
Reference in New Issue
Block a user