diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-23 15:48:26 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-23 15:48:26 +0000 |
| commit | a5d6df7b093a3f6cb0744527544ba69b10cb56e1 (patch) | |
| tree | 4204a5b2e005576bc50ebf40111cdcbf11b01b68 /nuttx/configs | |
| parent | 4f21934e7a6b37606101519d79d4bf2e1f2d8bc3 (diff) | |
| download | px4-nuttx-a5d6df7b093a3f6cb0744527544ba69b10cb56e1.tar.gz px4-nuttx-a5d6df7b093a3f6cb0744527544ba69b10cb56e1.tar.bz2 px4-nuttx-a5d6df7b093a3f6cb0744527544ba69b10cb56e1.zip | |
Fixes for clean(er) compilation
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@558 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs')
| -rw-r--r-- | nuttx/configs/z16f2800100zcog/src/Makefile | 4 | ||||
| -rw-r--r-- | nuttx/configs/z16f2800100zcog/src/z16f_lowinit.c | 19 |
2 files changed, 13 insertions, 10 deletions
diff --git a/nuttx/configs/z16f2800100zcog/src/Makefile b/nuttx/configs/z16f2800100zcog/src/Makefile index fa8b5ac2e..300e47cc4 100644 --- a/nuttx/configs/z16f2800100zcog/src/Makefile +++ b/nuttx/configs/z16f2800100zcog/src/Makefile @@ -37,7 +37,7 @@ ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)} -USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)/common' +USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common' INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) @@ -79,6 +79,6 @@ clean: $(call CLEAN) distclean: clean - rm -f Make.dep .depend + @rm -f Make.dep .depend -include Make.dep diff --git a/nuttx/configs/z16f2800100zcog/src/z16f_lowinit.c b/nuttx/configs/z16f2800100zcog/src/z16f_lowinit.c index 71744134c..02ee9daf6 100644 --- a/nuttx/configs/z16f2800100zcog/src/z16f_lowinit.c +++ b/nuttx/configs/z16f2800100zcog/src/z16f_lowinit.c @@ -39,6 +39,9 @@ * Included Files
***************************************************************************/
+#include <nuttx/config.h>
+#include <sys/types.h>
+
#include "chip/chip.h"
/***************************************************************************
@@ -53,23 +56,23 @@ static void z16f_gpioinit(void) {
/* Configure LEDs and Run/Stop switch port */
- putreg(getreg(Z16F_GPIOA_DD) | 0x87, Z16F_GPIOA_DD);
- putreg(getreg(Z16F_GPIOA_OUT) | 0x07, Z16F_GPIOA_OUT);
- putreg(getreg(Z16F_GPIOA_DD) | 0xF8, Z16F_GPIOA_DD);
+ putreg8(getreg8(Z16F_GPIOA_DD) | 0x87, Z16F_GPIOA_DD);
+ putreg8(getreg8(Z16F_GPIOA_OUT) | 0x07, Z16F_GPIOA_OUT);
+ putreg8(getreg8(Z16F_GPIOA_DD) | 0xF8, Z16F_GPIOA_DD);
/* Configure rate switch port */
- putreg(getreg(Z16F_GPIOB_DD) | 0x20, Z16F_GPIOB_DD);
- putreg(getreg(Z16F_GPIOB_AFL) | 0x20, Z16F_GPIOB_AFL);
+ putreg8(getreg8(Z16F_GPIOB_DD) | 0x20, Z16F_GPIOB_DD);
+ putreg8(getreg8(Z16F_GPIOB_AFL) | 0x20, Z16F_GPIOB_AFL);
#if 0 /* Not yet */
- ADC0MAX = 0x05;
- ADC0CTL = 0xF5;
+ putreg8(0x05, Z16F_ADC0_MAX);
+ putreg8(0xf5, Z16F_ADC0_CTL);
#endif
/* Configure Direction switch port */
- putreg(getreg() | 0x01, Z16F_GPIOC_DD);
+ putreg8(getreg8(Z16F_GPIOC_DD) | 0x01, Z16F_GPIOC_DD);
}
/***************************************************************************
|