arch: max32660: Fix style warnings and compile errors
Summary: - This commit fixes style warnings under max32660 - Also fix compile errors in max32660_gpio.c with CONFIG_DEBUG_GPIO_INFO=y Impact: - None Testing: - Built with max32660-evsys:nsh Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>
This commit is contained in:
parent
7a58144ff2
commit
9f414cf6db
@ -439,6 +439,7 @@ static void max326_set_clksrc(FAR const struct clock_setup_s *clksetup)
|
|||||||
switch (clksetup->clksrc)
|
switch (clksetup->clksrc)
|
||||||
{
|
{
|
||||||
case CLKSRC_HFIO: /* High frequency internal oscillator */
|
case CLKSRC_HFIO: /* High frequency internal oscillator */
|
||||||
|
|
||||||
/* Select the High-Frequency Internal Oscillator (HFIO) as the
|
/* Select the High-Frequency Internal Oscillator (HFIO) as the
|
||||||
* SYSOSC clock source.
|
* SYSOSC clock source.
|
||||||
*/
|
*/
|
||||||
@ -448,6 +449,7 @@ static void max326_set_clksrc(FAR const struct clock_setup_s *clksetup)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case CLKSRC_8KHZ: /* 8kHz Internal Ultra-Low Power Nano-Ring Oscillator */
|
case CLKSRC_8KHZ: /* 8kHz Internal Ultra-Low Power Nano-Ring Oscillator */
|
||||||
|
|
||||||
/* Select the 8kHz Internal Ultra-Low Power Nano-Ring Oscillator
|
/* Select the 8kHz Internal Ultra-Low Power Nano-Ring Oscillator
|
||||||
* as the SYSOSC clock source.
|
* as the SYSOSC clock source.
|
||||||
*/
|
*/
|
||||||
@ -597,7 +599,7 @@ static void max326_periph_reset(void)
|
|||||||
* clocking using the settings in board.h. This function also performs
|
* clocking using the settings in board.h. This function also performs
|
||||||
* other low-level chip as necessary.
|
* other low-level chip as necessary.
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
void max326_clockconfig(FAR const struct clock_setup_s *clksetup)
|
void max326_clockconfig(FAR const struct clock_setup_s *clksetup)
|
||||||
{
|
{
|
||||||
@ -685,7 +687,7 @@ void max326_clockconfig(FAR const struct clock_setup_s *clksetup)
|
|||||||
* Description:
|
* Description:
|
||||||
* Return the High-Frequency Internal Oscillator (HFIO) frequency.
|
* Return the High-Frequency Internal Oscillator (HFIO) frequency.
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
uint32_t max326_hfio_frequency(void)
|
uint32_t max326_hfio_frequency(void)
|
||||||
{
|
{
|
||||||
@ -715,7 +717,7 @@ uint32_t max326_hfio_frequency(void)
|
|||||||
* Description:
|
* Description:
|
||||||
* Return the current CPU frequency.
|
* Return the current CPU frequency.
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
uint32_t max326_cpu_frequency(void)
|
uint32_t max326_cpu_frequency(void)
|
||||||
{
|
{
|
||||||
@ -728,7 +730,7 @@ uint32_t max326_cpu_frequency(void)
|
|||||||
* Description:
|
* Description:
|
||||||
* Return the current peripheral clock frequency.
|
* Return the current peripheral clock frequency.
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
uint32_t max326_pclk_frequency(void)
|
uint32_t max326_pclk_frequency(void)
|
||||||
{
|
{
|
||||||
|
@ -63,8 +63,9 @@
|
|||||||
* Private Types
|
* Private Types
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
/* This structure describes state of a DMA channel */
|
/* This structure describes state of a DMA channel
|
||||||
/* TODO: Additional reload values for chains > 2 could be held here */
|
* TODO: Additional reload values for chains > 2 could be held here
|
||||||
|
*/
|
||||||
|
|
||||||
struct max326_dmach_s
|
struct max326_dmach_s
|
||||||
{
|
{
|
||||||
@ -192,8 +193,8 @@ static int max326_dmach_interrupt(int irq, FAR void *context, FAR void *arg)
|
|||||||
|
|
||||||
if ((stat & DMACH_STAT_CHST) != 0)
|
if ((stat & DMACH_STAT_CHST) != 0)
|
||||||
{
|
{
|
||||||
/* We must be on the buffer of a chained DMA */
|
/* We must be on the buffer of a chained DMA
|
||||||
/* TODO: Add software logic to manage more than two DMA buffers in
|
* TODO: Add software logic to manage more than two DMA buffers in
|
||||||
* the chain.
|
* the chain.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -245,7 +246,9 @@ void weak_function arm_dma_initialize(void)
|
|||||||
{
|
{
|
||||||
struct max326_dmach_s *dmach = &g_max326_dmach[i];
|
struct max326_dmach_s *dmach = &g_max326_dmach[i];
|
||||||
|
|
||||||
/* Initialize the state structure (assuming that it is already zeroed) */
|
/* Initialize the state structure
|
||||||
|
* (assuming that it is already zeroed)
|
||||||
|
*/
|
||||||
|
|
||||||
dmach->chno = i;
|
dmach->chno = i;
|
||||||
|
|
||||||
@ -303,8 +306,8 @@ DMA_HANDLE max326_dma_channel(void)
|
|||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
* Release a DMA channel. NOTE: The 'handle' used in this argument must
|
* Release a DMA channel. NOTE: The 'handle' used in this argument must
|
||||||
* NEVER be used again until max326_dma_channel() is called again to re-gain
|
* NEVER be used again until max326_dma_channel() is called again
|
||||||
* a valid handle.
|
* to re-gain a valid handle.
|
||||||
*
|
*
|
||||||
* Returned Value:
|
* Returned Value:
|
||||||
* None
|
* None
|
||||||
|
@ -125,8 +125,8 @@ DMA_HANDLE max326_dma_channel(void);
|
|||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
* Release a DMA channel. NOTE: The 'handle' used in this argument must
|
* Release a DMA channel. NOTE: The 'handle' used in this argument must
|
||||||
* NEVER be used again until max326_dma_channel() is called again to re-gain
|
* NEVER be used again until max326_dma_channel() is called again to
|
||||||
* a valid handle.
|
* re-gain a valid handle.
|
||||||
*
|
*
|
||||||
* Returned Value:
|
* Returned Value:
|
||||||
* None
|
* None
|
||||||
|
@ -484,7 +484,7 @@ bool max326_gpio_read(max326_pinset_t pinset)
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_GPIO_INFO
|
#ifdef CONFIG_DEBUG_GPIO_INFO
|
||||||
int max326_gpio_dump(max326_pinset_t pinset, const char *msg);
|
int max326_gpio_dump(max326_pinset_t pinset, const char *msg)
|
||||||
{
|
{
|
||||||
unsigned int pin;
|
unsigned int pin;
|
||||||
uint32_t pinmask;
|
uint32_t pinmask;
|
||||||
@ -513,7 +513,6 @@ int max326_gpio_dump(max326_pinset_t pinset, const char *msg);
|
|||||||
afmode |= (regval & pinmask) != 0 ? 2 : 0;
|
afmode |= (regval & pinmask) != 0 ? 2 : 0;
|
||||||
gpioinfo(" Mode: %d\n", g_afmode[afmode]);
|
gpioinfo(" Mode: %d\n", g_afmode[afmode]);
|
||||||
|
|
||||||
|
|
||||||
regval = getreg32(MAX326_GPIO0_OUTEN);
|
regval = getreg32(MAX326_GPIO0_OUTEN);
|
||||||
gpioinfo(" Output Enable: %s\n",
|
gpioinfo(" Output Enable: %s\n",
|
||||||
(regval & pinmask) != 0 ? "Yes" : "No");
|
(regval & pinmask) != 0 ? "Yes" : "No");
|
||||||
@ -527,7 +526,7 @@ int max326_gpio_dump(max326_pinset_t pinset, const char *msg);
|
|||||||
(regval & pinmask) != 0 ? "High" : "Low");
|
(regval & pinmask) != 0 ? "High" : "Low");
|
||||||
|
|
||||||
regval = getreg32(MAX326_GPIO0_INTMODE);
|
regval = getreg32(MAX326_GPIO0_INTMODE);
|
||||||
edge = (regval & pinmask) != 0
|
edge = (regval & pinmask) != 0;
|
||||||
gpioinfo(" Intr Mode: %s\n", edge ? "Yes" : "No");
|
gpioinfo(" Intr Mode: %s\n", edge ? "Yes" : "No");
|
||||||
|
|
||||||
regval = getreg32(MAX326_GPIO0_INTPOL);
|
regval = getreg32(MAX326_GPIO0_INTPOL);
|
||||||
@ -562,13 +561,13 @@ int max326_gpio_dump(max326_pinset_t pinset, const char *msg);
|
|||||||
gpioinfo(" Wakeup Enabled: %s\n",
|
gpioinfo(" Wakeup Enabled: %s\n",
|
||||||
(regval & pinmask) != 0 ? "Yes" : "No");
|
(regval & pinmask) != 0 ? "Yes" : "No");
|
||||||
|
|
||||||
pullmode = 0
|
pullmode = 0;
|
||||||
regval = getreg32(MAX326_GPIO0_PULLEN);
|
regval = getreg32(MAX326_GPIO0_PULLEN);
|
||||||
if ((regval & pinmask) != 0)
|
if ((regval & pinmask) != 0)
|
||||||
{
|
{
|
||||||
if ((PULLUP_SET & pinmask) == 0)
|
if ((PULLUP_SET & pinmask) == 0)
|
||||||
{
|
{
|
||||||
pullmode = 1:
|
pullmode = 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -583,9 +582,9 @@ int max326_gpio_dump(max326_pinset_t pinset, const char *msg);
|
|||||||
regval = getreg32(MAX326_GPIO0_DS0SEL);
|
regval = getreg32(MAX326_GPIO0_DS0SEL);
|
||||||
if ((regval & pinmask) != 0)
|
if ((regval & pinmask) != 0)
|
||||||
{
|
{
|
||||||
if (PULLUP_SET & pinmask) == 0)
|
if ((PULLUP_SET & pinmask) == 0)
|
||||||
{
|
{
|
||||||
dsmode = 3:
|
dsmode = 3;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -593,10 +592,10 @@ int max326_gpio_dump(max326_pinset_t pinset, const char *msg);
|
|||||||
dsmode = (regval & pinmask) != 0 ? 3 : 1;
|
dsmode = (regval & pinmask) != 0 ? 3 : 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (PULLUP_SET & pinmask) != 0)
|
else if ((PULLUP_SET & pinmask) != 0)
|
||||||
{
|
{
|
||||||
regval = getreg32(MAX326_GPIO0_DS1SEL);
|
regval = getreg32(MAX326_GPIO0_DS1SEL);
|
||||||
if (regval & pinmask) != 0)
|
if ((regval & pinmask) != 0)
|
||||||
{
|
{
|
||||||
dsmode = 2;
|
dsmode = 2;
|
||||||
}
|
}
|
||||||
@ -611,5 +610,7 @@ int max326_gpio_dump(max326_pinset_t pinset, const char *msg);
|
|||||||
regval = getreg32(MAX326_GPIO0_SRSEL);
|
regval = getreg32(MAX326_GPIO0_SRSEL);
|
||||||
gpioinfo(" Slew Enabled: %s\n",
|
gpioinfo(" Slew Enabled: %s\n",
|
||||||
(regval & pinmask) != 0 ? "Yes" : "No");
|
(regval & pinmask) != 0 ? "Yes" : "No");
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
* Pre-processor Definitions
|
* Pre-processor Definitions
|
||||||
************************************************************************************/
|
************************************************************************************/
|
||||||
|
|
||||||
/* Bit-encoded input to max326_gpio_config() ******************************************/
|
/* Bit-encoded input to max326_gpio_config() ****************************************/
|
||||||
|
|
||||||
/* 16-Bit Encoding: FFFF WRRV HSDD NNNN
|
/* 16-Bit Encoding: FFFF WRRV HSDD NNNN
|
||||||
*
|
*
|
||||||
|
@ -193,17 +193,18 @@ void max326_gpio_irqconfig(max326_pinset_t cfgset)
|
|||||||
putreg32(regval, MAX326_GPIO0_INTDUALEDGE);
|
putreg32(regval, MAX326_GPIO0_INTDUALEDGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/************************************************************************************
|
/****************************************************************************
|
||||||
* Name: max326_gpio_irqdisable
|
* Name: max326_gpio_irqdisable
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
* Disable a GPIO pin interrupt. This function should not be called directly but,
|
* Disable a GPIO pin interrupt.
|
||||||
|
* This function should not be called directly but,
|
||||||
* rather through up_disable_irq();
|
* rather through up_disable_irq();
|
||||||
*
|
*
|
||||||
* Assumptions:
|
* Assumptions:
|
||||||
* We are in a critical section.
|
* We are in a critical section.
|
||||||
*
|
*
|
||||||
************************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
void max326_gpio_irqdisable(int irq)
|
void max326_gpio_irqdisable(int irq)
|
||||||
{
|
{
|
||||||
@ -221,17 +222,18 @@ void max326_gpio_irqdisable(int irq)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/************************************************************************************
|
/****************************************************************************
|
||||||
* Name: max326_gpio_irqenable
|
* Name: max326_gpio_irqenable
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
* Enable a GPIO pin interrupt. This function should not be called directly but,
|
* Enable a GPIO pin interrupt.
|
||||||
|
* This function should not be called directly but,
|
||||||
* rather through up_enable_irq();
|
* rather through up_enable_irq();
|
||||||
*
|
*
|
||||||
* Assumptions:
|
* Assumptions:
|
||||||
* We are in a critical section.
|
* We are in a critical section.
|
||||||
*
|
*
|
||||||
************************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
void max326_gpio_irqenable(int irq)
|
void max326_gpio_irqenable(int irq)
|
||||||
{
|
{
|
||||||
|
@ -216,20 +216,20 @@ static void max326_setbaud(uintptr_t base,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/************************************************************************************
|
/****************************************************************************
|
||||||
* Public Functions
|
* Public Functions
|
||||||
************************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
/************************************************************************************
|
/****************************************************************************
|
||||||
* Name: max326_lowsetup
|
* Name: max326_lowsetup
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
* Called at the very beginning of _start. Performs low level initialization
|
* Called at the very beginning of _start.
|
||||||
* including setup of the console UART. This UART initialization is done
|
* Performs low level initialization including setup of the console UART.
|
||||||
* early so that the serial console is available for debugging very early in
|
* This UART initialization is done early so that the serial console
|
||||||
* the boot sequence.
|
* is available for debugging very early in the boot sequence.
|
||||||
*
|
*
|
||||||
************************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
void max326_lowsetup(void)
|
void max326_lowsetup(void)
|
||||||
{
|
{
|
||||||
@ -304,8 +304,9 @@ void max326_uart_configure(uintptr_t base,
|
|||||||
|
|
||||||
max326_setbaud(CONSOLE_BASE, config);
|
max326_setbaud(CONSOLE_BASE, config);
|
||||||
|
|
||||||
/* Configure RX and TX FIFOs */
|
/* Configure RX and TX FIFOs
|
||||||
/* Flush FIFOs */
|
* Flush FIFOs
|
||||||
|
*/
|
||||||
|
|
||||||
ctrl0 = getreg32(base + MAX326_UART_CTRL0_OFFSET);
|
ctrl0 = getreg32(base + MAX326_UART_CTRL0_OFFSET);
|
||||||
ctrl0 |= (UART_CTRL0_TXFLUSH | UART_CTRL0_RXFLUSH);
|
ctrl0 |= (UART_CTRL0_TXFLUSH | UART_CTRL0_RXFLUSH);
|
||||||
|
@ -443,7 +443,8 @@ int up_rtc_gettime(FAR struct timespec *tp)
|
|||||||
* Name: up_rtc_settime
|
* Name: up_rtc_settime
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
* Set the RTC to the provided time. All RTC implementations must be able to
|
* Set the RTC to the provided time.
|
||||||
|
* All RTC implementations must be able to
|
||||||
* set their time based on a standard tm.
|
* set their time based on a standard tm.
|
||||||
*
|
*
|
||||||
* Input Parameters:
|
* Input Parameters:
|
||||||
@ -515,7 +516,8 @@ int up_rtc_settime(FAR const struct timespec *tp)
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#ifdef CONFIG_RTC_ALARM
|
#ifdef CONFIG_RTC_ALARM
|
||||||
int max326_rtc_setalarm(FAR struct timespec *ts, alm_callback_t cb, FAR void *arg)
|
int max326_rtc_setalarm(FAR struct timespec *ts,
|
||||||
|
alm_callback_t cb, FAR void *arg)
|
||||||
{
|
{
|
||||||
irqstate_t flags;
|
irqstate_t flags;
|
||||||
b32_t b32now;
|
b32_t b32now;
|
||||||
|
Loading…
Reference in New Issue
Block a user