2009-06-12 Joel Sherrill <joel.sherrill@oarcorp.com>

	* libblock/src/flashdisk.c, libblock/src/nvdisk.c,
	libblock/src/ramdisk.c, libfs/src/dosfs/fat.c,
	libfs/src/dosfs/msdos_format.c: Eliminate using the GNU/Linux
	specific error numbers EBADRQC and ENOTBLK. Switch to EINVAL and
	ENOTTY as appropriate.

6 files changed, 18 insertions, 10 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index d3a1d8f5e2..9b82a18048 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-12	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* libblock/src/flashdisk.c, libblock/src/nvdisk.c,
+	libblock/src/ramdisk.c, libfs/src/dosfs/fat.c,
+	libfs/src/dosfs/msdos_format.c: Eliminate using the GNU/Linux
+	specific error numbers EBADRQC and ENOTBLK. Switch to EINVAL and
+	ENOTTY as appropriate.
+
 2009-06-12	Chris Johns <chrisj@rtems.org>
 
 	* libmisc/shell/dd-args.c, libmisc/shell/dd-conv.c,
diff --git a/cpukit/libblock/src/flashdisk.c b/cpukit/libblock/src/flashdisk.c
index b59d54ad6c..879ee9d61c 100644
--- a/cpukit/libblock/src/flashdisk.c
+++ b/cpukit/libblock/src/flashdisk.c
@@ -2378,7 +2378,7 @@ rtems_fdisk_ioctl (dev_t dev, uint32_t req, void* argp)
               break;
         
             default:
-              errno = EBADRQC;
+              errno = EINVAL;
               break;
           }
         }
@@ -2410,7 +2410,7 @@ rtems_fdisk_ioctl (dev_t dev, uint32_t req, void* argp)
         break;
 
       default:
-        errno = EBADRQC;
+        errno = EINVAL;
         break;
     }
 
diff --git a/cpukit/libblock/src/nvdisk.c b/cpukit/libblock/src/nvdisk.c
index acf2656b3a..7157dd08ab 100644
--- a/cpukit/libblock/src/nvdisk.c
+++ b/cpukit/libblock/src/nvdisk.c
@@ -730,7 +730,7 @@ rtems_nvdisk_ioctl (dev_t dev, uint32_t req, void* argp)
             break;
             
           default:
-            errno = EBADRQC;
+            errno = EINVAL;
             break;
         }
         break;
@@ -744,7 +744,7 @@ rtems_nvdisk_ioctl (dev_t dev, uint32_t req, void* argp)
         break;
         
       default:
-        errno = EBADRQC;
+        errno = EINVAL;
         break;
     }
 
diff --git a/cpukit/libblock/src/ramdisk.c b/cpukit/libblock/src/ramdisk.c
index 5684f302df..b2c802deee 100644
--- a/cpukit/libblock/src/ramdisk.c
+++ b/cpukit/libblock/src/ramdisk.c
@@ -201,14 +201,14 @@ ramdisk_ioctl(dev_t dev, uint32_t req, void *argp)
                     return ramdisk_write(rd, r);
 
                 default:
-                    errno = EBADRQC;
+                    errno = EINVAL;
                     return -1;
             }
             break;
         }
 
         default:
-            errno = EBADRQC;
+            errno = EINVAL;
             return -1;
     }
 }
diff --git a/cpukit/libfs/src/dosfs/fat.c b/cpukit/libfs/src/dosfs/fat.c
index 0bf3d29d28..26682dc6dd 100644
--- a/cpukit/libfs/src/dosfs/fat.c
+++ b/cpukit/libfs/src/dosfs/fat.c
@@ -351,12 +351,12 @@ fat_init_volume_info(rtems_filesystem_mount_table_entry_t *mt_entry)
 
     /* rtmes feature: no block devices, all are character devices */
     if (!S_ISCHR(stat_buf.st_mode))
-        rtems_set_errno_and_return_minus_one(ENOTBLK);
+        rtems_set_errno_and_return_minus_one(ENOTTY);
 
     /* check that device is registred as block device and lock it */
     vol->dd = rtems_disk_obtain(stat_buf.st_rdev);
     if (vol->dd == NULL)
-        rtems_set_errno_and_return_minus_one(ENOTBLK);
+        rtems_set_errno_and_return_minus_one(ENOTTY);
 
     vol->dev = stat_buf.st_rdev;
 
diff --git a/cpukit/libfs/src/dosfs/msdos_format.c b/cpukit/libfs/src/dosfs/msdos_format.c
index af4a109892..c420333243 100644
--- a/cpukit/libfs/src/dosfs/msdos_format.c
+++ b/cpukit/libfs/src/dosfs/msdos_format.c
@@ -910,7 +910,7 @@ int msdos_format
   /* rtems feature: no block devices, all are character devices */   
   if ((ret_val == 0) &&
       (!S_ISCHR(stat_buf.st_mode))) {
-    errno = ENOTBLK;
+    errno = ENOTTY;
     ret_val = -1;
   }
   
@@ -918,7 +918,7 @@ int msdos_format
   if (ret_val == 0) {
     dd = rtems_disk_obtain(stat_buf.st_rdev);
     if (dd == NULL) {
-      errno = ENOTBLK;
+      errno = ENOTTY;
       ret_val = -1;
     }
   }