<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2010-06-17)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ccj</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-06-18 Chris Johns <chrisj@rtems.org>
* libfs/src/rfs/rtems-rfs-file-system.h,
libfs/src/rfs/rtems-rfs-file-system.c: Move questionable macros to
C functions.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2421&r2=text&tr2=1.2422&diff_format=h">M</a></td><td width='1%'>1.2422</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h.diff?r1=text&tr1=1.6&r2=text&tr2=1.7&diff_format=h">M</a></td><td width='1%'>1.7</td><td width='100%'>cpukit/libfs/src/rfs/rtems-rfs-file-system.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&diff_format=h">M</a></td><td width='1%'>1.6</td><td width='100%'>cpukit/libfs/src/rfs/rtems-rfs-file-system.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2421 rtems/cpukit/ChangeLog:1.2422
--- rtems/cpukit/ChangeLog:1.2421 Thu Jun 17 13:39:28 2010
+++ rtems/cpukit/ChangeLog Thu Jun 17 17:00:45 2010
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2010-06-18 Chris Johns <chrisj@rtems.org>
+
+ * libfs/src/rfs/rtems-rfs-file-system.h,
+ libfs/src/rfs/rtems-rfs-file-system.c: Move questionable macros to
+ C functions.
+
</font> 2010-06-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* sapi/include/confdefs.h: Remove ITRON configuration parameters.
<font color='#006600'>diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h:1.6 rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h:1.7
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h:1.6 Wed Jun 16 22:57:11 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h Thu Jun 17 17:00:47 2010
</font><font color='#997700'>@@ -304,14 +304,6 @@
</font> #define rtems_rfs_fs_block_size(_fs) ((_fs)->block_size)
/**
<font color='#880000'>- * The size of the disk in bytes.
- *
- * @param _fs Pointer to the file system.
- */
-#define rtems_rfs_fs_size(_fs) (((uint64_t) rtems_rfs_fs_blocks (_fs)) * \
- rtems_rfs_fs_block_size (_fs))
-
-/**
</font> * The number of inodes.
*
* @param _fs Pointer to the file system.
<font color='#997700'>@@ -354,14 +346,6 @@
</font> #endif
/**
<font color='#880000'>- * The size of the disk in bytes.
- *
- * @param _fs Pointer to the file system.
- */
-#define rtems_rfs_fs_media_size(_fs) (((uint64_t) rtems_rfs_fs_media_blocks (_fs)) * \
- rtems_rfs_fs_media_block_size (_fs))
-
-/**
</font> * The maximum length of a name supported by the file system.
*/
#define rtems_rfs_fs_max_name(_fs) ((_fs)->max_name_length)
<font color='#997700'>@@ -379,6 +363,22 @@
</font> #define rtems_rfs_fs_user(_fs) ((_fs)->user)
/**
<font color='#000088'>+ * Return the size of the disk in bytes.
+ *
+ * @param fs Pointer to the file system.
+ * @return uint64_t The size of the disk in bytes.
+ */
+uint64_t rtems_rfs_fs_size(rtems_rfs_file_system* fs);
+
+/**
+ * The size of the disk in bytes calculated from the media parameters..
+ *
+ * @param fs Pointer to the file system.
+ * @return uint64_t The size of the disk in bytes.
+ */
+uint64_t rtems_rfs_fs_media_size (rtems_rfs_file_system* fs);
+
+/**
</font> * Open the file system given a file path.
*
* @param name The device to open.
<font color='#006600'>diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c:1.5 rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c:1.6
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c:1.5 Wed Jun 16 22:41:12 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c Thu Jun 17 17:00:47 2010
</font><font color='#997700'>@@ -28,6 +28,22 @@
</font> #include <rtems/rfs/rtems-rfs-inode.h>
#include <rtems/rfs/rtems-rfs-trace.h>
<font color='#000088'>+uint64_t
+rtems_rfs_fs_size (rtems_rfs_file_system* fs)
+{
+ uint64_t blocks = rtems_rfs_fs_blocks (fs);
+ uint64_t block_size = rtems_rfs_fs_block_size (fs);
+ return blocks * block_size;
+}
+
+uint64_t
+rtems_rfs_fs_media_size (rtems_rfs_file_system* fs)
+{
+ uint64_t media_blocks = (uint64_t) rtems_rfs_fs_media_blocks (fs);
+ uint64_t media_block_size = (uint64_t) rtems_rfs_fs_media_block_size (fs);
+ return media_blocks * media_block_size;
+}
+
</font> static int
rtems_rfs_fs_read_superblock (rtems_rfs_file_system* fs)
{
</pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ccj</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-06-18 Chris Johns <chrisj@rtems.org>
* libfs/src/rfs/rtems-rfs-file-block.c: Clean up uint64_t maths.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2422&r2=text&tr2=1.2423&diff_format=h">M</a></td><td width='1%'>1.2423</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-block.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&diff_format=h">M</a></td><td width='1%'>1.6</td><td width='100%'>cpukit/libfs/src/rfs/rtems-rfs-block.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2422 rtems/cpukit/ChangeLog:1.2423
--- rtems/cpukit/ChangeLog:1.2422 Thu Jun 17 17:00:45 2010
+++ rtems/cpukit/ChangeLog Thu Jun 17 17:04:51 2010
</font><font color='#997700'>@@ -1,5 +1,9 @@
</font> 2010-06-18 Chris Johns <chrisj@rtems.org>
<font color='#000088'>+ * libfs/src/rfs/rtems-rfs-file-block.c: Clean up uint64_t maths.
+
+2010-06-18 Chris Johns <chrisj@rtems.org>
+
</font> * libfs/src/rfs/rtems-rfs-file-system.h,
libfs/src/rfs/rtems-rfs-file-system.c: Move questionable macros to
C functions.
<font color='#006600'>diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-block.c:1.5 rtems/cpukit/libfs/src/rfs/rtems-rfs-block.c:1.6
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-block.c:1.5 Tue Jun 15 08:35:28 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-block.c Thu Jun 17 17:04:51 2010
</font><font color='#997700'>@@ -88,13 +88,15 @@
</font> rtems_rfs_block_size* size)
{
uint32_t offset;
<font color='#000088'>+ uint64_t block_size;
</font> if (size->count == 0)
return 0;
if (size->offset == 0)
offset = rtems_rfs_fs_block_size (fs);
else
offset = size->offset;
<font color='#880000'>- return (((uint64_t) (size->count - 1)) * rtems_rfs_fs_block_size (fs)) + offset;
</font><font color='#000088'>+ block_size = rtems_rfs_fs_block_size (fs);
+ return (((uint64_t) (size->count - 1)) * block_size) + offset;
</font> }
int
</pre>
<p> </p>
<a name='cs3'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ccj</strong></font>
<font color='#225522'><em>(on branch rtems-4-10-branch)</em></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-06-18 Chris Johns <chrisj@rtems.org>
* libfs/src/rfs/rtems-rfs-file-block.c: Clean up uint64_t
maths.
* libfs/src/rfs/rtems-rfs-file-system.h,
libfs/src/rfs/rtems-rfs-file-system.c: Move
questionable macros to C functions.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2346.2.37&r2=text&tr2=1.2346.2.38&diff_format=h">M</a></td><td width='1%'>1.2346.2.38</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-block.c.diff?r1=text&tr1=1.4.2.1&r2=text&tr2=1.4.2.2&diff_format=h">M</a></td><td width='1%'>1.4.2.2</td><td width='100%'>cpukit/libfs/src/rfs/rtems-rfs-block.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h.diff?r1=text&tr1=1.3.2.3&r2=text&tr2=1.3.2.4&diff_format=h">M</a></td><td width='1%'>1.3.2.4</td><td width='100%'>cpukit/libfs/src/rfs/rtems-rfs-file-system.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c.diff?r1=text&tr1=1.4.2.1&r2=text&tr2=1.4.2.2&diff_format=h">M</a></td><td width='1%'>1.4.2.2</td><td width='100%'>cpukit/libfs/src/rfs/rtems-rfs-file-system.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2346.2.37 rtems/cpukit/ChangeLog:1.2346.2.38
--- rtems/cpukit/ChangeLog:1.2346.2.37 Thu Jun 17 13:38:20 2010
+++ rtems/cpukit/ChangeLog Thu Jun 17 17:10:19 2010
</font><font color='#997700'>@@ -1,3 +1,12 @@
</font><font color='#000088'>+2010-06-18 Chris Johns <chrisj@rtems.org>
+
+ * libfs/src/rfs/rtems-rfs-file-block.c: Clean up uint64_t
+ maths.
+
+ * libfs/src/rfs/rtems-rfs-file-system.h,
+ libfs/src/rfs/rtems-rfs-file-system.c: Move
+ questionable macros to C functions.
+
</font> 2010-06-17 Joel Sherrill <joel.sherrilL@OARcorp.com>
* sapi/include/confdefs.h: Remove RTEMS_COVERAGE conditionals.
<font color='#006600'>diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-block.c:1.4.2.1 rtems/cpukit/libfs/src/rfs/rtems-rfs-block.c:1.4.2.2
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-block.c:1.4.2.1 Tue Jun 15 08:35:52 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-block.c Thu Jun 17 17:10:20 2010
</font><font color='#997700'>@@ -88,13 +88,15 @@
</font> rtems_rfs_block_size* size)
{
uint32_t offset;
<font color='#000088'>+ uint64_t block_size;
</font> if (size->count == 0)
return 0;
if (size->offset == 0)
offset = rtems_rfs_fs_block_size (fs);
else
offset = size->offset;
<font color='#880000'>- return (((uint64_t) (size->count - 1)) * rtems_rfs_fs_block_size (fs)) + offset;
</font><font color='#000088'>+ block_size = rtems_rfs_fs_block_size (fs);
+ return (((uint64_t) (size->count - 1)) * block_size) + offset;
</font> }
int
<font color='#006600'>diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h:1.3.2.3 rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h:1.3.2.4
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h:1.3.2.3 Wed Jun 16 22:57:17 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.h Thu Jun 17 17:10:20 2010
</font><font color='#997700'>@@ -304,14 +304,6 @@
</font> #define rtems_rfs_fs_block_size(_fs) ((_fs)->block_size)
/**
<font color='#880000'>- * The size of the disk in bytes.
- *
- * @param _fs Pointer to the file system.
- */
-#define rtems_rfs_fs_size(_fs) (((uint64_t) rtems_rfs_fs_blocks (_fs)) * \
- rtems_rfs_fs_block_size (_fs))
-
-/**
</font> * The number of inodes.
*
* @param _fs Pointer to the file system.
<font color='#997700'>@@ -354,14 +346,6 @@
</font> #endif
/**
<font color='#880000'>- * The size of the disk in bytes.
- *
- * @param _fs Pointer to the file system.
- */
-#define rtems_rfs_fs_media_size(_fs) (((uint64_t) rtems_rfs_fs_media_blocks (_fs)) * \
- rtems_rfs_fs_media_block_size (_fs))
-
-/**
</font> * The maximum length of a name supported by the file system.
*/
#define rtems_rfs_fs_max_name(_fs) ((_fs)->max_name_length)
<font color='#997700'>@@ -379,6 +363,22 @@
</font> #define rtems_rfs_fs_user(_fs) ((_fs)->user)
/**
<font color='#000088'>+ * Return the size of the disk in bytes.
+ *
+ * @param fs Pointer to the file system.
+ * @return uint64_t The size of the disk in bytes.
+ */
+uint64_t rtems_rfs_fs_size(rtems_rfs_file_system* fs);
+
+/**
+ * The size of the disk in bytes calculated from the media parameters..
+ *
+ * @param fs Pointer to the file system.
+ * @return uint64_t The size of the disk in bytes.
+ */
+uint64_t rtems_rfs_fs_media_size (rtems_rfs_file_system* fs);
+
+/**
</font> * Open the file system given a file path.
*
* @param name The device to open.
<font color='#006600'>diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c:1.4.2.1 rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c:1.4.2.2
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c:1.4.2.1 Wed Jun 16 22:41:21 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-file-system.c Thu Jun 17 17:10:20 2010
</font><font color='#997700'>@@ -28,6 +28,22 @@
</font> #include <rtems/rfs/rtems-rfs-inode.h>
#include <rtems/rfs/rtems-rfs-trace.h>
<font color='#000088'>+uint64_t
+rtems_rfs_fs_size (rtems_rfs_file_system* fs)
+{
+ uint64_t blocks = rtems_rfs_fs_blocks (fs);
+ uint64_t block_size = rtems_rfs_fs_block_size (fs);
+ return blocks * block_size;
+}
+
+uint64_t
+rtems_rfs_fs_media_size (rtems_rfs_file_system* fs)
+{
+ uint64_t media_blocks = (uint64_t) rtems_rfs_fs_media_blocks (fs);
+ uint64_t media_block_size = (uint64_t) rtems_rfs_fs_media_block_size (fs);
+ return media_blocks * media_block_size;
+}
+
</font> static int
rtems_rfs_fs_read_superblock (rtems_rfs_file_system* fs)
{
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>