From 73f6236bc09b3cadf0aa030e16396154421f3e30 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 1 Mar 1999 22:40:08 +0000 Subject: Patch from Eric Norum to eliminate external IO handlers scheme that was implemented originally just to support sockets. The file system IO switch is more general and works fine. --- c/src/exec/libcsupport/include/rtems/libio.h | 36 --------------------------- c/src/exec/libcsupport/include/rtems/libio_.h | 9 ------- 2 files changed, 45 deletions(-) (limited to 'c/src/exec/libcsupport/include') diff --git a/c/src/exec/libcsupport/include/rtems/libio.h b/c/src/exec/libcsupport/include/rtems/libio.h index 740574f303..1cbfef383b 100644 --- a/c/src/exec/libcsupport/include/rtems/libio.h +++ b/c/src/exec/libcsupport/include/rtems/libio.h @@ -397,15 +397,8 @@ typedef struct { #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) - void rtems_libio_init(void); /* @@ -446,35 +439,6 @@ typedef int (*rtems_libio_lseek_t)( int whence ); -typedef struct { - rtems_libio_open_t open; - rtems_libio_close_t close; - rtems_libio_read_t read; - rtems_libio_write_t write; - rtems_libio_ioctl_t ioctl; - rtems_libio_lseek_t lseek; -} rtems_libio_handler_t; - -/* - * Register a set of external handlers - */ - -void rtems_register_libio_handler( - int handler_flag, - const rtems_libio_handler_t *handler -); - -/* - * Macros to assist in management of external IO handlers. - */ - -#define RTEMS_FILE_DESCRIPTOR_TYPE_FILE 0x0000 -#define RTEMS_FILE_DESCRIPTOR_TYPE_SOCKET 0x1000 -#define rtems_make_file_descriptor(fd,flags) ((fd)|(flags)) -#define rtems_file_descriptor_base(fd) ((fd) & 0x0FFF) -#define rtems_file_descriptor_type(fd) ((fd) & 0xF000) -#define rtems_file_descriptor_type_index(fd) ((((fd) & 0xF000) >> 12) - 1) - /* * IOCTL values */ diff --git a/c/src/exec/libcsupport/include/rtems/libio_.h b/c/src/exec/libcsupport/include/rtems/libio_.h index 995809b6d5..16dc708f53 100644 --- a/c/src/exec/libcsupport/include/rtems/libio_.h +++ b/c/src/exec/libcsupport/include/rtems/libio_.h @@ -67,15 +67,6 @@ 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 - * - * Space for all possible handlers is preallocated - * to speed up dispatch to external handlers. - */ - -extern rtems_libio_handler_t rtems_libio_handlers[15]; - /* * Default mode for all files. */ -- cgit v1.2.3