diff options
| author | grehan <grehan@FreeBSD.org> | 2002-09-19 04:28:45 +0000 |
|---|---|---|
| committer | grehan <grehan@FreeBSD.org> | 2002-09-19 04:28:45 +0000 |
| commit | dd1398f2465b4d28c98c81b5b06f982ece071a75 (patch) | |
| tree | 207066898feb32b3a6b4f1b9e4724cbbfd110b62 | |
| parent | c6d7dcd0d4ed6fea9816611e49f529f22ddf12a5 (diff) | |
| download | FreeBSD-src-dd1398f2465b4d28c98c81b5b06f982ece071a75.zip FreeBSD-src-dd1398f2465b4d28c98c81b5b06f982ece071a75.tar.gz | |
- removed unnecessary includes
- converted inline asm to C for int enable
- shifted clearing of 'cold' to end of routine
Approved by: benno
| -rw-r--r-- | sys/powerpc/powerpc/autoconf.c | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/sys/powerpc/powerpc/autoconf.c b/sys/powerpc/powerpc/autoconf.c index a5f86c7..6bafc11 100644 --- a/sys/powerpc/powerpc/autoconf.c +++ b/sys/powerpc/powerpc/autoconf.c @@ -35,28 +35,9 @@ static const char rcsid[] = #include <sys/param.h> #include <sys/systm.h> -#include <sys/conf.h> -#include <sys/disklabel.h> -#include <sys/diskslice.h> /* for BASE_SLICE, MAX_SLICES */ -#include <sys/reboot.h> -#include <sys/kernel.h> -#include <sys/mount.h> -#include <sys/sysctl.h> #include <sys/bus.h> -#include <sys/devicestat.h> #include <sys/cons.h> - -#include <machine/md_var.h> -#include <machine/bootinfo.h> -#include <machine/ipl.h> -#include <machine/trap.h> - -#include <cam/cam.h> -#include <cam/cam_ccb.h> -#include <cam/cam_sim.h> -#include <cam/cam_periph.h> -#include <cam/cam_xpt_sim.h> -#include <cam/cam_debug.h> +#include <sys/kernel.h> static void configure(void *); SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL) @@ -84,16 +65,14 @@ cpu_rootconf() static void configure(void *dummy) { - unsigned int msr; - - cold = 0; - device_add_child(root_bus, "nexus", 0); root_bus_configure(); - msr = mfmsr(); - msr = PSL_EE|PSL_FP|PSL_ME|PSL_IR|PSL_DR|PSL_RI; - mtmsr(msr); - msr = mfmsr(); + /* + * Enable device interrupts + */ + mtmsr(mfmsr() | PSL_EE | PSL_RI); + + cold = 0; } |
