diff options
author | Pavel Pisa <pisa@cmp.felk.cvut.cz> | 2016-06-28 17:07:02 +0200 |
---|---|---|
committer | Pavel Pisa <pisa@cmp.felk.cvut.cz> | 2016-06-28 17:07:02 +0200 |
commit | b83c23e62af602d7b9b7af7036bf8e321cb2605c (patch) | |
tree | 41f87de5a0507c6299b9baceac28833ad5ebece6 /c | |
parent | arm/raspberrypi: run VideoCore and mailbox code through rtems.uncrustify. (diff) | |
download | rtems-b83c23e62af602d7b9b7af7036bf8e321cb2605c.tar.bz2 |
arm/raspberrypi: resolve BSP warnings.
Diffstat (limited to 'c')
-rw-r--r-- | c/src/lib/libbsp/arm/raspberrypi/console/fb.c | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/raspberrypi/console/outch.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/raspberrypi/console/usart.c | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/raspberrypi/irq/irq.c | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/raspberrypi/misc/vc_defines.h | 3 |
5 files changed, 8 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/arm/raspberrypi/console/fb.c b/c/src/lib/libbsp/arm/raspberrypi/console/fb.c index 185db29ac8..8043c7def8 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/console/fb.c +++ b/c/src/lib/libbsp/arm/raspberrypi/console/fb.c @@ -35,6 +35,7 @@ #include <rtems/fb.h> #include <rtems/framebuffer.h> #include <rtems/score/atomic.h> +#include <rtems/bspIo.h> #define SCREEN_WIDTH 1024 #define SCREEN_HEIGHT 768 diff --git a/c/src/lib/libbsp/arm/raspberrypi/console/outch.c b/c/src/lib/libbsp/arm/raspberrypi/console/outch.c index 1c8fb27948..20601384c7 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/console/outch.c +++ b/c/src/lib/libbsp/arm/raspberrypi/console/outch.c @@ -414,7 +414,7 @@ void rpi_video_init( void ) bytes_per_pixel = fb_var_info.bits_per_pixel / 8; bytes_per_line = bytes_per_pixel * fb_var_info.xres; bytes_per_char_line = RPI_FONT_HEIGHT * bytes_per_line; - fb_mem = fb_fix_info.smem_start; + fb_mem = RTEMS_DEVOLATILE( void *, fb_fix_info.smem_start ); column = 0; row = 0; nLines = 0; diff --git a/c/src/lib/libbsp/arm/raspberrypi/console/usart.c b/c/src/lib/libbsp/arm/raspberrypi/console/usart.c index 13186b0b62..25fb523621 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/console/usart.c +++ b/c/src/lib/libbsp/arm/raspberrypi/console/usart.c @@ -22,6 +22,7 @@ #include <bsp/irq.h> #include <bsp/usart.h> #include <bsp/raspberrypi.h> +#include <rtems/bspIo.h> static void usart_delay(uint32_t n) { diff --git a/c/src/lib/libbsp/arm/raspberrypi/irq/irq.c b/c/src/lib/libbsp/arm/raspberrypi/irq/irq.c index 96b16fbf20..7b3b2be3cb 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/irq/irq.c +++ b/c/src/lib/libbsp/arm/raspberrypi/irq/irq.c @@ -29,6 +29,7 @@ #include <bsp/raspberrypi.h> #include <bsp/linker-symbols.h> #include <bsp/mmu.h> +#include <rtems/bspIo.h> /* ** This sets the main exception vectors @@ -201,7 +202,7 @@ rtems_status_code bsp_interrupt_vector_disable(rtems_vector_number vector) void bsp_interrupt_handler_default(rtems_vector_number vector) { - printk("spurious interrupt: %u\n", vector); + printk("spurious interrupt: %lu\n", vector); } rtems_status_code bsp_interrupt_facility_initialize(void) diff --git a/c/src/lib/libbsp/arm/raspberrypi/misc/vc_defines.h b/c/src/lib/libbsp/arm/raspberrypi/misc/vc_defines.h index 2956c0827d..8d1067bc4f 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/misc/vc_defines.h +++ b/c/src/lib/libbsp/arm/raspberrypi/misc/vc_defines.h @@ -255,8 +255,11 @@ typedef struct { } body; } bcm2835_mbox_tag_power_state; +#ifndef BCM2835_MAILBOX_SET_POWER_STATE_REQ_ON +/* Value is defined as a part of public VideoCore API */ #define BCM2835_MAILBOX_SET_POWER_STATE_REQ_ON (1 << 0) #define BCM2835_MAILBOX_SET_POWER_STATE_REQ_WAIT (1 << 1) +#endif /* Clocks */ #define BCM2835_MAILBOX_UCID_CLOCK_RESERVED 0x000000000 |