sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor interface refinements

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1035 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2008-10-11 22:33:37 +00:00
parent a73bfe774f
commit 5a4d432c6d
2 changed files with 236 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
configs/mcu123-lpc214x/src/up_spi.c
View File

@ -88,12 +88,12 @@
****************************************************************************/
static void spi_select(boolean select);
static uint32 spi_setclockfrequency(uint32 frequency);
static uint32 spi_setfrequency(uint32 frequency);
static ubyte spi_status(void);
static ubyte spi_sndbyte(ubyte c);
static ubyte spi_waitready(void);
static void spi_sndblock(ubyte *data, int datlen);
static void spi_recvblock(ubyte *data, int datlen);
static void spi_sndbyte(ubyte ch);
static int spi_waitready(void);
static void spi_sndblock(FAR const ubyte *data, int datlen);
static void spi_recvblock(FAR ubyte *data, int datlen);
/****************************************************************************
* Private Data
@ -102,7 +102,7 @@ static void spi_recvblock(ubyte *data, int datlen);
static const struct spi_ops_s g_spiops =
{
.select = spi_select,
.setclockfrequency = spi_setclockfrequency,
.setfrequency = spi_setfrequency,
.status = spi_status,
.sndbyte = spi_sndbyte,
.waitready = spi_waitready,
@ -122,7 +122,13 @@ static const struct spi_ops_s g_spiops =
* Name: spi_select
*
* Description:
* MMC chip-select control
* Enable/disable the SPI chip select
*
* Input Parameters:
* select: TRUE: chip selected, FALSE: chip de-selected
*
* Returned Value:
* None
*
****************************************************************************/
@ -161,26 +167,20 @@ void spi_select(boolean select)
}
/****************************************************************************
* Name: spi_status
* Name: spi_setfrequency
*
* Description:
* Return MMC present + write protect status
* Set the SPI frequency.
*
* Input Parameters:
* frequency: The SPI frequency requested
*
* Returned Value:
* Returns the actual frequency selected
*
****************************************************************************/
ubyte spi_status(void)
{
return SPI_STATUS_PRESENT;
}
/****************************************************************************
* Name: spi_setclockfrequency
*
* Description:
* Set SPI clock frequency
*
****************************************************************************/
uint32 spi_setclockfrequency(uint32 frequency)
uint32 spi_setfrequency(uint32 frequency)
{
uint32 divisor = LPC214X_PCLKFREQ / frequency;
@ -199,14 +199,43 @@ uint32 spi_setclockfrequency(uint32 frequency)
}
/****************************************************************************
* Name: spi_sndbyte
* Name: spi_status
*
* Description:
* Transfer one byte to the SPI
* Get SPI/MMC status
*
* Input Parameters:
* None
*
* Returned Value:
* Returns a bitset of status values (see SPI_STATUS_* defines
*
****************************************************************************/
ubyte spi_sndbyte(ubyte c)
ubyte spi_status(void)
{
/* I don't think there is anyway to determine these things on the mcu123.com
* board.
*/
return SPI_STATUS_PRESENT;
}
/****************************************************************************
* Name: spi_sndbyte
*
* Description:
* Send one byte on SPI
*
* Input Parameters:
* ch - the byte to send
*
* Returned Value:
* None
*
****************************************************************************/
void spi_sndbyte(ubyte ch)
{
/* Wait while the TX FIFO is full */
@ -214,22 +243,31 @@ ubyte spi_sndbyte(ubyte c)
/* Send the byte */
putreg16(c, LPC214X_SPI1_DR);
putreg16(ch, LPC214X_SPI1_DR);
/* Wait for the RX FIFO not empty */
while (!(getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_RNE));
/* Return the value from the RX FIFO */
/* Get the value from the RX FIFO */
return (ubyte)getreg16(LPC214X_SPI1_DR);
(void)getreg16(LPC214X_SPI1_DR);
}
/****************************************************************************
* Name: spi_waitready
*
* Description:
* Wait for SPI to be ready
*
* Input Parameters: None
*
* Returned Value:
* OK if no error occured; a negated errno otherwise.
*
****************************************************************************/
ubyte spi_waitready(void)
int spi_waitready(void)
{
ubyte ret;
@ -249,18 +287,25 @@ ubyte spi_waitready(void)
}
while (ret != 0xff);
return ret;
return OK;
}
/*************************************************************************
* Name: spi_sndblock
*
* Description:
* Read a block of bytes from SPI
* Send a block of data on SPI
*
*************************************************************************/
* Input Parameters:
* data - A pointer to the buffer of data to be sent
* datlen - the length of data to send from the buffer
*
* Returned Value:
* None
*
****************************************************************************/
void spi_sndblock(ubyte *data, int datlen)
void spi_sndblock(FAR const ubyte *data, int datlen)
{
/* Loop while thre are bytes remaining to be sent */
@ -293,11 +338,18 @@ void spi_sndblock(ubyte *data, int datlen)
* Name: spi_recvblock
*
* Description:
* Receive a block of bytes from SPI
* Revice a block of data from SPI
*
*************************************************************************/
* Input Parameters:
* data - A pointer to the buffer in which to recieve data
* datlen - the length of data that can be received in the buffer
*
* Returned Value:
* None
*
****************************************************************************/
static void spi_recvblock(ubyte *data, int datlen)
static void spi_recvblock(FAR ubyte *data, int datlen)
{
uint32 fifobytes = 0;
@ -339,14 +391,29 @@ static void spi_recvblock(ubyte *data, int datlen)
* Description:
* Initialize the selected SPI port
*
* Input Parameter:
* Port number (for hardware that has mutiple SPI interfaces)
*
* Returned Value:
* Valid vtable pointer on succcess; NULL on failure
*
****************************************************************************/
void up_spiinitialize(int port)
FAR const struct spi_ops_s *up_spiinitialize(int port)
{
uint32 regval32;
ubyte regval8;
int i;
/* Only the SPI1 interface is supported */
#ifdef CONFIG_DEBUG
if (port != 1)
{
return NULL;
}
#endif
/* Configure multiplexed pins as connected on the mcu123.com board:
*
* PINSEL1 P0.17/CAP1.2/SCK1/MAT1.2 Bits 2-3=10 for SCK1
@ -386,7 +453,7 @@ void up_spiinitialize(int port)
/* Set the initial clock frequency for indentification mode < 400kHz */
spi_setclockfrequency(400000);
spi_setfrequency(400000);
/* Enable the SPI */
@ -397,18 +464,6 @@ void up_spiinitialize(int port)
{
(void)getreg16(LPC214X_SPI1_DR);
}
}
/****************************************************************************
* Name: up_spigetvtable
*
* Description:
* Return the vtable for the selected SPI port
*
****************************************************************************/
FAR const struct spi_ops_s *up_spigetvtable(int port)
{
return &g_spiops;
}

143
include/nuttx/spi.h
View File

@ -1,11 +1,9 @@
/****************************************************************************
* drivers/usbdev/sp.c
* drivers/usbdev/spi.h
*
* Copyright(C) 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* This logic emulates the Prolific PL2303 serial/USB converter
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@ -49,6 +47,121 @@
* Definitions
****************************************************************************/
/* Access macros */
/****************************************************************************
* Name:SPI_SELECT
*
* Description:
* Enable/disable the SPI chip select
*
* Input Parameters:
* select: TRUE: chip selected, FALSE: chip de-selected
*
* Returned Value:
* None
*
****************************************************************************/
#define SPI_SELECT(s,b) ((s)->select(b))
/****************************************************************************
* Name: SPI_SETFREQUENCY
*
* Description:
* Set the SPI frequency.
*
* Input Parameters:
* frequency: The SPI frequency requested
*
* Returned Value:
* Returns the actual frequency selected
*
****************************************************************************/
#define SPI_SETFREQUENCY(s,f) ((s)->setfrequency(f))
/****************************************************************************
* Name: SPI_STATUS
*
* Description:
* Get SPI/MMC status
*
* Input Parameters:
* None
*
* Returned Value:
* Returns a bitset of status values (see SPI_STATUS_* defines
*
****************************************************************************/
#define SPI_STATUS(s) ((s)->status())
/****************************************************************************
* Name: SPI_SNDBYTE
*
* Description:
* Send one byte on SPI
*
* Input Parameters:
* ch - the byte to send
*
* Returned Value:
* None
*
****************************************************************************/
#define SPI_SNDBYTE(s,ch) ((s)->sndbyte(ch))
/****************************************************************************
* Name: SPI_WAITREADY
*
* Description:
* Wait for SPI to be ready
*
* Input Parameters: None
*
* Returned Value:
* OK if no error occured; a negated errno otherwise.
*
****************************************************************************/
#define SPI_WAITREADY(s) ((s)->waitready())
/****************************************************************************
* Name: SPI_SNDBLOCK
*
* Description:
* Send a block of data on SPI
*
* Input Parameters:
* data - A pointer to the buffer of data to be sent
* datlen - the length of data to send from the buffer
*
* Returned Value:
* None
*
****************************************************************************/
#define SPI_SNDBLOCK(s,d,l) ((s)->sndblock(d,l))
/****************************************************************************
* Name: SPI_RECVBLOCK
*
* Description:
* Revice a block of data from SPI
*
* Input Parameters:
* data - A pointer to the buffer in which to recieve data
* datlen - the length of data that can be received in the buffer
*
* Returned Value:
* None
*
****************************************************************************/
#define SPI_RECVBLOCK(s,d,l) ((s)->recvblock(d,l))
/* SPI status bits -- Some dedicated for SPI MMC support and may have not
* relationship to SPI other than needed by the SPI MMC interface
*/
@ -63,12 +176,12 @@
struct spi_ops_s
{
void (*select)(boolean select);
uint32 (*setclockfrequency)(uint32 frequency);
uint32 (*setfrequency)(uint32 frequency);
ubyte (*status)(void);
ubyte (*sndbyte)(ubyte ch);
ubyte (*waitready)(void);
void (*sndblock)(ubyte *data, int datlen);
void (*recvblock)(ubyte *data, int datlen);
void (*sndbyte)(ubyte ch);
int (*waitready)(void);
void (*sndblock)(FAR const ubyte *data, int datlen);
void (*recvblock)(FAR ubyte *data, int datlen);
};
/****************************************************************************
@ -83,17 +196,21 @@ extern "C" {
#define EXTERN extern
#endif
EXTERN void up_spinitialize(int port);
/****************************************************************************
* Name: up_spigetvtable
* Name: up_spiinitialize
*
* Description:
* Return the vtable for the selected SPI port
* Initialize the selected SPI port
*
* Input Parameter:
* Port number (for hardware that has mutiple SPI interfaces)
*
* Returned Value:
* Valid vtable pointer on succcess; a NULL on failure
*
****************************************************************************/
EXTERN FAR const struct spi_ops_s *up_spigetvtable(int port);
EXTERN FAR const struct spi_ops_s *up_spiinitialize(int port);
#undef EXTERN
#if defined(__cplusplus)