diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-03 13:47:40 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-03 13:47:40 +0000 |
| commit | b748be7443a9b0a3077856a5a11ac12acbcefda9 (patch) | |
| tree | 6b22f4ee9ebc41eb7a656398a7b565c5a4ad9015 /nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c | |
| parent | 048e0346039fad2af077a7ebe7fb815c9d98cfd2 (diff) | |
| download | px4-nuttx-b748be7443a9b0a3077856a5a11ac12acbcefda9.tar.gz px4-nuttx-b748be7443a9b0a3077856a5a11ac12acbcefda9.tar.bz2 px4-nuttx-b748be7443a9b0a3077856a5a11ac12acbcefda9.zip | |
Improve LPC17xx CAN interrupt handling; Additions to LPC17xx SPI driver
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4255 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c')
| -rwxr-xr-x | nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c index 94f6427d0..e945ced40 100755 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c @@ -165,18 +165,22 @@ static const struct spi_ops_s g_spi0ops = #ifndef CONFIG_SPI_OWNBUS .lock = ssp_lock, #endif - .select = lpc17_ssp0select, + .select = lpc17_ssp0select, /* Provided externally */ .setfrequency = ssp_setfrequency, .setmode = ssp_setmode, .setbits = ssp_setbits, - .status = lpc17_ssp0status, + .status = lpc17_ssp0status, /* Provided externally */ #ifdef CONFIG_SPI_CMDDATA - .cmddata = lpc17_ssp0cmddata, + .cmddata = lpc17_ssp0cmddata, /* Provided externally */ #endif .send = ssp_send, .sndblock = ssp_sndblock, .recvblock = ssp_recvblock, - .registercallback = 0, /* Not implemented */ +#ifdef CONFIG_SPI_CALLBACK + .registercallback = lpc17_ssp0register, /* Provided externally */ +#else + .registercallback = 0, /* Not implemented */ +#endif }; static struct lpc17_sspdev_s g_ssp0dev = @@ -195,18 +199,22 @@ static const struct spi_ops_s g_spi1ops = #ifndef CONFIG_SPI_OWNBUS .lock = ssp_lock, #endif - .select = lpc17_ssp1select, + .select = lpc17_ssp1select, /* Provided externally */ .setfrequency = ssp_setfrequency, .setmode = ssp_setmode, .setbits = ssp_setbits, - .status = lpc17_ssp1status, + .status = lpc17_ssp1status, /* Provided externally */ #ifdef CONFIG_SPI_CMDDATA - .cmddata = lpc17_ssp1cmddata, + .cmddata = lpc17_ssp1cmddata, /* Provided externally */ #endif .send = ssp_send, .sndblock = ssp_sndblock, .recvblock = ssp_recvblock, - .registercallback = 0, /* Not implemented */ +#ifdef CONFIG_SPI_CALLBACK + .registercallback = lpc17_ssp1register, /* Provided externally */ +#else + .registercallback = 0, /* Not implemented */ +#endif }; static struct lpc17_sspdev_s g_ssp1dev = |