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

Fix typo/compile error introduced with last HSMCI changes

Browse Source
This commit is contained in:
Gregory Nutt 2014-06-30 16:08:29 -06:00
parent d8f4b29d5f
commit c5f2ec1637
2 changed files with 141 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
arch/arm/src/sama5/sam_emacb.c
View File

@ -94,35 +94,37 @@
* Pre-processor Definitions
****************************************************************************/
/* EMAC0 Configuration ******************************************************/
/* Number of buffers for RX */
#ifndef CONFIG_SAMA5_EMAC0_NRXBUFFERS
#ifdef CONFIG_SAMA5_EMAC0
/* Number of buffers for RX */
# ifndef CONFIG_SAMA5_EMAC0_NRXBUFFERS
# define CONFIG_SAMA5_EMAC0_NRXBUFFERS 16
#endif
# endif
/* Number of buffers for TX */
/* Number of buffers for TX */
#ifndef CONFIG_SAMA5_EMAC0_NTXBUFFERS
# ifndef CONFIG_SAMA5_EMAC0_NTXBUFFERS
# define CONFIG_SAMA5_EMAC0_NTXBUFFERS 8
#endif
# endif
#ifndef CONFIG_SAMA5_EMAC0_PHYADDR
# ifndef CONFIG_SAMA5_EMAC0_PHYADDR
# error "CONFIG_SAMA5_EMAC0_PHYADDR must be defined in the NuttX configuration"
#endif
# endif
#if !defined(CONFIG_SAMA5_EMAC0_MII) && !defined(CONFIG_SAMA5_EMAC0_RMII)
# if !defined(CONFIG_SAMA5_EMAC0_MII) && !defined(CONFIG_SAMA5_EMAC0_RMII)
# warning "Neither CONFIG_SAMA5_EMAC0_MII nor CONFIG_SAMA5_EMAC0_RMII defined"
#endif
# endif
#if defined(CONFIG_SAMA5_EMAC0_MII) && defined(CONFIG_SAMA5_EMAC0_RMII)
# if defined(CONFIG_SAMA5_EMAC0_MII) && defined(CONFIG_SAMA5_EMAC0_RMII)
# error "Both CONFIG_SAMA5_EMAC0_MII and CONFIG_SAMA5_EMAC0_RMII defined"
#endif
# endif
#ifndef CONFIG_SAMA5_EMAC0_PHYSR
# ifndef CONFIG_SAMA5_EMAC0_PHYSR
# error "CONFIG_SAMA5_EMAC0_PHYSR must be defined in the NuttX configuration"
#endif
# endif
#ifdef CONFIG_SAMA5_EMAC0_AUTONEG
# ifdef CONFIG_SAMA5_EMAC0_AUTONEG
# ifdef CONFIG_SAMA5_EMAC0_PHYSR_ALTCONFIG
# ifndef CONFIG_SAMA5_EMAC0_PHYSR_ALTMODE
# error "CONFIG_SAMA5_EMAC0_PHYSR_ALTMODE must be defined in the NuttX configuration"
@ -153,56 +155,59 @@
# error "CONFIG_SAMA5_EMAC0_PHYSR_FULLDUPLEX must be defined in the NuttX configuration"
# endif
# endif
#endif
# endif
/* PHY definitions */
/* PHY definitions */
#if defined(SAMA5_EMAC0_PHY_DM9161)
# if defined(SAMA5_EMAC0_PHY_DM9161)
# define EMAC0_MII_OUI_MSB 0x0181
# define EMAC0_MII_OUI_LSB 0x2e
#elif defined(SAMA5_EMAC0_PHY_LAN8700)
# elif defined(SAMA5_EMAC0_PHY_LAN8700)
# define EMAC0_MII_OUI_MSB 0x0007
# define EMAC0_MII_OUI_LSB 0x30
#elif defined(SAMA5_EMAC0_PHY_KSZ8051)
# elif defined(SAMA5_EMAC0_PHY_KSZ8051)
# define EMAC0_MII_OUI_MSB 0x0022
# define EMAC0_MII_OUI_LSB 0x05
#elif defined(SAMA5_EMAC0_PHY_KSZ8081)
# elif defined(SAMA5_EMAC0_PHY_KSZ8081)
# define EMAC0_MII_OUI_MSB 0x0022
# define EMAC0_MII_OUI_LSB 0x05
#else
# else
# error EMAC PHY unrecognized
#endif
# endif
#endif /* CONFIG_SAMA5_EMAC0 */
/* EMAC1 Configuration ******************************************************/
/* Number of buffers for RX */
#ifndef CONFIG_SAMA5_EMAC1_NRXBUFFERS
#ifdef CONFIG_SAMA5_EMAC1
/* Number of buffers for RX */
# ifndef CONFIG_SAMA5_EMAC1_NRXBUFFERS
# define CONFIG_SAMA5_EMAC1_NRXBUFFERS 16
#endif
# endif
/* Number of buffers for TX */
/* Number of buffers for TX */
#ifndef CONFIG_SAMA5_EMAC1_NTXBUFFERS
# ifndef CONFIG_SAMA5_EMAC1_NTXBUFFERS
# define CONFIG_SAMA5_EMAC1_NTXBUFFERS 8
#endif
# endif
#ifndef CONFIG_SAMA5_EMAC1_PHYADDR
# ifndef CONFIG_SAMA5_EMAC1_PHYADDR
# error "CONFIG_SAMA5_EMAC1_PHYADDR must be defined in the NuttX configuration"
#endif
# endif
#if !defined(CONFIG_SAMA5_EMAC1_MII) && !defined(CONFIG_SAMA5_EMAC1_RMII)
# if !defined(CONFIG_SAMA5_EMAC1_MII) && !defined(CONFIG_SAMA5_EMAC1_RMII)
# warning "Neither CONFIG_SAMA5_EMAC1_MII nor CONFIG_SAMA5_EMAC1_RMII defined"
#endif
# endif
#if defined(CONFIG_SAMA5_EMAC1_MII) && defined(CONFIG_SAMA5_EMAC1_RMII)
# if defined(CONFIG_SAMA5_EMAC1_MII) && defined(CONFIG_SAMA5_EMAC1_RMII)
# error "Both CONFIG_SAMA5_EMAC1_MII and CONFIG_SAMA5_EMAC1_RMII defined"
#endif
# endif
#ifndef CONFIG_SAMA5_EMAC1_PHYSR
# ifndef CONFIG_SAMA5_EMAC1_PHYSR
# error "CONFIG_SAMA5_EMAC1_PHYSR must be defined in the NuttX configuration"
#endif
# endif
#ifdef CONFIG_SAMA5_EMAC1_AUTONEG
# ifdef CONFIG_SAMA5_EMAC1_AUTONEG
# ifdef CONFIG_SAMA5_EMAC1_PHYSR_ALTCONFIG
# ifndef CONFIG_SAMA5_EMAC1_PHYSR_ALTMODE
# error "CONFIG_SAMA5_EMAC1_PHYSR_ALTMODE must be defined in the NuttX configuration"
@ -233,25 +238,26 @@
# error "CONFIG_SAMA5_EMAC1_PHYSR_FULLDUPLEX must be defined in the NuttX configuration"
# endif
# endif
#endif
# endif
/* PHY definitions */
/* PHY definitions */
#if defined(SAMA5_EMAC1_PHY_DM9161)
# if defined(SAMA5_EMAC1_PHY_DM9161)
# define EMAC1_MII_OUI_MSB 0x0181
# define EMAC1_MII_OUI_LSB 0x2e
#elif defined(SAMA5_EMAC1_PHY_LAN8700)
# elif defined(SAMA5_EMAC1_PHY_LAN8700)
# define EMAC1_MII_OUI_MSB 0x0007
# define EMAC1_MII_OUI_LSB 0x30
#elif defined(SAMA5_EMAC1_PHY_KSZ8051)
# elif defined(SAMA5_EMAC1_PHY_KSZ8051)
# define EMAC1_MII_OUI_MSB 0x0022
# define EMAC1_MII_OUI_LSB 0x05
#elif defined(SAMA5_EMAC1_PHY_KSZ8081)
# elif defined(SAMA5_EMAC1_PHY_KSZ8081)
# define EMAC1_MII_OUI_MSB 0x0022
# define EMAC1_MII_OUI_LSB 0x05
#else
# else
# error EMAC PHY unrecognized
#endif
# endif
#endif /* CONFIG_SAMA5_EMAC0 */
/* Common Configuration *****************************************************/

11
arch/arm/src/sama5/sam_pio.c
View File

@ -86,7 +86,7 @@ static const uint8_t g_piopid[SAM_NPIO] =
/* Used to determine if a PIO port is configured to support interrupts */
static const bool g_piointterrupts[SAM_NPIO] =
static const bool g_piointerrupt[SAM_NPIO] =
{
#ifdef CONFIG_SAMA5_PIOA_IRQ
true,
@ -109,14 +109,9 @@ static const bool g_piointterrupts[SAM_NPIO] =
false,
#endif
#ifdef CONFIG_SAMA5_PIOE_IRQ
true,
true
#else
false,
#endif
#ifdef CONFIG_SAMA5_PIOF_IRQ
true,
#else
false,
false
#endif
};