diff options
-rwxr-xr-x | nuttx/arch/arm/src/str71x/str71x_xti.c | 6 | ||||
-rwxr-xr-x | nuttx/configs/olimex-strp711/src/up_enc28j60.c | 22 |
2 files changed, 13 insertions, 15 deletions
diff --git a/nuttx/arch/arm/src/str71x/str71x_xti.c b/nuttx/arch/arm/src/str71x/str71x_xti.c index f89f0715f5..3143ad76f3 100755 --- a/nuttx/arch/arm/src/str71x/str71x_xti.c +++ b/nuttx/arch/arm/src/str71x/str71x_xti.c @@ -200,7 +200,7 @@ int str71x_xticonfig(int irq, bool rising) /* Configure one of the 16 lines as an interrupt source */ - if (irq > STR71X_IRQ_FIRSTXTI && irq <= NR_IRQS) + if (irq >= STR71X_IRQ_FIRSTXTI && irq <= NR_IRQS) { /* Make sure that the interrupt is disabled */ @@ -254,7 +254,7 @@ void str71x_enable_xtiirq(int irq) /* Enable the external interrupt */ - if (irq > STR71X_IRQ_FIRSTXTI && irq <= NR_IRQS) + if (irq >= STR71X_IRQ_FIRSTXTI && irq <= NR_IRQS) { /* Decide if we use the lower or upper regiser */ @@ -294,7 +294,7 @@ void str71x_disable_xtiirq(int irq) /* Disable the external interrupt */ - if (irq > STR71X_IRQ_FIRSTXTI && irq <= NR_IRQS) + if (irq >= STR71X_IRQ_FIRSTXTI && irq <= NR_IRQS) { /* Decide if we use the lower or upper regiser */ diff --git a/nuttx/configs/olimex-strp711/src/up_enc28j60.c b/nuttx/configs/olimex-strp711/src/up_enc28j60.c index f222160d19..047d271cf8 100755 --- a/nuttx/configs/olimex-strp711/src/up_enc28j60.c +++ b/nuttx/configs/olimex-strp711/src/up_enc28j60.c @@ -125,7 +125,7 @@ /* SPI Assumptions **********************************************************/ -#define ENC28J60_SPI_PORTNO 1 /* On SPI1 */ +#define ENC28J60_SPI_PORTNO 0 /* On SPI0 */ #define ENC28J60_DEVNO 0 /* Only one ENC28J60 */ #define ENC28J60_IRQ STR71X_IRQ_FIRSTXTI /* NEEDED!!!!!!!!!!!!!!!! */ @@ -154,13 +154,12 @@ void up_netinitialize(void) /* Get the SPI port */ - nvdbg("Initializing SPI port %d\n", ENC28J60_SPI_PORTNO); + nllvdbg("Initializing SPI port %d\n", ENC28J60_SPI_PORTNO); spi = up_spiinitialize(ENC28J60_SPI_PORTNO); if (!spi) { - ndbg("Failed to initialize SPI port %d\n", - ENC28J60_SPI_PORTNO); + nlldbg("Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO); return; } @@ -169,27 +168,26 @@ void up_netinitialize(void) ret = str71x_xticonfig(ENC28J60_IRQ, false); if (ret < 0) { - ndbg("Failed configure interrupt for IRQ %d: %d\n", ENC28J60_IRQ, ret); + nlldbg("Failed configure interrupt for IRQ %d: %d\n", ENC28J60_IRQ, ret); return; } - nvdbg("Successfully initialized SPI port %d\n", - ENC28J60_SPI_PORTNO); + nllvdbg("Successfully initialized SPI port %d\n", ENC28J60_SPI_PORTNO); /* Bind the SPI port to the ENC28J60 driver */ - nvdbg("Binding SPI port %d to ENC28J60 device %d\n", - ENC28J60_SPI_PORTNO, ENC28J60_DEVNO); + nllvdbg("Binding SPI port %d to ENC28J60 device %d\n", + ENC28J60_SPI_PORTNO, ENC28J60_DEVNO); ret = enc_initialize(spi, ENC28J60_DEVNO, ENC28J60_IRQ); if (ret < 0) { - ndbg("Failed to bind SPI port %d ENC28J60 device %d: %d\n", - ENC28J60_SPI_PORTNO, ENC28J60_DEVNO, ret); + nlldbg("Failed to bind SPI port %d ENC28J60 device %d: %d\n", + ENC28J60_SPI_PORTNO, ENC28J60_DEVNO, ret); return; } - nvdbg("Successfuly bound SPI port %d ENC28J60 device %d\n", + nllvdbg("Successfuly bound SPI port %d ENC28J60 device %d\n", ENC28J60_SPI_PORTNO, ENC28J60_DEVNO); } #endif /* CONFIG_NET_ENC28J60 */ |