Просмотр исходного кода

Fix IAR warning: Warning[Pe381]: extra ";" ignored

Mengsk 3 лет назад
Родитель
Сommit
82f105e32b
2 измененных файлов с 5 добавлено и 3 удалено
  1. 4 2
      src/class/usbtmc/usbtmc_device.c
  2. 1 1
      src/osal/osal.h

+ 4 - 2
src/class/usbtmc/usbtmc_device.c

@@ -157,8 +157,10 @@ static bool handle_devMsgOut(uint8_t rhport, void *data, size_t len, size_t pack
 static uint8_t termChar;
 static uint8_t termChar;
 static uint8_t termCharRequested = false;
 static uint8_t termCharRequested = false;
 
 
-OSAL_MUTEX_DEF(usbtmcLockBuffer);
-static osal_mutex_t usbtmcLock;
+#if OSAL_MUTEX_REQUIRED
+static OSAL_MUTEX_DEF(usbtmcLockBuffer);
+#endif
+osal_mutex_t usbtmcLock;
 
 
 // Our own private lock, mostly for the state variable.
 // Our own private lock, mostly for the state variable.
 #define criticalEnter() do { (void) osal_mutex_lock(usbtmcLock,OSAL_TIMEOUT_WAIT_FOREVER); } while (0)
 #define criticalEnter() do { (void) osal_mutex_lock(usbtmcLock,OSAL_TIMEOUT_WAIT_FOREVER); } while (0)

+ 1 - 1
src/osal/osal.h

@@ -44,7 +44,7 @@ typedef void (*osal_task_func_t)( void * );
 // Mutex is required when using a preempted RTOS or MCU has multiple cores
 // Mutex is required when using a preempted RTOS or MCU has multiple cores
 #if (CFG_TUSB_OS == OPT_OS_NONE) && !TUP_MCU_MULTIPLE_CORE
 #if (CFG_TUSB_OS == OPT_OS_NONE) && !TUP_MCU_MULTIPLE_CORE
   #define OSAL_MUTEX_REQUIRED   0
   #define OSAL_MUTEX_REQUIRED   0
-  #define OSAL_MUTEX_DEF(_name)
+  #define OSAL_MUTEX_DEF(_name) uint8_t :0
 #else
 #else
   #define OSAL_MUTEX_REQUIRED   1
   #define OSAL_MUTEX_REQUIRED   1
   #define OSAL_MUTEX_DEF(_name) osal_mutex_def_t _name
   #define OSAL_MUTEX_DEF(_name) osal_mutex_def_t _name