diff options
| author | briggs <briggs@cvs.openbsd.org> | 1996-02-20 04:45:57 +0000 |
|---|---|---|
| committer | briggs <briggs@cvs.openbsd.org> | 1996-02-20 04:45:57 +0000 |
| commit | 6ee2701bd0033dbf75d84975a74300099921fb7b (patch) | |
| tree | 3f6c2be3437cfbac8b2bbd1be3d2e4e13560c8b8 /sys | |
| parent | c00322b2689df172950136e92c96b801be5b1a78 (diff) | |
Move VIA_Initialize() back to where it works.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mac68k/mac68k/autoconf.c | 1 | ||||
| -rw-r--r-- | sys/arch/mac68k/mac68k/locore.s | 2 | ||||
| -rw-r--r-- | sys/arch/mac68k/mac68k/via.c | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/sys/arch/mac68k/mac68k/autoconf.c b/sys/arch/mac68k/mac68k/autoconf.c index d46ba810199..57307883091 100644 --- a/sys/arch/mac68k/mac68k/autoconf.c +++ b/sys/arch/mac68k/mac68k/autoconf.c @@ -402,6 +402,7 @@ mainbus_attach(parent, self, aux) {"ser0", 0}, {"sn0", 0}, {"nubus0", 1}, + {"sbc0", 0}, {"ncrscsi0", 0}, {"ncr96scsi0", 0}, {"asc0", 0}, diff --git a/sys/arch/mac68k/mac68k/locore.s b/sys/arch/mac68k/mac68k/locore.s index c147b4dac3b..e9946721968 100644 --- a/sys/arch/mac68k/mac68k/locore.s +++ b/sys/arch/mac68k/mac68k/locore.s @@ -820,7 +820,6 @@ start: .globl _initenv, _getenvvars | in machdep.c .globl _setmachdep | in machdep.c - .globl _VIA_initialize | in via.c /* Initialize source/destination control registers for movs */ moveq #FC_USERD,d0 | user space @@ -835,7 +834,6 @@ start: jbsr _getenvvars | Parse the environment buffer jbsr _setmachdep | Set some machine-dep stuff - jbsr _VIA_initialize | Initialize the VIAs jbsr _vm_set_page_size | Set the vm system page size, now. jbsr _consinit | XXX Should only be if graybar on diff --git a/sys/arch/mac68k/mac68k/via.c b/sys/arch/mac68k/mac68k/via.c index 35abdf1e070..0659f39de71 100644 --- a/sys/arch/mac68k/mac68k/via.c +++ b/sys/arch/mac68k/mac68k/via.c @@ -84,7 +84,6 @@ void *via2iarg[7] = { void via2_intr(struct frame *); void rbv_intr(struct frame *); -static int via_inited=0; void (*real_via2_intr)(struct frame *); /* nubus slot interrupt routines */ @@ -154,7 +153,6 @@ VIA_initialize() real_via2_intr = rbv_intr; via2itab[1] = rbv_nubus_intr; } - via_inited = 1; } void |