diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-17 14:02:22 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-17 14:02:22 -0600 |
| commit | e2a7ac0b42589153fbeb5596f1a8313ba7ffb62a (patch) | |
| tree | 6188f03bc2537f9892875b110dbb2a1250a9c261 /nuttx | |
| parent | 1ab1f3da2b44e0528b87000b23da329aec0a522e (diff) | |
| download | px4-nuttx-e2a7ac0b42589153fbeb5596f1a8313ba7ffb62a.tar.gz px4-nuttx-e2a7ac0b42589153fbeb5596f1a8313ba7ffb62a.tar.bz2 px4-nuttx-e2a7ac0b42589153fbeb5596f1a8313ba7ffb62a.zip | |
SAM3/4 Interrupt initialization. Default interrupt priority not being set correctly
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sam34/sam_irq.c | 2 | ||||
| -rw-r--r-- | nuttx/drivers/usbhost/usbhost_hidmouse.c | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index ed94972ac..79eb3bc4a 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -7198,3 +7198,6 @@ compilation. From Leo (2014-4-17). * drivers/usbhost/usbhost_hidmouse.c: Don't include NAKs from the device in the error count. From Leo (2014-4-17). + * arch/arm/src/sam34/sam_irq.c: Fix initialization of the default + priorities (2014-4-17). + diff --git a/nuttx/arch/arm/src/sam34/sam_irq.c b/nuttx/arch/arm/src/sam34/sam_irq.c index 00bc99e9d..575caa3e4 100644 --- a/nuttx/arch/arm/src/sam34/sam_irq.c +++ b/nuttx/arch/arm/src/sam34/sam_irq.c @@ -372,7 +372,7 @@ void up_irqinitialize(void) i > 0; i--, regaddr += 4) { - putreg32(0, regaddr); + putreg32(DEFPRIORITY32, regaddr); } /* currents_regs is non-NULL only while processing an interrupt */ diff --git a/nuttx/drivers/usbhost/usbhost_hidmouse.c b/nuttx/drivers/usbhost/usbhost_hidmouse.c index 5a9cff0a7..3ad3b51b7 100644 --- a/nuttx/drivers/usbhost/usbhost_hidmouse.c +++ b/nuttx/drivers/usbhost/usbhost_hidmouse.c @@ -1085,16 +1085,14 @@ static int usbhost_mouse_poll(int argc, char *argv[]) { /* If DRVR_TRANSFER() returns EAGAIN, that simply means that * the devices was not ready and has NAK'ed the transfer. That - * no be treated as an error (unless it persists for a long - * time). + * should not be treated as an error (unless it persists for a + * long time). */ udbg("ERROR: DRVR_TRANSFER returned: %d/%d\n", ret, nerrors); if (ret != -EAGAIN) { - nerrors++; - - if (nerrors > 200) + if (++nerrors > 200) { udbg("Too many errors... aborting: %d\n", nerrors); break; |