Merge remote-tracking branch 'origin/master' into ieee802154

This commit is contained in:
Gregory Nutt
2017-06-15 10:34:38 -06:00
130 changed files with 9903 additions and 783 deletions
+4 -2
View File
@@ -61,6 +61,9 @@
* Public Types
****************************************************************************/
/* Type of the MCP2515 interrupt handling callback */
struct mcp2515_config_s; /* Forward reference */
typedef void (*mcp2515_handler_t)(FAR struct mcp2515_config_s *config,
FAR void *arg);
@@ -104,8 +107,7 @@ struct mcp2515_config_s
mcp2515_handler_t handler, FAR void *arg);
};
typedef FAR void *MCP2515_HANDLE;
/* Internal representation of the MCP2515 state data */
struct mcp2515_can_s;
+24 -31
View File
@@ -396,42 +396,35 @@
/* The following are defined if pthreads are enabled */
#ifndef CONFIG_DISABLE_PTHREAD
# define SYS_pthread_barrier_destroy (__SYS_pthread+0)
# define SYS_pthread_barrier_init (__SYS_pthread+1)
# define SYS_pthread_barrier_wait (__SYS_pthread+2)
# define SYS_pthread_cancel (__SYS_pthread+3)
# define SYS_pthread_cond_broadcast (__SYS_pthread+4)
# define SYS_pthread_cond_destroy (__SYS_pthread+5)
# define SYS_pthread_cond_init (__SYS_pthread+6)
# define SYS_pthread_cond_signal (__SYS_pthread+7)
# define SYS_pthread_cond_wait (__SYS_pthread+8)
# define SYS_pthread_create (__SYS_pthread+9)
# define SYS_pthread_detach (__SYS_pthread+10)
# define SYS_pthread_exit (__SYS_pthread+11)
# define SYS_pthread_getschedparam (__SYS_pthread+12)
# define SYS_pthread_getspecific (__SYS_pthread+13)
# define SYS_pthread_join (__SYS_pthread+14)
# define SYS_pthread_key_create (__SYS_pthread+15)
# define SYS_pthread_key_delete (__SYS_pthread+16)
# define SYS_pthread_mutex_destroy (__SYS_pthread+17)
# define SYS_pthread_mutex_init (__SYS_pthread+18)
# define SYS_pthread_mutex_lock (__SYS_pthread+19)
# define SYS_pthread_mutex_trylock (__SYS_pthread+20)
# define SYS_pthread_mutex_unlock (__SYS_pthread+21)
# define SYS_pthread_cancel (__SYS_pthread+0)
# define SYS_pthread_cond_broadcast (__SYS_pthread+1)
# define SYS_pthread_cond_signal (__SYS_pthread+2)
# define SYS_pthread_cond_wait (__SYS_pthread+3)
# define SYS_pthread_create (__SYS_pthread+4)
# define SYS_pthread_detach (__SYS_pthread+5)
# define SYS_pthread_exit (__SYS_pthread+6)
# define SYS_pthread_getschedparam (__SYS_pthread+7)
# define SYS_pthread_getspecific (__SYS_pthread+8)
# define SYS_pthread_join (__SYS_pthread+9)
# define SYS_pthread_key_create (__SYS_pthread+10)
# define SYS_pthread_key_delete (__SYS_pthread+11)
# define SYS_pthread_mutex_destroy (__SYS_pthread+12)
# define SYS_pthread_mutex_init (__SYS_pthread+13)
# define SYS_pthread_mutex_lock (__SYS_pthread+14)
# define SYS_pthread_mutex_trylock (__SYS_pthread+15)
# define SYS_pthread_mutex_unlock (__SYS_pthread+16)
#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE
# define SYS_pthread_mutex_consistent (__SYS_pthread+22)
# define __SYS_pthread_once (__SYS_pthread+23)
# define SYS_pthread_mutex_consistent (__SYS_pthread+17)
# define __SYS_pthread_setschedparam (__SYS_pthread+18)
#else
# define __SYS_pthread_once (__SYS_pthread+22)
# define __SYS_pthread_setschedparam (__SYS_pthread+17)
#endif
# define SYS_pthread_once (__SYS_pthread_once+0)
# define SYS_pthread_setschedparam (__SYS_pthread_once+1)
# define SYS_pthread_setschedprio (__SYS_pthread_once+2)
# define SYS_pthread_setspecific (__SYS_pthread_once+3)
# define SYS_pthread_yield (__SYS_pthread_once+4)
# define __SYS_pthread_smp (__SYS_pthread_once+5)
# define SYS_pthread_setschedparam (__SYS_pthread_setschedparam+0)
# define SYS_pthread_setschedprio (__SYS_pthread_setschedparam+1)
# define SYS_pthread_setspecific (__SYS_pthread_setschedparam+2)
# define __SYS_pthread_smp (__SYS_pthread_setschedparam+3)
# ifdef CONFIG_SMP
# define SYS_pthread_setaffinity_np (__SYS_pthread_smp+0)