You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/04/15 16:05:12 UTC
[incubator-nuttx] branch master updated: Fix typos and nxstyle
complaints.
This is an automated email from the ASF dual-hosted git repository.
aguettouche 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 3c82922 Fix typos and nxstyle complaints.
3c82922 is described below
commit 3c829226f9f2f5495b22d3f7e239760ac54c589a
Author: Nathan Hartman <59...@users.noreply.github.com>
AuthorDate: Wed Apr 15 11:21:13 2020 -0400
Fix typos and nxstyle complaints.
arch/x86_64/src/intel64/intel64_tickless.c:
boards/x86_64/intel64/qemu-intel64/src/qemu_freq.c:
drivers/modem/altair/altmdm.c:
* Fix typos and nxstyle complaints.
---
arch/x86_64/src/intel64/intel64_tickless.c | 12 +++++++-----
boards/x86_64/intel64/qemu-intel64/src/qemu_freq.c | 5 +++--
drivers/modem/altair/altmdm.c | 2 +-
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/arch/x86_64/src/intel64/intel64_tickless.c b/arch/x86_64/src/intel64/intel64_tickless.c
index 24fcd56..84d59f2 100644
--- a/arch/x86_64/src/intel64/intel64_tickless.c
+++ b/arch/x86_64/src/intel64/intel64_tickless.c
@@ -25,8 +25,8 @@
* is suppressed and the platform specific code is expected to provide the
* following custom functions.
*
- * void sim_timer_initialize(void): Initializes the timer facilities. Called
- * early in the intialization sequence (by up_intialize()).
+ * void sim_timer_initialize(void): Initializes the timer facilities.
+ * Called early in the initialization sequence (by up_initialize()).
* int up_timer_gettime(FAR struct timespec *ts): Returns the current
* time from the platform specific time source.
* int up_timer_cancel(void): Cancels the interval timer.
@@ -91,7 +91,8 @@ void up_mask_tmr(void)
/* Disable TSC Deadline interrupt */
#ifdef CONFIG_ARCH_INTEL64_HAVE_TSC_DEADLINE
- write_msr(MSR_X2APIC_LVTT, TMR_IRQ | MSR_X2APIC_LVTT_TSC_DEADLINE | (1 << 16));
+ write_msr(MSR_X2APIC_LVTT, TMR_IRQ | MSR_X2APIC_LVTT_TSC_DEADLINE |
+ (1 << 16));
#else
write_msr(MSR_X2APIC_LVTT, TMR_IRQ | (1 << 16));
#endif
@@ -137,8 +138,9 @@ void up_timer_initialize(void)
static inline uint64_t up_ts2tick(FAR const struct timespec *ts)
{
- return ROUND_INT_DIV((uint64_t)ts->tv_nsec * x86_64_timer_freq, NS_PER_SEC) +
- (uint64_t)ts->tv_sec * x86_64_timer_freq;
+ return ROUND_INT_DIV((uint64_t)ts->tv_nsec * x86_64_timer_freq,
+ NS_PER_SEC) +
+ (uint64_t)ts->tv_sec * x86_64_timer_freq;
}
static inline void up_tick2ts(uint64_t tick, FAR struct timespec *ts)
diff --git a/boards/x86_64/intel64/qemu-intel64/src/qemu_freq.c b/boards/x86_64/intel64/qemu-intel64/src/qemu_freq.c
index ad3a945..3e56cdd 100644
--- a/boards/x86_64/intel64/qemu-intel64/src/qemu_freq.c
+++ b/boards/x86_64/intel64/qemu-intel64/src/qemu_freq.c
@@ -49,7 +49,7 @@ extern unsigned long x86_64_timer_freq;
*
* Description:
* Initializes all platform-specific timer facilities. This function is
- * called early in the initialization sequence by up_intialize().
+ * called early in the initialization sequence by up_initialize().
* On return, the current up-time should be available from
* up_timer_gettime() and the interval timer is ready for use (but not
* actively timing.
@@ -77,7 +77,8 @@ void x86_64_timer_calibrate_freq(void)
unsigned long numerator;
unsigned long denominator;
- asm volatile("cpuid" : "=c" (crystal_freq), "=b" (numerator), "=a" (denominator)
+ asm volatile("cpuid"
+ : "=c" (crystal_freq), "=b" (numerator), "=a" (denominator)
: "a" (X86_64_CPUID_TSC)
: "rdx", "memory");
diff --git a/drivers/modem/altair/altmdm.c b/drivers/modem/altair/altmdm.c
index bc05de4..0e72904 100644
--- a/drivers/modem/altair/altmdm.c
+++ b/drivers/modem/altair/altmdm.c
@@ -145,7 +145,7 @@ static int altmdm_uninitialize(FAR struct altmdm_dev_s *priv)
{
int ret;
- /* Unintialize ALTMDM SPI driver */
+ /* Uninitialize ALTMDM SPI driver */
altmdm_spi_uninit(priv);