From 19e5de68bae6f5eb2296a1fb20ec51939db5087e Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Wed, 5 Jun 2002 01:44:44 +0000 Subject: 2002-06-05 Marcus Brinkmann * input.h: Renamed to ... * input-drv.h: ... this. * focus.c: Include "input-drv.h" instead "input.h". * console.c: Likewise. * Makefile (LCLHDRS): Rename input.h to input-drv.h. --- console/ChangeLog | 8 +++++++ console/Makefile | 2 +- console/console.c | 2 +- console/focus.c | 2 +- console/input-drv.h | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++ console/input.h | 62 ----------------------------------------------------- 6 files changed, 73 insertions(+), 65 deletions(-) create mode 100644 console/input-drv.h delete mode 100644 console/input.h (limited to 'console') diff --git a/console/ChangeLog b/console/ChangeLog index 4e14a145..a51a927b 100644 --- a/console/ChangeLog +++ b/console/ChangeLog @@ -1,3 +1,11 @@ +2002-06-05 Marcus Brinkmann + + * input.h: Renamed to ... + * input-drv.h: ... this. + * focus.c: Include "input-drv.h" instead "input.h". + * console.c: Likewise. + * Makefile (LCLHDRS): Rename input.h to input-drv.h. + 2002-06-04 Marcus Brinkmann * display.h: New file. diff --git a/console/Makefile b/console/Makefile index 06ceec4e..7174787f 100644 --- a/console/Makefile +++ b/console/Makefile @@ -23,7 +23,7 @@ makemode := server target = console SRCS = main.c console.c focus.c vga-display.c vga.c dynafont.c bdf.c -LCLHDRS = focus.h input.h console.h display-drv.h vga.h vga-hw.h dynafont.h bdf.h \ +LCLHDRS = focus.h input-drv.h console.h display-drv.h vga.h vga-hw.h dynafont.h bdf.h \ mutations.h priv.h HURDLIBS = trivfs fshelp iohelp threads ports ihash shouldbeinlibc diff --git a/console/console.c b/console/console.c index 71422ffd..cecdb5b4 100644 --- a/console/console.c +++ b/console/console.c @@ -25,7 +25,7 @@ #include "console.h" #include "display-drv.h" -#include "input.h" +#include "input-drv.h" struct vcons diff --git a/console/focus.c b/console/focus.c index f2f1822d..c9779af1 100644 --- a/console/focus.c +++ b/console/focus.c @@ -3,7 +3,7 @@ #include #include "console.h" -#include "input.h" +#include "input-drv.h" #include "focus.h" struct argp_option focus_argp_options[] = diff --git a/console/input-drv.h b/console/input-drv.h new file mode 100644 index 00000000..60105078 --- /dev/null +++ b/console/input-drv.h @@ -0,0 +1,62 @@ +/* input-drv.h - The interface to an input driver. + Copyright (C) 2002 Free Software Foundation, Inc. + Written by Marcus Brinkmann. + + This file is part of the GNU Hurd. + + The GNU Hurd 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, or (at + your option) any later version. + + The GNU Hurd 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ + +#ifndef _INPUT_H_ +#define _INPUT_H_ 1 + +#include +#include + +#include "focus.h" + + +struct input_ops +{ + const char *name; + + /* Fill in ARGP with the argp_child structure for this display. */ + error_t (*argp) (struct argp_child *argp); + + /* Initialize the subsystem. */ + error_t (*init) (void); + + /* Assign the input device to the focus group FOCUS. */ + error_t (*set_focus) (focus_t *focus); + + /* Output LENGTH bytes starting from BUFFER in the system encoding. + Set BUFFER and LENGTH to the new values. The exact semantics are + just as in the iconv interface. */ + error_t (*input) (char **buffer, size_t *length); +}; +typedef struct input_ops *input_ops_t; + +extern struct input_ops pckbd_input_ops; +extern struct input_ops mach_input_ops; + +input_ops_t input_driver[] = + { +#if defined (__i386__) + &pckbd_input_ops, +#endif + &mach_input_ops, + 0 + }; + +#endif diff --git a/console/input.h b/console/input.h deleted file mode 100644 index e660fa22..00000000 --- a/console/input.h +++ /dev/null @@ -1,62 +0,0 @@ -/* input.h - The interface to an input driver. - Copyright (C) 2002 Free Software Foundation, Inc. - Written by Marcus Brinkmann. - - This file is part of the GNU Hurd. - - The GNU Hurd 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, or (at - your option) any later version. - - The GNU Hurd 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ - -#ifndef _INPUT_H_ -#define _INPUT_H_ 1 - -#include -#include - -#include "focus.h" - - -struct input_ops -{ - const char *name; - - /* Fill in ARGP with the argp_child structure for this display. */ - error_t (*argp) (struct argp_child *argp); - - /* Initialize the subsystem. */ - error_t (*init) (void); - - /* Assign the input device to the focus group FOCUS. */ - error_t (*set_focus) (focus_t *focus); - - /* Output LENGTH bytes starting from BUFFER in the system encoding. - Set BUFFER and LENGTH to the new values. The exact semantics are - just as in the iconv interface. */ - error_t (*input) (char **buffer, size_t *length); -}; -typedef struct input_ops *input_ops_t; - -extern struct input_ops pckbd_input_ops; -extern struct input_ops mach_input_ops; - -input_ops_t input_driver[] = - { -#if defined (__i386__) - &pckbd_input_ops, -#endif - &mach_input_ops, - 0 - }; - -#endif -- cgit v1.2.3