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

2010-06-17 Ralf Corsépius <ralf.corsepius@rtems.org>

Browse Source 
* libfs/src/rfs/rtems-rfs-buffer.c: Various 64bit fixes.
This commit is contained in:
Ralf Corsepius
2010-06-17 03:16:51 +00:00
parent f5577ea6eb
commit eb5d659ff7
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cpukit/ChangeLog
View File

@@ -1,5 +1,6 @@
2010-06-17 Ralf Corsépius <ralf.corsepius@rtems.org> 2010-06-17 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/rfs/rtems-rfs-buffer.c: Various 64bit fixes.
* libfs/src/rfs/rtems-rfs-shell.c: Various 64bit fixes. * libfs/src/rfs/rtems-rfs-shell.c: Various 64bit fixes.
* libfs/src/rfs/rtems-rfs-bitmaps-ut.c: Various 64bit fixes. * libfs/src/rfs/rtems-rfs-bitmaps-ut.c: Various 64bit fixes.
* libfs/src/rfs/rtems-rfs-group.c: Various 64bit fixes. * libfs/src/rfs/rtems-rfs-group.c: Various 64bit fixes.

26
cpukit/libfs/src/rfs/rtems-rfs-buffer.c
View File

@@ -52,13 +52,13 @@ rtems_rfs_scan_chain (rtems_chain_control* chain,
buffer = (rtems_rfs_buffer*) node; buffer = (rtems_rfs_buffer*) node;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_CHAINS)) if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_CHAINS))
printf ("%lu ", (rtems_rfs_buffer_block) ((intptr_t)(buffer->user))); printf ("%" PRIuPTR " ", ((intptr_t) buffer->user));
if (((rtems_rfs_buffer_block) ((intptr_t)(buffer->user))) == block) if (((rtems_rfs_buffer_block) ((intptr_t)(buffer->user))) == block)
{ {
if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_CHAINS)) if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_CHAINS))
printf (": found block=%lu\n", printf (": found block=%" PRIuPTR "\n",
(rtems_rfs_buffer_block) ((intptr_t)(buffer->user))); ((intptr_t)(buffer->user)));
(*count)--; (*count)--;
rtems_chain_extract (node); rtems_chain_extract (node);
@@ -95,7 +95,7 @@ rtems_rfs_buffer_handle_request (rtems_rfs_file_system* fs,
return 0; return 0;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_REQUEST)) if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_REQUEST))
printf ("rtems-rfs: buffer-request: handle has buffer: %lu\n", printf ("rtems-rfs: buffer-request: handle has buffer: %" PRIu32 "\n",
rtems_rfs_buffer_bnum (handle)); rtems_rfs_buffer_bnum (handle));
rc = rtems_rfs_buffer_handle_release (fs, handle); rc = rtems_rfs_buffer_handle_release (fs, handle);
@@ -171,7 +171,7 @@ rtems_rfs_buffer_handle_request (rtems_rfs_file_system* fs,
if (rc > 0) if (rc > 0)
{ {
if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_REQUEST)) if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_REQUEST))
printf ("rtems-rfs: buffer-request: block=%lu: bdbuf-%s: %d: %s\n", printf ("rtems-rfs: buffer-request: block=%" PRIu32 ": bdbuf-%s: %d: %s\n",
block, read ? "read" : "get", rc, strerror (rc)); block, read ? "read" : "get", rc, strerror (rc));
return rc; return rc;
} }
@@ -188,7 +188,7 @@ rtems_rfs_buffer_handle_request (rtems_rfs_file_system* fs,
handle->bnum = block; handle->bnum = block;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_REQUEST)) if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_REQUEST))
printf ("rtems-rfs: buffer-request: block=%lu bdbuf-%s=%lu refs=%d\n", printf ("rtems-rfs: buffer-request: block=%" PRIu32 " bdbuf-%s=%" PRIu32 " refs=%d\n",
block, read ? "read" : "get", handle->buffer->block, block, read ? "read" : "get", handle->buffer->block,
handle->buffer->references); handle->buffer->references);
@@ -204,7 +204,7 @@ rtems_rfs_buffer_handle_release (rtems_rfs_file_system* fs,
if (rtems_rfs_buffer_handle_has_block (handle)) if (rtems_rfs_buffer_handle_has_block (handle))
{ {
if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_RELEASE)) if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_RELEASE))
printf ("rtems-rfs: buffer-release: block=%lu %s refs=%d %s\n", printf ("rtems-rfs: buffer-release: block=%" PRIu32 " %s refs=%d %s\n",
rtems_rfs_buffer_bnum (handle), rtems_rfs_buffer_bnum (handle),
rtems_rfs_buffer_dirty (handle) ? "(dirty)" : "", rtems_rfs_buffer_dirty (handle) ? "(dirty)" : "",
rtems_rfs_buffer_refs (handle), rtems_rfs_buffer_refs (handle),
@@ -242,8 +242,8 @@ rtems_rfs_buffer_handle_release (rtems_rfs_file_system* fs,
bool modified; bool modified;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_RELEASE)) if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_HANDLE_RELEASE))
printf ("rtems-rfs: buffer-release: local cache overflow:" \ printf ("rtems-rfs: buffer-release: local cache overflow:"
" %lu\n", fs->release_count + fs->release_modified_count); " %" PRIu32 "\n", fs->release_count + fs->release_modified_count);
if (fs->release_count > fs->release_modified_count) if (fs->release_count > fs->release_modified_count)
{ {
@@ -330,7 +330,7 @@ rtems_rfs_buffer_open (const char* name, rtems_rfs_file_system* fs)
#endif #endif
if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_SYNC)) if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_SYNC))
printf ("rtems-rfs: buffer-open: blks=%ld, blk-size=%ld\n", printf ("rtems-rfs: buffer-open: blks=%" PRId32 ", blk-size=%" PRId32 "\n",
rtems_rfs_fs_media_blocks (fs), rtems_rfs_fs_media_blocks (fs),
rtems_rfs_fs_media_block_size (fs)); rtems_rfs_fs_media_block_size (fs));
@@ -442,7 +442,7 @@ rtems_rfs_release_chain (rtems_chain_control* chain,
int rc; int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_CHAINS)) if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_CHAINS))
printf ("rtems-rfs: release-chain: count=%lu\n", *count); printf ("rtems-rfs: release-chain: count=%" PRIu32 "\n", *count);
while (!rtems_chain_is_empty (chain)) while (!rtems_chain_is_empty (chain))
{ {
@@ -465,8 +465,8 @@ rtems_rfs_buffers_release (rtems_rfs_file_system* fs)
int rc; int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_RELEASE)) if (rtems_rfs_trace (RTEMS_RFS_TRACE_BUFFER_RELEASE))
printf ("rtems-rfs: buffers-release: active:%lu " \ printf ("rtems-rfs: buffers-release: active:%" PRIu32 " "
"release:%lu release-modified:%lu\n", "release:%" PRIu32 " release-modified:%" PRIu32 "\n",
fs->buffers_count, fs->release_count, fs->release_modified_count); fs->buffers_count, fs->release_count, fs->release_modified_count);
rc = rtems_rfs_release_chain (&fs->release, rc = rtems_rfs_release_chain (&fs->release,