diff options
| -rw-r--r-- | cpukit/ChangeLog | 9 | ||||
| -rw-r--r-- | cpukit/Makefile.am | 10 | ||||
| -rw-r--r-- | cpukit/libcsupport/include/rtems/libio.h | 4 |
3 files changed, 20 insertions, 3 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index dee72008c9..61e3a0fa83 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,4 +1,11 @@ -2005-02-03 Ralf Corsepius <ralf.corsepius@rtems.org> +2005-02-04 Ralf Corsepius <ralf.corsepius@rtems.org> + + * libcsupport/include/rtems/libio.h: Use rtems_id for semaphores. + Use char* for buffer. + * backward/ftpd.h: New. + * Makefile.am: Reflect having added backward/ftpd.h. + +2005-02-04 Ralf Corsepius <ralf.corsepius@rtems.org> PR 756/rtems * ftpd/ftpd.c, ftpd/ftpd.h, ftpd/Makefile.am: New (relocated from diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 2e2b90fa6a..d3df77f502 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -30,6 +30,10 @@ include_HEADERS += backward/asm.h backward/chain.h backward/clockdrv.h \ backward/ringbuf.h backward/rtc.h backward/spurious.h \ backward/timerdrv.h backward/vmeintr.h +if HAS_NETWORKING +include_HEADERS += backward/ftpd.h +endif + include_motoroladir = $(includedir)/motorola include_motorola_HEADERS = backward/motorola/mc68681.h \ backward/motorola/mc68230.h @@ -124,6 +128,12 @@ $(PROJECT_INCLUDE)/vmeintr.h: backward/vmeintr.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/vmeintr.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/vmeintr.h +if HAS_NETWORKING +$(PROJECT_INCLUDE)/ftpd.h: backward/ftpd.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ftpd.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/ftpd.h +endif + $(PROJECT_INCLUDE)/motorola/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/motorola @: > $(PROJECT_INCLUDE)/motorola/$(dirstamp) diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h index ca70ba1787..617cc41ec8 100644 --- a/cpukit/libcsupport/include/rtems/libio.h +++ b/cpukit/libcsupport/include/rtems/libio.h @@ -346,7 +346,7 @@ struct rtems_libio_tt { off_t offset; /* current offset into file */ uint32_t flags; rtems_filesystem_location_info_t pathinfo; - Objects_Id sem; + rtems_id sem; uint32_t data0; /* private to "driver" */ void *data1; /* ... */ void *file_info; /* used by file handlers */ @@ -362,7 +362,7 @@ struct rtems_libio_tt { typedef struct { rtems_libio_t *iop; off_t offset; - uint8_t *buffer; + char *buffer; uint32_t count; uint32_t flags; uint32_t bytes_moved; |