From 2b1d436615b6ad432c13e50c13fd910b163371c6 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>
Date: Wed, 23 Jan 2008 15:48:26 +0000
Subject: Fixes for clean(er) compilation

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@558 7fd9a85b-ad96-42d3-883c-3090e2eb8679
---
 nuttx/configs/z16f2800100zcog/src/Makefile       |  4 ++--
 nuttx/configs/z16f2800100zcog/src/z16f_lowinit.c | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'nuttx/configs/z16f2800100zcog')

diff --git a/nuttx/configs/z16f2800100zcog/src/Makefile b/nuttx/configs/z16f2800100zcog/src/Makefile
index fa8b5ac2ed..300e47cc48 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 71744134ce..02ee9daf61 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);
 }
 
 /***************************************************************************
-- 
cgit v1.2.3