diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-27 08:32:36 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-27 08:32:36 -0600 |
| commit | 9c60fa7bb579a163293f9b584eab55e8d970ae3b (patch) | |
| tree | c962cc75f85807d48369c7cdbaa585bf5635031b | |
| parent | a003b3b5a00f417a1f6df8811c404a82626e94b4 (diff) | |
| download | nuttx-9c60fa7bb579a163293f9b584eab55e8d970ae3b.tar.gz nuttx-9c60fa7bb579a163293f9b584eab55e8d970ae3b.tar.bz2 nuttx-9c60fa7bb579a163293f9b584eab55e8d970ae3b.zip | |
Minor/cosmetic changes
| -rw-r--r-- | apps/system/ramtest/Makefile | 30 | ||||
| -rw-r--r-- | nuttx/arch/z16/src/z16f/z16f_espi.c | 10 |
2 files changed, 20 insertions, 20 deletions
diff --git a/apps/system/ramtest/Makefile b/apps/system/ramtest/Makefile index a8263a89f..c6df8bde4 100644 --- a/apps/system/ramtest/Makefile +++ b/apps/system/ramtest/Makefile @@ -38,40 +38,40 @@ include $(APPDIR)/Make.defs ifeq ($(WINTOOL),y) -INCDIROPT = -w +INCDIROPT = -w endif # USB Monitor Application -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 768 +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 768 -ASRCS = -CSRCS = ramtest.c +ASRCS = +CSRCS = ramtest.c -AOBJS = $(ASRCS:.S=$(OBJEXT)) -COBJS = $(CSRCS:.c=$(OBJEXT)) +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) -SRCS = $(ASRCS) $(CSRCS) -OBJS = $(AOBJS) $(COBJS) +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BIN = ..\..\libapps$(LIBEXT) + BIN = ..\..\libapps$(LIBEXT) else ifeq ($(WINTOOL),y) - BIN = ..\\..\\libapps$(LIBEXT) + BIN = ..\\..\\libapps$(LIBEXT) else - BIN = ../../libapps$(LIBEXT) + BIN = ../../libapps$(LIBEXT) endif endif -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = -all: .built +all: .built .PHONY: context depend clean distclean $(AOBJS): %$(OBJEXT): %.S diff --git a/nuttx/arch/z16/src/z16f/z16f_espi.c b/nuttx/arch/z16/src/z16f/z16f_espi.c index acbb38e25..cc247fd94 100644 --- a/nuttx/arch/z16/src/z16f/z16f_espi.c +++ b/nuttx/arch/z16/src/z16f/z16f_espi.c @@ -866,15 +866,15 @@ struct spi_dev_s *up_spiinitialize(int port) * MISO - PC5, Alternate function 1 */ - regval = getreg8(Z16F_GPIOC_AFL); + regval = spi_getreg8(priv, Z16F_GPIOC_AFL); regval |= 0x38; - putreg8(regval, Z16F_GPIOC_AFL); + spi_putreg8(priv, regval, Z16F_GPIOC_AFL); - regval = getreg8(Z16F_GPIOC_AFH); + regval = spi_getreg8(priv, Z16F_GPIOC_AFH); regval &= ~0x38; - putreg8(regval, Z16F_GPIOC_AFH); + spi_putreg8(priv, regval, Z16F_GPIOC_AFH); - /* Initialize the hardware. Mode 0, 8-bits, 400KHz */ + /* Initialize the ESPI peripheral. Master, Mode 0, 8-bits, 400KHz */ spi_putreg8(priv, 0x00, Z16F_ESPI_CTL); /* Disabled the ESPI */ spi_putreg8(priv, 0x00, Z16F_ESPI_DCR); /* Disabled slave select; clear TEOF */ |