diff options
| author | Marin Ramesa <mpr@hi.t-com.hr> | 2013-11-29 22:53:53 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-12-05 06:22:45 +0900 |
| commit | e2f055b0224da1ee74398ff77e49e12e398e7afa (patch) | |
| tree | 351dd47aac289fb1e4204024943b333255c835cc | |
| parent | cd76b756ea59e4f2e367c6d943932fa7d18b4681 (diff) | |
i386/i386at: remove forward declarations
* Makefrag.am: Include kern/startup.h.
* i386/i386at/model_dep.c: Include kern/startup.h.
Include i386at/model_dep.h.
(setup_main, halt_all_cpus, halt_cpu, inittodr): Remove forward declarations.
* i386/i386at/model_dep.h (halt_all_cpus, halt_cpu, inittodr): Add prototypes.
* kern/startup.h: New file.
Add copyright.
[_KERN_STARTUP_H_]: Add ifndef.
(setup_main): Add prototype.
| -rw-r--r-- | Makefrag.am | 1 | ||||
| -rw-r--r-- | i386/i386at/model_dep.c | 10 | ||||
| -rw-r--r-- | i386/i386at/model_dep.h | 5 | ||||
| -rw-r--r-- | kern/startup.h | 24 |
4 files changed, 32 insertions, 8 deletions
diff --git a/Makefrag.am b/Makefrag.am index 2e08df1..2d09b62 100644 --- a/Makefrag.am +++ b/Makefrag.am @@ -190,6 +190,7 @@ libkernel_a_SOURCES += \ kern/sched_prim.h \ kern/shuttle.h \ kern/startup.c \ + kern/startup.h \ kern/strings.c \ kern/syscall_emulation.c \ kern/syscall_emulation.h \ diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c index 48ef329..21f6186 100644 --- a/i386/i386at/model_dep.c +++ b/i386/i386at/model_dep.c @@ -48,6 +48,7 @@ #include <kern/debug.h> #include <kern/mach_clock.h> #include <kern/printf.h> +#include <kern/startup.h> #include <sys/time.h> #include <sys/types.h> #include <vm/vm_page.h> @@ -67,6 +68,7 @@ #include <i386at/int_init.h> #include <i386at/kd.h> #include <i386at/rtc.h> +#include <i386at/model_dep.h> #ifdef MACH_XEN #include <xen/console.h> #include <xen/store.h> @@ -125,13 +127,6 @@ static vm_size_t avail_remaining; extern char version[]; -extern void setup_main(); - -void halt_all_cpus (boolean_t reboot) __attribute__ ((noreturn)); -void halt_cpu (void) __attribute__ ((noreturn)); - -void inittodr(); /* forward */ - int rebootflag = 0; /* exported to kdintr */ /* XX interrupt stack pointer and highwater mark, for locore.S. */ @@ -620,7 +615,6 @@ void c_boot_entry(vm_offset_t bi) #include <mach/vm_prot.h> #include <vm/pmap.h> #include <mach/time_value.h> -#include <i386at/model_dep.h> int timemmap(dev, off, prot) diff --git a/i386/i386at/model_dep.h b/i386/i386at/model_dep.h index 3a5749f..11c6451 100644 --- a/i386/i386at/model_dep.h +++ b/i386/i386at/model_dep.h @@ -23,4 +23,9 @@ extern int timemmap(int dev, int off, vm_prot_t prot); +void halt_all_cpus(boolean_t reboot) __attribute__ ((noreturn)); +void halt_cpu(void) __attribute__ ((noreturn)); + +void inittodr(void); + #endif /* _MODEL_DEP_H_ */ diff --git a/kern/startup.h b/kern/startup.h new file mode 100644 index 0000000..d167fde --- /dev/null +++ b/kern/startup.h @@ -0,0 +1,24 @@ +/* + * 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 _KERN_STARTUP_H_ +#define _KERN_STARTUP_H_ + +extern void setup_main(void); + +#endif /* _KERN_STARTUP_H_ */ |