diff options
Diffstat (limited to 'nuttx/configs/pic32mz-starterkit')
8 files changed, 55 insertions, 19 deletions
diff --git a/nuttx/configs/pic32mz-starterkit/nsh/setenv.sh b/nuttx/configs/pic32mz-starterkit/nsh/setenv.sh index 4f8b724d0..0ba0c7eb7 100755 --- a/nuttx/configs/pic32mz-starterkit/nsh/setenv.sh +++ b/nuttx/configs/pic32mz-starterkit/nsh/setenv.sh @@ -50,12 +50,12 @@ fi # location so you will probably have to edit this. You will also have # to edit this if you install a different version of if you install # the Linux PIC32MZ toolchain as well -export TOOLCHAIN_PREBIN="/cygdrive/c/MicroChip/mplabc32/v1.12/bin": +#export TOOLCHAIN_PREBIN="/cygdrive/c/MicroChip/mplabc32/v1.12/bin": # This is where I have the Pinquino toolchain installed # Careful with the ordering in the PATH variable... there is an incompatible # version of make in this directory too! -#export TOOLCHAIN_POSTBIN=:"/cygdrive/c/pinguino-11/compilers/p32/bin" +export TOOLCHAIN_POSTBIN=:"/cygdrive/c/pinguino-11/compilers/p32/bin" # This is the path to the tools subdirectory export PIC32TOOL_DIR="${WD}/tools/pic32mz" diff --git a/nuttx/configs/pic32mz-starterkit/src/Makefile b/nuttx/configs/pic32mz-starterkit/src/Makefile index e306024b6..35673186a 100644 --- a/nuttx/configs/pic32mz-starterkit/src/Makefile +++ b/nuttx/configs/pic32mz-starterkit/src/Makefile @@ -38,7 +38,7 @@ CFLAGS += -I$(TOPDIR)/sched ASRCS = -CSRCS = pic32mz_boot.c pic32mz_bringup.c pic32mz_leds.c pic32mz_spi.c +CSRCS = pic32mz_boot.c pic32mz_bringup.c pic32mz_spi.c ifeq ($(CONFIG_ARCH_LEDS),y) CSRCS += pic32mz_autoleds.c diff --git a/nuttx/configs/pic32mz-starterkit/src/pic32mz-starterkit.h b/nuttx/configs/pic32mz-starterkit/src/pic32mz-starterkit.h index cc31afe9b..65b34b6bb 100644 --- a/nuttx/configs/pic32mz-starterkit/src/pic32mz-starterkit.h +++ b/nuttx/configs/pic32mz-starterkit/src/pic32mz-starterkit.h @@ -130,7 +130,7 @@ #define GPIO_LED_1 (GPIO_OUTPUT|GPIO_VALUE_ZERO|GPIO_PORTH|GPIO_PIN0) #define GPIO_LED_2 (GPIO_OUTPUT|GPIO_VALUE_ZERO|GPIO_PORTH|GPIO_PIN1) -#define GPIO_LED_3 (GPIO_OUTPUT|GPIO_VALUE_ZERO|GPIO_PORTN|GPIO_PIN2) +#define GPIO_LED_3 (GPIO_OUTPUT|GPIO_VALUE_ZERO|GPIO_PORTH|GPIO_PIN2) /* The PIC32MZ Ethernet Starter kit has 3 user push buttons labelled SW1-3 * on the board: diff --git a/nuttx/configs/pic32mz-starterkit/src/pic32mz_autoleds.c b/nuttx/configs/pic32mz-starterkit/src/pic32mz_autoleds.c index b0188f5fb..69231fb1e 100644 --- a/nuttx/configs/pic32mz-starterkit/src/pic32mz_autoleds.c +++ b/nuttx/configs/pic32mz-starterkit/src/pic32mz_autoleds.c @@ -45,12 +45,10 @@ #include <arch/board/board.h> -#include "chip.h" #include "up_arch.h" #include "up_internal.h" -#include "pic32mz-internal.h" -#include "pic32mz-ioport.h" +#include "pic32mz-gpio.h" #include "pic32mz-starterkit.h" #ifdef CONFIG_ARCH_LEDS diff --git a/nuttx/configs/pic32mz-starterkit/src/pic32mz_boot.c b/nuttx/configs/pic32mz-starterkit/src/pic32mz_boot.c index 8d0b87271..f13e92432 100644 --- a/nuttx/configs/pic32mz-starterkit/src/pic32mz_boot.c +++ b/nuttx/configs/pic32mz-starterkit/src/pic32mz_boot.c @@ -41,12 +41,8 @@ #include <debug.h> -#include <arch/board/board.h> +#include <nuttx/arch.h> -#include "up_arch.h" -#include "up_internal.h" - -#include "pic32mz-internal.h" #include "pic32mz-starterkit.h" /************************************************************************************ diff --git a/nuttx/configs/pic32mz-starterkit/src/pic32mz_bringup.c b/nuttx/configs/pic32mz-starterkit/src/pic32mz_bringup.c index ef899d016..6e56f4ab6 100644 --- a/nuttx/configs/pic32mz-starterkit/src/pic32mz_bringup.c +++ b/nuttx/configs/pic32mz-starterkit/src/pic32mz_bringup.c @@ -47,7 +47,6 @@ #include <nuttx/spi/spi.h> #include <nuttx/mmcsd.h> -#include "pic32mz-internal.h" #include "pic32mz-starterkit.h" /**************************************************************************** diff --git a/nuttx/configs/pic32mz-starterkit/src/pic32mz_spi.c b/nuttx/configs/pic32mz-starterkit/src/pic32mz_spi.c index 3e5e7365e..86324ba74 100644 --- a/nuttx/configs/pic32mz-starterkit/src/pic32mz_spi.c +++ b/nuttx/configs/pic32mz-starterkit/src/pic32mz_spi.c @@ -47,12 +47,12 @@ #include <arch/board/board.h> #include "up_arch.h" -#include "chip.h" -#include "pic32mz-internal.h" + #include "pic32mz-starterkit.h" #if defined(CONFIG_PIC32MZ_SPI1) || defined(CONFIG_PIC32MZ_SPI2) || \ - defined(CONFIG_PIC32MZ_SPI3) || defined(CONFIG_PIC32MZ_SPI4) + defined(CONFIG_PIC32MZ_SPI3) || defined(CONFIG_PIC32MZ_SPI4) || \ + defined(CONFIG_PIC32MZ_SPI5) || defined(CONFIG_PIC32MZ_SPI6) /************************************************************************************ * Pre-processor Definitions @@ -219,4 +219,48 @@ int pic32mz_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm #endif #endif -#endif /* CONFIG_PIC32MZ_SPI1..4 */ +#ifdef CONFIG_PIC32MZ_SPI5 +void pic32mz_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +{ + sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); +#warning "Missing logic" +} + +uint8_t pic32mz_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +{ + sspdbg("Returning nothing\n"); +#warning "Missing logic" + return 0; +} +#ifdef CONFIG_SPI_CMDDATA +int pic32mz_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) +{ +#warning "Missing logic" + return 0; +} +#endif +#endif + +#ifdef CONFIG_PIC32MZ_SPI6 +void pic32mz_spi6select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) +{ + sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); +#warning "Missing logic" +} + +uint8_t pic32mz_spi6status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +{ + sspdbg("Returning nothing\n"); +#warning "Missing logic" + return 0; +} +#ifdef CONFIG_SPI_CMDDATA +int pic32mz_spi6cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd) +{ +#warning "Missing logic" + return 0; +} +#endif +#endif + +#endif /* CONFIG_PIC32MZ_SPI1..6 */ diff --git a/nuttx/configs/pic32mz-starterkit/src/pic32mz_userleds.c b/nuttx/configs/pic32mz-starterkit/src/pic32mz_userleds.c index b57e20166..bf610df47 100644 --- a/nuttx/configs/pic32mz-starterkit/src/pic32mz_userleds.c +++ b/nuttx/configs/pic32mz-starterkit/src/pic32mz_userleds.c @@ -49,8 +49,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "pic32mz-internal.h" -#include "pic32mz-ioport.h" +#include "pic32mz-gpio.h" #include "pic32mz-starterkit.h" #ifndef CONFIG_ARCH_LEDS |