From 9b05600b2cc0407688548fe479fecb7ebfb5bbee Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 14 Jun 2000 20:22:31 +0000
Subject: *** empty log message ***

---
 c/src/lib/libc/ioctl.c       | 14 +++++++++++---
 c/src/lib/libc/libio.h       | 10 +---------
 c/src/lib/libc/tcdrain.c     |  2 --
 c/src/lib/libc/tcflow.c      |  2 --
 c/src/lib/libc/tcflush.c     |  2 --
 c/src/lib/libc/tcgetattr.c   |  2 --
 c/src/lib/libc/tcgetprgrp.c  |  2 --
 c/src/lib/libc/tcsendbreak.c |  2 --
 c/src/lib/libc/tcsetattr.c   |  2 --
 c/src/lib/libc/tcsetpgrp.c   |  2 --
 10 files changed, 12 insertions(+), 28 deletions(-)

(limited to 'c/src/lib/libc')

diff --git a/c/src/lib/libc/ioctl.c b/c/src/lib/libc/ioctl.c
index af986743dd..8d84a26a15 100644
--- a/c/src/lib/libc/ioctl.c
+++ b/c/src/lib/libc/ioctl.c
@@ -16,19 +16,27 @@
 
 #include "libio_.h"
 
+#include <unistd.h>
+
 int ioctl(
-  int         fd,
-  unsigned32  command,
-  void *      buffer
+  int  fd,
+  int  command,
+  ...
 ) 
 { 
+  va_list            ap;
   rtems_status_code  rc;
   rtems_libio_t     *iop;
+  void              *buffer;
 
   rtems_libio_check_fd( fd );
   iop = rtems_libio_iop( fd );
   rtems_libio_check_is_open(iop);
 
+  va_start(ap, command);
+
+  buffer = va_arg(ap, void *);
+
   /*
    *  Now process the ioctl().
    */
diff --git a/c/src/lib/libc/libio.h b/c/src/lib/libc/libio.h
index d5255769e6..5df9cccc24 100644
--- a/c/src/lib/libc/libio.h
+++ b/c/src/lib/libc/libio.h
@@ -22,6 +22,7 @@
 #include <rtems.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/ioctl.h>
 
 /*
  *  Define data types which must be constructed using forward references.
@@ -445,15 +446,6 @@ typedef int (*rtems_libio_lseek_t)(
   int    whence
 );
 
-/*
- *  IOCTL values
- */
-
-#define       RTEMS_IO_GET_ATTRIBUTES 1
-#define       RTEMS_IO_SET_ATTRIBUTES 2
-#define       RTEMS_IO_TCDRAIN        3
-#define       FIONREAD                4
-
 /*
  *  The following macros are used to build up the permissions sets
  *  used to check permissions.  These are similar in style to the
diff --git a/c/src/lib/libc/tcdrain.c b/c/src/lib/libc/tcdrain.c
index 0c89a58115..31e026b9bc 100644
--- a/c/src/lib/libc/tcdrain.c
+++ b/c/src/lib/libc/tcdrain.c
@@ -20,8 +20,6 @@
 #include <termios.h>
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 
 int tcdrain(
diff --git a/c/src/lib/libc/tcflow.c b/c/src/lib/libc/tcflow.c
index 723013c898..19b7a9a8fd 100644
--- a/c/src/lib/libc/tcflow.c
+++ b/c/src/lib/libc/tcflow.c
@@ -20,8 +20,6 @@
 #include <termios.h>
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 
 int tcflow (int fd, int action)
diff --git a/c/src/lib/libc/tcflush.c b/c/src/lib/libc/tcflush.c
index 7d2f119aec..44616949a0 100644
--- a/c/src/lib/libc/tcflush.c
+++ b/c/src/lib/libc/tcflush.c
@@ -20,8 +20,6 @@
 #include <termios.h>
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 
 int tcflush (int fd, int queue)
diff --git a/c/src/lib/libc/tcgetattr.c b/c/src/lib/libc/tcgetattr.c
index 388282d37a..8888acd3a9 100644
--- a/c/src/lib/libc/tcgetattr.c
+++ b/c/src/lib/libc/tcgetattr.c
@@ -20,8 +20,6 @@
 #include <termios.h>
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 
 int tcgetattr(
diff --git a/c/src/lib/libc/tcgetprgrp.c b/c/src/lib/libc/tcgetprgrp.c
index 3f34b6ee13..3aca711fcf 100644
--- a/c/src/lib/libc/tcgetprgrp.c
+++ b/c/src/lib/libc/tcgetprgrp.c
@@ -20,8 +20,6 @@
 #include <termios.h>
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 
 pid_t tcgetprgrp(int fd)
diff --git a/c/src/lib/libc/tcsendbreak.c b/c/src/lib/libc/tcsendbreak.c
index b367d26ece..b37729f40a 100644
--- a/c/src/lib/libc/tcsendbreak.c
+++ b/c/src/lib/libc/tcsendbreak.c
@@ -20,8 +20,6 @@
 #include <termios.h>
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 
 int tcsendbreak ( int fd, int duration )
diff --git a/c/src/lib/libc/tcsetattr.c b/c/src/lib/libc/tcsetattr.c
index 466d2c35fb..d9a8426a3d 100644
--- a/c/src/lib/libc/tcsetattr.c
+++ b/c/src/lib/libc/tcsetattr.c
@@ -20,8 +20,6 @@
 #include <termios.h>
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 #include "libio_.h"
 
diff --git a/c/src/lib/libc/tcsetpgrp.c b/c/src/lib/libc/tcsetpgrp.c
index fa54df3b5f..fb0be34bc4 100644
--- a/c/src/lib/libc/tcsetpgrp.c
+++ b/c/src/lib/libc/tcsetpgrp.c
@@ -20,8 +20,6 @@
 #include <termios.h>
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 
 int tcsetprgrp(int fd, pid_t pid)
-- 
cgit v1.2.3