diff options
Diffstat (limited to 'source/application/hal/platforms/bare-metal/bsp/bsp-packs')
-rw-r--r-- | source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/include/stubs_simple_platform.h (renamed from source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/include/stubs_fvp.h) | 8 | ||||
-rw-r--r-- | source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/include/timer_simple_platform.h (renamed from source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/include/timer_fvp.h) | 18 | ||||
-rw-r--r-- | source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/stubs_simple_platform.c (renamed from source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/stubs_fvp.c) | 13 | ||||
-rw-r--r-- | source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/timer_simple_platform.c (renamed from source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/timer_fvp.c) | 14 | ||||
-rw-r--r-- | source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/uart_pl011.c | 9 |
5 files changed, 34 insertions, 28 deletions
diff --git a/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/include/stubs_fvp.h b/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/include/stubs_simple_platform.h index aec0be1..9977cd2 100644 --- a/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/include/stubs_fvp.h +++ b/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/include/stubs_simple_platform.h @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef BSP_PACK_FASTMODEL_H -#define BSP_PACK_FASTMODEL_H +#ifndef STUBS_SIMPLE_PLATFORM_H +#define STUBS_SIMPLE_PLATFORM_H #include "cmsis.h" /* device specific header file */ #include "peripheral_memmap.h" /* peripheral memory map definitions */ /****************************************************************************/ /* Definitions and stub functions for modules currently */ -/* unavailable on the model */ +/* unavailable on this target platform */ /****************************************************************************/ #define GLCD_WIDTH 320 #define GLCD_HEIGHT 240 @@ -113,4 +113,4 @@ void GLCD_Box(unsigned int x, unsigned int y, unsigned int w, unsigned int h, unsigned short color); -#endif /* BSP_PACK_FASTMODEL_H */ +#endif /* STUBS_SIMPLE_PLATFORM_H */ diff --git a/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/include/timer_fvp.h b/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/include/timer_simple_platform.h index c07a4eb..320a57a 100644 --- a/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/include/timer_fvp.h +++ b/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/include/timer_simple_platform.h @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef TIMER_FVP_H -#define TIMER_FVP_H +#ifndef TIMER_SIMPLE_PLATFORM_H +#define TIMER_SIMPLE_PLATFORM_H -#include "stubs_fvp.h" +#include "stubs_simple_platform.h" -/* Container for timestamp for fastmodel. */ -typedef struct _fvp_time_counter { +/* Container for timestamp for simple platform. */ +typedef struct _generic_time_counter { uint64_t counter_systick; -} fvp_time_counter; +} generic_time_counter; /** * @brief Resets the counters. @@ -33,13 +33,13 @@ void timer_reset(void); * @brief Gets the current counter values. * @returns counter struct. **/ -fvp_time_counter get_time_counter(void); +generic_time_counter get_time_counter(void); /** * @brief Gets the cycle counts elapsed between start and end. * @return difference in counter values as 32 bit unsigned integer. */ -uint64_t get_cycle_count_diff(fvp_time_counter *start, fvp_time_counter *end); +uint64_t get_cycle_count_diff(generic_time_counter *start, generic_time_counter *end); /** * @brief Enables or triggers cycle counting mechanism, if required @@ -52,4 +52,4 @@ void start_cycle_counter(void); */ void stop_cycle_counter(void); -#endif /* TIMER_FVP_H */ +#endif /* TIMER_SIMPLE_PLATFORM_H */ diff --git a/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/stubs_fvp.c b/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/stubs_simple_platform.c index e5b2969..df11adb 100644 --- a/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/stubs_fvp.c +++ b/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/stubs_simple_platform.c @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "stubs_fvp.h" +#include "stubs_simple_platform.h" #include "bsp_core_log.h" +#include <inttypes.h> + uint32_t GetCoreClock(void) { return 1; @@ -46,9 +48,10 @@ void GLCD_Image(void *data, const uint32_t width, const uint32_t height, UNUSED(height); UNUSED(channels); UNUSED(downsample_factor); - debug("image display: (x, y, w, h) = (%u, %u, %u, %u)\n", + debug("image display: (x, y, w, h) = " + "(%" PRIu32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ")\n", pos_x, pos_y, width, height); - debug("image display: channels = %u, downsample factor = %u\n", + debug("image display: channels = %" PRIu32 ", downsample factor = %" PRIu32 "\n", channels, downsample_factor); } @@ -100,12 +103,12 @@ void LED_On(uint32_t num, uint32_t port) { UNUSED(num); UNUSED(port); - debug("LED %u ON\n", num); + debug("LED %" PRIu32 " ON\n", num); } void LED_Off(uint32_t num, uint32_t port) { UNUSED(num); UNUSED(port); - debug("LED %u OFF\n", num); + debug("LED %" PRIu32 " OFF\n", num); } diff --git a/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/timer_fvp.c b/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/timer_simple_platform.c index b7a7232..6914209 100644 --- a/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/timer_fvp.c +++ b/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/timer_simple_platform.c @@ -14,17 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "timer_fvp.h" +#include "timer_simple_platform.h" #include "irqs.h" #include "bsp_core_log.h" -fvp_time_counter get_time_counter(void) +#include <inttypes.h> + +generic_time_counter get_time_counter(void) { - fvp_time_counter t = { + generic_time_counter t = { .counter_systick = Get_SysTick_Cycle_Count() }; - debug("counter_systick: %llu\n", t.counter_systick); + debug("counter_systick: %" PRIu64 "\n", t.counter_systick); return t; } @@ -36,8 +38,8 @@ void timer_reset(void) debug("system tick config ready\n"); } -uint64_t get_cycle_count_diff(fvp_time_counter *start, - fvp_time_counter *end) +uint64_t get_cycle_count_diff(generic_time_counter *start, + generic_time_counter *end) { if (start->counter_systick > end->counter_systick) { warn("start > end; counter might have overflown\n"); diff --git a/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/uart_pl011.c b/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/uart_pl011.c index 5c1ee06..b2dee14 100644 --- a/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/uart_pl011.c +++ b/source/application/hal/platforms/bare-metal/bsp/bsp-packs/simple_platform/uart_pl011.c @@ -199,11 +199,12 @@ bool GetLine (char *lp, unsigned int len) case 0: *lp = 0; /* ESC - stop editing line. */ return false; - case CR: /* CR - done, stop editing line. */ - *lp = c; - lp++; /* increment line pointer. */ - cnt++; /* and count. */ + case CR: /* CR - done, stop editing line. */ + UartPutc (*lp = c); /* Echo and store character. */ + lp++; /* Increment line pointer */ + cnt++; /* and count. */ c = LF; + break; default: UartPutc (*lp = c); /* echo and store character. */ fflush (stdout); |