diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-11-02 23:05:53 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-11-02 23:05:53 +0000 |
commit | 5dc79030987a04233b672933793c1d0182854160 (patch) | |
tree | 668a67f0a5fbd10824aee2f92174906e797c3279 /nuttx/arch/arm/src/dm320 | |
parent | 8543ac1d6bb8568cba8a31a66f3c7d31a4323657 (diff) | |
download | px4-nuttx-5dc79030987a04233b672933793c1d0182854160.tar.gz px4-nuttx-5dc79030987a04233b672933793c1d0182854160.tar.bz2 px4-nuttx-5dc79030987a04233b672933793c1d0182854160.zip |
Changes for clean compile of DM90x0 driver on Neuros OSD
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@365 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/dm320')
-rw-r--r-- | nuttx/arch/arm/src/dm320/Make.defs | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/dm320/dm320_gio.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/dm320/Make.defs b/nuttx/arch/arm/src/dm320/Make.defs index 0c54c02a9..09a86be28 100644 --- a/nuttx/arch/arm/src/dm320/Make.defs +++ b/nuttx/arch/arm/src/dm320/Make.defs @@ -38,7 +38,7 @@ HEAD_ASRC = up_head.S CMN_ASRCS = up_cache.S up_fullcontextrestore.S up_saveusercontext.S \ up_vectors.S up_vectortab.S CMN_CSRCS = up_assert.c up_blocktask.c up_copystate.c up_createstack.c \ - up_dataabort.c up_delay.c up_exit.c up_idle.c \ + up_dataabort.c up_mdelay.c up_udelay.c up_exit.c up_idle.c \ up_initialize.c up_initialstate.c up_interruptcontext.c \ up_prefetchabort.c up_releasepending.c up_releasestack.c \ up_reprioritizertr.c up_schedulesigaction.c \ diff --git a/nuttx/arch/arm/src/dm320/dm320_gio.h b/nuttx/arch/arm/src/dm320/dm320_gio.h index 9b9a206f3..642c68bc9 100644 --- a/nuttx/arch/arm/src/dm320/dm320_gio.h +++ b/nuttx/arch/arm/src/dm320/dm320_gio.h @@ -90,7 +90,7 @@ if ((pin) < 16) { _reg = (reg0); _pin = (pin); } \ else if ((pin) < 32) { _reg = (reg1); _pin = ((pin) - 16); } \ else { _reg = (reg2); _pin = ((pin) - 32); } \ - putreg16((getreg16(_reg) | (1 << _pin)), _reg)); \ + putreg16((getreg16(_reg) | (1 << _pin)), _reg); \ } while (0) #define _GIO_CLEAR_REG(pin, reg0, reg1, reg2) \ @@ -99,7 +99,7 @@ if ((pin) < 16) { _reg = (reg0); _pin = (pin); } \ else if ((pin) < 32) { _reg = (reg1); _pin = ((pin) - 16); } \ else { _reg = (reg2); _pin = ((pin) - 32); } \ - putreg16((getreg16(_reg) & ~(1 << _pin)), _reg)); \ + putreg16((getreg16(_reg) & ~(1 << _pin)), _reg); \ } while (0) /* Select GIO input or output */ |