From cc206bc51a08eb4c2a4908697c3585c44a91a8e9 Mon Sep 17 00:00:00 2001 From: Marin Ramesa Date: Fri, 6 Dec 2013 16:29:46 +0100 Subject: i386/i386at/pic_isa.c: remove forward declaration * i386/Makefrag.am: Include i386/i386/hardclock.h. * i386/i386/hardclock.h: New file. Add copyright. [_I386_HARDCLOCK_H_]: Add ifndef. (hardclock): Add prototype. * i386/i386at/pic_isa.c (hardclock): Remove forward declaration. Include i386/hardclock.h. --- i386/Makefrag.am | 1 + i386/i386/hardclock.h | 29 +++++++++++++++++++++++++++++ i386/i386at/pic_isa.c | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 i386/i386/hardclock.h diff --git a/i386/Makefrag.am b/i386/Makefrag.am index 160ae17..23437c6 100644 --- a/i386/Makefrag.am +++ b/i386/Makefrag.am @@ -147,6 +147,7 @@ EXTRA_DIST += \ if PLATFORM_at libkernel_a_SOURCES += \ i386/i386/hardclock.c \ + i386/i386/hardclock.h \ i386/i386/io_map.c \ i386/i386/pic.c \ i386/i386/pic.h \ diff --git a/i386/i386/hardclock.h b/i386/i386/hardclock.h new file mode 100644 index 0000000..38c51ea --- /dev/null +++ b/i386/i386/hardclock.h @@ -0,0 +1,29 @@ +/* + * 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 _I386_HARDCLOCK_H_ +#define _I386_HARDCLOCK_H_ + +void hardclock( + int iunit, + int old_ipl, + int irq, + char *ret_addr, + struct i386_interrupt_state *regs); + +#endif /* _I386_HARDCLOCK_H_ */ diff --git a/i386/i386at/pic_isa.c b/i386/i386at/pic_isa.c index e48fb50..0b36534 100644 --- a/i386/i386at/pic_isa.c +++ b/i386/i386at/pic_isa.c @@ -28,10 +28,10 @@ #include #include #include +#include #include /* These interrupts are always present */ -extern void hardclock(); void (*ivect[NINTR])() = { /* 00 */ hardclock, /* always */ -- cgit v1.2.3