Most cosmetic but also includes a fix for a compile problem from Ken Pettit
This commit is contained in:
parent
6af3ba78b9
commit
c16648b3fd
@ -113,17 +113,10 @@
|
|||||||
*(volatile uint8_t *)((uintptr_t)a) = (uint8_t)d; \
|
*(volatile uint8_t *)((uintptr_t)a) = (uint8_t)d; \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Private Types
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Private Data
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Private Functions
|
* Private Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Name: onfi_readstatus
|
* Name: onfi_readstatus
|
||||||
*
|
*
|
||||||
@ -216,6 +209,7 @@ bool onfi_have_embeddedecc(FAR struct onfi_pgparam_s *onfi)
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Public Functions
|
* Public Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Name: onfi_compatible
|
* Name: onfi_compatible
|
||||||
*
|
*
|
||||||
@ -340,7 +334,7 @@ int onfi_read(uintptr_t cmdaddr, uintptr_t addraddr, uintptr_t dataaddr,
|
|||||||
|
|
||||||
/* Get number of spare bytes per page (bytes 84-85 in the param table) */
|
/* Get number of spare bytes per page (bytes 84-85 in the param table) */
|
||||||
|
|
||||||
onfi->sparesize = *(FAR uint16_t *)(FAR voidFAR *)(parmtab + 84);
|
onfi->sparesize = *(FAR uint16_t *)(FAR void *)(parmtab + 84);
|
||||||
|
|
||||||
/* Number of pages per block. */
|
/* Number of pages per block. */
|
||||||
|
|
||||||
|
@ -460,7 +460,8 @@
|
|||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
#define EXTERN extern "C"
|
#define EXTERN extern "C"
|
||||||
extern "C" {
|
extern "C"
|
||||||
|
{
|
||||||
#else
|
#else
|
||||||
#define EXTERN extern
|
#define EXTERN extern
|
||||||
#endif
|
#endif
|
||||||
|
@ -59,18 +59,6 @@
|
|||||||
|
|
||||||
#define ICMPBUF ((struct icmp_iphdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)])
|
#define ICMPBUF ((struct icmp_iphdr_s *)&dev->d_buf[NET_LL_HDRLEN(dev)])
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Data
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Private Variables
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Private Functions
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Public Functions
|
* Public Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
@ -76,7 +76,7 @@
|
|||||||
*
|
*
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
static struct posix_timer_s *timer_allocate(void)
|
static FAR struct posix_timer_s *timer_allocate(void)
|
||||||
{
|
{
|
||||||
FAR struct posix_timer_s *ret;
|
FAR struct posix_timer_s *ret;
|
||||||
irqstate_t flags;
|
irqstate_t flags;
|
||||||
@ -177,8 +177,8 @@ static struct posix_timer_s *timer_allocate(void)
|
|||||||
|
|
||||||
int timer_create(clockid_t clockid, FAR struct sigevent *evp, FAR timer_t *timerid)
|
int timer_create(clockid_t clockid, FAR struct sigevent *evp, FAR timer_t *timerid)
|
||||||
{
|
{
|
||||||
struct posix_timer_s *ret;
|
FAR struct posix_timer_s *ret;
|
||||||
WDOG_ID wdog;
|
WDOG_ID wdog;
|
||||||
|
|
||||||
/* Sanity checks. Also, we support only CLOCK_REALTIME */
|
/* Sanity checks. Also, we support only CLOCK_REALTIME */
|
||||||
|
|
||||||
|
@ -48,18 +48,6 @@
|
|||||||
|
|
||||||
#ifndef CONFIG_DISABLE_POSIX_TIMERS
|
#ifndef CONFIG_DISABLE_POSIX_TIMERS
|
||||||
|
|
||||||
/********************************************************************************
|
|
||||||
* Pre-processor Definitions
|
|
||||||
********************************************************************************/
|
|
||||||
|
|
||||||
/********************************************************************************
|
|
||||||
* Private Data
|
|
||||||
********************************************************************************/
|
|
||||||
|
|
||||||
/********************************************************************************
|
|
||||||
* Public Data
|
|
||||||
********************************************************************************/
|
|
||||||
|
|
||||||
/********************************************************************************
|
/********************************************************************************
|
||||||
* Private Functions
|
* Private Functions
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
@ -195,7 +195,7 @@ static void timer_timeout(int argc, wdparm_t itimer)
|
|||||||
|
|
||||||
if (timer_release(u.timer))
|
if (timer_release(u.timer))
|
||||||
{
|
{
|
||||||
/* If this is a repetitive timer, the restart the watchdog */
|
/* If this is a repetitive timer, then restart the watchdog */
|
||||||
|
|
||||||
timer_restart(u.timer, itimer);
|
timer_restart(u.timer, itimer);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user