From e7e54ccbf77da72cdffbf00bc9151c7dae9c3f8f Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 1 Dec 2018 09:29:47 -0600 Subject: [PATCH] Re-arranging some Tiva directories to simply forthcoming SimpleLink port Squashed commit of the following: arch/arm/src/tiva/Make.defs: Trivial change to conditional VPATH. arch/arm/src/tiva: Move LM3S and LM4F source files to lm/ sub-directory. Move all TM4C source files to tm4c sub-directory. arch/arm/src/tiva and configs/: Change include patch from chip/ to hardware/ in all Tiva files includes. arch/tmp/src: Rename chip/ subdirectory to hardware/. This is a better name since it does not conflict with other directory names and, well, we are going to be change a lot of the Tiva directory structure in the next few commits. --- arch/arm/src/max326xx/Kconfig | 3 ++- arch/arm/src/tiva/Make.defs | 10 +++++++++ arch/arm/src/tiva/chip.h | 22 +++++++++---------- arch/arm/src/tiva/{ => common}/tiva_adclib.c | 6 ++--- arch/arm/src/tiva/{ => common}/tiva_adclow.c | 8 +++---- .../src/tiva/{ => common}/tiva_allocateheap.c | 2 +- .../arm/src/tiva/{ => common}/tiva_dumpgpio.c | 2 +- arch/arm/src/tiva/{ => common}/tiva_eeprom.c | 4 ++-- arch/arm/src/tiva/{ => common}/tiva_flash.c | 2 +- arch/arm/src/tiva/{ => common}/tiva_gpio.c | 2 +- arch/arm/src/tiva/{ => common}/tiva_gpioirq.c | 2 +- arch/arm/src/tiva/{ => common}/tiva_i2c.c | 6 ++--- arch/arm/src/tiva/{ => common}/tiva_irq.c | 2 +- arch/arm/src/tiva/{ => common}/tiva_lowputc.c | 4 ++-- arch/arm/src/tiva/{ => common}/tiva_mpuinit.c | 2 +- arch/arm/src/tiva/{ => common}/tiva_pwm.c | 8 +++---- .../arm/src/tiva/{ => common}/tiva_qencoder.c | 8 +++---- arch/arm/src/tiva/{ => common}/tiva_serial.c | 2 +- arch/arm/src/tiva/{ => common}/tiva_ssi.c | 4 ++-- arch/arm/src/tiva/{ => common}/tiva_start.c | 2 +- .../src/tiva/{ => common}/tiva_syscontrol.c | 2 +- .../arm/src/tiva/{ => common}/tiva_timerisr.c | 2 +- .../arm/src/tiva/{ => common}/tiva_timerlib.c | 6 ++--- .../src/tiva/{ => common}/tiva_timerlow32.c | 2 +- .../src/tiva/{ => common}/tiva_userspace.c | 2 +- .../tiva/{chip => hardware}/lm3s_ethernet.h | 8 +++---- .../src/tiva/{chip => hardware}/lm3s_flash.h | 8 +++---- .../tiva/{chip => hardware}/lm3s_memorymap.h | 8 +++---- .../src/tiva/{chip => hardware}/lm3s_pinmap.h | 8 +++---- .../tiva/{chip => hardware}/lm3s_syscontrol.h | 8 +++---- .../tiva/{chip => hardware}/lm4f_memorymap.h | 8 +++---- .../src/tiva/{chip => hardware}/lm4f_pinmap.h | 8 +++---- .../tiva/{chip => hardware}/lm4f_syscontrol.h | 8 +++---- .../src/tiva/{chip => hardware}/tiva_adc.h | 8 +++---- .../src/tiva/{chip => hardware}/tiva_eeprom.h | 8 +++---- .../src/tiva/{chip => hardware}/tiva_epi.h | 8 +++---- .../tiva/{chip => hardware}/tiva_ethernet.h | 12 +++++----- .../src/tiva/{chip => hardware}/tiva_flash.h | 12 +++++----- .../src/tiva/{chip => hardware}/tiva_gpio.h | 8 +++---- .../src/tiva/{chip => hardware}/tiva_i2c.h | 8 +++---- .../tiva/{chip => hardware}/tiva_memorymap.h | 14 ++++++------ .../src/tiva/{chip => hardware}/tiva_pinmap.h | 14 ++++++------ .../src/tiva/{chip => hardware}/tiva_pwm.h | 8 +++---- .../tiva/{chip => hardware}/tiva_qencoder.h | 8 +++---- .../src/tiva/{chip => hardware}/tiva_ssi.h | 8 +++---- .../tiva/{chip => hardware}/tiva_syscontrol.h | 16 +++++++------- .../src/tiva/{chip => hardware}/tiva_timer.h | 8 +++---- .../src/tiva/{chip => hardware}/tiva_uart.h | 8 +++---- .../{chip => hardware}/tm4c123_syscontrol.h | 8 +++---- .../{chip => hardware}/tm4c129_syscontrol.h | 8 +++---- .../tiva/{chip => hardware}/tm4c_ethernet.h | 8 +++---- .../src/tiva/{chip => hardware}/tm4c_flash.h | 8 +++---- .../tiva/{chip => hardware}/tm4c_memorymap.h | 8 +++---- .../src/tiva/{chip => hardware}/tm4c_pinmap.h | 8 +++---- arch/arm/src/tiva/{ => lm}/lm3s_ethernet.c | 4 ++-- arch/arm/src/tiva/tiva_eeprom.h | 2 +- arch/arm/src/tiva/tiva_enableclks.h | 2 +- arch/arm/src/tiva/tiva_enablepwr.h | 2 +- arch/arm/src/tiva/tiva_i2c.h | 2 +- arch/arm/src/tiva/tiva_periphrdy.h | 2 +- arch/arm/src/tiva/tiva_timer.h | 2 +- .../src/tiva/{ => tm4c}/tm4c129_syscontrol.c | 2 +- arch/arm/src/tiva/{ => tm4c}/tm4c_ethernet.c | 4 ++-- configs/dk-tm4c129x/src/tm4c_ethernet.c | 2 +- configs/tm4c123g-launchpad/src/tm4c_adc.c | 2 +- .../tm4c1294-launchpad/src/tm4c_ethernet.c | 2 +- 66 files changed, 207 insertions(+), 196 deletions(-) rename arch/arm/src/tiva/{ => common}/tiva_adclib.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_adclow.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_allocateheap.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_dumpgpio.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_eeprom.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_flash.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_gpio.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_gpioirq.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_i2c.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_irq.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_lowputc.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_mpuinit.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_pwm.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_qencoder.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_serial.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_ssi.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_start.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_syscontrol.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_timerisr.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_timerlib.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_timerlow32.c (99%) rename arch/arm/src/tiva/{ => common}/tiva_userspace.c (98%) rename arch/arm/src/tiva/{chip => hardware}/lm3s_ethernet.h (98%) rename arch/arm/src/tiva/{chip => hardware}/lm3s_flash.h (97%) rename arch/arm/src/tiva/{chip => hardware}/lm3s_memorymap.h (99%) rename arch/arm/src/tiva/{chip => hardware}/lm3s_pinmap.h (99%) rename arch/arm/src/tiva/{chip => hardware}/lm3s_syscontrol.h (99%) rename arch/arm/src/tiva/{chip => hardware}/lm4f_memorymap.h (98%) rename arch/arm/src/tiva/{chip => hardware}/lm4f_pinmap.h (98%) rename arch/arm/src/tiva/{chip => hardware}/lm4f_syscontrol.h (99%) rename arch/arm/src/tiva/{chip => hardware}/tiva_adc.h (99%) rename arch/arm/src/tiva/{chip => hardware}/tiva_eeprom.h (98%) rename arch/arm/src/tiva/{chip => hardware}/tiva_epi.h (96%) rename arch/arm/src/tiva/{chip => hardware}/tiva_ethernet.h (88%) rename arch/arm/src/tiva/{chip => hardware}/tiva_flash.h (89%) rename arch/arm/src/tiva/{chip => hardware}/tiva_gpio.h (99%) rename arch/arm/src/tiva/{chip => hardware}/tiva_i2c.h (99%) rename arch/arm/src/tiva/{chip => hardware}/tiva_memorymap.h (90%) rename arch/arm/src/tiva/{chip => hardware}/tiva_pinmap.h (90%) rename arch/arm/src/tiva/{chip => hardware}/tiva_pwm.h (97%) rename arch/arm/src/tiva/{chip => hardware}/tiva_qencoder.h (96%) rename arch/arm/src/tiva/{chip => hardware}/tiva_ssi.h (98%) rename arch/arm/src/tiva/{chip => hardware}/tiva_syscontrol.h (89%) rename arch/arm/src/tiva/{chip => hardware}/tiva_timer.h (99%) rename arch/arm/src/tiva/{chip => hardware}/tiva_uart.h (99%) rename arch/arm/src/tiva/{chip => hardware}/tm4c123_syscontrol.h (99%) rename arch/arm/src/tiva/{chip => hardware}/tm4c129_syscontrol.h (99%) rename arch/arm/src/tiva/{chip => hardware}/tm4c_ethernet.h (99%) rename arch/arm/src/tiva/{chip => hardware}/tm4c_flash.h (99%) rename arch/arm/src/tiva/{chip => hardware}/tm4c_memorymap.h (99%) rename arch/arm/src/tiva/{chip => hardware}/tm4c_pinmap.h (99%) rename arch/arm/src/tiva/{ => lm}/lm3s_ethernet.c (99%) rename arch/arm/src/tiva/{ => tm4c}/tm4c129_syscontrol.c (99%) rename arch/arm/src/tiva/{ => tm4c}/tm4c_ethernet.c (99%) diff --git a/arch/arm/src/max326xx/Kconfig b/arch/arm/src/max326xx/Kconfig index dea82bba1c..feae4d2fa3 100644 --- a/arch/arm/src/max326xx/Kconfig +++ b/arch/arm/src/max326xx/Kconfig @@ -427,7 +427,8 @@ config MAX326XX_3WIRE default n ---help--- By default, 4-pin mode is supported(MISO, MOSI, SCK, SS). Selecting - this option enables 3-pin mode (MOSI, SCK, SS). + this option enables 3-pin mode (SOSI, SCK, SS). The SISO pin is bi- + directional, half duplex in the 3-pin mode. REVISIT: Perhaps this should be an on-the-fly configuration as an SPI "Hardware Feature" so that we can support 3-wire and 4-wire diff --git a/arch/arm/src/tiva/Make.defs b/arch/arm/src/tiva/Make.defs index c256f664b0..e559eae9c5 100644 --- a/arch/arm/src/tiva/Make.defs +++ b/arch/arm/src/tiva/Make.defs @@ -144,3 +144,13 @@ endif ifeq ($(CONFIG_TIVA_EEPROM),y) CHIP_CSRCS += tiva_eeprom.c endif + +# Paths to source files + +VPATH += chip/common + +ifeq ($(CONFIG_ARCH_CHIP_LM),y) +VPATH += chip/lm +else ifeq ($(CONFIG_ARCH_CHIP_TM4C),y) +VPATH += chip/tm4c +endif diff --git a/arch/arm/src/tiva/chip.h b/arch/arm/src/tiva/chip.h index f8ecf0f285..34f48cbda9 100644 --- a/arch/arm/src/tiva/chip.h +++ b/arch/arm/src/tiva/chip.h @@ -46,17 +46,17 @@ /* Then get all of the register definitions */ -#include "chip/tiva_memorymap.h" /* Memory map */ -#include "chip/tiva_syscontrol.h" /* System control module */ -#include "chip/tiva_gpio.h" /* GPIO modules */ -#include "chip/tiva_uart.h" /* UART modules */ -#include "chip/tiva_i2c.h" /* I2C modules */ -#include "chip/tiva_ssi.h" /* SSI modules */ -#include "chip/tiva_ethernet.h" /* Ethernet MAC and PHY */ -#include "chip/tiva_flash.h" /* FLASH */ -#include "chip/tiva_eeprom.h" /* EEPROM */ -#include "chip/tiva_timer.h" /* Timer */ -#include "chip/tiva_adc.h" /* ADC */ +#include "hardware/tiva_memorymap.h" /* Memory map */ +#include "hardware/tiva_syscontrol.h" /* System control module */ +#include "hardware/tiva_gpio.h" /* GPIO modules */ +#include "hardware/tiva_uart.h" /* UART modules */ +#include "hardware/tiva_i2c.h" /* I2C modules */ +#include "hardware/tiva_ssi.h" /* SSI modules */ +#include "hardware/tiva_ethernet.h" /* Ethernet MAC and PHY */ +#include "hardware/tiva_flash.h" /* FLASH */ +#include "hardware/tiva_eeprom.h" /* EEPROM */ +#include "hardware/tiva_timer.h" /* Timer */ +#include "hardware/tiva_adc.h" /* ADC */ /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/tiva/tiva_adclib.c b/arch/arm/src/tiva/common/tiva_adclib.c similarity index 99% rename from arch/arm/src/tiva/tiva_adclib.c rename to arch/arm/src/tiva/common/tiva_adclib.c index 3f9d3d89d0..f8b9b4acb5 100644 --- a/arch/arm/src/tiva/tiva_adclib.c +++ b/arch/arm/src/tiva/common/tiva_adclib.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_adclib.c + * arch/arm/src/tiva/common/tiva_adclib.c * * Copyright (C) 2015 TRD2 Inc. All rights reserved. * Author: Calvin Maguranis @@ -71,8 +71,8 @@ #include "up_internal.h" #include "tiva_gpio.h" #include "tiva_adc.h" -#include "chip/tiva_adc.h" -#include "chip/tiva_pinmap.h" +#include "hardware/tiva_adc.h" +#include "hardware/tiva_pinmap.h" #if defined (CONFIG_TIVA_ADC0) || defined (CONFIG_TIVA_ADC1) diff --git a/arch/arm/src/tiva/tiva_adclow.c b/arch/arm/src/tiva/common/tiva_adclow.c similarity index 99% rename from arch/arm/src/tiva/tiva_adclow.c rename to arch/arm/src/tiva/common/tiva_adclow.c index 8b681d7b03..cb903bb824 100644 --- a/arch/arm/src/tiva/tiva_adclow.c +++ b/arch/arm/src/tiva/common/tiva_adclow.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_adclow.c + * arch/arm/src/tiva/common/tiva_adclow.c * * Copyright (C) 2016-2018 Gregory Nutt. All rights reserved. * Copyright (C) 2015 TRD2 Inc. All rights reserved. @@ -81,9 +81,9 @@ #include "up_internal.h" #include "tiva_gpio.h" #include "tiva_adc.h" -#include "chip/tiva_adc.h" -#include "chip/tiva_pinmap.h" -#include "chip/tiva_syscontrol.h" +#include "hardware/tiva_adc.h" +#include "hardware/tiva_pinmap.h" +#include "hardware/tiva_syscontrol.h" #ifdef CONFIG_TIVA_ADC diff --git a/arch/arm/src/tiva/tiva_allocateheap.c b/arch/arm/src/tiva/common/tiva_allocateheap.c similarity index 99% rename from arch/arm/src/tiva/tiva_allocateheap.c rename to arch/arm/src/tiva/common/tiva_allocateheap.c index 200f92331c..9dfe0b92cf 100644 --- a/arch/arm/src/tiva/tiva_allocateheap.c +++ b/arch/arm/src/tiva/common/tiva_allocateheap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_allocateheap.c + * arch/arm/src/tiva/common/tiva_allocateheap.c * * Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/tiva/tiva_dumpgpio.c b/arch/arm/src/tiva/common/tiva_dumpgpio.c similarity index 99% rename from arch/arm/src/tiva/tiva_dumpgpio.c rename to arch/arm/src/tiva/common/tiva_dumpgpio.c index b50e8fa0f5..2ba8dab014 100644 --- a/arch/arm/src/tiva/tiva_dumpgpio.c +++ b/arch/arm/src/tiva/common/tiva_dumpgpio.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_dumpgpio.c + * arch/arm/src/tiva/common/tiva_dumpgpio.c * * Copyright (C) 2009-2010, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/tiva/tiva_eeprom.c b/arch/arm/src/tiva/common/tiva_eeprom.c similarity index 99% rename from arch/arm/src/tiva/tiva_eeprom.c rename to arch/arm/src/tiva/common/tiva_eeprom.c index 1459f86631..c9e72e9b81 100644 --- a/arch/arm/src/tiva/tiva_eeprom.c +++ b/arch/arm/src/tiva/common/tiva_eeprom.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_eeprom.c + * arch/arm/src/tiva/common/tiva_eeprom.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Shirshak Sengupta @@ -48,7 +48,7 @@ #include "up_arch.h" #include "chip.h" -#include "chip/tiva_syscontrol.h" +#include "hardware/tiva_syscontrol.h" #include "tiva_eeprom.h" /**************************************************************************** diff --git a/arch/arm/src/tiva/tiva_flash.c b/arch/arm/src/tiva/common/tiva_flash.c similarity index 99% rename from arch/arm/src/tiva/tiva_flash.c rename to arch/arm/src/tiva/common/tiva_flash.c index ccfa5f0fc7..b52432314f 100644 --- a/arch/arm/src/tiva/tiva_flash.c +++ b/arch/arm/src/tiva/common/tiva_flash.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_flash.c + * arch/arm/src/tiva/common/tiva_flash.c * * Copyright (c) 2013 Max Holtzberg. All rights reserved. * Copyright (C) 2013, 2018 Gregory Nutt. All rights reserved. diff --git a/arch/arm/src/tiva/tiva_gpio.c b/arch/arm/src/tiva/common/tiva_gpio.c similarity index 99% rename from arch/arm/src/tiva/tiva_gpio.c rename to arch/arm/src/tiva/common/tiva_gpio.c index 5d009d7864..c8e8fd2c82 100644 --- a/arch/arm/src/tiva/tiva_gpio.c +++ b/arch/arm/src/tiva/common/tiva_gpio.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_gpio.c + * arch/arm/src/tiva/common/tiva_gpio.c * * Copyright (C) 2009-2010, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/tiva/tiva_gpioirq.c b/arch/arm/src/tiva/common/tiva_gpioirq.c similarity index 99% rename from arch/arm/src/tiva/tiva_gpioirq.c rename to arch/arm/src/tiva/common/tiva_gpioirq.c index a5d0e3dbe3..c284040a16 100644 --- a/arch/arm/src/tiva/tiva_gpioirq.c +++ b/arch/arm/src/tiva/common/tiva_gpioirq.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_gpioirq.c + * arch/arm/src/tiva/common/tiva_gpioirq.c * * Copyright (C) 2009-2010, 2012, 2014-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/tiva/tiva_i2c.c b/arch/arm/src/tiva/common/tiva_i2c.c similarity index 99% rename from arch/arm/src/tiva/tiva_i2c.c rename to arch/arm/src/tiva/common/tiva_i2c.c index 0e4253d89a..527e183cf1 100644 --- a/arch/arm/src/tiva/tiva_i2c.c +++ b/arch/arm/src/tiva/common/tiva_i2c.c @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/tiva_i2c.c + * arch/arm/src/tiva/common/tiva_i2c.c * * Copyright (C) 2014-2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -68,8 +68,8 @@ #include "tiva_enablepwr.h" #include "tiva_enableclks.h" #include "tiva_gpio.h" -#include "chip/tiva_pinmap.h" -#include "chip/tiva_syscontrol.h" +#include "hardware/tiva_pinmap.h" +#include "hardware/tiva_syscontrol.h" #include "tiva_i2c.h" /* At least one I2C peripheral must be enabled */ diff --git a/arch/arm/src/tiva/tiva_irq.c b/arch/arm/src/tiva/common/tiva_irq.c similarity index 99% rename from arch/arm/src/tiva/tiva_irq.c rename to arch/arm/src/tiva/common/tiva_irq.c index 4ca58a200b..aca7352f4c 100644 --- a/arch/arm/src/tiva/tiva_irq.c +++ b/arch/arm/src/tiva/common/tiva_irq.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_irq.c + * arch/arm/src/tiva/common/tiva_irq.c * * Copyright (C) 2009, 2011, 2013-2014, 2018 Gregory Nutt. All rights * reserved. diff --git a/arch/arm/src/tiva/tiva_lowputc.c b/arch/arm/src/tiva/common/tiva_lowputc.c similarity index 99% rename from arch/arm/src/tiva/tiva_lowputc.c rename to arch/arm/src/tiva/common/tiva_lowputc.c index 3674450f61..dfc5bf8dca 100644 --- a/arch/arm/src/tiva/tiva_lowputc.c +++ b/arch/arm/src/tiva/common/tiva_lowputc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_lowputc.c + * arch/arm/src/tiva/common/tiva_lowputc.c * * Copyright (C) 2009-2010, 2014, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -50,7 +50,7 @@ #include "tiva_enableclks.h" #include "tiva_periphrdy.h" #include "tiva_gpio.h" -#include "chip/tiva_pinmap.h" +#include "hardware/tiva_pinmap.h" #include "tiva_lowputc.h" diff --git a/arch/arm/src/tiva/tiva_mpuinit.c b/arch/arm/src/tiva/common/tiva_mpuinit.c similarity index 99% rename from arch/arm/src/tiva/tiva_mpuinit.c rename to arch/arm/src/tiva/common/tiva_mpuinit.c index a9a6aed9a2..d33d3befdb 100644 --- a/arch/arm/src/tiva/tiva_mpuinit.c +++ b/arch/arm/src/tiva/common/tiva_mpuinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_mpuinit.c + * arch/arm/src/tiva/common/tiva_mpuinit.c * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/tiva/tiva_pwm.c b/arch/arm/src/tiva/common/tiva_pwm.c similarity index 99% rename from arch/arm/src/tiva/tiva_pwm.c rename to arch/arm/src/tiva/common/tiva_pwm.c index b25e272255..59dadb351a 100644 --- a/arch/arm/src/tiva/tiva_pwm.c +++ b/arch/arm/src/tiva/common/tiva_pwm.c @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/tiva_pwm.c + * arch/arm/src/tiva/common/tiva_pwm.c * * Copyright (C) 2016 Young Mu. All rights reserved. * Author: Young Mu @@ -57,9 +57,9 @@ #include "tiva_enablepwr.h" #include "tiva_enableclks.h" -#include "chip/tiva_pwm.h" -#include "chip/tiva_pinmap.h" -#include "chip/tm4c_memorymap.h" +#include "hardware/tiva_pwm.h" +#include "hardware/tiva_pinmap.h" +#include "hardware/tm4c_memorymap.h" /************************************************************************************ * Private Types diff --git a/arch/arm/src/tiva/tiva_qencoder.c b/arch/arm/src/tiva/common/tiva_qencoder.c similarity index 99% rename from arch/arm/src/tiva/tiva_qencoder.c rename to arch/arm/src/tiva/common/tiva_qencoder.c index a10eb6577d..7e60563092 100644 --- a/arch/arm/src/tiva/tiva_qencoder.c +++ b/arch/arm/src/tiva/common/tiva_qencoder.c @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/tiva_qencoder.c + * arch/arm/src/tiva/common/tiva_qencoder.c * * Copyright (C) 2016 Young Mu. All rights reserved. * Author: Young Mu @@ -56,9 +56,9 @@ #include "tiva_enablepwr.h" #include "tiva_enableclks.h" -#include "chip/tiva_qencoder.h" -#include "chip/tiva_pinmap.h" -#include "chip/tm4c_memorymap.h" +#include "hardware/tiva_qencoder.h" +#include "hardware/tiva_pinmap.h" +#include "hardware/tm4c_memorymap.h" /************************************************************************************ * Private Types diff --git a/arch/arm/src/tiva/tiva_serial.c b/arch/arm/src/tiva/common/tiva_serial.c similarity index 99% rename from arch/arm/src/tiva/tiva_serial.c rename to arch/arm/src/tiva/common/tiva_serial.c index 0ecaf3469a..d9ac059088 100644 --- a/arch/arm/src/tiva/tiva_serial.c +++ b/arch/arm/src/tiva/common/tiva_serial.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_serial.c + * arch/arm/src/tiva/common/tiva_serial.c * * Copyright (C) 2009-2010, 2012-2014, 2017-2018 Gregory Nutt. All rights * reserved. diff --git a/arch/arm/src/tiva/tiva_ssi.c b/arch/arm/src/tiva/common/tiva_ssi.c similarity index 99% rename from arch/arm/src/tiva/tiva_ssi.c rename to arch/arm/src/tiva/common/tiva_ssi.c index d64e4dccdd..2ba2b4e7f8 100644 --- a/arch/arm/src/tiva/tiva_ssi.c +++ b/arch/arm/src/tiva/common/tiva_ssi.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_ssi.c + * arch/arm/src/tiva/common/tiva_ssi.c * * Copyright (C) 2009-2010, 2014, 2016-2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -61,7 +61,7 @@ #include "tiva_enableclks.h" #include "tiva_gpio.h" #include "tiva_ssi.h" -#include "chip/tiva_pinmap.h" +#include "hardware/tiva_pinmap.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/tiva/tiva_start.c b/arch/arm/src/tiva/common/tiva_start.c similarity index 99% rename from arch/arm/src/tiva/tiva_start.c rename to arch/arm/src/tiva/common/tiva_start.c index 606ce69277..c71986354e 100644 --- a/arch/arm/src/tiva/tiva_start.c +++ b/arch/arm/src/tiva/common/tiva_start.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_start.c + * arch/arm/src/tiva/common/tiva_start.c * * Copyright (C) 2009, 2012, 2014, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/tiva/tiva_syscontrol.c b/arch/arm/src/tiva/common/tiva_syscontrol.c similarity index 99% rename from arch/arm/src/tiva/tiva_syscontrol.c rename to arch/arm/src/tiva/common/tiva_syscontrol.c index b7a51aad0e..72897ae3fe 100644 --- a/arch/arm/src/tiva/tiva_syscontrol.c +++ b/arch/arm/src/tiva/common/tiva_syscontrol.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_syscontrol.c + * arch/arm/src/tiva/common/tiva_syscontrol.c * * Copyright (C) 2009-2014, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/tiva/tiva_timerisr.c b/arch/arm/src/tiva/common/tiva_timerisr.c similarity index 99% rename from arch/arm/src/tiva/tiva_timerisr.c rename to arch/arm/src/tiva/common/tiva_timerisr.c index 62a90f4902..a8f8b9d808 100644 --- a/arch/arm/src/tiva/tiva_timerisr.c +++ b/arch/arm/src/tiva/common/tiva_timerisr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_timerisr.c + * arch/arm/src/tiva/common/tiva_timerisr.c * * Copyright (C) 2009, 2014, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/tiva/tiva_timerlib.c b/arch/arm/src/tiva/common/tiva_timerlib.c similarity index 99% rename from arch/arm/src/tiva/tiva_timerlib.c rename to arch/arm/src/tiva/common/tiva_timerlib.c index 0abd19e801..621a71f77b 100644 --- a/arch/arm/src/tiva/tiva_timerlib.c +++ b/arch/arm/src/tiva/common/tiva_timerlib.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_timerlib.c + * arch/arm/src/tiva/common/tiva_timerlib.c * * Copyright (C) 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -51,8 +51,8 @@ #include #include "up_arch.h" -#include "chip/tiva_syscontrol.h" -#include "chip/tiva_timer.h" +#include "hardware/tiva_syscontrol.h" +#include "hardware/tiva_timer.h" #include "tiva_enableclks.h" #include "tiva_enablepwr.h" diff --git a/arch/arm/src/tiva/tiva_timerlow32.c b/arch/arm/src/tiva/common/tiva_timerlow32.c similarity index 99% rename from arch/arm/src/tiva/tiva_timerlow32.c rename to arch/arm/src/tiva/common/tiva_timerlow32.c index 9807588ec2..83501bf644 100644 --- a/arch/arm/src/tiva/tiva_timerlow32.c +++ b/arch/arm/src/tiva/common/tiva_timerlow32.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_timerlow32.c + * arch/arm/src/tiva/common/tiva_timerlow32.c * * Copyright (C) 2015-2016 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/arch/arm/src/tiva/tiva_userspace.c b/arch/arm/src/tiva/common/tiva_userspace.c similarity index 98% rename from arch/arm/src/tiva/tiva_userspace.c rename to arch/arm/src/tiva/common/tiva_userspace.c index b041a5d58c..078329034b 100644 --- a/arch/arm/src/tiva/tiva_userspace.c +++ b/arch/arm/src/tiva/common/tiva_userspace.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_userspace.c + * arch/arm/src/tiva/common/tiva_userspace.c * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/tiva/chip/lm3s_ethernet.h b/arch/arm/src/tiva/hardware/lm3s_ethernet.h similarity index 98% rename from arch/arm/src/tiva/chip/lm3s_ethernet.h rename to arch/arm/src/tiva/hardware/lm3s_ethernet.h index 785f10bbca..d23e20efce 100644 --- a/arch/arm/src/tiva/chip/lm3s_ethernet.h +++ b/arch/arm/src/tiva/hardware/lm3s_ethernet.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/lm3s_ethernet.h + * arch/arm/src/tiva/hardwarelm3s_ethernet.h * * Copyright (C) 2009-2010, 2012-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM3S_ETHERNET_H -#define __ARCH_ARM_SRC_TIVA_CHIP_LM3S_ETHERNET_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_ETHERNET_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_ETHERNET_H /************************************************************************************ * Included Files @@ -200,4 +200,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM3S_ETHERNET_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_ETHERNET_H */ diff --git a/arch/arm/src/tiva/chip/lm3s_flash.h b/arch/arm/src/tiva/hardware/lm3s_flash.h similarity index 97% rename from arch/arm/src/tiva/chip/lm3s_flash.h rename to arch/arm/src/tiva/hardware/lm3s_flash.h index 163a9c58a7..befcbeb991 100644 --- a/arch/arm/src/tiva/chip/lm3s_flash.h +++ b/arch/arm/src/tiva/hardware/lm3s_flash.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/lm3s_flash.h + * arch/arm/src/tiva/hardwarelm3s_flash.h * * Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM3S_FLASH_H -#define __ARCH_ARM_SRC_TIVA_CHIP_LM3S_FLASH_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_FLASH_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_FLASH_H /************************************************************************************ * Included Files @@ -160,4 +160,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM3S_FLASH_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_FLASH_H */ diff --git a/arch/arm/src/tiva/chip/lm3s_memorymap.h b/arch/arm/src/tiva/hardware/lm3s_memorymap.h similarity index 99% rename from arch/arm/src/tiva/chip/lm3s_memorymap.h rename to arch/arm/src/tiva/hardware/lm3s_memorymap.h index 71ad565c1c..f8c0647cfa 100644 --- a/arch/arm/src/tiva/chip/lm3s_memorymap.h +++ b/arch/arm/src/tiva/hardware/lm3s_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/lm3s_memorymap.h + * arch/arm/src/tiva/hardwarelm3s_memorymap.h * * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM3S_MEMORYMAP_H -#define __ARCH_ARM_SRC_TIVA_CHIP_LM3S_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_MEMORYMAP_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_MEMORYMAP_H /************************************************************************************ * Included Files @@ -349,4 +349,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM3S_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_MEMORYMAP_H */ diff --git a/arch/arm/src/tiva/chip/lm3s_pinmap.h b/arch/arm/src/tiva/hardware/lm3s_pinmap.h similarity index 99% rename from arch/arm/src/tiva/chip/lm3s_pinmap.h rename to arch/arm/src/tiva/hardware/lm3s_pinmap.h index 0e4a26c74c..b7e1fbb34e 100644 --- a/arch/arm/src/tiva/chip/lm3s_pinmap.h +++ b/arch/arm/src/tiva/hardware/lm3s_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/lm3s_pinmap.h + * arch/arm/src/tiva/hardwarelm3s_pinmap.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM3S_PINMAP_H -#define __ARCH_ARM_SRC_TIVA_CHIP_LM3S_PINMAP_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_PINMAP_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_PINMAP_H /************************************************************************************ * Included Files @@ -278,4 +278,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM3S_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_PINMAP_H */ diff --git a/arch/arm/src/tiva/chip/lm3s_syscontrol.h b/arch/arm/src/tiva/hardware/lm3s_syscontrol.h similarity index 99% rename from arch/arm/src/tiva/chip/lm3s_syscontrol.h rename to arch/arm/src/tiva/hardware/lm3s_syscontrol.h index 5097b9bd7a..374eb48716 100644 --- a/arch/arm/src/tiva/chip/lm3s_syscontrol.h +++ b/arch/arm/src/tiva/hardware/lm3s_syscontrol.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/lm3s_syscontrol.h + * arch/arm/src/tiva/hardwarelm3s_syscontrol.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM3S_SYSCONTROL_H -#define __ARCH_ARM_SRC_TIVA_CHIP_LM3S_SYSCONTROL_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_SYSCONTROL_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_SYSCONTROL_H /************************************************************************************ * Included Files @@ -492,4 +492,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM3S_SYSCONTROL_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM3S_SYSCONTROL_H */ diff --git a/arch/arm/src/tiva/chip/lm4f_memorymap.h b/arch/arm/src/tiva/hardware/lm4f_memorymap.h similarity index 98% rename from arch/arm/src/tiva/chip/lm4f_memorymap.h rename to arch/arm/src/tiva/hardware/lm4f_memorymap.h index 4ec56359cf..0514228871 100644 --- a/arch/arm/src/tiva/chip/lm4f_memorymap.h +++ b/arch/arm/src/tiva/hardware/lm4f_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/lm4f_memorymap.h + * arch/arm/src/tiva/hardwarelm4f_memorymap.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM4F_MEMORYMAP_H -#define __ARCH_ARM_SRC_TIVA_CHIP_LM4F_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_MEMORYMAP_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_MEMORYMAP_H /************************************************************************************ * Included Files @@ -160,4 +160,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM4F_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_MEMORYMAP_H */ diff --git a/arch/arm/src/tiva/chip/lm4f_pinmap.h b/arch/arm/src/tiva/hardware/lm4f_pinmap.h similarity index 98% rename from arch/arm/src/tiva/chip/lm4f_pinmap.h rename to arch/arm/src/tiva/hardware/lm4f_pinmap.h index ec8ad402a3..392ae374aa 100644 --- a/arch/arm/src/tiva/chip/lm4f_pinmap.h +++ b/arch/arm/src/tiva/hardware/lm4f_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/lm4f_pinmap.h + * arch/arm/src/tiva/hardwarelm4f_pinmap.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM4F_PINMAP_H -#define __ARCH_ARM_SRC_TIVA_CHIP_LM4F_PINMAP_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_PINMAP_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_PINMAP_H /************************************************************************************ * Included Files @@ -212,4 +212,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM4F_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_PINMAP_H */ diff --git a/arch/arm/src/tiva/chip/lm4f_syscontrol.h b/arch/arm/src/tiva/hardware/lm4f_syscontrol.h similarity index 99% rename from arch/arm/src/tiva/chip/lm4f_syscontrol.h rename to arch/arm/src/tiva/hardware/lm4f_syscontrol.h index 014f9ed000..176fa2489a 100644 --- a/arch/arm/src/tiva/chip/lm4f_syscontrol.h +++ b/arch/arm/src/tiva/hardware/lm4f_syscontrol.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/tiva/chip/lm4f_syscontrol.h + * arch/arm/src/tiva/hardwarelm4f_syscontrol.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM4F_SYSCONTROL_H -#define __ARCH_ARM_SRC_TIVA_CHIP_LM4F_SYSCONTROL_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_SYSCONTROL_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_SYSCONTROL_H /******************************************************************************************** * Included Files @@ -1533,4 +1533,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM4F_SYSCONTROL_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM4F_SYSCONTROL_H */ diff --git a/arch/arm/src/tiva/chip/tiva_adc.h b/arch/arm/src/tiva/hardware/tiva_adc.h similarity index 99% rename from arch/arm/src/tiva/chip/tiva_adc.h rename to arch/arm/src/tiva/hardware/tiva_adc.h index 2b2dd131d2..4793ccda67 100644 --- a/arch/arm/src/tiva/chip/tiva_adc.h +++ b/arch/arm/src/tiva/hardware/tiva_adc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tiva_adc.h + * arch/arm/src/tiva/hardwaretiva_adc.h * * Copyright (C) 2015 Calvin Maguranis. All rights reserved. * Author: Calvin Maguranis @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TIVA_ADC_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TIVA_ADC_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_ADC_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_ADC_H /************************************************************************************ * Included Files @@ -943,4 +943,4 @@ #define ADC_CC_CS_PIOSC (0x001) /* PIOSC */ #define ADC_CC_CS_MOSC (0x002) /* MOSC */ -#endif // __ARCH_ARM_SRC_TIVA_CHIP_TIVA_ADC_H +#endif // __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_ADC_H diff --git a/arch/arm/src/tiva/chip/tiva_eeprom.h b/arch/arm/src/tiva/hardware/tiva_eeprom.h similarity index 98% rename from arch/arm/src/tiva/chip/tiva_eeprom.h rename to arch/arm/src/tiva/hardware/tiva_eeprom.h index cf55e70bbc..682d64ae7f 100644 --- a/arch/arm/src/tiva/chip/tiva_eeprom.h +++ b/arch/arm/src/tiva/hardware/tiva_eeprom.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tiva_eeprom.h + * arch/arm/src/tiva/hardwaretiva_eeprom.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Shirshak Sengupta @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TIVA_EEPROM_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TIVA_EEPROM_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_EEPROM_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_EEPROM_H /************************************************************************************ * Included Files @@ -200,4 +200,4 @@ #define EEPROM_PP_SIZE_6K 0x000001ff /* 6 KB of EEPROM */ #define EEPROM_PP_SIZE_S 0 -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TIVA_EEPROM_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_EEPROM_H */ diff --git a/arch/arm/src/tiva/chip/tiva_epi.h b/arch/arm/src/tiva/hardware/tiva_epi.h similarity index 96% rename from arch/arm/src/tiva/chip/tiva_epi.h rename to arch/arm/src/tiva/hardware/tiva_epi.h index 612589ea14..1a20663769 100644 --- a/arch/arm/src/tiva/chip/tiva_epi.h +++ b/arch/arm/src/tiva/hardware/tiva_epi.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tiva_epi.h + * arch/arm/src/tiva/hardwaretiva_epi.h * * Copyright (C) 2009-2013 Max Neklyudov. All rights reserved. * Author: Max Neklyudov @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TIVA_EPI_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TIVA_EPI_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_EPI_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_EPI_H /************************************************************************************ * Included Files @@ -110,4 +110,4 @@ #define EPI_BAUD_COUNT0_MASK (0xFFFF << EPI_BAUD_COUNT0_SHIFT) # define EPI_BAUD_COUNT0(n) ((n) << EPI_BAUD_COUNT0_SHIFT) -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TIVA_EPI_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_EPI_H */ diff --git a/arch/arm/src/tiva/chip/tiva_ethernet.h b/arch/arm/src/tiva/hardware/tiva_ethernet.h similarity index 88% rename from arch/arm/src/tiva/chip/tiva_ethernet.h rename to arch/arm/src/tiva/hardware/tiva_ethernet.h index 7ed993b4da..b9c5d52826 100644 --- a/arch/arm/src/tiva/chip/tiva_ethernet.h +++ b/arch/arm/src/tiva/hardware/tiva_ethernet.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tiva_ethernet.h + * arch/arm/src/tiva/hardwaretiva_ethernet.h * * Copyright (C) 2009-2010, 2012-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TIVA_ETHERNET_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TIVA_ETHERNET_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_ETHERNET_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_ETHERNET_H /************************************************************************************ * Included Files @@ -43,9 +43,9 @@ #include #if defined(CONFIG_ARCH_CHIP_TM4C) -# include "chip/tm4c_ethernet.h" +# include "hardware/tm4c_ethernet.h" #elif defined(CONFIG_ARCH_CHIP_LM3S) -# include "chip/lm3s_ethernet.h" +# include "hardware/lm3s_ethernet.h" #endif -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TIVA_ETHERNET_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_ETHERNET_H */ diff --git a/arch/arm/src/tiva/chip/tiva_flash.h b/arch/arm/src/tiva/hardware/tiva_flash.h similarity index 89% rename from arch/arm/src/tiva/chip/tiva_flash.h rename to arch/arm/src/tiva/hardware/tiva_flash.h index 42c6880757..a52576d998 100644 --- a/arch/arm/src/tiva/chip/tiva_flash.h +++ b/arch/arm/src/tiva/hardware/tiva_flash.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tiva_flash.h + * arch/arm/src/tiva/hardwaretiva_flash.h * * Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TIVA_FLASH_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TIVA_FLASH_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_FLASH_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_FLASH_H /************************************************************************************ * Included Files @@ -45,12 +45,12 @@ /* The TM4C129 family has a different FLASH register layout */ #if defined(CONFIG_ARCH_CHIP_TM4C129) -# include "chip/tm4c_flash.h" +# include "hardware/tm4c_flash.h" /* Others (including LM4F and TM4C123) are similar to the LM3S family */ #else -# include "chip/lm3s_flash.h" +# include "hardware/lm3s_flash.h" #endif -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TIVA_FLASH_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_FLASH_H */ diff --git a/arch/arm/src/tiva/chip/tiva_gpio.h b/arch/arm/src/tiva/hardware/tiva_gpio.h similarity index 99% rename from arch/arm/src/tiva/chip/tiva_gpio.h rename to arch/arm/src/tiva/hardware/tiva_gpio.h index c19856e422..4b053597cf 100644 --- a/arch/arm/src/tiva/chip/tiva_gpio.h +++ b/arch/arm/src/tiva/hardware/tiva_gpio.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tiva_gpio.h + * arch/arm/src/tiva/hardwaretiva_gpio.h * * Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TIVA_GPIO_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TIVA_GPIO_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_GPIO_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_GPIO_H /************************************************************************************ * Included Files @@ -1208,4 +1208,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TIVA_GPIO_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_GPIO_H */ diff --git a/arch/arm/src/tiva/chip/tiva_i2c.h b/arch/arm/src/tiva/hardware/tiva_i2c.h similarity index 99% rename from arch/arm/src/tiva/chip/tiva_i2c.h rename to arch/arm/src/tiva/hardware/tiva_i2c.h index 4ca70eaf26..c6c813d65a 100644 --- a/arch/arm/src/tiva/chip/tiva_i2c.h +++ b/arch/arm/src/tiva/hardware/tiva_i2c.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tiva_i2c.h + * arch/arm/src/tiva/hardwaretiva_i2c.h * * Copyright (C) 2009, 2013-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TIVA_I2C_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TIVA_I2C_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_I2C_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_I2C_H /************************************************************************************ * Included Files @@ -1061,4 +1061,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TIVA_I2C_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_I2C_H */ diff --git a/arch/arm/src/tiva/chip/tiva_memorymap.h b/arch/arm/src/tiva/hardware/tiva_memorymap.h similarity index 90% rename from arch/arm/src/tiva/chip/tiva_memorymap.h rename to arch/arm/src/tiva/hardware/tiva_memorymap.h index 136b289082..8538924cf9 100644 --- a/arch/arm/src/tiva/chip/tiva_memorymap.h +++ b/arch/arm/src/tiva/hardware/tiva_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tiva_memorymap.h + * arch/arm/src/tiva/hardwaretiva_memorymap.h * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TIVA_MEMORYMAP_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TIVA_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_MEMORYMAP_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_MEMORYMAP_H /************************************************************************************ * Included Files @@ -45,11 +45,11 @@ /* Include the memory map file for the specific Tiva/Stellaris chip */ #if defined(CONFIG_ARCH_CHIP_LM3S) -# include "chip/lm3s_memorymap.h" +# include "hardware/lm3s_memorymap.h" #elif defined(CONFIG_ARCH_CHIP_LM4F) -# include "chip/lm4f_memorymap.h" +# include "hardware/lm4f_memorymap.h" #elif defined(CONFIG_ARCH_CHIP_TM4C) -# include "chip/tm4c_memorymap.h" +# include "hardware/tm4c_memorymap.h" #else # error "Unsupported Tiva/Stellaris memory map" #endif @@ -70,4 +70,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TIVA_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_MEMORYMAP_H */ diff --git a/arch/arm/src/tiva/chip/tiva_pinmap.h b/arch/arm/src/tiva/hardware/tiva_pinmap.h similarity index 90% rename from arch/arm/src/tiva/chip/tiva_pinmap.h rename to arch/arm/src/tiva/hardware/tiva_pinmap.h index ab8ee6b73f..835d2689fc 100644 --- a/arch/arm/src/tiva/chip/tiva_pinmap.h +++ b/arch/arm/src/tiva/hardware/tiva_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tiva_pinmap.h + * arch/arm/src/tiva/hardwaretiva_pinmap.h * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TIVA_PINMAP_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TIVA_PINMAP_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_PINMAP_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_PINMAP_H /************************************************************************************ * Included Files @@ -45,11 +45,11 @@ /* Include the pin mapping file for the specific Tiva/Stellaris chip */ #if defined(CONFIG_ARCH_CHIP_LM3S) -# include "chip/lm3s_pinmap.h" +# include "hardware/lm3s_pinmap.h" #elif defined(CONFIG_ARCH_CHIP_LM4F) -# include "chip/lm4f_pinmap.h" +# include "hardware/lm4f_pinmap.h" #elif defined(CONFIG_ARCH_CHIP_TM4C) -# include "chip/tm4c_pinmap.h" +# include "hardware/tm4c_pinmap.h" #else # error "Unsupported Tiva/Stellaris PIN mapping" #endif @@ -70,4 +70,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TIVA_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_PINMAP_H */ diff --git a/arch/arm/src/tiva/chip/tiva_pwm.h b/arch/arm/src/tiva/hardware/tiva_pwm.h similarity index 97% rename from arch/arm/src/tiva/chip/tiva_pwm.h rename to arch/arm/src/tiva/hardware/tiva_pwm.h index 05e2302f35..66a50c46d0 100644 --- a/arch/arm/src/tiva/chip/tiva_pwm.h +++ b/arch/arm/src/tiva/hardware/tiva_pwm.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tiva_pwm.h + * arch/arm/src/tiva/hardwaretiva_pwm.h * * Copyright (C) 2016 Young Mu. All rights reserved. * Author: Young Mu @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TIVA_PWM_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TIVA_PWM_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_PWM_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_PWM_H /************************************************************************************ * Included Files @@ -126,4 +126,4 @@ #define INT_CLR (0) /* (Value) Bit Clear */ #define INT_SET (1) /* (Value) Bit Set */ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TIVA_PWM_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_PWM_H */ diff --git a/arch/arm/src/tiva/chip/tiva_qencoder.h b/arch/arm/src/tiva/hardware/tiva_qencoder.h similarity index 96% rename from arch/arm/src/tiva/chip/tiva_qencoder.h rename to arch/arm/src/tiva/hardware/tiva_qencoder.h index 4352d2fa8d..44ee6bd812 100644 --- a/arch/arm/src/tiva/chip/tiva_qencoder.h +++ b/arch/arm/src/tiva/hardware/tiva_qencoder.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tiva_qencoder.h + * arch/arm/src/tiva/hardwaretiva_qencoder.h * * Copyright (C) 2016 Young Mu. All rights reserved. * Author: Young Mu @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TIVA_QENCODER_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TIVA_QENCODER_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_QENCODER_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_QENCODER_H /************************************************************************************ * Included Files @@ -95,4 +95,4 @@ #define DIRECTION_FORWARD (0) /* (Value) Forward */ #define DIRECTION_BACKWARD (1) /* (Value) Backward */ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TIVA_QENCODER_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_QENCODER_H */ diff --git a/arch/arm/src/tiva/chip/tiva_ssi.h b/arch/arm/src/tiva/hardware/tiva_ssi.h similarity index 98% rename from arch/arm/src/tiva/chip/tiva_ssi.h rename to arch/arm/src/tiva/hardware/tiva_ssi.h index edf1a49585..412833215d 100644 --- a/arch/arm/src/tiva/chip/tiva_ssi.h +++ b/arch/arm/src/tiva/hardware/tiva_ssi.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tiva_ssi.h + * arch/arm/src/tiva/hardwaretiva_ssi.h * * Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TIVA_SSI_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TIVA_SSI_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_SSI_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_SSI_H /************************************************************************************ * Included Files @@ -232,4 +232,4 @@ ************************************************************************************/ #endif /* TIVA_NSSI > 0 */ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TIVA_SSI_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_SSI_H */ diff --git a/arch/arm/src/tiva/chip/tiva_syscontrol.h b/arch/arm/src/tiva/hardware/tiva_syscontrol.h similarity index 89% rename from arch/arm/src/tiva/chip/tiva_syscontrol.h rename to arch/arm/src/tiva/hardware/tiva_syscontrol.h index 8daf2f1da7..b279bf2b41 100644 --- a/arch/arm/src/tiva/chip/tiva_syscontrol.h +++ b/arch/arm/src/tiva/hardware/tiva_syscontrol.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tiva_syscontrol.h + * arch/arm/src/tiva/hardwaretiva_syscontrol.h * * Copyright (C) 2009-2010, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TIVA_SYSCONTROL_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TIVA_SYSCONTROL_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_SYSCONTROL_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_SYSCONTROL_H /************************************************************************************ * Included Files @@ -46,13 +46,13 @@ /* Include the system control header file for the specific Tiva/Stellaris chip */ #if defined(CONFIG_ARCH_CHIP_LM3S) -# include "chip/lm3s_syscontrol.h" +# include "hardware/lm3s_syscontrol.h" #elif defined(CONFIG_ARCH_CHIP_LM4F) -# include "chip/lm4f_syscontrol.h" +# include "hardware/lm4f_syscontrol.h" #elif defined(CONFIG_ARCH_CHIP_TM4C123) -# include "chip/tm4c123_syscontrol.h" +# include "hardware/tm4c123_syscontrol.h" #elif defined(CONFIG_ARCH_CHIP_TM4C129) -# include "chip/tm4c129_syscontrol.h" +# include "hardware/tm4c129_syscontrol.h" #else # error "Unsupported Tiva/Stellaris system control module" #endif @@ -73,4 +73,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TIVA_SYSCONTROL_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_SYSCONTROL_H */ diff --git a/arch/arm/src/tiva/chip/tiva_timer.h b/arch/arm/src/tiva/hardware/tiva_timer.h similarity index 99% rename from arch/arm/src/tiva/chip/tiva_timer.h rename to arch/arm/src/tiva/hardware/tiva_timer.h index 8415ffe789..7d11238f4e 100644 --- a/arch/arm/src/tiva/chip/tiva_timer.h +++ b/arch/arm/src/tiva/hardware/tiva_timer.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tiva_timer.h + * arch/arm/src/tiva/hardwaretiva_timer.h * * Originally: * @@ -46,8 +46,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TIVA_TIMER_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TIVA_TIMER_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_TIMER_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_TIMER_H /************************************************************************************ * Included Files @@ -809,4 +809,4 @@ # define TIMER_CC_ALTCLK (1 << 0) /* Bit 0: Alternate Clock Source */ #endif -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TIVA_TIMER_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_TIMER_H */ diff --git a/arch/arm/src/tiva/chip/tiva_uart.h b/arch/arm/src/tiva/hardware/tiva_uart.h similarity index 99% rename from arch/arm/src/tiva/chip/tiva_uart.h rename to arch/arm/src/tiva/hardware/tiva_uart.h index a098072b2b..e2a069c336 100644 --- a/arch/arm/src/tiva/chip/tiva_uart.h +++ b/arch/arm/src/tiva/hardware/tiva_uart.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tiva_uart.h + * arch/arm/src/tiva/hardwaretiva_uart.h * * Copyright (C) 2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TIVA_UART_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TIVA_UART_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_UART_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_UART_H /************************************************************************************ * Included Files @@ -733,4 +733,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TIVA_UART_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_UART_H */ diff --git a/arch/arm/src/tiva/chip/tm4c123_syscontrol.h b/arch/arm/src/tiva/hardware/tm4c123_syscontrol.h similarity index 99% rename from arch/arm/src/tiva/chip/tm4c123_syscontrol.h rename to arch/arm/src/tiva/hardware/tm4c123_syscontrol.h index 8fb3dbcffe..273b12327c 100644 --- a/arch/arm/src/tiva/chip/tm4c123_syscontrol.h +++ b/arch/arm/src/tiva/hardware/tm4c123_syscontrol.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/tiva/chip/tm4c123_syscontrol.h + * arch/arm/src/tiva/hardwaretm4c123_syscontrol.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TM4C123_SYSCONTROL_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TM4C123_SYSCONTROL_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C123_SYSCONTROL_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C123_SYSCONTROL_H /******************************************************************************************** * Included Files @@ -1860,4 +1860,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TM4C123_SYSCONTROL_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C123_SYSCONTROL_H */ diff --git a/arch/arm/src/tiva/chip/tm4c129_syscontrol.h b/arch/arm/src/tiva/hardware/tm4c129_syscontrol.h similarity index 99% rename from arch/arm/src/tiva/chip/tm4c129_syscontrol.h rename to arch/arm/src/tiva/hardware/tm4c129_syscontrol.h index 5cf693b425..ef0ec78f72 100644 --- a/arch/arm/src/tiva/chip/tm4c129_syscontrol.h +++ b/arch/arm/src/tiva/hardware/tm4c129_syscontrol.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/tiva/chip/tm4c129_syscontrol.h + * arch/arm/src/tiva/hardwaretm4c129_syscontrol.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TM4C129_SYSCONTROL_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TM4C129_SYSCONTROL_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C129_SYSCONTROL_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C129_SYSCONTROL_H /******************************************************************************************** * Included Files @@ -2166,4 +2166,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TM4C129_SYSCONTROL_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C129_SYSCONTROL_H */ diff --git a/arch/arm/src/tiva/chip/tm4c_ethernet.h b/arch/arm/src/tiva/hardware/tm4c_ethernet.h similarity index 99% rename from arch/arm/src/tiva/chip/tm4c_ethernet.h rename to arch/arm/src/tiva/hardware/tm4c_ethernet.h index af9d43ffbb..1afba1ed3f 100644 --- a/arch/arm/src/tiva/chip/tm4c_ethernet.h +++ b/arch/arm/src/tiva/hardware/tm4c_ethernet.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tm4c_ethernet.h + * arch/arm/src/tiva/hardwaretm4c_ethernet.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -38,8 +38,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TM4C_ETHERNET_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TM4C_ETHERNET_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_ETHERNET_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_ETHERNET_H /************************************************************************************ * Included Files @@ -1387,4 +1387,4 @@ struct emac_rxdesc_s ************************************************************************************/ #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TM4C_ETHERNET_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_ETHERNET_H */ diff --git a/arch/arm/src/tiva/chip/tm4c_flash.h b/arch/arm/src/tiva/hardware/tm4c_flash.h similarity index 99% rename from arch/arm/src/tiva/chip/tm4c_flash.h rename to arch/arm/src/tiva/hardware/tm4c_flash.h index d18a07581e..841f69ef5f 100644 --- a/arch/arm/src/tiva/chip/tm4c_flash.h +++ b/arch/arm/src/tiva/hardware/tm4c_flash.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tm4c_flash.h + * arch/arm/src/tiva/hardwaretm4c_flash.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -38,8 +38,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TM4C_FLASH_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TM4C_FLASH_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_FLASH_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_FLASH_H /************************************************************************************ * Included Files @@ -401,4 +401,4 @@ /* Flash Memory Protection Read Enable 0-15 (32-bit, bit-encoded) */ /* Flash Memory Protection Program Enable 0-15 (32-bit, bit-encoded) */ -#endif // __ARCH_ARM_SRC_TIVA_CHIP_TM4C_FLASH_H +#endif // __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_FLASH_H diff --git a/arch/arm/src/tiva/chip/tm4c_memorymap.h b/arch/arm/src/tiva/hardware/tm4c_memorymap.h similarity index 99% rename from arch/arm/src/tiva/chip/tm4c_memorymap.h rename to arch/arm/src/tiva/hardware/tm4c_memorymap.h index 1a118bafdc..cac0682d4e 100644 --- a/arch/arm/src/tiva/chip/tm4c_memorymap.h +++ b/arch/arm/src/tiva/hardware/tm4c_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tm4c_memorymap.h + * arch/arm/src/tiva/hardwaretm4c_memorymap.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TM4C_MEMORYMAP_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TM4C_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_MEMORYMAP_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_MEMORYMAP_H /************************************************************************************ * Included Files @@ -574,4 +574,4 @@ * Public Function Prototypes ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TM4C_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_MEMORYMAP_H */ diff --git a/arch/arm/src/tiva/chip/tm4c_pinmap.h b/arch/arm/src/tiva/hardware/tm4c_pinmap.h similarity index 99% rename from arch/arm/src/tiva/chip/tm4c_pinmap.h rename to arch/arm/src/tiva/hardware/tm4c_pinmap.h index 5d32959f06..e7479b4954 100644 --- a/arch/arm/src/tiva/chip/tm4c_pinmap.h +++ b/arch/arm/src/tiva/hardware/tm4c_pinmap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/tiva/chip/tm4c_pinmap.h + * arch/arm/src/tiva/hardwaretm4c_pinmap.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_TIVA_CHIP_TM4C_PINMAP_H -#define __ARCH_ARM_SRC_TIVA_CHIP_TM4C_PINMAP_H +#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_PINMAP_H +#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_PINMAP_H /************************************************************************************ * Included Files @@ -1426,4 +1426,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __ARCH_ARM_SRC_TIVA_CHIP_TM4C_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_PINMAP_H */ diff --git a/arch/arm/src/tiva/lm3s_ethernet.c b/arch/arm/src/tiva/lm/lm3s_ethernet.c similarity index 99% rename from arch/arm/src/tiva/lm3s_ethernet.c rename to arch/arm/src/tiva/lm/lm3s_ethernet.c index e5157695ff..c56de2fed1 100644 --- a/arch/arm/src/tiva/lm3s_ethernet.c +++ b/arch/arm/src/tiva/lm/lm3s_ethernet.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/lm3s_ethernet.c + * arch/arm/src/tiva/lm/lm3s_ethernet.c * * Copyright (C) 2009-2010, 2014, 2016, 2018 Gregory Nutt. All rights * reserved. @@ -68,7 +68,7 @@ #include "tiva_gpio.h" #include "tiva_ethernet.h" -#include "chip/tiva_pinmap.h" +#include "hardware/tiva_pinmap.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/tiva/tiva_eeprom.h b/arch/arm/src/tiva/tiva_eeprom.h index 1bb0c57a37..f7a8733295 100644 --- a/arch/arm/src/tiva/tiva_eeprom.h +++ b/arch/arm/src/tiva/tiva_eeprom.h @@ -41,7 +41,7 @@ * Included Files ****************************************************************************/ -#include "chip/tiva_eeprom.h" +#include "hardware/tiva_eeprom.h" /**************************************************************************** * Public Function Prototypes diff --git a/arch/arm/src/tiva/tiva_enableclks.h b/arch/arm/src/tiva/tiva_enableclks.h index 5f876032b0..7e3b0a4600 100644 --- a/arch/arm/src/tiva/tiva_enableclks.h +++ b/arch/arm/src/tiva/tiva_enableclks.h @@ -44,7 +44,7 @@ #include "up_arch.h" #include "chip.h" -#include "chip/tiva_syscontrol.h" +#include "hardware/tiva_syscontrol.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/tiva/tiva_enablepwr.h b/arch/arm/src/tiva/tiva_enablepwr.h index 28b91722e8..379a52c4f4 100644 --- a/arch/arm/src/tiva/tiva_enablepwr.h +++ b/arch/arm/src/tiva/tiva_enablepwr.h @@ -44,7 +44,7 @@ #include "up_arch.h" #include "chip.h" -#include "chip/tiva_syscontrol.h" +#include "hardware/tiva_syscontrol.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/tiva/tiva_i2c.h b/arch/arm/src/tiva/tiva_i2c.h index c43e167f86..6ce4a80e42 100644 --- a/arch/arm/src/tiva/tiva_i2c.h +++ b/arch/arm/src/tiva/tiva_i2c.h @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/tiva_i2c.h" +#include "hardware/tiva_i2c.h" /**************************************************************************** * Public Function Prototypes diff --git a/arch/arm/src/tiva/tiva_periphrdy.h b/arch/arm/src/tiva/tiva_periphrdy.h index b7e86158d8..cce4e6297d 100644 --- a/arch/arm/src/tiva/tiva_periphrdy.h +++ b/arch/arm/src/tiva/tiva_periphrdy.h @@ -44,7 +44,7 @@ #include "up_arch.h" #include "chip.h" -#include "chip/tiva_syscontrol.h" +#include "hardware/tiva_syscontrol.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/tiva/tiva_timer.h b/arch/arm/src/tiva/tiva_timer.h index f5d9c6f9fe..59b9c29519 100644 --- a/arch/arm/src/tiva/tiva_timer.h +++ b/arch/arm/src/tiva/tiva_timer.h @@ -49,7 +49,7 @@ #include "up_arch.h" #include "chip.h" -#include "chip/tiva_timer.h" +#include "hardware/tiva_timer.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/tiva/tm4c129_syscontrol.c b/arch/arm/src/tiva/tm4c/tm4c129_syscontrol.c similarity index 99% rename from arch/arm/src/tiva/tm4c129_syscontrol.c rename to arch/arm/src/tiva/tm4c/tm4c129_syscontrol.c index 56b8bba9e8..7e7321e533 100644 --- a/arch/arm/src/tiva/tm4c129_syscontrol.c +++ b/arch/arm/src/tiva/tm4c/tm4c129_syscontrol.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tm4c129_syscontrol.c + * arch/arm/src/tiva/tm4c/tm4c129_syscontrol.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/arm/src/tiva/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c similarity index 99% rename from arch/arm/src/tiva/tm4c_ethernet.c rename to arch/arm/src/tiva/tm4c/tm4c_ethernet.c index 5252ff057a..de50622294 100644 --- a/arch/arm/src/tiva/tm4c_ethernet.c +++ b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tm4c_ethernet.c + * arch/arm/src/tiva/tm4c/tm4c_ethernet.c * * Copyright (C) 2014-2015, 2017-2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -76,7 +76,7 @@ #include "tiva_periphrdy.h" #include "tiva_ethernet.h" -#include "chip/tiva_pinmap.h" +#include "hardware/tiva_pinmap.h" #include /* TIVA_NETHCONTROLLERS determines the number of physical interfaces diff --git a/configs/dk-tm4c129x/src/tm4c_ethernet.c b/configs/dk-tm4c129x/src/tm4c_ethernet.c index dbf31f0896..4c5eacfb7a 100644 --- a/configs/dk-tm4c129x/src/tm4c_ethernet.c +++ b/configs/dk-tm4c129x/src/tm4c_ethernet.c @@ -48,7 +48,7 @@ #include "up_arch.h" #include "chip.h" -#include "chip/tiva_flash.h" +#include "hardware/tiva_flash.h" #include "tiva_ethernet.h" /************************************************************************************ diff --git a/configs/tm4c123g-launchpad/src/tm4c_adc.c b/configs/tm4c123g-launchpad/src/tm4c_adc.c index a43f5ee961..98449d441d 100644 --- a/configs/tm4c123g-launchpad/src/tm4c_adc.c +++ b/configs/tm4c123g-launchpad/src/tm4c_adc.c @@ -48,7 +48,7 @@ #include "tiva_adc.h" #include "tiva_timer.h" #include "tm4c123g-launchpad.h" -#include "chip/tiva_pinmap.h" +#include "hardware/tiva_pinmap.h" #ifdef CONFIG_TIVA_ADC diff --git a/configs/tm4c1294-launchpad/src/tm4c_ethernet.c b/configs/tm4c1294-launchpad/src/tm4c_ethernet.c index c62d0fc012..7a7e106870 100644 --- a/configs/tm4c1294-launchpad/src/tm4c_ethernet.c +++ b/configs/tm4c1294-launchpad/src/tm4c_ethernet.c @@ -48,7 +48,7 @@ #include "up_arch.h" #include "chip.h" -#include "chip/tiva_flash.h" +#include "hardware/tiva_flash.h" #include "tiva_ethernet.h" /************************************************************************************