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 /i386/i386at | |
| 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.
Diffstat (limited to 'i386/i386at')
| -rw-r--r-- | i386/i386at/model_dep.c | 10 | ||||
| -rw-r--r-- | i386/i386at/model_dep.h | 5 |
2 files changed, 7 insertions, 8 deletions
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_ */ |