Compilation fix on OSX / Windows

This commit is contained in:
Bertrand Songis
2019-06-21 12:51:39 +02:00
parent 2ac0ed307d
commit ba445c6c0d
4 changed files with 19 additions and 14 deletions
+1 -1
View File
@@ -363,7 +363,7 @@ dev_from_mount_options (char const *mount_options)
/* GNU/Linux allows file system implementations to define their own /* GNU/Linux allows file system implementations to define their own
meaning for "dev=" mount options, so don't trust the meaning meaning for "dev=" mount options, so don't trust the meaning
here. */ here. */
# ifndef __linux__ #ifndef __linux__
static char const dev_pattern[] = ",dev="; static char const dev_pattern[] = ",dev=";
char const *devopt = strstr (mount_options, dev_pattern); char const *devopt = strstr (mount_options, dev_pattern);
+11 -5
View File
@@ -28,7 +28,6 @@ extern "C++" {
#endif #endif
#if defined(SIMU) #if defined(SIMU)
#include <pthread.h> #include <pthread.h>
#include <semaphore.h> #include <semaphore.h>
@@ -113,11 +112,20 @@ extern "C++" {
#define TASK_FUNCTION(task) void * task(void * pdata) #define TASK_FUNCTION(task) void * task(void * pdata)
template<int SIZE> inline void RTOS_CREATE_TASK(pthread_t &taskId, void * task(void *), const char * name)
inline void RTOS_CREATE_TASK(pthread_t &taskId, void * task(void *), const char * name, FakeTaskStack<SIZE> &, unsigned, unsigned)
{ {
pthread_create(&taskId, nullptr, task, nullptr); pthread_create(&taskId, nullptr, task, nullptr);
#ifdef __linux__
pthread_setname_np(taskId, name); pthread_setname_np(taskId, name);
#endif
}
template<int SIZE>
inline void RTOS_CREATE_TASK(pthread_t &taskId, void * task(void *), const char * name, FakeTaskStack<SIZE> &, unsigned size = 0, unsigned priority = 0)
{
UNUSED(size);
UNUSED(priority);
RTOS_CREATE_TASK(taskId, task, name);
} }
#define TASK_RETURN() return nullptr #define TASK_RETURN() return nullptr
@@ -138,9 +146,7 @@ extern "C++" {
{ {
return (uint32_t)(simuTimerMicros() / 1000); return (uint32_t)(simuTimerMicros() / 1000);
} }
#elif defined(RTOS_COOS) #elif defined(RTOS_COOS)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
+2
View File
@@ -386,7 +386,9 @@ void StartAudioThread(int volumeGain)
sp.sched_priority = SCHED_RR; sp.sched_priority = SCHED_RR;
pthread_attr_setschedparam(&attr, &sp); pthread_attr_setschedparam(&attr, &sp);
pthread_create(&simuAudio.threadPid, &attr, &audioThread, nullptr); pthread_create(&simuAudio.threadPid, &attr, &audioThread, nullptr);
#ifdef __linux__
pthread_setname_np(simuAudio.threadPid, "audio"); pthread_setname_np(simuAudio.threadPid, "audio");
#endif
return; return;
} }
+5 -8
View File
@@ -73,6 +73,8 @@ void eepromSimuWriteBlock(uint8_t * buffer, size_t address, size_t size)
volatile uint8_t eepromTransferComplete = 1; volatile uint8_t eepromTransferComplete = 1;
void * eeprom_thread_function(void *) void * eeprom_thread_function(void *)
{ {
eeprom_thread_running = true;
while (!sem_wait(eeprom_write_sem)) { while (!sem_wait(eeprom_write_sem)) {
if (!eeprom_thread_running) if (!eeprom_thread_running)
return nullptr; return nullptr;
@@ -85,7 +87,8 @@ void * eeprom_thread_function(void *)
} }
eepromTransferComplete = 1; eepromTransferComplete = 1;
} }
return 0;
return nullptr;
} }
uint8_t eepromReadStatus() uint8_t eepromReadStatus()
@@ -162,13 +165,7 @@ void StartEepromThread(const char * filename)
sem_init(eeprom_write_sem, 0, 0); sem_init(eeprom_write_sem, 0, 0);
#endif #endif
if (!pthread_create(&eeprom_thread_pid, nullptr, &eeprom_thread_function, nullptr)) { RTOS_CREATE_TASK(eeprom_thread_pid, eeprom_thread_function, "eeprom");
pthread_setname_np(eeprom_thread_pid, "eeprom");
eeprom_thread_running = true;
}
else {
perror("Could not create eeprom thread.");
}
} }
void StopEepromThread() void StopEepromThread()