Skip to content

Commit

Permalink
Some fixes for < v0.3 images. default_libpd_render.cpp still broken
Browse files Browse the repository at this point in the history
  • Loading branch information
giuliomoro committed Feb 14, 2019
1 parent 5382832 commit 5e3a372
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions include/xenomai_wraps.h
Expand Up @@ -25,6 +25,10 @@ extern "C" {
// At link time, Xenomai will provide implementations for these
int __wrap_nanosleep(const struct timespec *req, struct timespec *rem);
int __wrap_pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine) (void *), void *arg);
int __wrap_pthread_setschedparam(pthread_t thread, int policy, const struct sched_param *param);
int __wrap_pthread_getschedparam(pthread_t thread, int *policy, struct sched_param *param);
int __wrap_pthread_yield(void);

int __wrap_pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr);
int __wrap_pthread_mutex_destroy(pthread_mutex_t *mutex);
int __wrap_pthread_mutex_lock(pthread_mutex_t *mutex);
Expand Down Expand Up @@ -54,10 +58,12 @@ int __wrap_mq_unlink(const char *name);
#if XENOMAI_MAJOR == 2
#define __wrap_pthread_join(a,b) pthread_join(a,b) // NOWRAP
#define __wrap_pthread_attr_init(a) pthread_attr_init(a) // NOWRAP
#define __wrap_sched_get_priority_max(a) sched_get_priority_max(a) // NOWRAP
#endif
#if XENOMAI_MAJOR == 3
int __wrap_pthread_join(pthread_t thread, void **retval);
int __wrap_pthread_attr_init(pthread_attr_t *attr);
int __wrap_sched_get_priority_max(int policy);
#endif
#endif /* XENOMAI_SKIN_posix */

Expand Down
6 changes: 3 additions & 3 deletions resources/tools/board_detect/Makefile
Expand Up @@ -7,7 +7,7 @@ OBJS = $(BUILD)/GPIOcontrol.o $(BUILD)/Spi_Codec.o $(BUILD)/I2c_Codec.o $(BUILD)
CPPFLAGS=-I../../../include

board_detect: $(OBJS)
$(CXX) $(LDFLAGS) $(OBJS) $(LOADLIBES) -o "$@"
$(CXX) $(LDFLAGS) $(OBJS) $(LOADLIBES) -o "$@" -std=c++11

clean:
rm -rf $(OBJS) board_detect
Expand All @@ -16,7 +16,7 @@ install: board_detect
cp board_detect /usr/local/bin/

$(BUILD)/main.o: main.cpp
$(CXX) "$<" -c $(CPPFLAGS) $(CXXFLAGS) -o "$@"
$(CXX) "$<" -c $(CPPFLAGS) $(CXXFLAGS) -o "$@" -std=c++11

$(BUILD)/%.o: ../../../core/%.cpp
$(CXX) "$<" -c $(CPPFLAGS) $(CXXFLAGS) -o "$@"
$(CXX) "$<" -c $(CPPFLAGS) $(CXXFLAGS) -o "$@" -std=c++11
1 change: 0 additions & 1 deletion resources/wheezy/deb/libne10-dev_20180515-1_armhf.deb

This file was deleted.

1 change: 1 addition & 0 deletions resources/wheezy/deb/libne10-dev_20181116-1_armhf.deb

0 comments on commit 5e3a372

Please sign in to comment.