From 58569cc6f569dadee22c4d6e813363f7cc51d56f Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Thu, 11 Aug 2016 20:32:30 +0200 Subject: Removed leading and trailing underscores from include guards. --- os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h') diff --git a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h index 1d2661d..669a446 100644 --- a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h +++ b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h @@ -20,8 +20,8 @@ * @{ */ -#ifndef _CMPARAMS_H_ -#define _CMPARAMS_H_ +#ifndef CMPARAMS_H +#define CMPARAMS_H /** * @brief Cortex core model. @@ -89,7 +89,7 @@ #endif /* !defined(_FROM_ASM_) */ -#endif /* _CMPARAMS_H_ */ +#endif /* CMPARAMS_H */ /** * @} -- cgit v1.2.3 From 41f8b0c0c61f5f43c4717a2f6a67979ff5470f0c Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Wed, 24 Aug 2016 20:41:18 +0200 Subject: Updated cmparams.h files to start using the TivaWare headers. --- .../startup/ARMCMx/devices/TM4C129x/cmparams.h | 70 ++++++++++++---------- 1 file changed, 39 insertions(+), 31 deletions(-) (limited to 'os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h') diff --git a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h index 669a446..bd9dc0d 100644 --- a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h +++ b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h @@ -17,22 +17,32 @@ /** * @file TM4C129x/cmparams.h * @brief ARM Cortex-M4 parameters for the TM4C129x. + * + * @defgroup ARMCMx_TM4C129x TM4C129x Specific Parameters + * @ingroup ARMCMx_SPECIFIC + * @details This file contains the Cortex-M4 specific parameters for the + * TM4C129x platform. * @{ */ #ifndef CMPARAMS_H #define CMPARAMS_H +/* Defines required for correct CMSIS header functioning */ +#define __MPU_PRESENT 1 /**< MPU present */ +#define __NVIC_PRIO_BITS 3 /**< Bits used for Priority Levels */ +#define __Vendor_SysTickConfig 1 /**< Use different SysTick Config */ +#define __FPU_PRESENT 1 /**< FPU present */ + +/* The following two defines are needed by ChibiOS */ +#define SVCall_IRQn -5 +#define PendSV_IRQn -3 + /** * @brief Cortex core model. */ #define CORTEX_MODEL 4 -/** - * @brief Memory Protection unit presence. - */ -#define CORTEX_HAS_MPU 1 - /** * @brief Floating Point unit presence. */ @@ -48,7 +58,7 @@ * @note This number does not include the 16 system vectors and must be * rounded to a multiple of 8. */ -#define CORTEX_NUM_VECTORS 112 +#define CORTEX_NUM_VECTORS 120 /* The following code is not processed when the file is included from an asm module.*/ @@ -57,40 +67,38 @@ /* If the device type is not externally defined, for example from the Makefile, then a file named board.h is included. This file must contain a device definition compatible with the include file.*/ -#if !defined(TM4C1290NCPDT) && !defined(TM4C1290NCZAD) \ - && !defined(TM4C1292NCPDT) && !defined(TM4C1292NCZAD) \ - && !defined(TM4C1294KCPDT) && !defined(TM4C1294NCPDT) \ - && !defined(TM4C1294NCZAD) && !defined(TM4C1297NCZAD) \ - && !defined(TM4C1299KCZAD) && !defined(TM4C1299NCZAD) \ - && !defined(TM4C129CNCPDT) && !defined(TM4C129CNCZAD) \ - && !defined(TM4C129DNCPDT) && !defined(TM4C129DNCZAD) \ - && !defined(TM4C129EKCPDT) && !defined(TM4C129ENCPDT) \ - && !defined(TM4C129ENCZAD) && !defined(TM4C129LNCZAD) \ - && !defined(TM4C129XKCZAD) && !defined(TM4C129XNCZAD) +#if !defined (PART_TM4C1290NCPDT) && !defined (PART_TM4C1290NCZAD) && \ + !defined (PART_TM4C1292NCPDT) && !defined (PART_TM4C1292NCZAD) && \ + !defined (PART_TM4C1294KCPDT) && !defined (PART_TM4C1294NCPDT) && \ + !defined (PART_TM4C1294NCZAD) && !defined (PART_TM4C1297NCZAD) && \ + !defined (PART_TM4C1299KCZAD) && !defined (PART_TM4C1299NCZAD) && \ + !defined (PART_TM4C129CNCPDT) && !defined (PART_TM4C129CNCZAD) && \ + !defined (PART_TM4C129DNCPDT) && !defined (PART_TM4C129DNCZAD) && \ + !defined (PART_TM4C129EKCPDT) && !defined (PART_TM4C129ENCPDT) && \ + !defined (PART_TM4C129ENCZAD) && !defined (PART_TM4C129LNCZAD) && \ + !defined (PART_TM4C129XKCZAD) && !defined (PART_TM4C129XNCZAD) #include "board.h" #endif -/* Including the device CMSIS header. Note, we are not using the definitions - from this header because we need this file to be usable also from - assembler source files. We verify that the info matches instead.*/ -#include "tm4c129x.h" +typedef int IRQn_Type; -#if !CORTEX_HAS_MPU != !__MPU_PRESENT -#error "CMSIS __MPU_PRESENT mismatch" -#endif +#include "core_cm4.h" -#if !CORTEX_HAS_FPU != !__FPU_PRESENT -#error "CMSIS __FPU_PRESENT mismatch" -#endif +/* Including the TivaWare peripheral headers.*/ +#include "inc/hw_ints.h" +#include "inc/hw_memmap.h" +#include "inc/hw_types.h" +#include "inc/hw_timer.h" +#include "inc/hw_sysctl.h" +#include "inc/hw_gpio.h" +#include "inc/hw_uart.h" -#if CORTEX_PRIORITY_BITS != __NVIC_PRIO_BITS -#error "CMSIS __NVIC_PRIO_BITS mismatch" +#if CORTEX_NUM_VECTORS != ((((NUM_INTERRUPTS - 16) + 7) / 8) * 8) +#error "TivaWare NUM_INTERRUPTS mismatch" #endif #endif /* !defined(_FROM_ASM_) */ #endif /* CMPARAMS_H */ -/** - * @} - */ +/** @} */ -- cgit v1.2.3 From ce1575d3edfe5dd68e92e303102af20ec7b83a88 Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Sat, 8 Oct 2016 20:21:53 +0200 Subject: Added hw_timer to cmparams.h for tm4c129x. --- os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h | 1 + 1 file changed, 1 insertion(+) (limited to 'os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h') diff --git a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h index bd9dc0d..564d107 100644 --- a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h +++ b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h @@ -92,6 +92,7 @@ typedef int IRQn_Type; #include "inc/hw_sysctl.h" #include "inc/hw_gpio.h" #include "inc/hw_uart.h" +#include "inc/hw_timer.h" #if CORTEX_NUM_VECTORS != ((((NUM_INTERRUPTS - 16) + 7) / 8) * 8) #error "TivaWare NUM_INTERRUPTS mismatch" -- cgit v1.2.3 From 51abe9fbeb3c66fbf18e124c20edfb0ae3c0d0d4 Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Sat, 8 Oct 2016 20:46:03 +0200 Subject: Updated mac_lld to use TivaWare. --- os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h | 1 + 1 file changed, 1 insertion(+) (limited to 'os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h') diff --git a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h index 564d107..d59ac06 100644 --- a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h +++ b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h @@ -93,6 +93,7 @@ typedef int IRQn_Type; #include "inc/hw_gpio.h" #include "inc/hw_uart.h" #include "inc/hw_timer.h" +#include "inc/hw_emac.h" #if CORTEX_NUM_VECTORS != ((((NUM_INTERRUPTS - 16) + 7) / 8) * 8) #error "TivaWare NUM_INTERRUPTS mismatch" -- cgit v1.2.3 From 9fd36443b43c92bacc594ff4c9c1cce08d49a6e0 Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Sat, 8 Oct 2016 22:03:56 +0200 Subject: Updated i2c_lld to use TivaWare. --- os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h | 1 + 1 file changed, 1 insertion(+) (limited to 'os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h') diff --git a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h index d59ac06..82d2e02 100644 --- a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h +++ b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h @@ -94,6 +94,7 @@ typedef int IRQn_Type; #include "inc/hw_uart.h" #include "inc/hw_timer.h" #include "inc/hw_emac.h" +#include "inc/hw_i2c.h" #if CORTEX_NUM_VECTORS != ((((NUM_INTERRUPTS - 16) + 7) / 8) * 8) #error "TivaWare NUM_INTERRUPTS mismatch" -- cgit v1.2.3 From 2c2c3c567c329d748d551b29de5cbf04f0ae4beb Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Sat, 8 Oct 2016 22:14:45 +0200 Subject: Updated wdg_lld to use TivaWare. --- os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h | 1 + 1 file changed, 1 insertion(+) (limited to 'os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h') diff --git a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h index 82d2e02..34528af 100644 --- a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h +++ b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h @@ -95,6 +95,7 @@ typedef int IRQn_Type; #include "inc/hw_timer.h" #include "inc/hw_emac.h" #include "inc/hw_i2c.h" +#include "inc/hw_watchdog.h" #if CORTEX_NUM_VECTORS != ((((NUM_INTERRUPTS - 16) + 7) / 8) * 8) #error "TivaWare NUM_INTERRUPTS mismatch" -- cgit v1.2.3 From 88810040501e15001e2b7072398417a99846b7f3 Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Tue, 11 Oct 2016 21:21:30 +0200 Subject: Updated spi and udma lld to use TivaWare. --- os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h') diff --git a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h index 34528af..89fe5ea 100644 --- a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h +++ b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h @@ -96,6 +96,8 @@ typedef int IRQn_Type; #include "inc/hw_emac.h" #include "inc/hw_i2c.h" #include "inc/hw_watchdog.h" +#include "inc/hw_ssi.h" +#include "inc/hw_udma.h" #if CORTEX_NUM_VECTORS != ((((NUM_INTERRUPTS - 16) + 7) / 8) * 8) #error "TivaWare NUM_INTERRUPTS mismatch" -- cgit v1.2.3 From 94fe96d3ae4a8d05b7d752f9ff8e0bd4b3de25d6 Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Wed, 26 Oct 2016 21:09:34 +0200 Subject: Updated pwm_lld to use TivaWare. --- os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h | 1 + 1 file changed, 1 insertion(+) (limited to 'os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h') diff --git a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h index 89fe5ea..69d1e01 100644 --- a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h +++ b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h @@ -98,6 +98,7 @@ typedef int IRQn_Type; #include "inc/hw_watchdog.h" #include "inc/hw_ssi.h" #include "inc/hw_udma.h" +#include "inc/hw_pwm.h" #if CORTEX_NUM_VECTORS != ((((NUM_INTERRUPTS - 16) + 7) / 8) * 8) #error "TivaWare NUM_INTERRUPTS mismatch" -- cgit v1.2.3 From 2841fd88cde83b00d79c77e4d5c9441ddd9e22aa Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Thu, 20 Apr 2017 19:47:50 +0200 Subject: Updated license headers --- os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h') diff --git a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h index 69d1e01..b73032b 100644 --- a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h +++ b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014..2016 Marco Veeneman + Copyright (C) 2014..2017 Marco Veeneman Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. -- cgit v1.2.3 From ffd9d3fd90ffe7f8a7f9d824fa3d9d8b6f33c196 Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Sun, 2 Jul 2017 17:11:10 +0200 Subject: Initial ADC driver and testhal application for TM4C123x. --- os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h | 1 + 1 file changed, 1 insertion(+) (limited to 'os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h') diff --git a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h index b73032b..7bf68a0 100644 --- a/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h +++ b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h @@ -99,6 +99,7 @@ typedef int IRQn_Type; #include "inc/hw_ssi.h" #include "inc/hw_udma.h" #include "inc/hw_pwm.h" +#include "inc/hw_adc.h" #if CORTEX_NUM_VECTORS != ((((NUM_INTERRUPTS - 16) + 7) / 8) * 8) #error "TivaWare NUM_INTERRUPTS mismatch" -- cgit v1.2.3