diff options
| author | Marin Ramesa <mpr@hi.t-com.hr> | 2013-11-22 18:30:40 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-11-24 23:12:59 +0100 |
| commit | c476fec1212370f2a24d79037c65970c1974ce19 (patch) | |
| tree | 84afa93b93d037be20939f2ffbf5f0ac870a64b5 | |
| parent | 5ad897a1ef527fecad7caca6b0ba4f20afc95d1e (diff) | |
device: new header file chario.h
* Makefrag.am: Include device/chario.h.
* device/chario.c (queue_delayed_reply, tty_output, char_open_done, char_read_done, char_write_done): Remove forward declarations.
* device/chario.h: New file.
Add copyright.
[_DEVICE_CHARIO_H_]: Add ifndef.
Include device/tty.h.
(queue_delayed_reply, tty_output, char_open_done, char_read_done, char_write_done): Add prototypes.
| -rw-r--r-- | Makefrag.am | 1 | ||||
| -rw-r--r-- | device/chario.c | 11 | ||||
| -rw-r--r-- | device/chario.h | 35 |
3 files changed, 37 insertions, 10 deletions
diff --git a/Makefrag.am b/Makefrag.am index abebd08..cdb51f2 100644 --- a/Makefrag.am +++ b/Makefrag.am @@ -275,6 +275,7 @@ libkernel_a_SOURCES += \ device/blkio.c \ device/buf.h \ device/chario.c \ + device/chario.h \ device/cirbuf.h \ device/conf.h \ device/cons.c \ diff --git a/device/chario.c b/device/chario.c index 19f3bae..387428a 100644 --- a/device/chario.c +++ b/device/chario.c @@ -49,6 +49,7 @@ #include <device/io_req.h> #include <device/ds_routines.h> #include <device/device_reply.user.h> +#include <device/chario.h> #include <device/tty.h> @@ -63,16 +64,6 @@ short ttlowat[NSPEEDS] = 125,125 }; /* - * forward declarations - */ -void queue_delayed_reply( - queue_t, io_req_t, boolean_t (*)(io_req_t)); -void tty_output(struct tty *); -boolean_t char_open_done(io_req_t); -boolean_t char_read_done(io_req_t); -boolean_t char_write_done(io_req_t); - -/* * Fake 'line discipline' switch for the benefit of old code * that wants to call through it. */ diff --git a/device/chario.h b/device/chario.h new file mode 100644 index 0000000..2dbf09f --- /dev/null +++ b/device/chario.h @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2013 Free Software Foundation. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef _DEVICE_CHARIO_H_ +#define _DEVICE_CHARIO_H_ + +#include <device/tty.h> + +void queue_delayed_reply( + queue_t qh, + io_req_t ior, + boolean_t (*io_done)(io_req_t)); + +void tty_output(struct tty *tp); + +boolean_t char_open_done(io_req_t); +boolean_t char_read_done(io_req_t); +boolean_t char_write_done(io_req_t); + +#endif /* _DEVICE_CHARIO_H_ */ |