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 2022/09/13 06:53:59 UTC
[incubator-nuttx] branch master updated: tools/pic32: Add description, fix nxstyle, fix typos
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 69feebe48c tools/pic32: Add description, fix nxstyle, fix typos
69feebe48c is described below
commit 69feebe48cea8af865271206063d0e3e6296bb4e
Author: Nathan Hartman <59...@users.noreply.github.com>
AuthorDate: Mon Sep 12 23:38:16 2022 -0400
tools/pic32: Add description, fix nxstyle, fix typos
* tools/pic32/Config.mk: Fix typo.
* tools/pic32/mkpichex.c:
(): Add one-line description of this file.
(adjust_extlin): Fix nxstyle error and typo in comment.
---
tools/pic32/Config.mk | 2 +-
tools/pic32/mkpichex.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/pic32/Config.mk b/tools/pic32/Config.mk
index dd535616f6..c107af0464 100644
--- a/tools/pic32/Config.mk
+++ b/tools/pic32/Config.mk
@@ -19,7 +19,7 @@
############################################################################
# These are the macros that will be used in the NuttX make system to compile
-# and assembly source files and to insert the resulting object files into an
+# and assemble source files and to insert the resulting object files into an
# archive. These replace the default definitions at tools/Config.mk
# POSTBUILD -- Perform post build operations
diff --git a/tools/pic32/mkpichex.c b/tools/pic32/mkpichex.c
index 84e2365da0..381952f7cb 100644
--- a/tools/pic32/mkpichex.c
+++ b/tools/pic32/mkpichex.c
@@ -1,5 +1,6 @@
/****************************************************************************
* tools/pic32/mkpichex.c
+ * Convert virtual addresses in nuttx.hex to physical addresses
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -205,14 +206,14 @@ static void adjust_extlin(struct hex_s *hexline)
segment &= 0x1fff;
/* Recalculate the checksum and make sure that there is a null terminator
- * Since len=2, addr=0, type=4, the is a trivial calculation.
+ * Since len=2, addr=0, type=4, this is a trivial calculation.
*/
chksum = (-(segment + (segment >> 8) + 6)) & 0xff;
/* Then create the new output record */
- snprintf(line, MAX_LINE-PAYLOAD_OFFSET, ":02000004%04X%02X\n",
+ snprintf(line, MAX_LINE - PAYLOAD_OFFSET, ":02000004%04X%02X\n",
segment, chksum);
}