You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/07/28 11:07:39 UTC
[incubator-nuttx] branch master updated: arch: lc823450: Fix
nxstyle violations
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 904ec76 arch: lc823450: Fix nxstyle violations
904ec76 is described below
commit 904ec767f7663dc84c69b58a99d63056514a3e78
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Tue Jul 28 12:54:08 2020 +0900
arch: lc823450: Fix nxstyle violations
Summary:
- This PR fixes style violations for lc823450.
- NOTE: I will fix more style violations in separate PR later.
Impact:
- No impacts.
Testing:
- I checked build test only.
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
arch/arm/include/lc823450/chip.h | 12 ----
arch/arm/include/lc823450/clk.h | 12 ++--
arch/arm/include/lc823450/irq.h | 28 +++------
arch/arm/src/lc823450/chip.h | 30 +++++-----
arch/arm/src/lc823450/lc823450_adc.c | 20 +++----
arch/arm/src/lc823450/lc823450_adc.h | 48 +++++++--------
arch/arm/src/lc823450/lc823450_allocateheap2.c | 13 ++--
arch/arm/src/lc823450/lc823450_clockconfig.c | 11 ++--
arch/arm/src/lc823450/lc823450_clockconfig.h | 3 +-
arch/arm/src/lc823450/lc823450_cpustart.c | 1 -
arch/arm/src/lc823450/lc823450_dma.c | 15 +++--
arch/arm/src/lc823450/lc823450_dma.h | 2 +-
arch/arm/src/lc823450/lc823450_dvfs2.c | 23 ++++---
arch/arm/src/lc823450/lc823450_dvfs2.h | 2 +-
arch/arm/src/lc823450/lc823450_gpio.c | 5 +-
arch/arm/src/lc823450/lc823450_gpio.h | 4 +-
arch/arm/src/lc823450/lc823450_i2c.h | 5 +-
arch/arm/src/lc823450/lc823450_lowputc.c | 26 ++++----
arch/arm/src/lc823450/lc823450_lowputc.h | 15 ++---
arch/arm/src/lc823450/lc823450_mmcl.h | 2 +-
arch/arm/src/lc823450/lc823450_mpuinit2.h | 26 +++-----
arch/arm/src/lc823450/lc823450_mtd.h | 2 +-
arch/arm/src/lc823450/lc823450_pwm.h | 2 +-
arch/arm/src/lc823450/lc823450_rtc.c | 26 ++++----
arch/arm/src/lc823450/lc823450_sdc.h | 11 ++--
arch/arm/src/lc823450/lc823450_serial.c | 83 +++++++++++++++++---------
arch/arm/src/lc823450/lc823450_serial.h | 12 ++--
arch/arm/src/lc823450/lc823450_spifi2.c | 6 +-
arch/arm/src/lc823450/lc823450_spifi2.h | 3 +-
arch/arm/src/lc823450/lc823450_syscontrol.c | 10 +++-
arch/arm/src/lc823450/lc823450_testset.c | 1 +
arch/arm/src/lc823450/lc823450_timer.h | 2 +-
arch/arm/src/lc823450/lc823450_usbdev.c | 13 ++--
arch/arm/src/lc823450/lc823450_userspace.h | 26 +++-----
arch/arm/src/lc823450/lc823450_wdt.c | 44 +++++++-------
arch/arm/src/lc823450/lc823450_wdt.h | 2 +-
36 files changed, 278 insertions(+), 268 deletions(-)
diff --git a/arch/arm/include/lc823450/chip.h b/arch/arm/include/lc823450/chip.h
index bbf82dc..27c0941 100644
--- a/arch/arm/include/lc823450/chip.h
+++ b/arch/arm/include/lc823450/chip.h
@@ -54,16 +54,4 @@
#define NVIC_SYSH_PRIORITY_MAX 0x00 /* Zero is maximum priority */
#define NVIC_SYSH_PRIORITY_STEP 0x10 /* Four bits of interrupt priority used */
-/************************************************************************************
- * Public Types
- ************************************************************************************/
-
-/************************************************************************************
- * Public Data
- ************************************************************************************/
-
-/************************************************************************************
- * Public Functions
- ************************************************************************************/
-
#endif /* __ARCH_ARM_INCLUDE_LC823450_CHIP_H */
diff --git a/arch/arm/include/lc823450/clk.h b/arch/arm/include/lc823450/clk.h
index 90904b9..4d1c1c6 100644
--- a/arch/arm/include/lc823450/clk.h
+++ b/arch/arm/include/lc823450/clk.h
@@ -54,10 +54,9 @@
{0, "mtm1c", MCLKCNTEXT1, MCLKCNTEXT1_MTM1C_CLKEN}, \
}
-
-/************************************************************************************
+/****************************************************************************
* Public Types
- ************************************************************************************/
+ ****************************************************************************/
struct clk_st
{
@@ -78,10 +77,9 @@ enum clock_e
LC823450_CLOCK_NUM,
};
-
-/************************************************************************************
- * Public Functions
- ************************************************************************************/
+/****************************************************************************
+ * Public Functions Prototypes
+ ****************************************************************************/
void up_enable_clk(enum clock_e clk);
void up_disable_clk(enum clock_e clk);
diff --git a/arch/arm/include/lc823450/irq.h b/arch/arm/include/lc823450/irq.h
index 8a35a73..0d95704 100644
--- a/arch/arm/include/lc823450/irq.h
+++ b/arch/arm/include/lc823450/irq.h
@@ -52,11 +52,6 @@
* Pre-processor Definitions
****************************************************************************/
-/* IRQ numbers. The IRQ number corresponds vector number and hence map directly to
- * bits in the NVIC. This does, however, waste several words of memory in the IRQ
- * to handle mapping tables.
- */
-
/* Processor Exceptions (vectors 0-15) */
#define LC823450_IRQ_RESERVED (0) /* Reserved vector (only used with CONFIG_DEBUG) */
@@ -73,21 +68,12 @@
#define LC823450_IRQ_PENDSV (14) /* Vector 14: Pendable system service request */
#define LC823450_IRQ_SYSTICK (15) /* Vector 15: System tick */
-/* External interrupts (vectors >= 16). These definitions are chip-specific */
+/* External interrupts (vectors >= 16).
+ * These definitions are chip-specific
+ */
#define LC823450_IRQ_INTERRUPTS (16) /* Vector number of the first external interrupt */
-
-/* IRQ numbers. The IRQ number corresponds vector number and hence map directly to
- * bits in the NVIC. This does, however, waste several words of memory in the IRQ
- * to handle mapping tables.
- *
- * Processor Exceptions (vectors 0-15). These common definitions can be found
- * in nuttx/arch/arm/include/lc823450/irq.h
- *
- * External interrupts (vectors >= 16)
- */
-
#define LC823450_IRQ_CTXM3_00 (LC823450_IRQ_INTERRUPTS+0) /* 16: CortexM3_00 interrupt */
#define LC823450_IRQ_CTXM3_01 (LC823450_IRQ_INTERRUPTS+1) /* 17: CortexM3_01 interrupt */
#define LC823450_IRQ_CTXM3_02 (LC823450_IRQ_INTERRUPTS+2) /* 18: CortexM3_02 interrupt */
@@ -279,7 +265,8 @@ enum lc823450_srctype_e
SRCTYPE_MAX,
};
#ifdef CONFIG_LC823450_VIRQ
-struct lc823450_irq_ops {
+struct lc823450_irq_ops
+{
void (*enable)(int irq);
void (*disable)(int irq);
int (*srctype)(int irq, enum lc823450_srctype_e type);
@@ -295,13 +282,14 @@ struct lc823450_irq_ops {
#ifndef __ASSEMBLY__
#ifdef __cplusplus
#define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
#else
#define EXTERN extern
#endif
/****************************************************************************
- * Public Functions
+ * Public Functions Prototypes
****************************************************************************/
EXTERN int lc823450_irq_srctype(int irq, enum lc823450_srctype_e srctype);
diff --git a/arch/arm/src/lc823450/chip.h b/arch/arm/src/lc823450/chip.h
index 2b3606c..41a9a8e 100644
--- a/arch/arm/src/lc823450/chip.h
+++ b/arch/arm/src/lc823450/chip.h
@@ -78,7 +78,7 @@
#ifdef __ASSEMBLY__
#if defined(CONFIG_SMP) && CONFIG_ARCH_INTERRUPTSTACK > 7
- .globl g_instack_alloc
+ .globl g_instack_alloc
#endif /* CONFIG_SMP && CONFIG_ARCH_INTERRUPTSTACK > 7 */
#endif /* __ASSEMBLY__ */
@@ -99,25 +99,25 @@
****************************************************************************/
#if defined(CONFIG_SMP) && CONFIG_ARCH_INTERRUPTSTACK > 7
- .macro setintstack, tmp1, tmp2
+ .macro setintstack, tmp1, tmp2
#if CONFIG_SMP_NCPUS > 1
- ldr \tmp1, =CORE_COREID
- ldr \tmp1, [\tmp1, 0] /* \tmp = getreg32(coreid_reg) */
- and \tmp1, \tmp1, 1 /* \tmp = COREID */
- cmp \tmp1, #0
- bne 1f
- ldr \tmp1, =g_cpu0_instack_base
- ldr sp, [\tmp1, 0] /* sp = getreg32(g_cpu0_instack_base) */
- b 2f
+ ldr \tmp1, =CORE_COREID
+ ldr \tmp1, [\tmp1, 0] /* \tmp = getreg32(coreid_reg) */
+ and \tmp1, \tmp1, 1 /* \tmp = COREID */
+ cmp \tmp1, #0
+ bne 1f
+ ldr \tmp1, =g_cpu0_instack_base
+ ldr sp, [\tmp1, 0] /* sp = getreg32(g_cpu0_instack_base) */
+ b 2f
1:
- ldr \tmp1, =g_cpu1_instack_base
- ldr sp, [\tmp1, 0] /* sp = getreg32(g_cpu1_instack_base) */
+ ldr \tmp1, =g_cpu1_instack_base
+ ldr sp, [\tmp1, 0] /* sp = getreg32(g_cpu1_instack_base) */
2:
#else
- ldr \tmp1, =g_cpu0_instack_base
- ldr sp, [\tmp1, 0] /* sp = getreg32(g_cpu0_instack_base) */
+ ldr \tmp1, =g_cpu0_instack_base
+ ldr sp, [\tmp1, 0] /* sp = getreg32(g_cpu0_instack_base) */
#endif
- .endm
+ .endm
#endif /* CONFIG_SMP && CONFIG_ARCH_INTERRUPTSTACK > 7 */
#endif /* __ASSEMBLY__ */
diff --git a/arch/arm/src/lc823450/lc823450_adc.c b/arch/arm/src/lc823450/lc823450_adc.c
index 4bc836a..5636db3 100644
--- a/arch/arm/src/lc823450/lc823450_adc.c
+++ b/arch/arm/src/lc823450/lc823450_adc.c
@@ -74,8 +74,8 @@
* Pre-processor Definitions
****************************************************************************/
-#define LC823450_ADCHST(c) (((c) & 0xf) << rADCCTL_fADCHST_SHIFT)
-#define LC823450_ADC0DT(d) (rADC0DT + ((d) << 2))
+#define LC823450_ADCHST(c) (((c) & 0xf) << ADCCTL_ADCHST_SHIFT)
+#define LC823450_ADC0DT(d) (ADC0DT + ((d) << 2))
#define LC823450_MAX_ADCCLK (5 * 1000 * 1000) /* Hz */
@@ -169,7 +169,7 @@ static const struct adc_ops_s lc823450_adc_ops =
static inline void lc823450_adc_clearirq(void)
{
- putreg32(rADCSTS_fADCMPL, rADCSTS);
+ putreg32(ADCSTS_ADCMPL, ADCSTS);
}
/****************************************************************************
@@ -190,7 +190,7 @@ static void lc823450_adc_standby(int on)
/* Enter standby mode */
- modifyreg32(rADCSTBY, 0, rADCSTBY_STBY);
+ modifyreg32(ADCSTBY, 0, ADCSTBY_STBY);
/* disable clock */
@@ -204,7 +204,7 @@ static void lc823450_adc_standby(int on)
/* Exit standby mode */
- modifyreg32(rADCSTBY, rADCSTBY_STBY, 0);
+ modifyreg32(ADCSTBY, ADCSTBY_STBY, 0);
up_udelay(10);
@@ -250,18 +250,18 @@ static void lc823450_adc_start(FAR struct lc823450_adc_inst_s *inst)
/* Setup ADC channels */
- putreg32((i << rADCCTL_fADCNVCK_SHIFT) |
+ putreg32((i << ADCCTL_ADCNVCK_SHIFT) |
LC823450_ADCHST(CONFIG_LC823450_ADC_NCHANNELS - 1) |
- rADCCTL_fADCHSCN, rADCCTL);
+ ADCCTL_ADCHSCN, ADCCTL);
/* Start A/D conversion */
- modifyreg32(rADCCTL, rADCCTL_fADACT, rADCCTL_fADACT);
+ modifyreg32(ADCCTL, ADCCTL_ADACT, ADCCTL_ADACT);
/* Wait for completion */
#ifdef CONFIG_ADC_POLLED
- while ((getreg32(rADCSTS) & rADCSTS_fADCMPL) == 0)
+ while ((getreg32(ADCSTS) & ADCSTS_ADCMPL) == 0)
;
#else
ret = nxsem_wait_uninterruptible(&inst->sem_isr);
@@ -572,7 +572,7 @@ FAR struct adc_dev_s *lc823450_adcinitialize(void)
* all ADCCLK between 2MHz and 5MHz. [PDFW15IS-1847]
*/
- putreg32(53, rADCSMPL);
+ putreg32(53, ADCSMPL);
/* Setup ADC interrupt */
diff --git a/arch/arm/src/lc823450/lc823450_adc.h b/arch/arm/src/lc823450/lc823450_adc.h
index 4204504..5f8d6f5 100644
--- a/arch/arm/src/lc823450/lc823450_adc.h
+++ b/arch/arm/src/lc823450/lc823450_adc.h
@@ -52,42 +52,42 @@
/* Register Addresses *******************************************************/
#define ADC_REGBASE 0x40087000
-#define rADC0DT (ADC_REGBASE + 0x00)
-#define rADC1DT (ADC_REGBASE + 0x04)
-#define rADC2DT (ADC_REGBASE + 0x08)
-#define rADC3DT (ADC_REGBASE + 0x0C)
-#define rADC4DT (ADC_REGBASE + 0x10)
-#define rADC5DT (ADC_REGBASE + 0x14)
-#define rADCCTL (ADC_REGBASE + 0x28)
-#define rADCSTS (ADC_REGBASE + 0x2C)
-#define rADCSMPL (ADC_REGBASE + 0x30)
-#define rADCSTBY (ADC_REGBASE + 0x34)
+#define ADC0DT (ADC_REGBASE + 0x00)
+#define ADC1DT (ADC_REGBASE + 0x04)
+#define ADC2DT (ADC_REGBASE + 0x08)
+#define ADC3DT (ADC_REGBASE + 0x0C)
+#define ADC4DT (ADC_REGBASE + 0x10)
+#define ADC5DT (ADC_REGBASE + 0x14)
+#define ADCCTL (ADC_REGBASE + 0x28)
+#define ADCSTS (ADC_REGBASE + 0x2C)
+#define ADCSMPL (ADC_REGBASE + 0x30)
+#define ADCSTBY (ADC_REGBASE + 0x34)
/* Register Bitfield Definitions ********************************************/
/* ADC Control Register */
-#define rADCCTL_fADCNTNU (1 << 9) /* Bit 9: ADC continuous conversion enable */
-#define rADCCTL_fADACT (1 << 8) /* Bit 8: ADC activate enable */
-#define rADCCTL_fADCHSCN (1 << 7) /* Bit 7: ADC channel scan enable */
+#define ADCCTL_ADCNTNU (1 << 9) /* Bit 9: ADC continuous conversion enable */
+#define ADCCTL_ADACT (1 << 8) /* Bit 8: ADC activate enable */
+#define ADCCTL_ADCHSCN (1 << 7) /* Bit 7: ADC channel scan enable */
-#define rADCCTL_fADCNVCK_SHIFT (4)
-#define rADCCTL_fADCNVCK_DIV2 (0 << rADCCTL_fADCNVCK_SHIFT)
-#define rADCCTL_fADCNVCK_DIV4 (1 << rADCCTL_fADCNVCK_SHIFT)
-#define rADCCTL_fADCNVCK_DIV8 (2 << rADCCTL_fADCNVCK_SHIFT)
-#define rADCCTL_fADCNVCK_DIV16 (3 << rADCCTL_fADCNVCK_SHIFT)
-#define rADCCTL_fADCNVCK_DIV32 (4 << rADCCTL_fADCNVCK_SHIFT)
-#define rADCCTL_fADCNVCK_DIV64 (5 << rADCCTL_fADCNVCK_SHIFT)
+#define ADCCTL_ADCNVCK_SHIFT (4)
+#define ADCCTL_ADCNVCK_DIV2 (0 << ADCCTL_ADCNVCK_SHIFT)
+#define ADCCTL_ADCNVCK_DIV4 (1 << ADCCTL_ADCNVCK_SHIFT)
+#define ADCCTL_ADCNVCK_DIV8 (2 << ADCCTL_ADCNVCK_SHIFT)
+#define ADCCTL_ADCNVCK_DIV16 (3 << ADCCTL_ADCNVCK_SHIFT)
+#define ADCCTL_ADCNVCK_DIV32 (4 << ADCCTL_ADCNVCK_SHIFT)
+#define ADCCTL_ADCNVCK_DIV64 (5 << ADCCTL_ADCNVCK_SHIFT)
-#define rADCCTL_fADCHST_SHIFT (0)
+#define ADCCTL_ADCHST_SHIFT (0)
/* ADC Status Register */
-#define rADCSTS_fADCMPL (1 << 0) /* Bit 0: ADC Conversion Completion Flag */
+#define ADCSTS_ADCMPL (1 << 0) /* Bit 0: ADC Conversion Completion Flag */
/* ADC Standby Register */
-#define rADCSTBY_STBY (1 << 0) /* Bit 0: Standby enable */
+#define ADCSTBY_STBY (1 << 0) /* Bit 0: Standby enable */
/****************************************************************************
* Public Types
@@ -108,7 +108,7 @@ extern "C"
#endif
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
FAR struct adc_dev_s *lc823450_adcinitialize(void);
diff --git a/arch/arm/src/lc823450/lc823450_allocateheap2.c b/arch/arm/src/lc823450/lc823450_allocateheap2.c
index 3395fe5..b9f3497 100644
--- a/arch/arm/src/lc823450/lc823450_allocateheap2.c
+++ b/arch/arm/src/lc823450/lc823450_allocateheap2.c
@@ -115,7 +115,8 @@ static inline void up_heap_color(FAR void *start, size_t size)
*
* Kernel .data region. Size determined at link time.
* Kernel .bss region Size determined at link time.
- * Kernel IDLE thread stack. Size determined by CONFIG_IDLETHREAD_STACKSIZE.
+ * Kernel IDLE thread stack.
+ * Size determined by CONFIG_IDLETHREAD_STACKSIZE.
* Padding for alignment
* User .data region. Size determined at link time.
* User .bss region Size determined at link time.
@@ -132,7 +133,9 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
* of CONFIG_MM_KERNEL_HEAPSIZE (subject to alignment).
*/
- uintptr_t ubase = (uintptr_t)USERSPACE->us_bssend + CONFIG_MM_KERNEL_HEAPSIZE;
+ uintptr_t ubase = (uintptr_t)USERSPACE->us_bssend +
+ CONFIG_MM_KERNEL_HEAPSIZE;
+
size_t usize = SRAM1_END - ubase;
int log2;
@@ -160,7 +163,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Allow user-mode access to the user heap memory */
- lc823450_mpu_uheap((uintptr_t)ubase, usize);
+ lc823450_mpu_uheap((uintptr_t)ubase, usize);
#else
/* Return the heap settings */
@@ -197,7 +200,9 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
* of CONFIG_MM_KERNEL_HEAPSIZE (subject to alignment).
*/
- uintptr_t ubase = (uintptr_t)USERSPACE->us_bssend + CONFIG_MM_KERNEL_HEAPSIZE;
+ uintptr_t ubase = (uintptr_t)USERSPACE->us_bssend +
+ CONFIG_MM_KERNEL_HEAPSIZE;
+
size_t usize = SRAM1_END - ubase;
int log2;
diff --git a/arch/arm/src/lc823450/lc823450_clockconfig.c b/arch/arm/src/lc823450/lc823450_clockconfig.c
index 68c8b28..b45d143 100644
--- a/arch/arm/src/lc823450/lc823450_clockconfig.c
+++ b/arch/arm/src/lc823450/lc823450_clockconfig.c
@@ -84,7 +84,7 @@ unsigned int XT1OSC_CLK;
uint32_t lc823450_get_systemfreq(void)
{
- return SYSCLK * 1000000;
+ return SYSCLK * 1000000;
}
/****************************************************************************
@@ -94,7 +94,7 @@ uint32_t lc823450_get_systemfreq(void)
#ifndef CONFIG_DVFS
uint32_t lc823450_get_apb(void)
{
- return SYSCLK * 1000000;
+ return SYSCLK * 1000000;
}
#endif
@@ -104,7 +104,7 @@ uint32_t lc823450_get_apb(void)
uint32_t lc823450_get_ahb(void)
{
- return (SYSCLK * 1000000) / (HCLKDIV + 1);
+ return (SYSCLK * 1000000) / (HCLKDIV + 1);
}
/****************************************************************************
@@ -142,8 +142,9 @@ void lc823450_clockconfig()
putreg32(val, OSCCNT);
#ifdef CONFIG_LC823450_IPL2
- /* set the common PLL values */
- /* XTAL / XT1OSC_CLK = 1MHz */
+ /* Set the common PLL values
+ * XTAL / XT1OSC_CLK = 1MHz
+ */
putreg32((XT1OSC_CLK / 1000000) - 1, PLL1MDIV);
diff --git a/arch/arm/src/lc823450/lc823450_clockconfig.h b/arch/arm/src/lc823450/lc823450_clockconfig.h
index 34e037d..933b099 100644
--- a/arch/arm/src/lc823450/lc823450_clockconfig.h
+++ b/arch/arm/src/lc823450/lc823450_clockconfig.h
@@ -80,7 +80,6 @@
#define PLL1MDIV (LC823450_SYSTEMPLL_BASE + 0x04)
#define PLL1NDIV (LC823450_SYSTEMPLL_BASE + 0x08)
-
/****************************************************************************
* Public Types
****************************************************************************/
@@ -100,7 +99,7 @@ extern "C"
#endif
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
uint32_t lc823450_get_systemfreq(void);
diff --git a/arch/arm/src/lc823450/lc823450_cpustart.c b/arch/arm/src/lc823450/lc823450_cpustart.c
index 4abeae8..65017c8 100644
--- a/arch/arm/src/lc823450/lc823450_cpustart.c
+++ b/arch/arm/src/lc823450/lc823450_cpustart.c
@@ -133,7 +133,6 @@ static void cpu1_boot(void)
/* Then transfer control to the IDLE task */
nx_idle_task(0, NULL);
-
}
/****************************************************************************
diff --git a/arch/arm/src/lc823450/lc823450_dma.c b/arch/arm/src/lc823450/lc823450_dma.c
index 2993fa2..81ff841 100644
--- a/arch/arm/src/lc823450/lc823450_dma.c
+++ b/arch/arm/src/lc823450/lc823450_dma.c
@@ -123,6 +123,7 @@ struct lc823450_dma_s
sem_t exclsem; /* For exclusive access to the DMA channel list */
/* This is the state of each DMA channel */
+
int count;
struct lc823450_phydmach_s phydmach[DMA_CHANNEL_NUM];
uint32_t reqline_use;
@@ -187,7 +188,8 @@ static int dma_interrupt_core(void *context)
static int dma_interrupt(int irq, FAR void *context, FAR void *arg)
{
int i;
- uint32_t stat, err;
+ uint32_t stat;
+ uint32_t err;
up_enable_clk(LC823450_CLOCK_DMA);
@@ -203,6 +205,7 @@ static int dma_interrupt(int irq, FAR void *context, FAR void *arg)
{
dma_interrupt_core((void *)&g_dma.phydmach[i]);
}
+
if (err & (1 << i))
{
dmaerr("ERROR %d\n", i);
@@ -358,6 +361,7 @@ void arm_dma_initialize(void)
{
return;
}
+
up_enable_irq(LC823450_IRQ_DMAC);
/* Clock & Reset */
@@ -421,6 +425,7 @@ void lc823450_dmarequest(DMA_HANDLE handle, uint8_t dmarequest)
break;
}
}
+
DEBUGASSERT(req_line != 16);
up_enable_clk(LC823450_CLOCK_DMA);
@@ -533,8 +538,8 @@ DMA_HANDLE lc823450_dmachannel(int ch)
*
* Description:
* Release a DMA channel. NOTE: The 'handle' used in this argument must
- * NEVER be used again until lc823450_dmachannel() is called again to re-gain
- * a valid handle.
+ * NEVER be used again until lc823450_dmachannel() is called again to
+ * re-gain a valid handle.
*
* Returned Value:
* None
@@ -584,7 +589,8 @@ int lc823450_dmasetup(DMA_HANDLE handle, uint32_t control,
}
int lc823450_dmallsetup(DMA_HANDLE handle, uint32_t control,
- uint32_t srcaddr, uint32_t destaddr, size_t nxfrs, uint32_t llist)
+ uint32_t srcaddr, uint32_t destaddr,
+ size_t nxfrs, uint32_t llist)
{
struct lc823450_dmach_s *dmach = (DMA_HANDLE)handle;
@@ -665,6 +671,7 @@ void lc823450_dmastop(DMA_HANDLE handle)
{
up_disable_clk(LC823450_CLOCK_DMA);
}
+
pdmach->inprogress = 0;
sq_rem(&dmach->q_ent, &pdmach->req_q);
}
diff --git a/arch/arm/src/lc823450/lc823450_dma.h b/arch/arm/src/lc823450/lc823450_dma.h
index e4698b2..fc830e2 100644
--- a/arch/arm/src/lc823450/lc823450_dma.h
+++ b/arch/arm/src/lc823450/lc823450_dma.h
@@ -134,7 +134,7 @@ extern "C"
#endif
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
void lc823450_dmaconfigure(uint8_t dmarequest, bool alternate);
diff --git a/arch/arm/src/lc823450/lc823450_dvfs2.c b/arch/arm/src/lc823450/lc823450_dvfs2.c
index edb1ee7..fc9ff71 100644
--- a/arch/arm/src/lc823450/lc823450_dvfs2.c
+++ b/arch/arm/src/lc823450/lc823450_dvfs2.c
@@ -220,7 +220,6 @@ static void lc832450_set_core_voltage(bool high)
}
#endif
-
/****************************************************************************
* Name: lc823450_dvfs_set_div
* Set dividers in the OSC block
@@ -263,7 +262,7 @@ static void lc823450_dvfs_set_div(int idx, int tbl)
modifyreg32(MEMEN4, 0, MEMEN4_HWAIT);
}
- /* adjust AHB */
+ /* adjust AHB */
if (t_hdiv > _dvfs_cur_hdiv)
{
@@ -276,8 +275,9 @@ static void lc823450_dvfs_set_div(int idx, int tbl)
uint32_t regval = getreg32(OSCCNT);
- /* NOTE: In LC823450, MCSEL is reflected first then MAINDIV */
- /* To avoid spec violation, 2-step clock change is needed */
+ /* NOTE: In LC823450, MCSEL is reflected first then MAINDIV
+ * To avoid spec violation, 2-step clock change is needed
+ */
/* step 1 : change MAINDIV if needed */
@@ -291,7 +291,7 @@ static void lc823450_dvfs_set_div(int idx, int tbl)
putreg32(regval, OSCCNT);
}
- /* step 2 : change MCSEL and MAINDIV */
+ /* step 2 : change MCSEL and MAINDIV */
regval = getreg32(OSCCNT);
regval &= ~(OSCCNT_MCSEL | OSCCNT_MAINDIV_MASK);
@@ -338,7 +338,6 @@ static void lc823450_dvfs_set_div(int idx, int tbl)
_dvfs_cur_mdiv = t_mdiv;
g_dvfs_cur_freq = target;
-
#ifdef CONFIG_DVFS_CHANGE_VOLTAGE
/* NOTE: check the index instead of the target freq */
@@ -356,7 +355,6 @@ static void lc823450_dvfs_set_div(int idx, int tbl)
modifyreg32(MEMEN4, MEMEN4_HWAIT, 0);
}
-
}
/****************************************************************************
@@ -396,7 +394,6 @@ static void lc823450_dvfs_change_idx(int up)
{
lc823450_dvfs_set_div(idx, 0);
}
-
}
/****************************************************************************
@@ -505,8 +502,8 @@ void lc823450_dvfs_tick_callback(void)
for (i = 0; i < CONFIG_SMP_NCPUS; i++)
{
- idle[i] = 100 * (tmp_idle_total[i] - g_idle_totaltime0[i])
- / NSEC_PER_TICK;
+ idle[i] = 100 *
+ (tmp_idle_total[i] - g_idle_totaltime0[i]) / NSEC_PER_TICK;
}
/* Update g_idle_totaltime0 */
@@ -609,8 +606,9 @@ exit_with_error:
if (0 == _dvfs_cpu_is_active[me])
{
- /* In case of idle to active transition */
- /* Accumulate idle total time on this CPU */
+ /* In case of idle to active transition
+ * Accumulate idle total time on this CPU
+ */
now = _get_current_time64();
d = now - g_idle_starttime[me];
@@ -633,6 +631,7 @@ exit_with_error:
int lc823450_dvfs_boost(int timeout)
{
/* TODO */
+
return 0;
}
diff --git a/arch/arm/src/lc823450/lc823450_dvfs2.h b/arch/arm/src/lc823450/lc823450_dvfs2.h
index f7d582f..fb1b99e 100644
--- a/arch/arm/src/lc823450/lc823450_dvfs2.h
+++ b/arch/arm/src/lc823450/lc823450_dvfs2.h
@@ -56,7 +56,7 @@ extern "C"
#endif
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
void lc823450_dvfs_get_idletime(uint64_t idaletime[]);
diff --git a/arch/arm/src/lc823450/lc823450_gpio.c b/arch/arm/src/lc823450/lc823450_gpio.c
index fe325d8..92c1987 100644
--- a/arch/arm/src/lc823450/lc823450_gpio.c
+++ b/arch/arm/src/lc823450/lc823450_gpio.c
@@ -145,7 +145,9 @@ static inline void lc823450_configpull(uint16_t gpiocfg,
switch (pull)
{
case GPIO_FLOAT:
+
/* do nothing */
+
break;
case GPIO_PULLUP:
regval |= (1 << (2 * pin));
@@ -418,7 +420,7 @@ void lc823450_gpio_write(uint16_t gpiocfg, bool value)
putreg32(regval, regaddr);
spin_unlock_irqrestore(flags);
- }
+ }
#ifdef CONFIG_IOEX
else if (port <= (GPIO_PORTEX >> GPIO_PORT_SHIFT))
{
@@ -464,6 +466,7 @@ bool lc823450_gpio_read(uint16_t gpiocfg)
DEBUGASSERT(pin < NUM_GPIO_PINS);
/* Get the value of the pin from the pin data register */
+
regaddr = lc823450_get_gpio_data(port);
regval = getreg32(regaddr);
value = ((regval >> pin) & 0x01);
diff --git a/arch/arm/src/lc823450/lc823450_gpio.h b/arch/arm/src/lc823450/lc823450_gpio.h
index c6491a6..370957c 100644
--- a/arch/arm/src/lc823450/lc823450_gpio.h
+++ b/arch/arm/src/lc823450/lc823450_gpio.h
@@ -106,7 +106,6 @@
# define GPIO_MUX2 (2 << GPIO_MUX_SHIFT) /* mux mode 2 */
# define GPIO_MUX3 (3 << GPIO_MUX_SHIFT) /* mux mode 3 */
-
/* GPIO pull-ups/downs
*
* 1111 1100 0000 0000
@@ -205,7 +204,7 @@ extern "C"
#endif
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
/****************************************************************************
@@ -274,7 +273,6 @@ int lc823450_gpio_dump(uint16_t gpiocfg, FAR const char *msg);
int lc823450_vgpio_register(unsigned int pin, FAR struct vgpio_ops_s *ops);
#endif /* CONFIG_LC823450_VGPIO */
-
#if defined(__cplusplus)
}
#endif
diff --git a/arch/arm/src/lc823450/lc823450_i2c.h b/arch/arm/src/lc823450/lc823450_i2c.h
index b0cb260..32cd95f 100644
--- a/arch/arm/src/lc823450/lc823450_i2c.h
+++ b/arch/arm/src/lc823450/lc823450_i2c.h
@@ -102,12 +102,13 @@ extern "C"
#endif
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
FAR struct i2c_master_s *lc823450_i2cbus_initialize(int port);
int lc823450_i2cbus_uninitialize(FAR struct i2c_master_s *dev);
-void lc823450_i2cbus_changetimeout(FAR struct i2c_master_s *dev, uint32_t timeoms);
+void lc823450_i2cbus_changetimeout(FAR struct i2c_master_s *dev,
+ uint32_t timeoms);
#if defined(__cplusplus)
}
diff --git a/arch/arm/src/lc823450/lc823450_lowputc.c b/arch/arm/src/lc823450/lc823450_lowputc.c
index e371f82..dbbc357 100644
--- a/arch/arm/src/lc823450/lc823450_lowputc.c
+++ b/arch/arm/src/lc823450/lc823450_lowputc.c
@@ -34,9 +34,9 @@
*
****************************************************************************/
-/**************************************************************************
+/****************************************************************************
* Included Files
- **************************************************************************/
+ ****************************************************************************/
#include <nuttx/config.h>
@@ -52,11 +52,11 @@
#include <arch/board/board.h>
-/**************************************************************************
+/****************************************************************************
* Pre-processor Definitions
- **************************************************************************/
+ ****************************************************************************/
-/* Configuration **********************************************************/
+/* Configuration ************************************************************/
/* Select UART parameters for the selected console */
@@ -128,21 +128,20 @@
#define UART_UMD_VALUE \
(UART_UMD_BIT_VALUE | UART_UMD_2STOP_VALUE | UART_UMD_PARITY_VALUE)
-/**************************************************************************
+/****************************************************************************
* Public Functions
- **************************************************************************/
+ ****************************************************************************/
-/**************************************************************************
+/****************************************************************************
* Name: arm_lowputc
*
* Description:
* Output one byte on the serial console
*
- **************************************************************************/
+ ****************************************************************************/
void arm_lowputc(char ch)
{
-
#ifdef CONFIG_DEV_CONSOLE_SWITCH
if (g_console_disable)
{
@@ -170,11 +169,12 @@ void arm_lowputc(char ch)
/* Wait SendDone */
- while (!(getreg32(LC823450_CONSOLE_BASE + UART_UISR) & UART_UINT_UARTTF_INT))
+ while (!(getreg32(LC823450_CONSOLE_BASE + UART_UISR)
+ & UART_UINT_UARTTF_INT))
;
}
-/**************************************************************************
+/****************************************************************************
* Name: up_lowsetup
*
* Description:
@@ -182,7 +182,7 @@ void arm_lowputc(char ch)
* console. Its purpose is to get the console output available as soon
* as possible.
*
- **************************************************************************/
+ ****************************************************************************/
void lc823450_lowsetup(void)
{
diff --git a/arch/arm/src/lc823450/lc823450_lowputc.h b/arch/arm/src/lc823450/lc823450_lowputc.h
index c8f3ff6..e6de6ae 100644
--- a/arch/arm/src/lc823450/lc823450_lowputc.h
+++ b/arch/arm/src/lc823450/lc823450_lowputc.h
@@ -36,15 +36,15 @@
#ifndef __ARCH_ARM_SRC_LC823450_LC823450_LOWPUTC_H
#define __ARCH_ARM_SRC_LC823450_LC823450_LOWPUTC_H
-/************************************************************************************
+/****************************************************************************
* Included Files
- ************************************************************************************/
+ ****************************************************************************/
#include <nuttx/config.h>
-/************************************************************************************
+/****************************************************************************
* Public Function Prototypes
- ************************************************************************************/
+ ****************************************************************************/
#ifndef __ASSEMBLY__
@@ -57,13 +57,14 @@ extern "C"
#define EXTERN extern
#endif
-/************************************************************************************
+/****************************************************************************
* Name: lc823450_lowsetup
*
* Description:
- * Called at the very beginning of _start. Performs low level initialization.
+ * Called at the very beginning of _start.
+ * Performs low level initialization.
*
- ************************************************************************************/
+ ****************************************************************************/
void lc823450_lowsetup(void);
diff --git a/arch/arm/src/lc823450/lc823450_mmcl.h b/arch/arm/src/lc823450/lc823450_mmcl.h
index 5c4b3fe..23a9803 100644
--- a/arch/arm/src/lc823450/lc823450_mmcl.h
+++ b/arch/arm/src/lc823450/lc823450_mmcl.h
@@ -55,7 +55,7 @@ extern "C"
#endif
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
int mmcl_initialize(int minor, FAR struct mtd_dev_s *mtd);
diff --git a/arch/arm/src/lc823450/lc823450_mpuinit2.h b/arch/arm/src/lc823450/lc823450_mpuinit2.h
index 8ae7d71..38158f2 100644
--- a/arch/arm/src/lc823450/lc823450_mpuinit2.h
+++ b/arch/arm/src/lc823450/lc823450_mpuinit2.h
@@ -1,4 +1,4 @@
-/************************************************************************************
+/****************************************************************************
* arch/arm/src/lc823450/lc823450_mpuinit2.h
*
* Copyright 2018 Sony Video & Sound Products Inc.
@@ -33,32 +33,20 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- ************************************************************************************/
+ ****************************************************************************/
#ifndef __ARCH_ARM_SRC_LC823450_LC823450_MPUINIT2_H
#define __ARCH_ARM_SRC_LC823450_LC823450_MPUINIT2_H
-/************************************************************************************
+/****************************************************************************
* Included Files
- ************************************************************************************/
+ ****************************************************************************/
#include <nuttx/config.h>
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-/************************************************************************************
- * Public Types
- ************************************************************************************/
-
-/************************************************************************************
- * Public Data
- ************************************************************************************/
-
-/************************************************************************************
- * Public Functions
- ************************************************************************************/
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
/****************************************************************************
* Name: lc823450_mpuinitialize
diff --git a/arch/arm/src/lc823450/lc823450_mtd.h b/arch/arm/src/lc823450/lc823450_mtd.h
index 6af025f..edf411a 100644
--- a/arch/arm/src/lc823450/lc823450_mtd.h
+++ b/arch/arm/src/lc823450/lc823450_mtd.h
@@ -98,7 +98,7 @@ extern "C"
#endif
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
int lc823450_mtd_initialize(uint32_t devno);
diff --git a/arch/arm/src/lc823450/lc823450_pwm.h b/arch/arm/src/lc823450/lc823450_pwm.h
index 5a03c6f..24b12ef 100644
--- a/arch/arm/src/lc823450/lc823450_pwm.h
+++ b/arch/arm/src/lc823450/lc823450_pwm.h
@@ -101,7 +101,7 @@ extern "C"
#endif
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
EXTERN FAR struct pwm_lowerhalf_s *lc823450_pwminitialize(int timer);
diff --git a/arch/arm/src/lc823450/lc823450_rtc.c b/arch/arm/src/lc823450/lc823450_rtc.c
index 916ba27..72bb2f8 100644
--- a/arch/arm/src/lc823450/lc823450_rtc.c
+++ b/arch/arm/src/lc823450/lc823450_rtc.c
@@ -223,6 +223,7 @@ static void rtc_pmnotify(struct pm_callback_s *cb, enum pm_state_e pmstate)
default:
break;
}
+
return;
}
#endif /* CONFIG_RTC_SAVE_DEFAULT */
@@ -281,14 +282,15 @@ static int rtc_interrupt(int irq, void *context, FAR void *arg)
* Description:
* Get the current date and time from the date/time RTC. This interface
* is only supported by the date/time RTC hardware implementation.
- * It is used to replace the system timer. It is only used by the RTOS during
- * initialization to set up the system time when CONFIG_RTC and CONFIG_RTC_DATETIME
+ * It is used to replace the system timer.
+ * It is only used by the RTOS during initialization to
+ * set up the system time when CONFIG_RTC and CONFIG_RTC_DATETIME
* are selected (and CONFIG_RTC_HIRES is not).
*
- * NOTE: Some date/time RTC hardware is capability of sub-second accuracy. That
- * sub-second accuracy is lost in this interface. However, since the system time
- * is reinitialized on each power-up/reset, there will be no timing inaccuracy in
- * the long run.
+ * NOTE: Some date/time RTC hardware is capability of sub-second accuracy.
+ * That sub-second accuracy is lost in this interface.
+ * However, since the system time is reinitialized on each power-up/reset,
+ * there will be no timing inaccuracy in the long run.
*
* Input Parameters:
* tp - The location to return the high resolution time value.
@@ -470,7 +472,8 @@ int up_rtc_initialize(void)
int up_rtc_getdatetime(FAR struct tm *tp)
{
- struct tm tm1, tm2;
+ struct tm tm1;
+ struct tm tm2;
#ifdef CONFIG_RTC_DIV
/* WA: time registers cannot be read within one second(from set) */
@@ -511,8 +514,9 @@ int up_rtc_getdatetime(FAR struct tm *tp)
* Name: up_rtc_settime
*
* Description:
- * Set the RTC to the provided time. All RTC implementations must be able to
- * set their time based on a standard timespec.
+ * Set the RTC to the provided time.
+ * All RTC implementations must be able to set their time
+ * based on a standard timespec.
*
* Input Parameters:
* tp - the time to use
@@ -662,7 +666,6 @@ int up_rtc_cancelalarm(void)
#endif
-
/****************************************************************************
* Name: up_rtc_getrawtime
*
@@ -676,7 +679,8 @@ int up_rtc_getrawtime(FAR struct timespec *ts)
struct tm tm;
#ifdef CONFIG_CLOCK_MONOTONIC
- struct timespec now, diff;
+ struct timespec now;
+ struct timespec diff;
clock_gettime(CLOCK_MONOTONIC, &now);
timespec_sub(&now, &lastupdate_mono, &diff);
diff --git a/arch/arm/src/lc823450/lc823450_sdc.h b/arch/arm/src/lc823450/lc823450_sdc.h
index c6a51f4..adedab2 100644
--- a/arch/arm/src/lc823450/lc823450_sdc.h
+++ b/arch/arm/src/lc823450/lc823450_sdc.h
@@ -55,7 +55,7 @@ extern "C"
#endif
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
int lc823450_sdc_refversion(void);
@@ -69,12 +69,15 @@ int lc823450_sdc_setclock(uint32_t ch, uint32_t limitclk, uint32_t sysclk);
int lc823450_sdc_refmediatype(uint32_t ch);
int lc823450_sdc_getcardsize(uint32_t ch, unsigned long *psecnum,
unsigned long *psecsize);
-int lc823450_sdc_readsector(uint32_t ch, unsigned long addr, unsigned short cnt,
+int lc823450_sdc_readsector(uint32_t ch, unsigned long addr,
+ unsigned short cnt,
void *pbuf, unsigned long type);
-int lc823450_sdc_writesector(uint32_t ch, unsigned long addr, unsigned short cnt,
+int lc823450_sdc_writesector(uint32_t ch, unsigned long addr,
+ unsigned short cnt,
void *pbuf, unsigned long type);
int lc823450_sdc_checktrim(uint32_t ch);
-int lc823450_sdc_trimsector(uint32_t ch, unsigned long addr, unsigned short cnt);
+int lc823450_sdc_trimsector(uint32_t ch, unsigned long addr,
+ unsigned short cnt);
int lc823450_sdc_cachectl(uint32_t ch, int ctrl);
int lc823450_sdc_changespeedmode(uint32_t ch, int mode);
int lc823450_sdc_getcid(uint32_t ch, char *cidstr, int length);
diff --git a/arch/arm/src/lc823450/lc823450_serial.c b/arch/arm/src/lc823450/lc823450_serial.c
index d1112f2..6542716 100644
--- a/arch/arm/src/lc823450/lc823450_serial.c
+++ b/arch/arm/src/lc823450/lc823450_serial.c
@@ -314,7 +314,7 @@ static uart_dev_t g_uart1port =
{
.size = CONFIG_UART1_TXBUFSIZE,
.buffer = g_uart1txbuffer,
- },
+ },
.ops = &g_uart_ops,
.priv = &g_uart1priv,
};
@@ -344,7 +344,7 @@ static uart_dev_t g_uart2port =
{
.size = CONFIG_UART2_TXBUFSIZE,
.buffer = g_uart2txbuffer,
- },
+ },
.ops = &g_uart_ops,
.priv = &g_uart2priv,
};
@@ -372,7 +372,8 @@ static inline uint32_t up_serialin(struct up_dev_s *priv, int offset)
* Name: up_serialout
****************************************************************************/
-static inline void up_serialout(struct up_dev_s *priv, int offset, uint32_t value)
+static inline void up_serialout(struct up_dev_s *priv,
+ int offset, uint32_t value)
{
putreg32(value, priv->uartbase + offset);
}
@@ -449,7 +450,11 @@ static int up_setup(struct uart_dev_s *dev)
{
struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
uint32_t ctl;
- int min_diff = INT_MAX, udiv = -1, tmp_reg, real_baud, i;
+ int min_diff = INT_MAX;
+ int udiv = -1;
+ int tmp_reg;
+ int real_baud;
+ int i;
/* Note: The logic here depends on the fact that that the UART module
* was enabled and the GPIOs were configured in up_lowsetup().
@@ -605,14 +610,16 @@ static void up_shutdown(struct uart_dev_s *dev)
* Name: up_attach
*
* Description:
- * Configure the UART to operation in interrupt driven mode. This method is
- * called when the serial port is opened. Normally, this is just after the
- * the setup() method is called, however, the serial console may operate in
- * a non-interrupt driven mode during the boot phase.
+ * Configure the UART to operation in interrupt driven mode.
+ * This method is called when the serial port is opened.
+ * Normally, this is just after the the setup() method is called,
+ * however, the serial console may operate in a non-interrupt driven mode
+ * during the boot phase.
*
- * RX and TX interrupts are not enabled when by the attach method (unless the
- * hardware supports multiple levels of interrupt enabling). The RX and TX
- * interrupts are not enabled until the txint() and rxint() methods are called.
+ * RX and TX interrupts are not enabled when by the attach method
+ * (unless the hardware supports multiple levels of interrupt enabling).
+ * The RX and TX interrupts are not enabled until the txint() and rxint()
+ * methods are called.
*
****************************************************************************/
@@ -641,8 +648,8 @@ static int up_attach(struct uart_dev_s *dev)
*
* Description:
* Detach UART interrupts. This method is called when the serial port is
- * closed normally just before the shutdown method is called. The exception is
- * the serial console which is never shutdown.
+ * closed normally just before the shutdown method is called.
+ * The exception is the serial console which is never shutdown.
*
****************************************************************************/
@@ -683,6 +690,7 @@ static int up_interrupt(int irq, void *context, FAR void *arg)
/* Handle incoming, receive bytes (with or without timeout) */
/* Rx buffer not empty ... process incoming bytes */
+
if (mis & UART_UISR_UARTRF)
{
uart_recvchars(dev);
@@ -781,7 +789,6 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
((priv->iflow) ? CRTS_IFLOW : 0) |
#endif
CS8;
-
}
break;
@@ -984,6 +991,7 @@ static void up_txint(struct uart_dev_s *dev, bool enable)
priv->im &= ~UART_UIEN_UARTTF_IEN;
up_serialout(priv, UART_UIEN, priv->im);
}
+
leave_critical_section(flags);
}
@@ -1089,7 +1097,7 @@ static void uart_dma_callback(DMA_HANDLE hdma, void *arg, int result)
* Name: uart_rxdma_callback
****************************************************************************/
- static void uart_rxdma_callback(DMA_HANDLE hdma, void *arg, int result)
+static void uart_rxdma_callback(DMA_HANDLE hdma, void *arg, int result)
{
if (hs_dmaact == HS_DMAACT_ACT1)
{
@@ -1150,7 +1158,8 @@ static void up_hs_dmasetup()
LC823450_DMA_DSTWIDTH_BYTE |
LC823450_DMA_DSTINC,
LC823450_UART1_REGBASE + UART_USRF,
- (uint32_t)(g_uart1rxbuffer + CONFIG_UART1_RXBUFSIZE / 2) ,
+ (uint32_t)(g_uart1rxbuffer + CONFIG_UART1_RXBUFSIZE
+ / 2),
CONFIG_UART1_RXBUFSIZE / 2);
lc823450_dmastart(g_uart1priv.hrxdma, uart_rxdma_callback, NULL);
@@ -1230,7 +1239,9 @@ retry:
LC823450_DMA_SRCWIDTH_BYTE |
LC823450_DMA_DSTWIDTH_BYTE |
LC823450_DMA_SRCINC,
- (uint32_t)dev->xmit.buffer, priv->uartbase + UART_USTF, len);
+ (uint32_t)dev->xmit.buffer,
+ priv->uartbase + UART_USTF,
+ len);
lc823450_dmastart(priv->htxdma, uart_dma_callback, dev);
/* BT stack may not handle to short write */
@@ -1271,16 +1282,28 @@ void arm_earlyserialinit(void)
/* workaround: force clock enable */
#if defined(CONFIG_LC823450_UART0)
- modifyreg32(MCLKCNTAPB, 0, MCLKCNTAPB_UART0_CLKEN | MCLKCNTAPB_UART0IF_CLKEN);
- modifyreg32(MRSTCNTAPB, 0, MRSTCNTAPB_UART0_RSTB);
+ modifyreg32(MCLKCNTAPB,
+ 0,
+ MCLKCNTAPB_UART0_CLKEN | MCLKCNTAPB_UART0IF_CLKEN);
+ modifyreg32(MRSTCNTAPB,
+ 0,
+ MRSTCNTAPB_UART0_RSTB);
#endif
#if defined(CONFIG_LC823450_UART1)
- modifyreg32(MCLKCNTAPB, 0, MCLKCNTAPB_UART1_CLKEN | MCLKCNTAPB_UART1IF_CLKEN);
- modifyreg32(MRSTCNTAPB, 0, MRSTCNTAPB_UART1_RSTB);
+ modifyreg32(MCLKCNTAPB,
+ 0,
+ MCLKCNTAPB_UART1_CLKEN | MCLKCNTAPB_UART1IF_CLKEN);
+ modifyreg32(MRSTCNTAPB,
+ 0,
+ MRSTCNTAPB_UART1_RSTB);
#endif
#if defined(CONFIG_LC823450_UART2)
- modifyreg32(MCLKCNTAPB, 0, MCLKCNTAPB_UART2_CLKEN | MCLKCNTAPB_UART2IF_CLKEN);
- modifyreg32(MRSTCNTAPB, 0, MRSTCNTAPB_UART2_RSTB);
+ modifyreg32(MCLKCNTAPB,
+ 0,
+ MCLKCNTAPB_UART2_CLKEN | MCLKCNTAPB_UART2IF_CLKEN);
+ modifyreg32(MRSTCNTAPB,
+ 0,
+ MRSTCNTAPB_UART2_RSTB);
#endif
/* Disable all UARTS */
@@ -1327,12 +1350,12 @@ void arm_serialinit(void)
g_uart1priv.htxdma = lc823450_dmachannel(DMA_CHANNEL_UART1TX);
lc823450_dmarequest(g_uart1priv.htxdma, DMA_REQUEST_UART1TX);
-
nxsem_init(&g_uart1priv.rxdma_wait, 0, 0);
g_uart1priv.hrxdma = lc823450_dmachannel(DMA_CHANNEL_UART1RX);
lc823450_dmarequest(g_uart1priv.hrxdma, DMA_REQUEST_UART1RX);
- up_serialout(&g_uart1priv, UART_UDMA, UART_UDMA_RREQ_EN | UART_UDMA_TREQ_EN);
+ up_serialout(&g_uart1priv, UART_UDMA,
+ UART_UDMA_RREQ_EN | UART_UDMA_TREQ_EN);
hsuart_register("/dev/ttyHS1", &TTYS1_DEV);
#endif /* CONFIG_HSUART */
#endif
@@ -1356,7 +1379,9 @@ int up_putc(int ch)
#ifdef CONFIG_DEV_CONSOLE_SWITCH
if (g_console_disable)
- return ch;
+ {
+ return ch;
+ }
#endif /* CONFIG_DEV_CONSOLE_SWITCH */
up_disableuartint(priv, &im);
@@ -1463,10 +1488,12 @@ void hsuart_wdtimer(void)
switch (hs_dmaact)
{
case HS_DMAACT_ACT1:
- newhead = CONFIG_UART1_RXBUFSIZE / 2 - lc823450_dmaremain(g_uart1priv.hrxdma);
+ newhead = CONFIG_UART1_RXBUFSIZE /
+ 2 - lc823450_dmaremain(g_uart1priv.hrxdma);
break;
case HS_DMAACT_ACT2:
- newhead = CONFIG_UART1_RXBUFSIZE - lc823450_dmaremain(g_uart1priv.hrxdma);
+ newhead = CONFIG_UART1_RXBUFSIZE -
+ lc823450_dmaremain(g_uart1priv.hrxdma);
break;
case HS_DMAACT_STOP1:
newhead = 0;
diff --git a/arch/arm/src/lc823450/lc823450_serial.h b/arch/arm/src/lc823450/lc823450_serial.h
index fe3c4cb..7ea856a 100644
--- a/arch/arm/src/lc823450/lc823450_serial.h
+++ b/arch/arm/src/lc823450/lc823450_serial.h
@@ -37,9 +37,9 @@
#ifndef __ARCH_ARM_SRC_LC823450_LC823450_SERIAL_H
#define __ARCH_ARM_SRC_LC823450_LC823450_SERIAL_H
-/************************************************************************************
+/****************************************************************************
* Pre-processor Definitions
- ************************************************************************************/
+ ****************************************************************************/
#define LC823450_UART0_REGBASE 0x4008b000
#define LC823450_UART1_REGBASE 0x4008c000
@@ -94,17 +94,17 @@
#define UART_USFS_TXFF_LV(v) (((v) >> 8 ) & 0x1f)
#define UART_USFS_RXFF_LV(v) (((v) >> 0 ) & 0x1f)
-/************************************************************************************
+/****************************************************************************
* Public Data
- ************************************************************************************/
+ ****************************************************************************/
#ifdef CONFIG_DEV_CONSOLE_SWITCH
extern int g_console_disable;
#endif
-/************************************************************************************
+/****************************************************************************
* Public Function Prototypes
- ************************************************************************************/
+ ****************************************************************************/
#ifdef CONFIG_DEV_CONSOLE_SWITCH
void up_console_disable(int disable);
diff --git a/arch/arm/src/lc823450/lc823450_spifi2.c b/arch/arm/src/lc823450/lc823450_spifi2.c
index 961fca9..8201fa8 100644
--- a/arch/arm/src/lc823450/lc823450_spifi2.c
+++ b/arch/arm/src/lc823450/lc823450_spifi2.c
@@ -34,6 +34,10 @@
*
****************************************************************************/
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
#include <nuttx/config.h>
#include <nuttx/arch.h>
@@ -163,7 +167,7 @@ static void spiflash_quad_enable_winbond(void)
putreg32(SF_SIZE_NOREAD | 3 << SF_SIZE_T_SHIFT, SF_SIZE);
putreg32(0, SF_DUMMY);
putreg8(SF_CMD_WRITE_STATUS, SF_T_FIFO);
- putreg8(0, SF_T_FIFO); /* status1 */
+ putreg8(0, SF_T_FIFO); /* status1 */
putreg8(SF_STATUS2_QE, SF_T_FIFO); /* status2 */
/* Start Transfer */
diff --git a/arch/arm/src/lc823450/lc823450_spifi2.h b/arch/arm/src/lc823450/lc823450_spifi2.h
index e3fc92d..f1bf52e 100644
--- a/arch/arm/src/lc823450/lc823450_spifi2.h
+++ b/arch/arm/src/lc823450/lc823450_spifi2.h
@@ -100,7 +100,6 @@
#define SF_JID_MID_WINBOND 0xef0000
#define SF_JID_MID_MACRONIX 0xc20000
-
/****************************************************************************
* Public Data
****************************************************************************/
@@ -115,7 +114,7 @@ extern "C"
#endif
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
void lc823450_spiflash_earlyinit(void);
diff --git a/arch/arm/src/lc823450/lc823450_syscontrol.c b/arch/arm/src/lc823450/lc823450_syscontrol.c
index f673fe8..097daff 100644
--- a/arch/arm/src/lc823450/lc823450_syscontrol.c
+++ b/arch/arm/src/lc823450/lc823450_syscontrol.c
@@ -95,6 +95,7 @@ uint32_t get_cpu_ver(void)
sinfo("??? \n");
break;
}
+
cpu_ver = ret;
return ret;
}
@@ -123,8 +124,9 @@ void mod_stby_regs(uint32_t enabits, uint32_t disbits)
if (enabits)
{
- /* stand-by to active case */
- /* assumption: the specified blocks are already isolated */
+ /* stand-by to active case
+ * assumption: the specified blocks are already isolated
+ */
up_udelay(100); /* need to wait 100us */
@@ -133,7 +135,9 @@ void mod_stby_regs(uint32_t enabits, uint32_t disbits)
modifyreg32(ISOCNT, 0, enabits);
}
- /* sinfo("ISOCNT=0x%x, LSISTBY=0x%x \n", getreg32(ISOCNT), getreg32(LSISTBY)); */
+ /* sinfo("ISOCNT=0x%x, LSISTBY=0x%x \n",
+ * getreg32(ISOCNT), getreg32(LSISTBY));
+ */
}
#endif /* CONFIG_LC823450_LSISTBY */
diff --git a/arch/arm/src/lc823450/lc823450_testset.c b/arch/arm/src/lc823450/lc823450_testset.c
index 432212c..15ccbe3 100644
--- a/arch/arm/src/lc823450/lc823450_testset.c
+++ b/arch/arm/src/lc823450/lc823450_testset.c
@@ -103,6 +103,7 @@ spinlock_t up_testset(volatile FAR spinlock_t *lock)
{
*lock = SP_LOCKED;
}
+
SP_DMB();
val = (up_cpu_index() << 16) | 0x0;
diff --git a/arch/arm/src/lc823450/lc823450_timer.h b/arch/arm/src/lc823450/lc823450_timer.h
index a0bd76b..df493b6 100644
--- a/arch/arm/src/lc823450/lc823450_timer.h
+++ b/arch/arm/src/lc823450/lc823450_timer.h
@@ -58,7 +58,7 @@ extern "C"
#endif
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
#ifdef CONFIG_HRT_TIMER
diff --git a/arch/arm/src/lc823450/lc823450_usbdev.c b/arch/arm/src/lc823450/lc823450_usbdev.c
index e045b62..0da49b4 100644
--- a/arch/arm/src/lc823450/lc823450_usbdev.c
+++ b/arch/arm/src/lc823450/lc823450_usbdev.c
@@ -668,7 +668,8 @@ static void lc823450_epfreebuffer(struct usbdev_ep_s *ep, void *buf)
*
****************************************************************************/
-static int lc823450_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
+static int lc823450_epsubmit(struct usbdev_ep_s *ep,
+ struct usbdev_req_s *req)
{
struct lc823450_req_s *privreq = (struct lc823450_req_s *)req;
struct lc823450_ep_s *privep = (struct lc823450_ep_s *)ep;
@@ -728,7 +729,8 @@ static int lc823450_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
*
****************************************************************************/
-static int lc823450_epcancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
+static int lc823450_epcancel(struct usbdev_ep_s *ep,
+ struct usbdev_req_s *req)
{
struct lc823450_req_s *privreq = (struct lc823450_req_s *)req;
struct lc823450_ep_s *privep = (struct lc823450_ep_s *)ep;
@@ -797,12 +799,12 @@ void up_epignore_clear_stall(struct usbdev_ep_s *ep, bool ignore)
* Input Parameters:
* eplog - 7-bit logical endpoint number (direction bit ignored). Zero
* means that any endpoint matching the other requirements will
- * suffice. The assigned endpoint can be found in the eplog field.
+ * suffice. The assigned endpoint can be found in the eplog field.
* in - true: IN (device-to-host) endpoint requested
* eptype - Endpoint type. One of {USB_EP_ATTR_XFER_ISOC,
* USB_EP_ATTR_XFER_BULK, USB_EP_ATTR_XFER_INT}
*
- ******************************************************************************/
+ ****************************************************************************/
static struct usbdev_ep_s *lc823450_allocep(struct usbdev_s *dev,
uint8_t eplog, bool in,
@@ -1955,7 +1957,8 @@ int usbdev_is_usbcharger(void)
#endif
#ifdef CONFIG_PM
-static void usbdev_pmnotify(struct pm_callback_s *cb, enum pm_state_e pmstate)
+static void usbdev_pmnotify(struct pm_callback_s *cb,
+ enum pm_state_e pmstate)
{
irqstate_t flags;
diff --git a/arch/arm/src/lc823450/lc823450_userspace.h b/arch/arm/src/lc823450/lc823450_userspace.h
index bddc63d..c84af19 100644
--- a/arch/arm/src/lc823450/lc823450_userspace.h
+++ b/arch/arm/src/lc823450/lc823450_userspace.h
@@ -1,4 +1,4 @@
-/************************************************************************************
+/****************************************************************************
* arch/arm/src/lc823450/lc823450_userspace.h
*
* Copyright 2018 Sony Video & Sound Products Inc.
@@ -33,32 +33,20 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- ************************************************************************************/
+ ****************************************************************************/
#ifndef __ARCH_ARM_SRC_LC823450_LC823450_USERSPACE_H
#define __ARCH_ARM_SRC_LC823450_LC823450_USERSPACE_H
-/************************************************************************************
+/****************************************************************************
* Included Files
- ************************************************************************************/
+ ****************************************************************************/
#include <nuttx/config.h>
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-/************************************************************************************
- * Public Types
- ************************************************************************************/
-
-/************************************************************************************
- * Public Data
- ************************************************************************************/
-
-/************************************************************************************
- * Public Functions
- ************************************************************************************/
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
/****************************************************************************
* Name: lc823450_userspace
diff --git a/arch/arm/src/lc823450/lc823450_wdt.c b/arch/arm/src/lc823450/lc823450_wdt.c
index d65f3a1..2861af6 100644
--- a/arch/arm/src/lc823450/lc823450_wdt.c
+++ b/arch/arm/src/lc823450/lc823450_wdt.c
@@ -115,7 +115,8 @@ struct lc823450_wdt_lowerhalf_s
/* Interrupt handling *******************************************************/
#ifdef CONFIG_LC823450_WDT_INTERRUPT
-static int lc823450_wdt_interrupt(int irq, FAR void *context, FAR void *arg);
+static int lc823450_wdt_interrupt(int irq,
+ FAR void *context, FAR void *arg);
#endif
/* "Lower half" driver methods **********************************************/
@@ -157,7 +158,6 @@ static struct lc823450_wdt_lowerhalf_s g_wdtdev;
static struct work_s wdg_work;
#endif
-
/****************************************************************************
* Private Functions
****************************************************************************/
@@ -220,8 +220,8 @@ static int lc823450_wdt_interrupt(int irq, FAR void *context, FAR void *arg)
* Start the watchdog timer, resetting the time to the current timeout,
*
* Input Parameters:
- * lower - A pointer the publicly visible representation of the "lower-half"
- * driver state structure.
+ * lower - A pointer the publicly visible representation of
+ * the "lower-half" driver state structure.
*
* Returned Value:
* Zero on success; a negated errno value on failure.
@@ -243,8 +243,8 @@ static int lc823450_wdt_start(FAR struct watchdog_lowerhalf_s *lower)
* Stop the watchdog timer
*
* Input Parameters:
- * lower - A pointer the publicly visible representation of the "lower-half"
- * driver state structure.
+ * lower - A pointer the publicly visible representation of
+ * the "lower-half" driver state structure.
*
* Returned Value:
* Zero on success; a negated errno value on failure.
@@ -268,8 +268,8 @@ static int lc823450_wdt_stop(FAR struct watchdog_lowerhalf_s *lower)
* the atchdog timer or "petting the dog".
*
* Input Parameters:
- * lower - A pointer the publicly visible representation of the "lower-half"
- * driver state structure.
+ * lower - A pointer the publicly visible representation of
+ * the "lower-half" driver state structure.
*
* Returned Value:
* Zero on success; a negated errno value on failure.
@@ -295,8 +295,8 @@ static int lc823450_wdt_keepalive(FAR struct watchdog_lowerhalf_s *lower)
* Get the current watchdog timer status
*
* Input Parameters:
- * lower - A pointer the publicly visible representation of the "lower-half"
- * driver state structure.
+ * lower - A pointer the publicly visible representation of
+ * the "lower-half" driver state structure.
* stawtus - The location to return the watchdog status information.
*
* Returned Value:
@@ -358,8 +358,8 @@ static int lc823450_wdt_getstatus(FAR struct watchdog_lowerhalf_s *lower,
* Set a new timeout value (and reset the watchdog timer)
*
* Input Parameters:
- * lower - A pointer the publicly visible representation of the "lower-half"
- * driver state structure.
+ * lower - A pointer the publicly visible representation of
+ * the "lower-half" driver state structure.
* timeout - The new timeout value in millisecnds.
*
* Returned Value:
@@ -381,7 +381,8 @@ static int lc823450_wdt_settimeout(FAR struct watchdog_lowerhalf_s *lower,
/* ProgrammersModel_PTM0v0.1.pdf:p24 */
- wt0pstst = 65536 - (uint64_t)timeout * wdt_freq / (2 * (256 - WT0BCGST) * 1000);
+ wt0pstst = 65536 - (uint64_t)timeout * wdt_freq /
+ (2 * (256 - WT0BCGST) * 1000);
if (wt0pstst < 1 || wt0pstst > 0xffff)
{
@@ -424,8 +425,8 @@ static int lc823450_wdt_settimeout(FAR struct watchdog_lowerhalf_s *lower,
* behavior.
*
* Input Parameters:
- * lower - A pointer the publicly visible representation of the "lower-half"
- * driver state structure.
+ * lower - A pointer the publicly visible representation of
+ * the "lower-half" driver state structure.
* newhandler - The new watchdog expiration function pointer. If this
* function pointer is NULL, then the reset-on-expiration
* behavior is restored,
@@ -459,7 +460,7 @@ static xcpt_t lc823450_wdt_capture(FAR struct watchdog_lowerhalf_s *lower,
/* Save the new handler */
- priv->handler = handler;
+ priv->handler = handler;
/* Are we attaching or detaching the handler? */
@@ -489,8 +490,8 @@ static xcpt_t lc823450_wdt_capture(FAR struct watchdog_lowerhalf_s *lower,
* are forwarded to the lower half driver through this method.
*
* Input Parameters:
- * lower - A pointer the publicly visible representation of the "lower-half"
- * driver state structure.
+ * lower - A pointer the publicly visible representation of
+ * the "lower-half" driver state structure.
* cmd - The ioctol command value
* arg - The optional argument that accompanies the 'cmd'. The
* interpretation of this argument depends on the particular
@@ -501,8 +502,8 @@ static xcpt_t lc823450_wdt_capture(FAR struct watchdog_lowerhalf_s *lower,
*
****************************************************************************/
-static int lc823450_wdt_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd,
- unsigned long arg)
+static int lc823450_wdt_ioctl(FAR struct watchdog_lowerhalf_s *lower,
+ int cmd, unsigned long arg)
{
wdinfo("cmd=%d arg=%ld\n", cmd, arg);
@@ -587,7 +588,8 @@ void lc823450_wdt_work_enable(int en)
putreg32(LOCKUPR_LOCKUPR0, LOCKUPR);
}
- lc823450_wdt_settimeout(&g_wdtdev.wdt_lh, CONFIG_WATCHDOG_WORK_TIMEOUT);
+ lc823450_wdt_settimeout(&g_wdtdev.wdt_lh,
+ CONFIG_WATCHDOG_WORK_TIMEOUT);
work_queue(HPWORK, &wdg_work, wdg_work_func, NULL,
MSEC2TICK(CONFIG_WATCHDOG_WORK_TIMEOUT / 2));
diff --git a/arch/arm/src/lc823450/lc823450_wdt.h b/arch/arm/src/lc823450/lc823450_wdt.h
index ce984ec..4a29420 100644
--- a/arch/arm/src/lc823450/lc823450_wdt.h
+++ b/arch/arm/src/lc823450/lc823450_wdt.h
@@ -63,7 +63,7 @@ extern "C"
#endif
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
int lc823450_wdt_initialize(void);