Changeset 9b05600 in rtems

Timestamp:

06/14/00 20:22:31 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

5e77d129

Parents:

07f0442

Message:

* empty log message *

Files:

• c/src/exec/libcsupport/include/rtems/libio.h (modified) (2 diffs)
• c/src/exec/libcsupport/include/sys/filio.h (modified) (2 diffs)
• c/src/exec/libcsupport/include/sys/ioccom.h (added)
• c/src/exec/libcsupport/src/ioctl.c (modified) (1 diff)
• c/src/exec/libcsupport/src/tcdrain.c (modified) (1 diff)
• c/src/exec/libcsupport/src/tcflow.c (modified) (1 diff)
• c/src/exec/libcsupport/src/tcflush.c (modified) (1 diff)
• c/src/exec/libcsupport/src/tcgetattr.c (modified) (1 diff)
• c/src/exec/libcsupport/src/tcgetprgrp.c (modified) (1 diff)
• c/src/exec/libcsupport/src/tcsendbreak.c (modified) (1 diff)
• c/src/exec/libcsupport/src/tcsetattr.c (modified) (1 diff)
• c/src/exec/libcsupport/src/tcsetpgrp.c (modified) (1 diff)
• c/src/exec/libnetworking/sys/Makefile.am (modified) (1 diff)
• c/src/lib/include/ioccom.h (moved) (moved from c/src/libnetworking/sys/ioccom.h) (2 diffs)
• c/src/lib/include/rtems/libio.h (modified) (2 diffs)
• c/src/lib/include/sys/Makefile.am (modified) (1 diff)
• c/src/lib/include/sys/filio.h (modified) (2 diffs)
• c/src/lib/include/sys/ioccom.h (added)
• c/src/lib/libc/ioctl.c (modified) (1 diff)
• c/src/lib/libc/libio.h (modified) (2 diffs)
• c/src/lib/libc/tcdrain.c (modified) (1 diff)
• c/src/lib/libc/tcflow.c (modified) (1 diff)
• c/src/lib/libc/tcflush.c (modified) (1 diff)
• c/src/lib/libc/tcgetattr.c (modified) (1 diff)
• c/src/lib/libc/tcgetprgrp.c (modified) (1 diff)
• c/src/lib/libc/tcsendbreak.c (modified) (1 diff)
• c/src/lib/libc/tcsetattr.c (modified) (1 diff)
• c/src/lib/libc/tcsetpgrp.c (modified) (1 diff)
• c/src/libnetworking/sys/Makefile.am (modified) (1 diff)
• c/src/libnetworking/sys/filio.h (modified) (2 diffs)
• cpukit/libcsupport/include/rtems/libio.h (modified) (2 diffs)
• cpukit/libcsupport/include/sys/filio.h (modified) (2 diffs)
• cpukit/libcsupport/include/sys/ioccom.h (added)
• cpukit/libcsupport/src/ioctl.c (modified) (1 diff)
• cpukit/libcsupport/src/tcdrain.c (modified) (1 diff)
• cpukit/libcsupport/src/tcflow.c (modified) (1 diff)
• cpukit/libcsupport/src/tcflush.c (modified) (1 diff)
• cpukit/libcsupport/src/tcgetattr.c (modified) (1 diff)
• cpukit/libcsupport/src/tcgetprgrp.c (modified) (1 diff)
• cpukit/libcsupport/src/tcsendbreak.c (modified) (1 diff)
• cpukit/libcsupport/src/tcsetattr.c (modified) (1 diff)
• cpukit/libcsupport/src/tcsetpgrp.c (modified) (1 diff)
• cpukit/libnetworking/sys/Makefile.am (modified) (1 diff)

c/src/exec/libcsupport/include/rtems/libio.h

@@ -23 +23 @@
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/ioctl.h>
 
 /*
@@ -447 +448 @@
 
 /*
- *  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

c/src/exec/libcsupport/include/sys/filio.h

@@ -45 +45 @@
 #include <sys/ioccom.h>
 
+/* RTEMS defines all of these in sys/ioccom.h */
+#if 0
 /* Generic file-descriptor ioctl's. */
 #define FIOCLEX          _IO('f', 1)            /* set close on exec on fd */
@@ -53 +55 @@
 #define FIOSETOWN       _IOW('f', 124, int)     /* set owner */
 #define FIOGETOWN       _IOR('f', 123, int)     /* get owner */
+#endif
 
 #endif /* !_SYS_FILIO_H_ */

c/src/exec/libcsupport/src/ioctl.c

@@ -17 +17 @@
 #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 *);
 
   /*

c/src/exec/libcsupport/src/tcdrain.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

c/src/exec/libcsupport/src/tcflow.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

c/src/exec/libcsupport/src/tcflush.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

c/src/exec/libcsupport/src/tcgetattr.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

c/src/exec/libcsupport/src/tcgetprgrp.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

c/src/exec/libcsupport/src/tcsendbreak.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

c/src/exec/libcsupport/src/tcsetattr.c

@@ -20 +20 @@
 #include <termios.h>
 /* #include <sys/ioctl.h> */
-
-int ioctl();
 
 #include <rtems/libio.h>

c/src/exec/libcsupport/src/tcsetpgrp.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

c/src/exec/libnetworking/sys/Makefile.am

@@ -5 +5 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = buf.h callout.h cdefs.h conf.h domain.h filio.h ioccom.h \
+H_FILES = buf.h callout.h cdefs.h conf.h domain.h filio.h \
     ioctl.h kernel.h libkern.h malloc.h mbuf.h mount.h param.h proc.h \
     protosw.h queue.h reboot.h resourcevar.h rtprio.h select.h signalvar.h \

c/src/lib/include/ioccom.h

@@ -38 +38 @@
 #define _SYS_IOCCOM_H_
 
+/* the definitions were moved to a common placed so they could be shared */
+#include <sys/rtems_ioccom.h>
+
+#if 0
 /*
  * Ioctl's have the command encoded in the lower word, and the size of
@@ -62 +66 @@
 /* this should be _IORW, but stdio got there first */
 #define _IOWR(g,n,t)    _IOC(IOC_INOUT, (g), (n), sizeof(t))
+#endif
 
 #ifndef KERNEL

c/src/lib/include/rtems/libio.h

@@ -23 +23 @@
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/ioctl.h>
 
 /*
@@ -447 +448 @@
 
 /*
- *  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

c/src/lib/include/sys/Makefile.am

@@ -15 +15 @@
 endif
 
-H_FILES = utime.h $(NEWLIB_H_FILES) $(NETWORKING_H_FILES)
+H_FILES = ioccom.h utime.h $(NEWLIB_H_FILES) $(NETWORKING_H_FILES)
 
-noinst_HEADERS = utime.h termios.h ioctl.h
+noinst_HEADERS = utime.h termios.h ioctl.h rtems_ioccom.h
 
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \

c/src/lib/include/sys/filio.h

@@ -45 +45 @@
 #include <sys/ioccom.h>
 
+/* RTEMS defines all of these in sys/ioccom.h */
+#if 0
 /* Generic file-descriptor ioctl's. */
 #define FIOCLEX          _IO('f', 1)            /* set close on exec on fd */
@@ -53 +55 @@
 #define FIOSETOWN       _IOW('f', 124, int)     /* set owner */
 #define FIOGETOWN       _IOR('f', 123, int)     /* get owner */
+#endif
 
 #endif /* !_SYS_FILIO_H_ */

c/src/lib/libc/ioctl.c

@@ -17 +17 @@
 #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 *);
 
   /*

c/src/lib/libc/libio.h

@@ -23 +23 @@
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/ioctl.h>
 
 /*
@@ -447 +448 @@
 
 /*
- *  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

c/src/lib/libc/tcdrain.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

c/src/lib/libc/tcflow.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

c/src/lib/libc/tcflush.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

c/src/lib/libc/tcgetattr.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

c/src/lib/libc/tcgetprgrp.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

c/src/lib/libc/tcsendbreak.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

c/src/lib/libc/tcsetattr.c

@@ -20 +20 @@
 #include <termios.h>
 /* #include <sys/ioctl.h> */
-
-int ioctl();
 
 #include <rtems/libio.h>

c/src/lib/libc/tcsetpgrp.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

c/src/libnetworking/sys/Makefile.am

@@ -5 +5 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = buf.h callout.h cdefs.h conf.h domain.h filio.h ioccom.h \
+H_FILES = buf.h callout.h cdefs.h conf.h domain.h filio.h \
     ioctl.h kernel.h libkern.h malloc.h mbuf.h mount.h param.h proc.h \
     protosw.h queue.h reboot.h resourcevar.h rtprio.h select.h signalvar.h \

c/src/libnetworking/sys/filio.h

@@ -45 +45 @@
 #include <sys/ioccom.h>
 
+/* RTEMS defines all of these in sys/ioccom.h */
+#if 0
 /* Generic file-descriptor ioctl's. */
 #define FIOCLEX          _IO('f', 1)            /* set close on exec on fd */
@@ -53 +55 @@
 #define FIOSETOWN       _IOW('f', 124, int)     /* set owner */
 #define FIOGETOWN       _IOR('f', 123, int)     /* get owner */
+#endif
 
 #endif /* !_SYS_FILIO_H_ */

cpukit/libcsupport/include/rtems/libio.h

@@ -23 +23 @@
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/ioctl.h>
 
 /*
@@ -447 +448 @@
 
 /*
- *  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

cpukit/libcsupport/include/sys/filio.h

@@ -45 +45 @@
 #include <sys/ioccom.h>
 
+/* RTEMS defines all of these in sys/ioccom.h */
+#if 0
 /* Generic file-descriptor ioctl's. */
 #define FIOCLEX          _IO('f', 1)            /* set close on exec on fd */
@@ -53 +55 @@
 #define FIOSETOWN       _IOW('f', 124, int)     /* set owner */
 #define FIOGETOWN       _IOR('f', 123, int)     /* get owner */
+#endif
 
 #endif /* !_SYS_FILIO_H_ */

cpukit/libcsupport/src/ioctl.c

@@ -17 +17 @@
 #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 *);
 
   /*

cpukit/libcsupport/src/tcdrain.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

cpukit/libcsupport/src/tcflow.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

cpukit/libcsupport/src/tcflush.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

cpukit/libcsupport/src/tcgetattr.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

cpukit/libcsupport/src/tcgetprgrp.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

cpukit/libcsupport/src/tcsendbreak.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

cpukit/libcsupport/src/tcsetattr.c

@@ -20 +20 @@
 #include <termios.h>
 /* #include <sys/ioctl.h> */
-
-int ioctl();
 
 #include <rtems/libio.h>

cpukit/libcsupport/src/tcsetpgrp.c

@@ -21 +21 @@
 /* #include <sys/ioctl.h> */
 
-int ioctl();
-
 #include <rtems/libio.h>
 

cpukit/libnetworking/sys/Makefile.am

@@ -5 +5 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = buf.h callout.h cdefs.h conf.h domain.h filio.h ioccom.h \
+H_FILES = buf.h callout.h cdefs.h conf.h domain.h filio.h \
     ioctl.h kernel.h libkern.h malloc.h mbuf.h mount.h param.h proc.h \
     protosw.h queue.h reboot.h resourcevar.h rtprio.h select.h signalvar.h \