aboutsummaryrefslogtreecommitdiffstats
path: root/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP
diff options
context:
space:
mode:
authorFabio Utzig <utzig@utzig.org>2016-04-04 21:35:11 -0300
committerFabio Utzig <utzig@utzig.org>2016-04-04 21:35:11 -0300
commit653c72ccc3c8ff29bb2f2cffa00d1898c96c8ecf (patch)
tree603b134b8ff03b4d85c81082c0f6a177c8d0ed41 /demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP
parent031d81ae18328625fef4f8a578648d9de3b869b0 (diff)
downloadChibiOS-Contrib-653c72ccc3c8ff29bb2f2cffa00d1898c96c8ecf.tar.gz
ChibiOS-Contrib-653c72ccc3c8ff29bb2f2cffa00d1898c96c8ecf.tar.bz2
ChibiOS-Contrib-653c72ccc3c8ff29bb2f2cffa00d1898c96c8ecf.zip
Fix tiva demos
Diffstat (limited to 'demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP')
-rw-r--r--demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile6
-rw-r--r--demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/chconf.h25
-rw-r--r--demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.c5
-rw-r--r--demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.h2
4 files changed, 31 insertions, 7 deletions
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile
index f69722b..8d96b75 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile
@@ -83,7 +83,7 @@ PROJECT = ch
CHIBIOS = ../../../../ChibiOS-RT
CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
# Startup files.
-include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
+include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
# HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/TM4C129x/platform.mk
@@ -91,7 +91,7 @@ include $(CHIBIOS_CONTRIB)/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
# RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk
@@ -210,5 +210,5 @@ ULIBS =
# End of user defines
##############################################################################
-RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
include $(RULESPATH)/rules.mk
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/chconf.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/chconf.h
index ad50207..e0be810 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/chconf.h
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/chconf.h
@@ -1,6 +1,8 @@
#ifndef _CHCONF_H_
#define _CHCONF_H_
+#define _CHIBIOS_RT_CONF_
+
/*===========================================================================*/
/**
* @name System timers settings
@@ -414,6 +416,20 @@
}
/**
+ * @brief ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() { \
+ /* IRQ prologue code here.*/ \
+}
+
+/**
+ * @brief ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() { \
+ /* IRQ epilogue code here.*/ \
+}
+
+/**
* @brief Idle thread enter hook.
* @note This hook is invoked within a critical zone, no OS functions
* should be invoked from here.
@@ -457,6 +473,15 @@
/* System halt code here.*/ \
}
+/**
+ * @brief Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ * trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) { \
+ /* Trace code here.*/ \
+}
+
/** @} */
/*===========================================================================*/
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.c b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.c
index dfc9d0d..d3d74df 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.c
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.c
@@ -87,7 +87,7 @@ THD_WORKING_AREA(wa_http_server, WEB_THREAD_STACK_SIZE);
/**
* HTTP server thread.
*/
-msg_t http_server(void *p) {
+THD_FUNCTION(http_server, p) {
struct netconn *conn, *newconn;
err_t err;
@@ -95,7 +95,7 @@ msg_t http_server(void *p) {
/* Create a new TCP connection handle */
conn = netconn_new(NETCONN_TCP);
- LWIP_ERROR("http_server: invalid conn", (conn != NULL), return MSG_RESET;);
+ LWIP_ERROR("http_server: invalid conn", (conn != NULL), return;);
/* Bind to port 80 (HTTP) with default IP address */
netconn_bind(conn, NULL, WEB_THREAD_PORT);
@@ -113,7 +113,6 @@ msg_t http_server(void *p) {
http_server_serve(newconn);
netconn_delete(newconn);
}
- return MSG_OK;
}
#endif /* LWIP_NETCONN */
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.h
index 2764242..11b245b 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.h
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.h
@@ -41,7 +41,7 @@ extern THD_WORKING_AREA(wa_http_server, WEB_THREAD_STACK_SIZE);
#ifdef __cplusplus
extern "C" {
#endif
- msg_t http_server(void *p);
+ void http_server(void *p);
#ifdef __cplusplus
}
#endif