NUC123 USB driver CI fixes: add .skip file to darwin client, and revert testhal/USB_HID to RT/6.1

This commit is contained in:
Alex Lewontin 2020-12-14 19:37:27 -05:00
parent 3ce5c400df
commit 6da4818fd2
No known key found for this signature in database
GPG Key ID: 52A3855FC3BB8CD7
4 changed files with 44 additions and 56 deletions

View File

@ -107,7 +107,8 @@ include $(CHIBIOS_CONTRIB)/os/hal/boards/NUTINY-SDK-NUC123-V2.0/board.mk
include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk
# RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMv6-M/compilers/GCC/mk/port.mk
#include $(CHIBIOS)/os/common/ports/ARMv6-M/compilers/GCC/mk/port.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v6m.mk
# Auto-build files in ./source recursively.
include $(CHIBIOS)/tools/mk/autobuild.mk
# Other files (optional).

View File

@ -29,7 +29,7 @@
#define CHCONF_H
#define _CHIBIOS_RT_CONF_
#define _CHIBIOS_RT_CONF_VER_7_0_
#define _CHIBIOS_RT_CONF_VER_6_1_
/*===========================================================================*/
/**
@ -40,7 +40,7 @@
/**
* @brief System time counter resolution.
* @note Allowed values are 16 or 32 bits.
* @note Allowed values are 16, 32 or 64 bits.
*/
#if !defined(CH_CFG_ST_RESOLUTION)
#define CH_CFG_ST_RESOLUTION 32
@ -160,17 +160,6 @@
#define CH_CFG_USE_TM FALSE
#endif
/**
* @brief Time Stamps APIs.
* @details If enabled then the time time stamps APIs are included in
* the kernel.
*
* @note The default is @p TRUE.
*/
#if !defined(CH_CFG_USE_TIMESTAMP)
#define CH_CFG_USE_TIMESTAMP FALSE
#endif
/**
* @brief Threads registry APIs.
* @details If enabled then the registry APIs are included in the kernel.
@ -638,21 +627,19 @@
/*===========================================================================*/
/**
* @brief OS instance structure extension.
* @brief System structure extension.
* @details User fields added to the end of the @p ch_system_t structure.
*/
#define CH_CFG_OS_INSTANCE_EXTRA_FIELDS /* Add OS instance custom fields here.*/
#define CH_CFG_SYSTEM_EXTRA_FIELDS /* Add threads custom fields here.*/
/**
* @brief OS instance initialization hook.
* @brief System initialization hook.
* @details User initialization code added to the @p chSysInit() function
* just before interrupts are enabled globally.
*
* @param[in] oip pointer to the @p os_instance_t structure
*/
#define CH_CFG_OS_INSTANCE_INIT_HOOK(oip) \
{ \
/* Add system instance initialization code here.*/ \
#define CH_CFG_SYSTEM_INIT_HOOK() \
{ \
/* Add threads initialization code here.*/ \
}
/**
@ -668,43 +655,43 @@
* @note It is invoked from within @p _thread_init() and implicitly from all
* the threads creation APIs.
*/
#define CH_CFG_THREAD_INIT_HOOK(tp) \
{ \
/* Add threads initialization code here.*/ \
#define CH_CFG_THREAD_INIT_HOOK(tp) \
{ \
/* Add threads initialization code here.*/ \
}
/**
* @brief Threads finalization hook.
* @details User finalization code added to the @p chThdExit() API.
*/
#define CH_CFG_THREAD_EXIT_HOOK(tp) \
{ \
/* Add threads finalization code here.*/ \
#define CH_CFG_THREAD_EXIT_HOOK(tp) \
{ \
/* Add threads finalization code here.*/ \
}
/**
* @brief Context switch hook.
* @details This hook is invoked just before switching between threads.
*/
#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) \
{ \
/* Context switch code here.*/ \
#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) \
{ \
/* Context switch code here.*/ \
}
/**
* @brief ISR enter hook.
*/
#define CH_CFG_IRQ_PROLOGUE_HOOK() \
{ \
/* IRQ prologue code here.*/ \
#define CH_CFG_IRQ_PROLOGUE_HOOK() \
{ \
/* IRQ prologue code here.*/ \
}
/**
* @brief ISR exit hook.
*/
#define CH_CFG_IRQ_EPILOGUE_HOOK() \
{ \
/* IRQ epilogue code here.*/ \
#define CH_CFG_IRQ_EPILOGUE_HOOK() \
{ \
/* IRQ epilogue code here.*/ \
}
/**
@ -713,9 +700,9 @@
* should be invoked from here.
* @note This macro can be used to activate a power saving mode.
*/
#define CH_CFG_IDLE_ENTER_HOOK() \
{ \
/* Idle-enter code here.*/ \
#define CH_CFG_IDLE_ENTER_HOOK() \
{ \
/* Idle-enter code here.*/ \
}
/**
@ -724,18 +711,18 @@
* should be invoked from here.
* @note This macro can be used to deactivate a power saving mode.
*/
#define CH_CFG_IDLE_LEAVE_HOOK() \
{ \
/* Idle-leave code here.*/ \
#define CH_CFG_IDLE_LEAVE_HOOK() \
{ \
/* Idle-leave code here.*/ \
}
/**
* @brief Idle Loop hook.
* @details This hook is continuously invoked by the idle thread loop.
*/
#define CH_CFG_IDLE_LOOP_HOOK() \
{ \
/* Idle loop code here.*/ \
#define CH_CFG_IDLE_LOOP_HOOK() \
{ \
/* Idle loop code here.*/ \
}
/**
@ -743,9 +730,9 @@
* @details This hook is invoked in the system tick handler immediately
* after processing the virtual timers queue.
*/
#define CH_CFG_SYSTEM_TICK_HOOK() \
{ \
/* System tick event code here.*/ \
#define CH_CFG_SYSTEM_TICK_HOOK() \
{ \
/* System tick event code here.*/ \
}
/**
@ -753,9 +740,9 @@
* @details This hook is invoked in case to a system halting error before
* the system is halted.
*/
#define CH_CFG_SYSTEM_HALT_HOOK(reason) \
{ \
/* System halt code here.*/ \
#define CH_CFG_SYSTEM_HALT_HOOK(reason) \
{ \
/* System halt code here.*/ \
}
/**
@ -763,9 +750,9 @@
* @details This hook is invoked each time a new record is written in the
* trace buffer.
*/
#define CH_CFG_TRACE_HOOK(tep) \
{ \
/* Trace code here.*/ \
#define CH_CFG_TRACE_HOOK(tep) \
{ \
/* Trace code here.*/ \
}
/** @} */

View File

@ -56,7 +56,7 @@ int main(void)
*/
OnboardLED_Off();
chDbgSuspendTrace(CH_DBG_TRACE_MASK_READY | CH_DBG_TRACE_MASK_SWITCH);
chDbgSuspendTrace(CH_DBG_TRACE_MASK_SWITCH);
/*
* Initializes a USB HID driver.
*/