rusefi
/
ChibiOS-Contrib
mirror of https://github.com/rusefi/ChibiOS-Contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #78 from flabbergast/kinetis 

[KINETIS] Fixes for kernel-less builds.
This commit is contained in:
Fabio Utzig 2016-05-25 19:04:42 -03:00
parent e1311c4db6 3cde591bd2
commit 209c356677
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
os/hal/boards/PJRC_TEENSY_LC/board.c
View File

@ -14,7 +14,6 @@
limitations under the License. limitations under the License.
*/ */
#include "ch.h"
#include "hal.h" #include "hal.h"
#if HAL_USE_PAL || defined(__DOXYGEN__) #if HAL_USE_PAL || defined(__DOXYGEN__)

4
os/hal/ports/KINETIS/LLD/hal_i2c_lld.h
View File

@ -157,14 +157,10 @@ struct I2CDriver {
*/ */
i2cflags_t errors; i2cflags_t errors;
#if I2C_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__) #if I2C_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)
#if CH_CFG_USE_MUTEXES || defined(__DOXYGEN__)
/** /**
* @brief Mutex protecting the bus. * @brief Mutex protecting the bus.
*/ */
mutex_t mutex; mutex_t mutex;
#elif CH_CFG_USE_SEMAPHORES
semaphore_t semaphore;
#endif
#endif /* I2C_USE_MUTUAL_EXCLUSION */ #endif /* I2C_USE_MUTUAL_EXCLUSION */
#if defined(I2C_DRIVER_EXT_FIELDS) #if defined(I2C_DRIVER_EXT_FIELDS)
I2C_DRIVER_EXT_FIELDS I2C_DRIVER_EXT_FIELDS

4
os/hal/ports/KINETIS/LLD/hal_pal_lld.c
View File

@ -108,7 +108,7 @@ void _pal_lld_setpadmode(ioportid_t port,
PORT_TypeDef *portcfg = NULL; PORT_TypeDef *portcfg = NULL;
chDbgAssert(pad < PADS_PER_PORT, "pal_lld_setpadmode() #1, invalid pad"); osalDbgAssert(pad < PADS_PER_PORT, "pal_lld_setpadmode() #1, invalid pad");
if (mode == PAL_MODE_OUTPUT_PUSHPULL) if (mode == PAL_MODE_OUTPUT_PUSHPULL)
port->PDDR |= ((uint32_t) 1 << pad); port->PDDR |= ((uint32_t) 1 << pad);
@ -126,7 +126,7 @@ void _pal_lld_setpadmode(ioportid_t port,
else if (port == IOPORT5) else if (port == IOPORT5)
portcfg = PORTE; portcfg = PORTE;
chDbgAssert(portcfg != NULL, "pal_lld_setpadmode() #2, invalid port"); osalDbgAssert(portcfg != NULL, "pal_lld_setpadmode() #2, invalid port");
switch (mode) { switch (mode) {
case PAL_MODE_RESET: case PAL_MODE_RESET:

2
os/hal/ports/KINETIS/LLD/hal_usb_lld.c
View File

@ -420,7 +420,7 @@ void usb_lld_init(void) {
} }
} }
usbfrac_match_found: usbfrac_match_found:
chDbgAssert(i<2 && j <8,"USB Init error"); osalDbgAssert(i<2 && j <8,"USB Init error");
#else /* KINETIS_MCG_MODE == KINETIS_MCG_MODE_PEE */ #else /* KINETIS_MCG_MODE == KINETIS_MCG_MODE_PEE */
#error USB clock setting not implemented for this KINETIS_MCG_MODE #error USB clock setting not implemented for this KINETIS_MCG_MODE