From f4e6d73ce0102127eb1ab9d9f9e1b2ec39f1d844 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 3 Aug 2013 16:51:48 -0600 Subject: Fixes for compiler warnings from Lorenz Meier --- nuttx/configs/sama5d3x-ek/README.txt | 3 ++- nuttx/include/nuttx/math.h | 4 ++-- nuttx/include/nuttx/usb/usbdev_trace.h | 31 +++++++++++++++---------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/nuttx/configs/sama5d3x-ek/README.txt b/nuttx/configs/sama5d3x-ek/README.txt index 0a9470226..727925d92 100644 --- a/nuttx/configs/sama5d3x-ek/README.txt +++ b/nuttx/configs/sama5d3x-ek/README.txt @@ -933,7 +933,8 @@ Configurations improves with accesses. Clearly, more work needs to be done. Here is another strange observation: SDRAM accesses tend to - generate occasional spurious interrupts! No idea why. + generate occasional spurious interrupts in those same conditions + where the memory test fails! No idea why. ostest: This configuration directory, performs a simple OS test using diff --git a/nuttx/include/nuttx/math.h b/nuttx/include/nuttx/math.h index aaadb9c91..d4277b802 100644 --- a/nuttx/include/nuttx/math.h +++ b/nuttx/include/nuttx/math.h @@ -51,13 +51,13 @@ #ifdef CONFIG_ARCH_MATH_H # include -/* If CONFIG_LIB is enabled, then the math library at lib/math will be +/* If CONFIG_LIBM is enabled, then the math library at lib/math will be * built. This library was taken from the math library developed for the * Rhombus OS by Nick Johnson (https://github.com/nickbjohnson4224/rhombus). * The port or the Rhombus math library was contributed by Darcy Gong. */ -#else if defined CONFIG_LIBM +#elif defined CONFIG_LIBM /**************************************************************************** * Copyright (C) 2009-2011 Nick Johnson diff --git a/nuttx/include/nuttx/usb/usbdev_trace.h b/nuttx/include/nuttx/usb/usbdev_trace.h index b6f0ac2a3..d9de60b11 100644 --- a/nuttx/include/nuttx/usb/usbdev_trace.h +++ b/nuttx/include/nuttx/usb/usbdev_trace.h @@ -377,22 +377,21 @@ #define USBMSC_TRACEERR_VERIFY10NOBLOCKS 0x0066 #define USBMSC_TRACEERR_VERIFY10READFAIL 0x0067 #define USBMSC_TRACEERR_WRALLOCREQ 0x0068 -#define USBMSC_TRACEERR_SNDPHERROR 0x0069 -#define USBMSC_TRACEERR_WRCOMPLETEINVALIDARGS 0x006a -#define USBMSC_TRACEERR_WRITE10FLAGS 0x006b -#define USBMSC_TRACEERR_WRITE10LBARANGE 0x006c -#define USBMSC_TRACEERR_WRITE10MEDIANOTPRESENT 0x006d -#define USBMSC_TRACEERR_WRITE10READONLY 0x006e -#define USBMSC_TRACEERR_WRITE12FLAGS 0x006f -#define USBMSC_TRACEERR_WRITE12LBARANGE 0x0070 -#define USBMSC_TRACEERR_WRITE12MEDIANOTPRESENT 0x0071 -#define USBMSC_TRACEERR_WRITE12READONLY 0x0072 -#define USBMSC_TRACEERR_WRITE6LBARANGE 0x0073 -#define USBMSC_TRACEERR_WRITE6MEDIANOTPRESENT 0x0074 -#define USBMSC_TRACEERR_WRITE6READONLY 0x0075 -#define USBMSC_TRACEERR_WRSHUTDOWN 0x0076 -#define USBMSC_TRACEERR_WRUNEXPECTED 0x0077 -#define USBMSC_TRACEERR_UNSUPPORTEDTYPE 0x0078 +#define USBMSC_TRACEERR_WRCOMPLETEINVALIDARGS 0x0069 +#define USBMSC_TRACEERR_WRITE10FLAGS 0x006a +#define USBMSC_TRACEERR_WRITE10LBARANGE 0x006b +#define USBMSC_TRACEERR_WRITE10MEDIANOTPRESENT 0x006c +#define USBMSC_TRACEERR_WRITE10READONLY 0x006d +#define USBMSC_TRACEERR_WRITE12FLAGS 0x006e +#define USBMSC_TRACEERR_WRITE12LBARANGE 0x006f +#define USBMSC_TRACEERR_WRITE12MEDIANOTPRESENT 0x0070 +#define USBMSC_TRACEERR_WRITE12READONLY 0x0071 +#define USBMSC_TRACEERR_WRITE6LBARANGE 0x0072 +#define USBMSC_TRACEERR_WRITE6MEDIANOTPRESENT 0x0073 +#define USBMSC_TRACEERR_WRITE6READONLY 0x0074 +#define USBMSC_TRACEERR_WRSHUTDOWN 0x0075 +#define USBMSC_TRACEERR_WRUNEXPECTED 0x0076 +#define USBMSC_TRACEERR_UNSUPPORTEDTYPE 0x0077 /**************************************************************************** * Public Types -- cgit v1.2.3