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

SAMA5 EMAC: Missing right parens from last change. Noted by Luciano Neri

Browse Source
This commit is contained in:
Gregory Nutt 2014-04-17 09:02:55 -06:00
parent 3133ebfcee
commit c6d70e29bc
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -7179,7 +7179,11 @@
Duckworth (2014-4-16).
* arch/arm/src/stm32/chip/stm32f20xxx_pinmap.h: Correct a mapping for
SPI MOSI pin. From dlsitzer (2014-4-26).
* arm/src/sama5/sam_clockconfig.c/.h: Move the un-definitions of
__ramfuncs__ from the .c file to the .h file or, otherwise, the
attribute will be applied differently for the prototype and the
function definition. Sourceforge patch 38 from Luciano Neri (2014-4-17).
* arm/src/sama5/sam_clockconfig.c and common/up_internal.h: Move the
un-definitions of __ramfuncs__ from the .c file to the .h file or,
otherwise, the attribute will be applied differently for the prototype
and the function definition. Sourceforge patch 38 from Luciano Neri
(2014-4-17).
* arch/arm/src/sama5/sam_emac.c: Add missing right parentheses. This
introduced in the above change and is Sourceforge patch 39 from Luciano
Neri (2014-4-17).

6
arch/arm/src/sama5/sam_emac.c
View File

@ -2484,15 +2484,15 @@ static int sam_phyinit(struct sam_emac_s *priv)
ndbg("ERROR: Cannot realize PHY clock\n");
return -EINVAL;
}
else if (mck > (80*1000*1000)
else if (mck > (80*1000*1000))
{
regval |= EMAC_NCFGR_CLK_DIV64; /* MCK divided by 64 (MCK up to 160 MHz) */
}
else if (mck > (40*1000*1000)
else if (mck > (40*1000*1000))
{
regval |= EMAC_NCFGR_CLK_DIV32; /* MCK divided by 32 (MCK up to 80 MHz) */
}
else if (mck > (20*1000*1000)
else if (mck > (20*1000*1000))
{
regval |= EMAC_NCFGR_CLK_DIV16; /* MCK divided by 16 (MCK up to 40 MHz) */
}