From dcb8df76d044092c7c7e8a7769fbe4d38e67437e Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 15 Aug 2017 19:07:35 -0600 Subject: [PATCH] Fix argument to SPI initializatio function --- arch/arm/src/samv7/sam_spi.h | 4 +- .../samv71-xult/mrf24j40-starhub/SAVEconfig | 377 ------------------ configs/samv71-xult/src/sam_mrf24j40.c | 12 +- configs/samv71-xult/src/samv71-xult.h | 5 + 4 files changed, 13 insertions(+), 385 deletions(-) delete mode 100644 configs/samv71-xult/mrf24j40-starhub/SAVEconfig diff --git a/arch/arm/src/samv7/sam_spi.h b/arch/arm/src/samv7/sam_spi.h index 762f34f67d..6e5a76e9ef 100644 --- a/arch/arm/src/samv7/sam_spi.h +++ b/arch/arm/src/samv7/sam_spi.h @@ -68,7 +68,7 @@ # define __SPI_CS_SHIFT (0) /* Bits 0-3: SPI chip select number */ # define __SPI_CS_MASK (15 << __SPI_CS_SHIFT) -# define __SPI_SPI_SHIFT (4) /* Bit 4: SPI controller number */ +# define __SPI_SPI_SHIFT (4) /* Bit 4: SPI controller number */ # define __SPI_SPI_MASK (1 << __SPI_SPI_SHIFT) # define __SPI_SPI0 (0 << __SPI_SPI_SHIFT) /* SPI0 */ # define __SPI_SPI1 (1 << __SPI_SPI_SHIFT) /* SPI1 */ @@ -113,7 +113,7 @@ # define __SPI_CS1 (1 << __SPI_CS_SHIFT) # define __SPI_CS2 (2 << __SPI_CS_SHIFT) # define __SPI_CS3 (3 << __SPI_CS_SHIFT) -# define __SPI_SPI_SHIFT (2) /* Bit 2: SPI controller number */ +# define __SPI_SPI_SHIFT (2) /* Bit 2: SPI controller number */ # define __SPI_SPI_MASK (1 << __SPI_SPI_SHIFT) # define __SPI_SPI0 (0 << __SPI_SPI_SHIFT) /* SPI0 */ # define __SPI_SPI1 (1 << __SPI_SPI_SHIFT) /* SPI1 */ diff --git a/configs/samv71-xult/mrf24j40-starhub/SAVEconfig b/configs/samv71-xult/mrf24j40-starhub/SAVEconfig deleted file mode 100644 index 61c27df924..0000000000 --- a/configs/samv71-xult/mrf24j40-starhub/SAVEconfig +++ /dev/null @@ -1,377 +0,0 @@ -CONFIG_ARCH_ARM=y -CONFIG_ARCH_BOARD_SAME70_XPLAINED=y -CONFIG_ARCH_BOARD="same70-xplained" -CONFIG_ARCH_BUTTONS=y -CONFIG_ARCH_CHIP_SAME70=y -CONFIG_ARCH_CHIP_SAME70Q=y -CONFIG_ARCH_CHIP_SAME70Q21=y -CONFIG_ARCH_CHIP_SAMV7=y -CONFIG_ARCH_CHIP="samv7" -CONFIG_ARCH_CORTEXM7=y -CONFIG_ARCH_DMA=y -CONFIG_ARCH_DPFPU=y -CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_FPU=y -CONFIG_ARCH_HAVE_BUTTONS=y -CONFIG_ARCH_HAVE_CMNVECTOR=y -CONFIG_ARCH_HAVE_CUSTOMOPT=y -CONFIG_ARCH_HAVE_DPFPU=y -CONFIG_ARCH_HAVE_FPU=y -CONFIG_ARCH_HAVE_HEAPCHECK=y -CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y -CONFIG_ARCH_HAVE_I2CRESET=y -CONFIG_ARCH_HAVE_INTERRUPTSTACK=y -CONFIG_ARCH_HAVE_IRQBUTTONS=y -CONFIG_ARCH_HAVE_IRQPRIO=y -CONFIG_ARCH_HAVE_LEDS=y -CONFIG_ARCH_HAVE_MPU=y -CONFIG_ARCH_HAVE_NET=y -CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y -CONFIG_ARCH_HAVE_PHY=y -CONFIG_ARCH_HAVE_RAMFUNCS=y -CONFIG_ARCH_HAVE_RAMVECTORS=y -CONFIG_ARCH_HAVE_RESET=y -CONFIG_ARCH_HAVE_SDIO=y -CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y -CONFIG_ARCH_HAVE_SPI_BITORDER=y -CONFIG_ARCH_HAVE_SPI_CS_CONTROL=y -CONFIG_ARCH_HAVE_STACKCHECK=y -CONFIG_ARCH_HAVE_TICKLESS=y -CONFIG_ARCH_HAVE_TIMEKEEPING=y -CONFIG_ARCH_HAVE_TLS=y -CONFIG_ARCH_HAVE_VFORK=y -CONFIG_ARCH_INTERRUPTSTACK=2048 -CONFIG_ARCH_IRQBUTTONS=y -CONFIG_ARCH_LEDS=y -CONFIG_ARCH_LOWPUTC=y -CONFIG_ARCH_PHY_INTERRUPT=y -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_TOOLCHAIN_GNU=y -CONFIG_ARCH="arm" -CONFIG_ARM_HAVE_MPU_UNIFIED=y -CONFIG_ARMV7M_CMNVECTOR=y -CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y -CONFIG_ARMV7M_DCACHE=y -CONFIG_ARMV7M_HAVE_DCACHE=y -CONFIG_ARMV7M_HAVE_DTCM=y -CONFIG_ARMV7M_HAVE_ICACHE=y -CONFIG_ARMV7M_HAVE_ITCM=y -CONFIG_ARMV7M_HAVE_STACKCHECK=y -CONFIG_ARMV7M_ICACHE=y -CONFIG_ARMV7M_LAZYFPU=y -CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y -CONFIG_AT24XX_ADDR=0x57 -CONFIG_AT24XX_EXTENDED=y -CONFIG_AT24XX_EXTSIZE=160 -CONFIG_AT24XX_FREQUENCY=100000 -CONFIG_AT24XX_SIZE=2 -CONFIG_AT25_SPIFREQUENCY=20000000 -CONFIG_AT25_SPIMODE=0 -CONFIG_BOARD_INITIALIZE=y -CONFIG_BOARD_LOOPSPERMSEC=51262 -CONFIG_BOOT_RUNFROMFLASH=y -CONFIG_BUILD_FLAT=y -CONFIG_BUILTIN_PROXY_STACKSIZE=1024 -CONFIG_BUILTIN=y -CONFIG_SAME70XPLND_CLICK_MB1_BEE=y -CONFIG_SAME70XPLND_CLICK_MB1_SPI=y -CONFIG_DEBUG_ALERT=y -CONFIG_DEBUG_FULLOPT=y -CONFIG_DEV_CONSOLE=y -CONFIG_DEV_NULL=y -CONFIG_DISABLE_OS_API=y -CONFIG_DISABLE_POLL=y -CONFIG_DRIVERS_IEEE802154=y -CONFIG_DRIVERS_WIRELESS=y -CONFIG_EOL_IS_EITHER_CRLF=y -CONFIG_ETH0_PHY_KSZ8081=y -CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y -CONFIG_EXAMPLES_NSH=y -CONFIG_FAT_LCNAMES=y -CONFIG_FAT_LFN=y -CONFIG_FAT_MAXFNAME=32 -CONFIG_FS_FAT=y -CONFIG_FS_MQUEUE_MPATH="/var/mqueue" -CONFIG_FS_PROCFS=y -CONFIG_FS_READABLE=y -CONFIG_FS_WRITABLE=y -CONFIG_HAVE_CXX=y -CONFIG_HAVE_CXXINITIALIZE=y -CONFIG_HOST_WINDOWS=y -CONFIG_IDLETHREAD_STACKSIZE=1024 -CONFIG_IEEE802154_DEFAULT_EADDR=0x00fade00deadbeef -CONFIG_IEEE802154_I8SAK_PRIORITY=100 -CONFIG_IEEE802154_I8SAK_STACKSIZE=2048 -CONFIG_IEEE802154_I8SAK=y -CONFIG_IEEE802154_IND_IRQRESERVE=10 -CONFIG_IEEE802154_IND_PREALLOC=32 -CONFIG_IEEE802154_LIBMAC=y -CONFIG_IEEE802154_LIBUTILS=y -CONFIG_IEEE802154_MACDEV_RECVRPRIO=0 -CONFIG_IEEE802154_MACDEV=y -CONFIG_IEEE802154_MRF24J40=y -CONFIG_IEEE802154_NETDEV_LPWORK=y -CONFIG_IEEE802154_NETDEV_RECVRPRIO=1 -CONFIG_IEEE802154_NETDEV=y -CONFIG_INIT_ENTRYPOINT=y -CONFIG_INTELHEX_BINARY=y -CONFIG_IOB_BUFSIZE=128 -CONFIG_IOB_NBUFFERS=32 -CONFIG_IOB_NCHAINS=16 -CONFIG_IOB_THROTTLE=8 -CONFIG_LIB_BOARDCTL=y -CONFIG_LIB_HOMEDIR="/" -CONFIG_LIB_RAND_ORDER=1 -CONFIG_LIB_SENDFILE_BUFSIZE=512 -CONFIG_LIBC_LONG_LONG=y -CONFIG_LIBC_MAX_TMPFILE=32 -CONFIG_LIBC_NETDB=y -CONFIG_LIBC_TMPDIR="/tmp" -CONFIG_MAC802154_HPWORK=y -CONFIG_MAC802154_NNOTIF=48 -CONFIG_MAC802154_NPANDESC=5 -CONFIG_MAC802154_NTXDESC=32 -CONFIG_MAX_TASKS=16 -CONFIG_MAX_WDOGPARMS=2 -CONFIG_MCU_SERIAL=y -CONFIG_MM_IOB=y -CONFIG_MM_REGIONS=1 -CONFIG_MMCSD_HAVECARDDETECT=y -CONFIG_MMCSD_MULTIBLOCK_DISABLE=y -CONFIG_MMCSD_NSLOTS=1 -CONFIG_MMCSD_SDIO=y -CONFIG_MMCSD=y -CONFIG_MQ_MAXMSGSIZE=32 -CONFIG_MTD_AT24XX=y -CONFIG_MTD_AT25=y -CONFIG_MTD_CONFIG_ERASEDVALUE=0xff -CONFIG_MTD_CONFIG=y -CONFIG_MTD=y -CONFIG_NAME_MAX=32 -CONFIG_NET_6LOWPAN_COMPRESSION_HC06=y -CONFIG_NET_6LOWPAN_COMPRESSION_THRESHOLD=63 -CONFIG_NET_6LOWPAN_FRAG=y -CONFIG_NET_6LOWPAN_FRAMELEN=127 -CONFIG_NET_6LOWPAN_MAX_MACTRANSMITS=4 -CONFIG_NET_6LOWPAN_MAXADDRCONTEXT_PREFIX_0_0=0xaa -CONFIG_NET_6LOWPAN_MAXADDRCONTEXT_PREFIX_0_1=0xaa -CONFIG_NET_6LOWPAN_MAXADDRCONTEXT=1 -CONFIG_NET_6LOWPAN_MAXAGE=20 -CONFIG_NET_6LOWPAN_MTU=1294 -CONFIG_NET_6LOWPAN_TCP_RECVWNDO=1220 -CONFIG_NET_6LOWPAN=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_ETH_MTU=590 -CONFIG_NET_ETH_TCP_RECVWNDO=536 -CONFIG_NET_ETHERNET=y -CONFIG_NET_GUARDSIZE=2 -CONFIG_NET_HAVE_STAR=y -CONFIG_NET_HOSTNAME="MRF24J40-Hub" -CONFIG_NET_IPFORWARD=y -# CONFIG_NET_IPv4 is not set -CONFIG_NET_IPv6_NCONF_ENTRIES=8 -CONFIG_NET_IPv6=y -CONFIG_NET_MAX_LISTENPORTS=20 -CONFIG_NET_NACTIVESOCKETS=16 -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STAR=y -CONFIG_NET_STARHUB=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_CONNS=8 -CONFIG_NET_TCP_NWRBCHAINS=8 -CONFIG_NET_TCP_READAHEAD=y -CONFIG_NET_TCP_RECVDELAY=0 -CONFIG_NET_TCP_WRITE_BUFFERS=y -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP_CHECKSUMS=y -CONFIG_NET_UDP_CONNS=8 -CONFIG_NET_UDP_READAHEAD=y -CONFIG_NET_UDP=y -CONFIG_NET=y -CONFIG_NETDB_DNSCLIENT_ENTRIES=8 -CONFIG_NETDB_DNSCLIENT_LIFESEC=3600 -CONFIG_NETDB_DNSCLIENT_MAXRESPONSE=96 -CONFIG_NETDB_DNSCLIENT_NAMESIZE=32 -CONFIG_NETDB_DNSCLIENT=y -CONFIG_NETDB_DNSSERVER_NOADDR=y -CONFIG_NETDEV_IOCTL=y -CONFIG_NETDEV_LATEINIT=y -CONFIG_NETDEV_PHY_IOCTL=y -CONFIG_NETDEV_STATISTICS=y -CONFIG_NETDEV_TELNET=y -CONFIG_NETDEV_WIRELESS_IOCTL=y -CONFIG_NETDEVICES=y -CONFIG_NETUTILS_NETLIB=y -CONFIG_NETUTILS_TELNETC=y -CONFIG_NETUTILS_TELNETD=y -CONFIG_NETUTILS_TFTPC=y -CONFIG_NETUTILS_WEBCLIENT=y -CONFIG_NFILE_DESCRIPTORS=8 -CONFIG_NFILE_STREAMS=8 -CONFIG_NPTHREAD_KEYS=4 -CONFIG_NSH_ARCHINIT=y -CONFIG_NSH_ARGCAT=y -CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_CMDOPT_HEXDUMP=y -CONFIG_NSH_CMDPARMS=y -CONFIG_NSH_CODECS_BUFSIZE=128 -CONFIG_NSH_CONSOLE=y -CONFIG_NSH_DISABLE_DATE=y -CONFIG_NSH_DISABLE_GET=y -CONFIG_NSH_DISABLE_LOSMART=y -CONFIG_NSH_DISABLE_PRINTF=y -CONFIG_NSH_DISABLE_PUT=y -CONFIG_NSH_DISABLE_WGET=y -CONFIG_NSH_DRIPADDR=0x0a000001 -CONFIG_NSH_FILEIOSIZE=512 -CONFIG_NSH_IOBUFFER_SIZE=512 -CONFIG_NSH_IPADDR=0x0a000002 -CONFIG_NSH_LIBRARY=y -CONFIG_NSH_LINELEN=64 -CONFIG_NSH_MACADDR=0x00fade00deadbeef -CONFIG_NSH_MAX_ROUNDTRIP=20 -CONFIG_NSH_MAXARGUMENTS=6 -CONFIG_NSH_MMCSDMINOR=0 -CONFIG_NSH_MMCSDSLOTNO=0 -CONFIG_NSH_NESTDEPTH=3 -CONFIG_NSH_NETINIT_MONITOR=y -CONFIG_NSH_NETINIT_RETRYMSEC=2000 -CONFIG_NSH_NETINIT_SIGNO=18 -CONFIG_NSH_NETINIT_THREAD_PRIORITY=80 -CONFIG_NSH_NETINIT_THREAD_STACKSIZE=1568 -CONFIG_NSH_NETINIT_THREAD=y -CONFIG_NSH_NETINIT=y -CONFIG_NSH_NETLOCAL=y -CONFIG_NSH_NETMASK=0xffffff00 -CONFIG_NSH_NOMAC=y -CONFIG_NSH_PROC_MOUNTPOINT="/proc" -CONFIG_NSH_READLINE=y -CONFIG_NSH_SWMAC=y -CONFIG_NSH_TELNET=y -CONFIG_NSH_TELNETD_CLIENTPRIO=100 -CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048 -CONFIG_NSH_TELNETD_DAEMONPRIO=100 -CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048 -CONFIG_NSH_TELNETD_PORT=23 -CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)" -CONFIG_NSOCKET_DESCRIPTORS=8 -CONFIG_NUNGET_CHARS=2 -CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024 -CONFIG_PREALLOC_MQ_MSGS=4 -CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=32 -CONFIG_PTHREAD_MUTEX_ROBUST=y -CONFIG_PTHREAD_STACK_DEFAULT=2048 -CONFIG_PTHREAD_STACK_MIN=256 -CONFIG_RAM_SIZE=393216 -CONFIG_RAM_START=0x20400000 -CONFIG_RAMLOG_BUFSIZE=8192 -CONFIG_RAMLOG_NONBLOCKING=y -CONFIG_RAMLOG_NPOLLWAITERS=4 -CONFIG_RAMLOG_SYSLOG=y -CONFIG_RAMLOG=y -CONFIG_RAW_BINARY=y -CONFIG_READLINE_ECHO=y -CONFIG_READLINE_HAVE_EXTMATCH=y -CONFIG_RR_INTERVAL=200 -CONFIG_SAMV7_EMAC_HPWORK=y -CONFIG_SAMV7_EMAC=y -CONFIG_SAMV7_EMAC0_AUTONEG=y -CONFIG_SAMV7_EMAC0_ISETH0=y -CONFIG_SAMV7_EMAC0_NRXBUFFERS=16 -CONFIG_SAMV7_EMAC0_NTXBUFFERS=8 -CONFIG_SAMV7_EMAC0_PHYADDR=1 -CONFIG_SAMV7_EMAC0_PHYSR_100FD=0x6 -CONFIG_SAMV7_EMAC0_PHYSR_100HD=0x2 -CONFIG_SAMV7_EMAC0_PHYSR_10FD=0x5 -CONFIG_SAMV7_EMAC0_PHYSR_10HD=0x1 -CONFIG_SAMV7_EMAC0_PHYSR_ALTCONFIG=y -CONFIG_SAMV7_EMAC0_PHYSR_ALTMODE=0x7 -CONFIG_SAMV7_EMAC0_PHYSR=30 -CONFIG_SAMV7_EMAC0_RMII=y -CONFIG_SAMV7_EMAC0=y -CONFIG_SAMV7_ERASE_ENABLE=y -CONFIG_SAMV7_GPIO_IRQ=y -CONFIG_SAMV7_GPIOA_IRQ=y -CONFIG_SAMV7_GPIOC_IRQ=y -CONFIG_SAMV7_HAVE_EBI=y -CONFIG_SAMV7_HAVE_HSMCI0=y -CONFIG_SAMV7_HAVE_MCAN1=y -CONFIG_SAMV7_HAVE_SDRAMC=y -CONFIG_SAMV7_HAVE_SPI0=y -CONFIG_SAMV7_HAVE_SPI1=y -CONFIG_SAMV7_HAVE_TWIHS2=y -CONFIG_SAMV7_HAVE_USART0=y -CONFIG_SAMV7_HAVE_USART1=y -CONFIG_SAMV7_HAVE_USART2=y -CONFIG_SAMV7_HAVE_USBHS=y -CONFIG_SAMV7_HSMCI_DMA=y -CONFIG_SAMV7_HSMCI=y -CONFIG_SAMV7_HSMCI0=y -CONFIG_SAMV7_JTAG_FULL_ENABLE=y -CONFIG_SAMV7_TWIHS0_FREQUENCY=100000 -CONFIG_SAMV7_TWIHS0_GLITCH_FILTER=1 -CONFIG_SAMV7_TWIHS0=y -# CONFIG_SAMV7_UART0 is not set -# CONFIG_SAMV7_UART1 is not set -# CONFIG_SAMV7_UART2 is not set -# CONFIG_SAMV7_UART3 is not set -# CONFIG_SAMV7_UART4 is not set -CONFIG_SAMV7_USART1=y -CONFIG_SAMV7_XDMAC=y -CONFIG_SCHED_HPWORK=y -CONFIG_SCHED_HPWORKPERIOD=50000 -CONFIG_SCHED_HPWORKPRIORITY=224 -CONFIG_SCHED_HPWORKSTACKSIZE=2048 -CONFIG_SCHED_LPNTHREADS=1 -CONFIG_SCHED_LPWORK=y -CONFIG_SCHED_LPWORKPERIOD=50000 -CONFIG_SCHED_LPWORKPRIORITY=160 -CONFIG_SCHED_LPWORKSTACKSIZE=2048 -CONFIG_SCHED_WAITPID=y -CONFIG_SCHED_WORKQUEUE=y -CONFIG_SDCLONE_DISABLE=y -CONFIG_SDIO_BLOCKSETUP=y -CONFIG_SDIO_DMA=y -CONFIG_SERIAL_CONSOLE=y -CONFIG_SERIAL_NPOLLWAITERS=2 -CONFIG_SERIAL=y -CONFIG_SIG_SIGALARM=3 -CONFIG_SIG_SIGCONDTIMEDOUT=16 -CONFIG_SIG_SIGUSR1=1 -CONFIG_SIG_SIGUSR2=2 -CONFIG_SIG_SIGWORK=17 -CONFIG_SPI_EXCHANGE=y -CONFIG_SPI=y -CONFIG_STANDARD_SERIAL=y -CONFIG_START_DAY=1 -CONFIG_START_MONTH=7 -CONFIG_START_YEAR=2017 -CONFIG_STDIO_BUFFER_SIZE=64 -CONFIG_STDIO_LINEBUFFER=y -CONFIG_SYSTEM_READLINE=y -CONFIG_SYSTEM_TELNET_CLIENT=y -CONFIG_SYSTEM_TELNET_CLIENT_PRIORITY=100 -CONFIG_SYSTEM_TELNET_CLIENT_STACKSIZE=2048 -CONFIG_TASK_NAME_SIZE=31 -CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048 -CONFIG_TELNET_RXBUFFER_SIZE=256 -CONFIG_TELNET_TXBUFFER_SIZE=256 -CONFIG_TOOLCHAIN_WINDOWS=y -CONFIG_USART1_2STOP=0 -CONFIG_USART1_BAUD=115200 -CONFIG_USART1_BITS=8 -CONFIG_USART1_PARITY=0 -CONFIG_USART1_RXBUFSIZE=256 -CONFIG_USART1_SERIAL_CONSOLE=y -CONFIG_USART1_SERIALDRIVER=y -CONFIG_USART1_TXBUFSIZE=256 -CONFIG_USEC_PER_TICK=10000 -CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_USERMAIN_STACKSIZE=2048 -CONFIG_WDOG_INTRESERVE=4 -CONFIG_WEBCLIENT_TIMEOUT=10 -CONFIG_WINDOWS_CYGWIN=y -CONFIG_WIRELESS_IEEE802154=y -CONFIG_WIRELESS=y diff --git a/configs/samv71-xult/src/sam_mrf24j40.c b/configs/samv71-xult/src/sam_mrf24j40.c index 06613a00c8..2453830b02 100644 --- a/configs/samv71-xult/src/sam_mrf24j40.c +++ b/configs/samv71-xult/src/sam_mrf24j40.c @@ -75,7 +75,7 @@ struct sam_priv_s uint32_t rstcfg; #endif uint8_t irq; - uint8_t spidev; + uint8_t csno; }; /**************************************************************************** @@ -121,7 +121,7 @@ static struct sam_priv_s g_mrf24j40_mb1_priv = .rstcfg = CLICK_MB1_RESET, #endif .irq = IRQ_MB1, - .spidev = 0, + .csno = MB1_CSNO, }; #endif @@ -135,7 +135,7 @@ static struct sam_priv_s g_mrf24j40_mb2_priv = .rstcfg = CLICK_MB2_RESET, #endif .irq = IRQ_MB2, - .spidev = 0, + .csno = MB2_CSNO, }; #endif @@ -244,10 +244,10 @@ static int sam_mrf24j40_devsetup(FAR struct sam_priv_s *priv) /* Initialize the SPI bus and get an instance of the SPI interface */ - spi = sam_spibus_initialize(priv->spidev); + spi = sam_spibus_initialize(priv->csno); if (spi == NULL) { - wlerr("ERROR: Failed to initialize SPI bus %d\n", priv->spidev); + wlerr("ERROR: Failed to initialize SPI bus %d\n", priv->csno); return -ENODEV; } @@ -256,7 +256,7 @@ static int sam_mrf24j40_devsetup(FAR struct sam_priv_s *priv) radio = mrf24j40_init(spi, &priv->dev); if (radio == NULL) { - wlerr("ERROR: Failed to initialize SPI bus %d\n", priv->spidev); + wlerr("ERROR: Failed to initialize MRF24J40 radio\n"); return -ENODEV; } diff --git a/configs/samv71-xult/src/samv71-xult.h b/configs/samv71-xult/src/samv71-xult.h index 273f008b5d..c9b3718b2c 100644 --- a/configs/samv71-xult/src/samv71-xult.h +++ b/configs/samv71-xult/src/samv71-xult.h @@ -611,11 +611,16 @@ #define CLICK_MB2_CS (GPIO_OUTPUT | GPIO_CFG_DEFAULT | GPIO_OUTPUT_SET | \ GPIO_PORT_PIOC | GPIO_PIN9) +#define MB1_CSNO SPI0_CS1 +#define MB2_CSNO SPI0_CS0 /* REVISIT PC9 is not one of the NPCS pins */ + /* EDBG DGI_SPI Chip select (PD12) */ #define CLICK_EDBG_CS (GPIO_OUTPUT | GPIO_CFG_DEFAULT | GPIO_OUTPUT_SET | \ GPIO_PORT_PIOD | GPIO_PIN12) +#define EDBG_CSNO SPI0_CS2 + /************************************************************************************ * Public Types ************************************************************************************/