Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bugs in the turbochannel config table for MAXINE (personal decstation).

This commit is contained in:
jonathan 1995-10-09 01:45:26 +00:00
parent cc6ab4e68d
commit 0736074d04
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/pmax/dev/xcfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xcfb.c,v 1.8 1995/09/20 05:19:54 jonathan Exp $ */
/* $NetBSD: xcfb.c,v 1.9 1995/10/09 01:45:26 jonathan Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -119,8 +119,6 @@ xcfb needs dtop device
#include <pmax/dev/fbreg.h>
#include <pmax/stand/dec_prom.h> /* console debugging */
/*
* These need to be mapped into user space.
*/
@ -233,7 +231,6 @@ xcfbinit(fi, base, unit, silent)
{
register u_int *reset = (u_int *)IMS332_RESET_ADDRESS;
(*callv->_printf)("xcfbinit: starting\n");
if (fi == 0) fi = &xcfbfi;
unit = 0; /*XXX*/ /* FIXME */
@ -268,7 +265,6 @@ xcfbinit(fi, base, unit, silent)
/*
* qvss/pm-style mmap()ed event queue compatibility glue
*/
(*callv->_printf)("xcfbinit: starting qvss-compat init\n");
/*
* Must be in Uncached space since the fbuaccess structure is
* mapped into the user's address space uncached.
@ -295,7 +291,6 @@ xcfbinit(fi, base, unit, silent)
fi->fi_fbu->scrInfo.min_cur_x = -15;
fi->fi_fbu->scrInfo.min_cur_y = -15;
(*callv->_printf)("xcfbinit: resetting RAMDAC\n");
/* Initialize the RAMDAC. */
ims332init (fi);
@ -309,13 +304,11 @@ xcfbinit(fi, base, unit, silent)
/*
* Connect to the raster-console pseudo-driver
*/
(*callv->_printf)("xcfbinit: calling fbconnect()\n");
fbconnect("PMAG-DV", fi, silent);
#ifdef fpinitialized
fp->initialized = 1;
#endif
(*callv->_printf)("xcfbinit: done\n");
return (1);
}

4
sys/arch/pmax/tc/ds-asic-conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ds-asic-conf.c,v 1.2 1995/08/09 01:21:43 jonathan Exp $ */
/* $NetBSD: ds-asic-conf.c,v 1.3 1995/10/09 01:45:29 jonathan Exp $ */
/*
* Copyright (c) 1995 Jonathan Stone
@ -60,7 +60,7 @@ struct asic_slot xine_asic_slots[] =
0, asic_intrnull, (void *)(long) XINE_FLOPPY_SLOT, },
{ { "asc", 6, XINE_SCSI_SLOT, (u_int) (12 * 0x40000), },
XINE_INTR_SCSI, asic_intrnull, (void*)XINE_SCSI_SLOT, },
0 /*XINE_INTR_SCSI*/, asic_intrnull, (void*)XINE_SCSI_SLOT, },
#if 0
{ { "frc", 3, (u_int) XINE_SLOT_FRC, (15* 0x40000), },
0, asic_intrnull, (void *)(long) XINE_SLOT_FRC, },

4
sys/arch/pmax/tc/ds-tc-conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ds-tc-conf.c,v 1.3 1995/09/12 07:27:07 jonathan Exp $ */
/* $NetBSD: ds-tc-conf.c,v 1.4 1995/10/09 01:45:28 jonathan Exp $ */
/*
* Copyright (c) 1995 Jonathan Stone
@ -83,7 +83,7 @@ static struct tc_slot_desc xine_slot_addrs [4] = {
struct tc_cpu_desc xine_tc_desc =
{
xine_slot_addrs, XINE_TC_NSLOTS,
xine_devs, 11, /*XXX*/
xine_devs, 4, /*XXX*/
tc_ds_ioasic_intr_setup,
tc_ds_ioasic_intr_establish,
tc_ds_ioasic_intr_disestablish,

6
sys/arch/pmax/tc/tc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tc.c,v 1.4 1995/09/25 20:33:26 jonathan Exp $ */
/* $NetBSD: tc.c,v 1.5 1995/10/09 01:45:30 jonathan Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@ -160,11 +160,11 @@ cpu_tcdesc(cpu)
tc_enable_interrupt = kn02_enable_intr;
return &kn02_tc_desc;
} else if (cpu == DS_3MIN) {
DPRINTF(("tcattach: 3MIN Turbochannel (UNTESTED)\n"));
DPRINTF(("tcattach: 3MIN Turbochannel\n"));
tc_enable_interrupt = kmin_enable_intr;
return &kmin_tc_desc;
} else if (cpu == DS_MAXINE) {
DPRINTF(("MAXINE turbochannel (UNTESTED)\n"));
DPRINTF(("MAXINE turbochannel\n"));
tc_enable_interrupt = xine_enable_intr;
return &xine_tc_desc;
} else if (cpu == DS_PMAX) {