summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-09-18 13:21:49 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-09-18 13:21:49 +0000
commitec9e8a9bae3aad55196fa6460fcbc665194a8be2 (patch)
treecb6ea6f028eaa4cd94251d3f5025d96a4555a1c4 /cpukit
parentRemove *.orig files having crept into patch. (diff)
downloadrtems-ec9e8a9bae3aad55196fa6460fcbc665194a8be2.tar.bz2
2008-09-18 Miao Yan <yanmiaobest@gmail.com>
* libfs/src/devfs/devclose.c, libfs/src/devfs/devfs_eval.c, libfs/src/devfs/devioctl.c, libfs/src/devfs/devopen.c, libfs/src/devfs/devread.c, libfs/src/devfs/devwrite.c: Fix warnings.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog6
-rw-r--r--cpukit/libfs/src/devfs/devclose.c4
-rw-r--r--cpukit/libfs/src/devfs/devfs_eval.c2
-rw-r--r--cpukit/libfs/src/devfs/devioctl.c4
-rw-r--r--cpukit/libfs/src/devfs/devopen.c4
-rw-r--r--cpukit/libfs/src/devfs/devread.c4
-rw-r--r--cpukit/libfs/src/devfs/devwrite.c4
7 files changed, 17 insertions, 11 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 2809862017..344aa7a3ec 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-18 Miao Yan <yanmiaobest@gmail.com>
+
+ * libfs/src/devfs/devclose.c, libfs/src/devfs/devfs_eval.c,
+ libfs/src/devfs/devioctl.c, libfs/src/devfs/devopen.c,
+ libfs/src/devfs/devread.c, libfs/src/devfs/devwrite.c: Fix warnings.
+
2008-09-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* Doxyfile.in, rtems/mainpage.h, score/include/rtems/system.h: Move to
diff --git a/cpukit/libfs/src/devfs/devclose.c b/cpukit/libfs/src/devfs/devclose.c
index 87bac80488..66a89b98e7 100644
--- a/cpukit/libfs/src/devfs/devclose.c
+++ b/cpukit/libfs/src/devfs/devclose.c
@@ -21,9 +21,9 @@ int devFS_close(
{
rtems_libio_open_close_args_t args;
rtems_status_code status;
- rtems_driver_name_t *np;
+ rtems_device_name_t *np;
- np = (rtems_driver_name_t *)iop->file_info;
+ np = (rtems_device_name_t *)iop->file_info;
args.iop = iop;
args.flags = 0;
diff --git a/cpukit/libfs/src/devfs/devfs_eval.c b/cpukit/libfs/src/devfs/devfs_eval.c
index 8f7fb90c87..5d9423b007 100644
--- a/cpukit/libfs/src/devfs/devfs_eval.c
+++ b/cpukit/libfs/src/devfs/devfs_eval.c
@@ -42,7 +42,7 @@ int devFS_evaluate_path(
pathloc->node_access = (void *)&device_name_table[i];
pathloc->handlers = &devFS_file_handlers;
pathloc->ops = &devFS_ops;
- pathloc->mt_entry = &rtems_filesystem_root;
+ pathloc->mt_entry = rtems_filesystem_root.mt_entry;
return 0;
}
}
diff --git a/cpukit/libfs/src/devfs/devioctl.c b/cpukit/libfs/src/devfs/devioctl.c
index 5325584b1d..59a5c907e9 100644
--- a/cpukit/libfs/src/devfs/devioctl.c
+++ b/cpukit/libfs/src/devfs/devioctl.c
@@ -23,9 +23,9 @@ int devFS_ioctl(
{
rtems_libio_ioctl_args_t args;
rtems_status_code status;
- rtems_driver_name_t *np;
+ rtems_device_name_t *np;
- np = (rtems_driver_name_t *)iop->file_info;
+ np = (rtems_device_name_t *)iop->file_info;
args.iop = iop;
args.command = command;
diff --git a/cpukit/libfs/src/devfs/devopen.c b/cpukit/libfs/src/devfs/devopen.c
index c05b116d3a..e1dcf64957 100644
--- a/cpukit/libfs/src/devfs/devopen.c
+++ b/cpukit/libfs/src/devfs/devopen.c
@@ -24,9 +24,9 @@ int devFS_open(
{
rtems_libio_open_close_args_t args;
rtems_status_code status;
- rtems_driver_name_t *np;
+ rtems_device_name_t *np;
- np = (rtems_driver_name_t *)iop->file_info;
+ np = (rtems_device_name_t *)iop->file_info;
args.iop = iop;
args.flags = iop->flags;
diff --git a/cpukit/libfs/src/devfs/devread.c b/cpukit/libfs/src/devfs/devread.c
index 78fe102b6d..90c8203cb5 100644
--- a/cpukit/libfs/src/devfs/devread.c
+++ b/cpukit/libfs/src/devfs/devread.c
@@ -23,9 +23,9 @@ ssize_t devFS_read(
{
rtems_libio_rw_args_t args;
rtems_status_code status;
- rtems_driver_name_t *np;
+ rtems_device_name_t *np;
- np = (rtems_driver_name_t *)iop->file_info;
+ np = (rtems_device_name_t *)iop->file_info;
args.iop = iop;
args.offset = iop->offset;
diff --git a/cpukit/libfs/src/devfs/devwrite.c b/cpukit/libfs/src/devfs/devwrite.c
index 2a6bd5ab7a..400422fd64 100644
--- a/cpukit/libfs/src/devfs/devwrite.c
+++ b/cpukit/libfs/src/devfs/devwrite.c
@@ -23,9 +23,9 @@ ssize_t devFS_write(
{
rtems_libio_rw_args_t args;
rtems_status_code status;
- rtems_driver_name_t *np;
+ rtems_device_name_t *np;
- np = (rtems_driver_name_t *)iop->file_info;
+ np = (rtems_device_name_t *)iop->file_info;
args.iop = iop;
args.offset = iop->offset;