Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix a couple of problems introduced in review of commit 06e27e5547.

Browse Source
This commit is contained in:
Abdelatif Guettouche
2019-02-06 17:23:51 -06:00
committed by Gregory Nutt
parent e5ea84c1ff
commit 0344e017f9
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/mips/src/pic32mz/Make.defs
+4 -4
View File
@@ -92,12 +92,9 @@ endif
ifeq ($(CONFIG_PIC32MZ_TIMER),y) ifeq ($(CONFIG_PIC32MZ_TIMER),y)
CHIP_CSRCS += pic32mz-timer.c CHIP_CSRCS += pic32mz-timer.c
endif
ifeq ($(CONFIG_TIMER),y) ifeq ($(CONFIG_TIMER),y)
CHIP_CSRCS += pic32mz-timer-lowerhalf.c CHIP_CSRCS += pic32mz-timer-lowerhalf.c
else ifeq ($(CONFIG_PIC32MZ_ONESHOT),y) endif
CHIP_CSRCS += pic32mz-timer-lowerhalf.c
endif endif
ifeq ($(CONFIG_PIC32MZ_FREERUN),y) ifeq ($(CONFIG_PIC32MZ_FREERUN),y)
@@ -106,6 +103,9 @@ endif
ifeq ($(CONFIG_PIC32MZ_ONESHOT),y) ifeq ($(CONFIG_PIC32MZ_ONESHOT),y)
CHIP_CSRCS += pic32mz-oneshot.c CHIP_CSRCS += pic32mz-oneshot.c
ifeq ($(CONFIG_ONESHOT),y)
CHIP_CSRCS += pic32mz-oneshot-lowerhalf.c
endif
endif endif
ifeq ($(CONFIG_PIC32MZ_ETHERNET),y) ifeq ($(CONFIG_PIC32MZ_ETHERNET),y)
arch/mips/src/pic32mz/pic32mz-timer.c
+5 -2
View File
@@ -773,7 +773,7 @@ static void pic32mz_timer_extclocksource(FAR struct pic32mz_timer_dev_s *dev,
bool enable) bool enable)
{ {
FAR struct pic32mz_timer_priv_s *priv = FAR struct pic32mz_timer_priv_s *priv =
(FAR truct pic32mz_timer_priv_s *)dev; (FAR struct pic32mz_timer_priv_s *)dev;
if (enable) if (enable)
{ {
@@ -1161,7 +1161,10 @@ static bool pic32mz_timer_checkint(FAR struct pic32mz_timer_dev_s *dev)
} }
else else
{ {
return up_pending_irq(((FAR structpic32mz_timer_priv_s *)dev)->config->irq); FAR struct pic32mz_timer_priv_s *priv =
(FAR struct pic32mz_timer_priv_s *)dev;
return up_pending_irq(priv->config->irq);
} }
} }