diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-12-10 23:31:54 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-12-10 23:31:54 +0000 |
| commit | cca44008d81209e9fa992157637d9de0384e0536 (patch) | |
| tree | e13728c80e91a8cff28f98ca7d7e6dea2359e05f /cpukit/libcsupport/include | |
| parent | RDBG headers files ignored if not configured (diff) | |
| download | rtems-cca44008d81209e9fa992157637d9de0384e0536.tar.bz2 | |
Merged Eric Norum's select patch that was based on 4.0 and resolved
all conflicts.
Diffstat (limited to 'cpukit/libcsupport/include')
| -rw-r--r-- | cpukit/libcsupport/include/rtems/libio.h | 6 | ||||
| -rw-r--r-- | cpukit/libcsupport/include/rtems/libio_.h | 1 | ||||
| -rw-r--r-- | cpukit/libcsupport/include/sys/sockio.h | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h index ee0aaf9b7f..740574f303 100644 --- a/cpukit/libcsupport/include/rtems/libio.h +++ b/cpukit/libcsupport/include/rtems/libio.h @@ -393,12 +393,16 @@ typedef struct { #define LIBIO_FLAGS_NO_DELAY 0x0001 /* return immediately if no data */ #define LIBIO_FLAGS_READ 0x0002 /* reading */ #define LIBIO_FLAGS_WRITE 0x0004 /* writing */ -#define LIBIO_FLAGS_LINE_BUFFERED 0x0008 /* line buffered io (^h, ^u, etc) */ #define LIBIO_FLAGS_OPEN 0x0100 /* device is open */ #define LIBIO_FLAGS_APPEND 0x0200 /* all writes append */ #define LIBIO_FLAGS_CREATE 0x0400 /* create file */ #define LIBIO_FLAGS_CLOSE_ON_EXEC 0x0800 /* close on process exec() */ +#define LIBIO_FLAGS_HANDLER_SHIFT 12 +#define LIBIO_FLAGS_HANDLER_MASK 0xF000 /* mask for external handler type */ +#define LIBIO_FLAGS_HANDLER_RTEMS 0x0000 /* `traditional' RTEMS I/O */ +#define LIBIO_FLAGS_HANDLER_SOCK 0x1000 /* BSD socket */ + #define LIBIO_FLAGS_READ_WRITE (LIBIO_FLAGS_READ | LIBIO_FLAGS_WRITE) diff --git a/cpukit/libcsupport/include/rtems/libio_.h b/cpukit/libcsupport/include/rtems/libio_.h index 33a9e7bda5..d595500430 100644 --- a/cpukit/libcsupport/include/rtems/libio_.h +++ b/cpukit/libcsupport/include/rtems/libio_.h @@ -65,6 +65,7 @@ extern rtems_id rtems_libio_semaphore; extern unsigned32 rtems_libio_number_iops; extern rtems_libio_t *rtems_libio_iops; extern rtems_libio_t *rtems_libio_last_iop; +extern rtems_libio_t *rtems_libio_iop_freelist; /* * External I/O Handlers Table diff --git a/cpukit/libcsupport/include/sys/sockio.h b/cpukit/libcsupport/include/sys/sockio.h index 03ec16e43a..5e54baffe8 100644 --- a/cpukit/libcsupport/include/sys/sockio.h +++ b/cpukit/libcsupport/include/sys/sockio.h @@ -83,11 +83,10 @@ #define SIOCSIFMEDIA _IOWR('i', 55, struct ifreq) /* set net media */ #define SIOCGIFMEDIA _IOWR('i', 56, struct ifmediareq) /* get net media */ - /* * RTEMS additions for setting/getting `tap' function on incoming packets. */ -#define SIOCSIFTAP _IOW('i', 80, struct ifreq) /* set tap function */ -#define SIOCGIFTAP _IOWR('i', 81, struct ifreq) /* get tap function */ +#define SIOCSIFTAP _IOW('i', 80, struct ifreq) /* set tap function */ +#define SIOCGIFTAP _IOW('i', 81, struct ifreq) /* get tap function */ #endif /* !_SYS_SOCKIO_H_ */ |