From 15bb6ac628c3f3ed68d947f00c272f1bb3600328 Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Sun, 23 Jun 2019 21:33:25 +0200
Subject: [PATCH] chore: Fix a few compiler warnings
Signed-off-by: Rahix <rahix@rahix.de>
---
epicardium/api/genapi.py | 2 +-
epicardium/epicardium.h | 2 +-
epicardium/main.c | 21 +++++++++++----------
pycardium/mphalport.c | 1 +
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/epicardium/api/genapi.py b/epicardium/api/genapi.py
index 5adddf8f..725020e5 100644
--- a/epicardium/api/genapi.py
+++ b/epicardium/api/genapi.py
@@ -44,7 +44,7 @@ def main():
re.DOTALL | re.MULTILINE,
)
- args_matcher = re.compile(r"(?P<type>\w+(?:\*+|\s+))(?P<name>\w+),")
+ args_matcher = re.compile(r"(?P<type>(?:const )?\w+(?:\*+|\s+))(?P<name>\w+),")
# Open output files
f_client = cx.enter_context(open(args.client, "w"))
diff --git a/epicardium/epicardium.h b/epicardium/epicardium.h
index e74ee0dd..435c9564 100644
--- a/epicardium/epicardium.h
+++ b/epicardium/epicardium.h
@@ -7,7 +7,7 @@
#endif
#define API_UART_WRITE 0x1
-API(API_UART_WRITE, void epic_uart_write_str(char*str, intptr_t length));
+API(API_UART_WRITE, void epic_uart_write_str(const char*str, intptr_t length));
#define API_UART_READ 0x2
API(API_UART_READ, char epic_uart_read_chr(void));
diff --git a/epicardium/main.c b/epicardium/main.c
index a3906b0a..931779d1 100644
--- a/epicardium/main.c
+++ b/epicardium/main.c
@@ -2,6 +2,7 @@
#include "card10.h"
#include "uart.h"
#include "cdcacm.h"
+#include "leds.h"
#include "api/dispatcher.h"
extern mxc_uart_regs_t * ConsoleUart;
@@ -9,20 +10,20 @@ extern mxc_uart_regs_t * ConsoleUart;
void epic_uart_write_str(char*str, intptr_t length)
{
UART_Write(ConsoleUart, (uint8_t*)str, length);
- cdcacm_write((uint8_t*)str, length);
+ cdcacm_write((uint8_t*)str, length);
}
char epic_uart_read_chr(void)
{
- while(1) {
- if(UART_NumReadAvail(ConsoleUart) > 0) {
- return UART_ReadByte(ConsoleUart);
- }
-
- if(cdcacm_num_read_avail() > 0) {
- return cdcacm_read();
- }
- }
+ while(1) {
+ if(UART_NumReadAvail(ConsoleUart) > 0) {
+ return UART_ReadByte(ConsoleUart);
+ }
+
+ if(cdcacm_num_read_avail() > 0) {
+ return cdcacm_read();
+ }
+ }
}
void epic_leds_set(int led, uint8_t r, uint8_t g, uint8_t b)
diff --git a/pycardium/mphalport.c b/pycardium/mphalport.c
index 5694f47a..723fe844 100644
--- a/pycardium/mphalport.c
+++ b/pycardium/mphalport.c
@@ -7,6 +7,7 @@
#include "py/runtime.h"
#include "epicardium.h"
+#include "mxc_delay.h"
/******************************************************************************
* Serial Communication
--
GitLab