Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix some errors introduced into the Mirtoo configuration in the last commits

Browse Source
This commit is contained in:
Gregory Nutt
2015-11-01 16:26:41 -06:00
parent 9743e5997e
commit 109b4f496a
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/mirtoo/src/mirtoo-internal.h → configs/mirtoo/src/mirtoo.h
+7 -7
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/mirtoo/src/mirtoo-internal.h * configs/mirtoo/src/mirtoo.h
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef __CONFIGS_MIRTOO_SRC_MIRTOO_INTERNAL_H #ifndef __CONFIGS_MIRTOO_SRC_MIRTOO_H
#define __CONFIGS_MIRTOO_SRC_MIRTOO_INTERNAL_H #define __CONFIGS_MIRTOO_SRC_MIRTOO_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@@ -82,7 +82,7 @@ void weak_function pic32mx_spi2initialize(void);
#endif #endif
/************************************************************************************ /************************************************************************************
* Name: pic32mx_autoled_initialize * Name: pic32mx_led_initialize
* *
* Description: * Description:
* Configure on-board LEDs if LED support has been selected. * Configure on-board LEDs if LED support has been selected.
@@ -90,7 +90,7 @@ void weak_function pic32mx_spi2initialize(void);
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_ARCH_LEDS #ifdef CONFIG_ARCH_LEDS
void pic32mx_autoled_initialize(void); void pic32mx_led_initialize(void);
#endif #endif
/**************************************************************************** /****************************************************************************
@@ -111,4 +111,4 @@ void pic32mx_autoled_initialize(void);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __CONFIGS_MIRTOO_SRC_MIRTOO_INTERNAL_H */ #endif /* __CONFIGS_MIRTOO_SRC_MIRTOO_H */
configs/mirtoo/src/pic32_adc.c
+1 -1
View File
@@ -44,7 +44,7 @@
#include <debug.h> #include <debug.h>
#include "pic32mx-internal.h" #include "pic32mx-internal.h"
#include "mirtoo-internal.h" #include "mirtoo.h"
#ifdef CONFIG_PIC32MX_ADC #ifdef CONFIG_PIC32MX_ADC
configs/mirtoo/src/pic32_boot.c
+2 -2
View File
@@ -48,7 +48,7 @@
#include "pic32mx-internal.h" #include "pic32mx-internal.h"
#include "pic32mx-pps.h" #include "pic32mx-pps.h"
#include "mirtoo-internal.h" #include "mirtoo.h"
/************************************************************************************ /************************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@@ -155,6 +155,6 @@ void pic32mx_boardinitialize(void)
/* Configure on-board LEDs if LED support has been selected. */ /* Configure on-board LEDs if LED support has been selected. */
#ifdef CONFIG_ARCH_LEDS #ifdef CONFIG_ARCH_LEDS
pic32mx_autoled_initialize(); pic32mx_led_initialize();
#endif #endif
} }
configs/mirtoo/src/pic32_leds.c
+4 -4
View File
@@ -47,7 +47,7 @@
#include <arch/board/board.h> #include <arch/board/board.h>
#include "pic32mx-internal.h" #include "pic32mx-internal.h"
#include "mirtoo-internal.h" #include "mirtoo.h"
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@@ -232,11 +232,11 @@ void board_userled_all(uint8_t ledset)
#endif #endif
/**************************************************************************** /****************************************************************************
* Name: pic32mx_autoled_initialize * Name: pic32mx_led_initialize
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_ARCH_LEDS #ifdef CONFIG_ARCH_LEDS
void pic32mx_autoled_initialize(void) void pic32mx_led_initialize(void)
{ {
/* Configure output pins */ /* Configure output pins */
configs/mirtoo/src/pic32_spi2.c
+1 -1
View File
@@ -50,7 +50,7 @@
#include "chip.h" #include "chip.h"
#include "pic32mx-internal.h" #include "pic32mx-internal.h"
#include "pic32mx-pps.h" #include "pic32mx-pps.h"
#include "mirtoo-internal.h" #include "mirtoo.h"
#ifdef CONFIG_PIC32MX_SPI2 #ifdef CONFIG_PIC32MX_SPI2