diff options
| author | Marin Ramesa <mpr@hi.t-com.hr> | 2013-12-06 16:29:46 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-12-09 00:34:45 +0900 |
| commit | cc206bc51a08eb4c2a4908697c3585c44a91a8e9 (patch) | |
| tree | d7d4e77c9e807059f429646d09c4c2f615ad8a74 | |
| parent | a05fa165cc88ee47f69ef331bf8e39c18df7ec3d (diff) | |
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.
| -rw-r--r-- | i386/Makefrag.am | 1 | ||||
| -rw-r--r-- | i386/i386/hardclock.h | 29 | ||||
| -rw-r--r-- | i386/i386at/pic_isa.c | 2 |
3 files changed, 31 insertions, 1 deletions
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 <i386/ipl.h> #include <i386/pic.h> #include <i386/fpu.h> +#include <i386/hardclock.h> #include <i386at/kd.h> /* These interrupts are always present */ -extern void hardclock(); void (*ivect[NINTR])() = { /* 00 */ hardclock, /* always */ |