michaelh/zephyr
1
0
Fork 0
Code Releases Activity

native_posix: fix hw_irq_ctrl_get_irq_status() conflicting type

Browse source 
My compiler is rather fussy:

zephyr/boards/posix/native_posix/irq_ctrl.c:133:7:
error: conflicting types for ‘hw_irq_ctrl_get_irq_status’
 u64_t hw_irq_ctrl_get_irq_status(void)
       ^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from zephyr/boards/posix/native_posix/irq_ctrl.c:11:
zephyr/boards/posix/native_posix/irq_ctrl.h:29:10:
note: previous declaration of ‘hw_irq_ctrl_get_irq_status’ was here
 uint64_t hw_irq_ctrl_get_irq_status(void);
          ^~~~~~~~~~~~~~~~~~~~~~~~~~

Make the definition match its declaration.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
This commit is contained in:
Nicolas Pitre 2019-05-23 21:36:37 -04:00 • committed by Andrew Boie
commit 74db5ce203
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
boards/posix/native_posix/irq_ctrl.c
View file

@ -6,6 +6,7 @@
* HW IRQ controller model
*/
#include <stdint.h>
#include <stdbool.h>
#include "hw_models_top.h"
#include "irq_ctrl.h"
@ -130,7 +131,7 @@ u32_t hw_irq_ctrl_change_lock(u32_t new_lock)
return previous_lock;
}
u64_t hw_irq_ctrl_get_irq_status(void)
uint64_t hw_irq_ctrl_get_irq_status(void)
{
return irq_status;
}