RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2010-06-18 Chris Johns <chrisj@rtems.org>

Browse Source 
* libfs/src/rfs/rtems-rfs-file-system.h,
        libfs/src/rfs/rtems-rfs-file-system.c: Move questionable macros to
        C functions.
This commit is contained in:
Chris Johns
2010-06-17 22:00:47 +00:00
parent f5d429b6d9
commit ca8c50deae
3 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/ChangeLog
View File

@@ -1,3 +1,9 @@
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.
2010-06-17 Joel Sherrill <joel.sherrill@oarcorp.com> 2010-06-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* sapi/include/confdefs.h: Remove ITRON configuration parameters. * sapi/include/confdefs.h: Remove ITRON configuration parameters.

16
cpukit/libfs/src/rfs/rtems-rfs-file-system.c
View File

@@ -28,6 +28,22 @@
#include <rtems/rfs/rtems-rfs-inode.h> #include <rtems/rfs/rtems-rfs-inode.h>
#include <rtems/rfs/rtems-rfs-trace.h> #include <rtems/rfs/rtems-rfs-trace.h>
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;
}
static int static int
rtems_rfs_fs_read_superblock (rtems_rfs_file_system* fs) rtems_rfs_fs_read_superblock (rtems_rfs_file_system* fs)
{ {

32
cpukit/libfs/src/rfs/rtems-rfs-file-system.h
View File

@@ -303,14 +303,6 @@ struct _rtems_rfs_file_system
*/ */
#define rtems_rfs_fs_block_size(_fs) ((_fs)->block_size) #define rtems_rfs_fs_block_size(_fs) ((_fs)->block_size)
/**
* 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))
/** /**
* The number of inodes. * The number of inodes.
* *
@@ -353,14 +345,6 @@ struct _rtems_rfs_file_system
#define rtems_rfs_fs_media_block_size(_fs) (1) #define rtems_rfs_fs_media_block_size(_fs) (1)
#endif #endif
/**
* 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))
/** /**
* The maximum length of a name supported by the file system. * The maximum length of a name supported by the file system.
*/ */
@@ -378,6 +362,22 @@ struct _rtems_rfs_file_system
*/ */
#define rtems_rfs_fs_user(_fs) ((_fs)->user) #define rtems_rfs_fs_user(_fs) ((_fs)->user)
/**
* 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);
/** /**
* Open the file system given a file path. * Open the file system given a file path.
* *