From 8a4cd2258a5f535f54abf86d6eb92aa000ac085b Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 1 Apr 2013 15:02:22 +0000 Subject: LPC17xx SPI and SSP initialization functions both called up_spiinitialize(); Changed to lpc17_spinitialize() and lpc17_sspinitialize(). git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5809 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/configs/nucleus2g/src/up_nsh.c | 4 ++-- nuttx/configs/nucleus2g/src/up_ssp.c | 6 +++--- nuttx/configs/nucleus2g/src/up_usbmsc.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'nuttx/configs/nucleus2g') diff --git a/nuttx/configs/nucleus2g/src/up_nsh.c b/nuttx/configs/nucleus2g/src/up_nsh.c index 4453d73a1..c19937bdc 100644 --- a/nuttx/configs/nucleus2g/src/up_nsh.c +++ b/nuttx/configs/nucleus2g/src/up_nsh.c @@ -2,7 +2,7 @@ * config/nucleus2g/src/up_nsh.c * arch/arm/src/board/up_nsh.c * - * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -136,7 +136,7 @@ int nsh_archinitialize(void) /* Get the SSP port */ - ssp = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO); + ssp = lpc17_sspinitialize(CONFIG_NSH_MMCSDSPIPORTNO); if (!ssp) { message("nsh_archinitialize: Failed to initialize SSP port %d\n", diff --git a/nuttx/configs/nucleus2g/src/up_ssp.c b/nuttx/configs/nucleus2g/src/up_ssp.c index 77c07f3eb..435378bba 100644 --- a/nuttx/configs/nucleus2g/src/up_ssp.c +++ b/nuttx/configs/nucleus2g/src/up_ssp.c @@ -137,7 +137,7 @@ void weak_function lpc17_sspinitialize(void) * The external functions, lpc17_ssp0/ssp1select and lpc17_ssp0/ssp1status * must be provided by board-specific logic. They are implementations of the select * and status methods of the SPI interface defined by struct spi_ops_s (see - * include/nuttx/spi.h). All other methods (including up_spiinitialize()) + * include/nuttx/spi.h). All other methods (including lpc17_sspinitialize()) * are provided by common LPC17xx logic. To use this common SPI logic on your * board: * @@ -146,9 +146,9 @@ void weak_function lpc17_sspinitialize(void) * 2. Provide lpc17_ssp0/ssp1select() and lpc17_ssp0/ssp1status() functions * in your board-specific logic. These functions will perform chip selection * and status operations using GPIOs in the way your board is configured. - * 3. Add a calls to up_spiinitialize() in your low level application + * 3. Add a calls to lpc17_sspinitialize() in your low level application * initialization logic - * 4. The handle returned by up_spiinitialize() may then be used to bind the + * 4. The handle returned by lpc17_sspinitialize() may then be used to bind the * SPI driver to higher level logic (e.g., calling * mmcsd_spislotinitialize(), for example, will bind the SPI driver to * the SPI MMC/SD driver). diff --git a/nuttx/configs/nucleus2g/src/up_usbmsc.c b/nuttx/configs/nucleus2g/src/up_usbmsc.c index f4a533cb6..5da9f948d 100644 --- a/nuttx/configs/nucleus2g/src/up_usbmsc.c +++ b/nuttx/configs/nucleus2g/src/up_usbmsc.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/nucleus2g/src/up_usbmsc.c * - * Copyright (C) 2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Configure and register the LPC17xx MMC/SD SPI block driver. @@ -113,7 +113,7 @@ int usbmsc_archinitialize(void) message("usbmsc_archinitialize: Initializing SPI port %d\n", LPC17XX_MMCSDSPIPORTNO); - spi = up_spiinitialize(LPC17XX_MMCSDSPIPORTNO); + spi = lpc17_sspinitialize(LPC17XX_MMCSDSPIPORTNO); if (!spi) { message("usbmsc_archinitialize: Failed to initialize SPI port %d\n", -- cgit v1.2.3