Patch set updated for coreboot: 0bbef0f src/*: Remove the last remnants of struct keyboard
Edward O'Callaghan (eocallaghan@alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5624
-gerrit
commit 0bbef0fbe52e8bbde362e040c74340f70b716e5c Author: Edward O'Callaghan eocallaghan@alterapraxis.com Date: Wed Apr 30 20:41:41 2014 +1000
src/*: Remove the last remnants of struct keyboard
Change-Id: I7d0e8d2119a470428cfc01c0738b8988ab75ba2d Signed-off-by: Edward O'Callaghan eocallaghan@alterapraxis.com --- src/ec/compal/ene932/chip.h | 2 -- src/ec/compal/ene932/ec.c | 1 + src/ec/google/chromeec/chip.h | 4 +--- src/ec/google/chromeec/ec_lpc.c | 1 + src/ec/quanta/ene_kb3940q/chip.h | 2 -- src/ec/quanta/ene_kb3940q/ec.c | 1 + src/ec/quanta/it8518/chip.h | 2 -- src/ec/quanta/it8518/ec.c | 1 + src/include/pc80/keyboard.h | 4 ---- src/southbridge/via/vt82c686/chip.h | 31 ------------------------------- src/superio/smsc/fdc37n972/chip.h | 32 -------------------------------- src/superio/smsc/fdc37n972/fdc37n972.c | 1 - src/superio/smsc/sio10n268/chip.h | 31 ------------------------------- src/superio/smsc/sio10n268/sio10n268.c | 1 - 14 files changed, 5 insertions(+), 109 deletions(-)
diff --git a/src/ec/compal/ene932/chip.h b/src/ec/compal/ene932/chip.h index 5d209ff..7dcd3eb 100644 --- a/src/ec/compal/ene932/chip.h +++ b/src/ec/compal/ene932/chip.h @@ -23,13 +23,11 @@ #define _EC_COMPAL_ENE932_CHIP_H
#include <device/device.h> -#include <pc80/keyboard.h>
struct chip_operations; extern struct chip_operations ec_compal_ene932_ops;
struct ec_compal_ene932_config { - struct pc_keyboard keyboard; };
#endif /* _EC_COMPAL_ENE932_CHIP_H */ diff --git a/src/ec/compal/ene932/ec.c b/src/ec/compal/ene932/ec.c index e60a0ac..2e83b4c 100644 --- a/src/ec/compal/ene932/ec.c +++ b/src/ec/compal/ene932/ec.c @@ -27,6 +27,7 @@ #include <stdlib.h> #include <arch/io.h> #include <delay.h> +#include <pc80/keyboard.h> #include "ec.h" #include "chip.h"
diff --git a/src/ec/google/chromeec/chip.h b/src/ec/google/chromeec/chip.h index eb35632..1cd97f4 100644 --- a/src/ec/google/chromeec/chip.h +++ b/src/ec/google/chromeec/chip.h @@ -21,12 +21,10 @@ #define EC_GOOGLE_CHROMEEC_CHIP_H
#include <device/device.h> -#include <pc80/keyboard.h>
extern struct chip_operations ec_google_chromeec_ops;
struct ec_google_chromeec_config { - struct pc_keyboard keyboard; };
-#endif +#endif /* EC_GOOGLE_CHROMEEC_CHIP_H */ diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c index 5f377c9..8b1cb2f 100644 --- a/src/ec/google/chromeec/ec_lpc.c +++ b/src/ec/google/chromeec/ec_lpc.c @@ -24,6 +24,7 @@ #include <arch/io.h> #include <delay.h> #include <device/pnp.h> +#include <pc80/keyboard.h> #include "chip.h" #include "ec.h" #include "ec_commands.h" diff --git a/src/ec/quanta/ene_kb3940q/chip.h b/src/ec/quanta/ene_kb3940q/chip.h index ce95c1c..6a28c43 100644 --- a/src/ec/quanta/ene_kb3940q/chip.h +++ b/src/ec/quanta/ene_kb3940q/chip.h @@ -23,13 +23,11 @@ #define _EC_QUANTA_ENE_KB3940Q_CHIP_H
#include <device/device.h> -#include <pc80/keyboard.h>
struct chip_operations; extern struct chip_operations ec_quanta_ene_kb3940q_ops;
struct ec_quanta_ene_kb3940q_config { - struct pc_keyboard keyboard; };
#endif /* _EC_QUANTA_ENE_KB3940Q_CHIP_H */ diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c index 57854d0..7d0e6ae 100644 --- a/src/ec/quanta/ene_kb3940q/ec.c +++ b/src/ec/quanta/ene_kb3940q/ec.c @@ -28,6 +28,7 @@ #include <stdlib.h> #include <delay.h> #include <elog.h> +#include <pc80/keyboard.h> #include "ec.h" #include "chip.h"
diff --git a/src/ec/quanta/it8518/chip.h b/src/ec/quanta/it8518/chip.h index cc7d374..52e842b 100644 --- a/src/ec/quanta/it8518/chip.h +++ b/src/ec/quanta/it8518/chip.h @@ -23,13 +23,11 @@ #define _EC_QUANTA_IT8518_CHIP_H
#include <device/device.h> -#include <pc80/keyboard.h>
struct chip_operations; extern struct chip_operations ec_quanta_it8518_ops;
struct ec_quanta_it8518_config { - struct pc_keyboard keyboard; };
#endif /* _EC_QUANTA_IT8518_CHIP_H */ diff --git a/src/ec/quanta/it8518/ec.c b/src/ec/quanta/it8518/ec.c index 7588a1e..9e6d3d0 100644 --- a/src/ec/quanta/it8518/ec.c +++ b/src/ec/quanta/it8518/ec.c @@ -22,6 +22,7 @@
#include <console/console.h> +#include <pc80/keyboard.h>
#ifndef __PRE_RAM__ #include <device/device.h> diff --git a/src/include/pc80/keyboard.h b/src/include/pc80/keyboard.h index 5f97723..16cb959 100644 --- a/src/include/pc80/keyboard.h +++ b/src/include/pc80/keyboard.h @@ -1,10 +1,6 @@ #ifndef PC80_KEYBOARD_H #define PC80_KEYBOARD_H
-struct pc_keyboard { - /* No initialization parameters for now */ -}; - void pc_keyboard_init(void); void set_kbc_ps2_mode(void);
diff --git a/src/southbridge/via/vt82c686/chip.h b/src/southbridge/via/vt82c686/chip.h deleted file mode 100644 index 5c4959f..0000000 --- a/src/southbridge/via/vt82c686/chip.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007 Corey Osgood corey_osgood@verizon.net - * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _SUPERIO_VIA_VT82C686 -#define _SUPERIO_VIA_VT82C686 - -#include <device/device.h> -#include <pc80/keyboard.h> - -struct superio_via_vt82c686_config { - struct pc_keyboard keyboard; -}; - -#endif /* _SUPERIO_VIA_VT82C686 */ diff --git a/src/superio/smsc/fdc37n972/chip.h b/src/superio/smsc/fdc37n972/chip.h deleted file mode 100644 index e4126a7..0000000 --- a/src/superio/smsc/fdc37n972/chip.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2008 coresystems GmbH - * - * 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; version 2 of the License. - * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef SUPERIO_SMSC_FDC37N972_CHIP_H -#define SUPERIO_SMSC_FDC37N972_CHIP_H - -#include <device/device.h> -#include <pc80/keyboard.h> - -struct superio_smsc_fdc37n972_config { - - struct pc_keyboard keyboard; -}; - -#endif - diff --git a/src/superio/smsc/fdc37n972/fdc37n972.c b/src/superio/smsc/fdc37n972/fdc37n972.c index f7ae697..78d8350 100644 --- a/src/superio/smsc/fdc37n972/fdc37n972.c +++ b/src/superio/smsc/fdc37n972/fdc37n972.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pnp.h> #include <pc80/keyboard.h> -#include "chip.h" #include "fdc37n972.h"
static void init(device_t dev) diff --git a/src/superio/smsc/sio10n268/chip.h b/src/superio/smsc/sio10n268/chip.h deleted file mode 100644 index cde51d1..0000000 --- a/src/superio/smsc/sio10n268/chip.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2008 coresystems GmbH - * - * 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; version 2 of the License. - * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef SUPERIO_SMSC_SIO10N268_CHIP_H -#define SUPERIO_SMSC_SIO10N268_CHIP_H - -#include <device/device.h> -#include <pc80/keyboard.h> - -struct superio_smsc_sio10n268_config { - - struct pc_keyboard keyboard; -}; - -#endif diff --git a/src/superio/smsc/sio10n268/sio10n268.c b/src/superio/smsc/sio10n268/sio10n268.c index 40c01b4..f69e3bf 100644 --- a/src/superio/smsc/sio10n268/sio10n268.c +++ b/src/superio/smsc/sio10n268/sio10n268.c @@ -21,7 +21,6 @@ #include <device/device.h> #include <device/pnp.h> #include <pc80/keyboard.h> -#include "chip.h" #include "sio10n268.h"
static void init(device_t dev)
-
Edward O'Callaghan