From ba95cfe067baeb92229ed3a730c6fe1c2de5cc95 Mon Sep 17 00:00:00 2001 From: Dave Marples Date: Thu, 25 Oct 2018 06:42:21 -0600 Subject: [PATCH] Eliminate some warnings. --- arch/arm/src/lpc43xx/lpc43_irq.c | 2 +- arch/arm/src/lpc54xx/lpc54_irq.c | 2 +- drivers/usbhost/usbhost_hidkbd.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c index d51a8e48f7..f64f10a74a 100644 --- a/arch/arm/src/lpc43xx/lpc43_irq.c +++ b/arch/arm/src/lpc43xx/lpc43_irq.c @@ -298,7 +298,7 @@ static int lpc43_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit, void up_irqinitialize(void) { uint32_t regaddr; -#ifdef CONFIG_DEBUG_FEATURES +#if defined(CONFIG_DEBUG_FEATURES) && !defined(CONFIG_ARMV7M_USEBASEPRI) uint32_t regval; #endif int num_priority_registers; diff --git a/arch/arm/src/lpc54xx/lpc54_irq.c b/arch/arm/src/lpc54xx/lpc54_irq.c index 6397b2af05..6da4ee49de 100644 --- a/arch/arm/src/lpc54xx/lpc54_irq.c +++ b/arch/arm/src/lpc54xx/lpc54_irq.c @@ -297,7 +297,7 @@ static int lpc54_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit, void up_irqinitialize(void) { uint32_t regaddr; -#ifdef CONFIG_DEBUG_FEATURES +#if defined(CONFIG_DEBUG_FEATURES) && !defined(CONFIG_ARMV7M_USEBASEPRI) uint32_t regval; #endif int num_priority_registers; diff --git a/drivers/usbhost/usbhost_hidkbd.c b/drivers/usbhost/usbhost_hidkbd.c index 3a0e07afaf..432f095585 100644 --- a/drivers/usbhost/usbhost_hidkbd.c +++ b/drivers/usbhost/usbhost_hidkbd.c @@ -351,7 +351,7 @@ static int usbhost_poll(FAR struct file *filep, FAR struct pollfd *fds, * device. */ -static const const struct usbhost_id_s g_hidkbd_id = +static const struct usbhost_id_s g_hidkbd_id = { USB_CLASS_HID, /* base */ USBHID_SUBCLASS_BOOTIF, /* subclass */