aboutsummaryrefslogtreecommitdiff
path: root/nuttx/lib/math
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2012-09-03 12:35:36 -0700
committerpx4dev <px4@purgatory.org>2012-09-03 12:35:36 -0700
commitf92139f53b83fae1efd9f91f74e9cb20a612cb53 (patch)
treebf2ffe53cb6e68e13f70b18bc07e3f4233300165 /nuttx/lib/math
parenteb8e3a2942abbed63bcb3c6336f20bb247f0c6e6 (diff)
parent79801b15789217f15ad3fbd15938c3f6b09425a5 (diff)
downloadpx4-firmware-f92139f53b83fae1efd9f91f74e9cb20a612cb53.tar.gz
px4-firmware-f92139f53b83fae1efd9f91f74e9cb20a612cb53.tar.bz2
px4-firmware-f92139f53b83fae1efd9f91f74e9cb20a612cb53.zip
Merge branch 'master' into ms5611_newmath
Diffstat (limited to 'nuttx/lib/math')
-rw-r--r--nuttx/lib/math/lib_b16atan2.c2
-rw-r--r--nuttx/lib/math/lib_b16cos.c2
-rw-r--r--nuttx/lib/math/lib_b16sin.c2
-rw-r--r--nuttx/lib/math/lib_fixedmath.c4
-rw-r--r--nuttx/lib/math/lib_rint.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/lib/math/lib_b16atan2.c b/nuttx/lib/math/lib_b16atan2.c
index a39652451..8792fa087 100644
--- a/nuttx/lib/math/lib_b16atan2.c
+++ b/nuttx/lib/math/lib_b16atan2.c
@@ -2,7 +2,7 @@
* lib/math/lib_b16atan2.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/math/lib_b16cos.c b/nuttx/lib/math/lib_b16cos.c
index 69cc61042..7547871f6 100644
--- a/nuttx/lib/math/lib_b16cos.c
+++ b/nuttx/lib/math/lib_b16cos.c
@@ -2,7 +2,7 @@
* lib/math/lib_b16cos.c
*
* Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/math/lib_b16sin.c b/nuttx/lib/math/lib_b16sin.c
index fc4b5e566..1eee17993 100644
--- a/nuttx/lib/math/lib_b16sin.c
+++ b/nuttx/lib/math/lib_b16sin.c
@@ -2,7 +2,7 @@
* lib/math/lib_b16sin.c
*
* Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/nuttx/lib/math/lib_fixedmath.c b/nuttx/lib/math/lib_fixedmath.c
index b20158dc8..c1a710e73 100644
--- a/nuttx/lib/math/lib_fixedmath.c
+++ b/nuttx/lib/math/lib_fixedmath.c
@@ -2,7 +2,7 @@
* lib/math/lib_fixedmath.c
*
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -165,7 +165,7 @@ ub16_t ub16mulub16(ub16_t m1, ub16_t m2)
}
/****************************************************************************
- * Name: b16divb16
+ * Name: b16sqr
**************************************************************************/
b16_t b16sqr(b16_t a)
diff --git a/nuttx/lib/math/lib_rint.c b/nuttx/lib/math/lib_rint.c
index b122870b8..bd861eced 100644
--- a/nuttx/lib/math/lib_rint.c
+++ b/nuttx/lib/math/lib_rint.c
@@ -2,7 +2,7 @@
* lib/math/lib_rint.c
*
* Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions