diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-03-05 10:42:18 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-03-05 10:42:18 +0000 |
| commit | bfd29a27c2c977de5b565e48012eb38e6541f15f (patch) | |
| tree | b25e4548c948c83f2fe902209b52623bb1e8d4d7 /os/hal/include | |
| parent | a6224d1964ef80a53500bde178d639c12dda98ee (diff) | |
| download | ChibiOS-bfd29a27c2c977de5b565e48012eb38e6541f15f.tar.gz ChibiOS-bfd29a27c2c977de5b565e48012eb38e6541f15f.tar.bz2 ChibiOS-bfd29a27c2c977de5b565e48012eb38e6541f15f.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6755 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/include')
| -rw-r--r-- | os/hal/include/dac.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/os/hal/include/dac.h b/os/hal/include/dac.h index ac2396b1c..3d1157ae0 100644 --- a/os/hal/include/dac.h +++ b/os/hal/include/dac.h @@ -1,6 +1,6 @@ /* ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, - 2011,2012 Giovanni Di Sirio. + 2011,2012,2013 Giovanni Di Sirio. This file is part of ChibiOS/RT. @@ -64,10 +64,6 @@ /* Derived constants and error checks. */ /*===========================================================================*/ -#if DAC_USE_MUTUAL_EXCLUSION && !CH_USE_MUTEXES && !CH_USE_SEMAPHORES && !NIL_USE_MUTEXES && !NIL_USE_SEMAPHORES -//#error "DAC_USE_MUTUAL_EXCLUSION requires CH_USE_MUTEXES and/or CH_USE_SEMAPHORES" -#endif - /*===========================================================================*/ /* Driver data structures and types. */ /*===========================================================================*/ @@ -118,7 +114,6 @@ typedef enum { */ #define _dac_reset_i(dacp) osalThreadResumeI(&(dacp)->thread, MSG_RESET) - /** * @brief Resumes a thread waiting for a conversion completion. * @@ -138,7 +133,7 @@ typedef enum { #define _dac_wakeup_isr(dacp) { \ osalSysLockFromISR(); \ osalThreadResumeI(&(dacp)->thread, MSG_OK); \ - osalSysUnlockFromISR(); \ + osalSysUnlockFromISR(); \ } /** @@ -151,7 +146,7 @@ typedef enum { #define _dac_timeout_isr(dacp) { \ osalSysLockFromISR(); \ osalThreadResumeI(&(dacp)->thread, MSG_TIMEOUT); \ - osalSysUnlockFromISR(); \ + osalSysUnlockFromISR(); \ } #else /* !DAC_USE_WAIT */ |