diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-11 16:50:16 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-11 16:50:16 +0000 |
| commit | 88da8a5b4f042532c0b980510b0d90b77158eff4 (patch) | |
| tree | 7549e64438eb97eda761a8274c9e00fa92870b20 /nuttx/configs/olimex-strp711/src/up_spi.c | |
| parent | 9f572dff87614ce1d025e8d98fac36db13bcfd71 (diff) | |
| download | px4-nuttx-88da8a5b4f042532c0b980510b0d90b77158eff4.tar.gz px4-nuttx-88da8a5b4f042532c0b980510b0d90b77158eff4.tar.bz2 px4-nuttx-88da8a5b4f042532c0b980510b0d90b77158eff4.zip | |
Updates/fixes related to ENC28J60, Kconfigs, and fire-stm32v2
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5128 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/olimex-strp711/src/up_spi.c')
| -rw-r--r-- | nuttx/configs/olimex-strp711/src/up_spi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/configs/olimex-strp711/src/up_spi.c b/nuttx/configs/olimex-strp711/src/up_spi.c index bbd046df7..452a43fb7 100644 --- a/nuttx/configs/olimex-strp711/src/up_spi.c +++ b/nuttx/configs/olimex-strp711/src/up_spi.c @@ -1,8 +1,8 @@ /**************************************************************************** * config/olimex-strp711/src/up_spi.c * - * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2008-2010,2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -155,7 +155,7 @@ * P0.4/S1.MISO P0.4 output 6 5 NET RST */ -#ifdef CONFIG_NET_ENC28J60 +#ifdef CONFIG_ENC28J60 /* UART3, I2C cannot be used with SPI0. The GPIOs selected for the ENC28J60 * interrupt conflict with BSPI1 @@ -981,7 +981,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port) * reset (also active low) */ -#ifdef CONFIG_NET_ENC28J60 +#ifdef CONFIG_ENC28J60 reg16 = getreg16(STR71X_GPIO0_PD); reg16 |= (ENC_GPIO0_CS | ENC_GPIO0_NETRST); putreg16(reg16, STR71X_GPIO0_PD); |