diff options
| -rw-r--r-- | cpukit/ChangeLog | 4 | ||||
| -rw-r--r-- | cpukit/libfs/src/imfs/deviceio.c | 28 |
2 files changed, 5 insertions, 27 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 9b55f7dc35..805afa54fc 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,7 @@ +2008-09-25 Joel Sherrill <joel.sherrill@oarcorp.com> + + * libfs/src/imfs/deviceio.c: Eliminate duplicate implementation. + 2008-09-24 Joel Sherrill <joel.sherrill@OARcorp.com> PR 1326/cpukit diff --git a/cpukit/libfs/src/imfs/deviceio.c b/cpukit/libfs/src/imfs/deviceio.c index 6bf46066e2..dc5cc1b4f4 100644 --- a/cpukit/libfs/src/imfs/deviceio.c +++ b/cpukit/libfs/src/imfs/deviceio.c @@ -28,33 +28,7 @@ /* * Convert RTEMS status to a UNIX errno */ - -const rtems_assoc_t errno_assoc[] = { - { "OK", RTEMS_SUCCESSFUL, 0 }, - { "BUSY", RTEMS_RESOURCE_IN_USE, EBUSY }, - { "INVALID NAME", RTEMS_INVALID_NAME, EINVAL }, - { "NOT IMPLEMENTED", RTEMS_NOT_IMPLEMENTED, ENOSYS }, - { "TIMEOUT", RTEMS_TIMEOUT, ETIMEDOUT }, - { "NO MEMORY", RTEMS_NO_MEMORY, ENOMEM }, - { "NO DEVICE", RTEMS_UNSATISFIED, ENODEV }, - { "INVALID NUMBER", RTEMS_INVALID_NUMBER, EBADF}, - { "NOT RESOURCE OWNER", RTEMS_NOT_OWNER_OF_RESOURCE, EPERM}, - { "IO ERROR", RTEMS_IO_ERROR, EIO}, - { 0, 0, 0 }, -}; - -static int -rtems_deviceio_errno(rtems_status_code code) -{ - int rc; - - if ((rc = rtems_assoc_remote_by_local(errno_assoc, (uint32_t) code))) - { - errno = rc; - return -1; - } - return -1; -} +extern int rtems_deviceio_errno(rtems_status_code code); /* * device_open |