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

general cleanup including boot diag messages.

Browse Source
This commit is contained in:
chopps 1994-05-11 19:06:40 +00:00
parent 7061e64af2
commit b08b714bd3
8 changed files with 76 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/amiga/dev/ahsc.c
View File

@ -32,7 +32,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)dma.c * @(#)dma.c
* $Id: ahsc.c,v 1.1 1994/05/08 05:52:54 chopps Exp $ * $Id: ahsc.c,v 1.2 1994/05/11 19:06:40 chopps Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -112,6 +112,8 @@ ahscattach(pdp, dp, auxp)
volatile struct sdmac *rp; volatile struct sdmac *rp;
struct sbic_softc *sc; struct sbic_softc *sc;
printf("\n");
sc = (struct sbic_softc *)dp; sc = (struct sbic_softc *)dp;
sc->sc_cregs = rp = ztwomap(0xdd0000); sc->sc_cregs = rp = ztwomap(0xdd0000);
/* /*

10
sys/arch/amiga/dev/atzsc.c
View File

@ -32,7 +32,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)dma.c * @(#)dma.c
* $Id: atzsc.c,v 1.1 1994/05/08 05:52:56 chopps Exp $ * $Id: atzsc.c,v 1.2 1994/05/11 19:06:41 chopps Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -132,19 +132,21 @@ atzscattach(pdp, dp, auxp)
sc->sc_dmago = atzsc_dmago; sc->sc_dmago = atzsc_dmago;
sc->sc_dmanext = atzsc_dmanext; sc->sc_dmanext = atzsc_dmanext;
sc->sc_dmastop = atzsc_dmastop; sc->sc_dmastop = atzsc_dmastop;
sc->sc_dmacmd = 0xFF000000; /* only ztwomem */ sc->sc_dmacmd = 0;
#ifdef DEBUG #ifdef DEBUG
/* make sure timeout is really not needed */ /* make sure timeout is really not needed */
timeout(atzsc_dmatimeout, 0, 30 * hz); timeout(atzsc_dmatimeout, 0, 30 * hz);
#endif #endif
/* /*
* eveything is a valid dma address * only 24 bit mem.
*/ */
sc->sc_dmamask = 0; sc->sc_dmamask = ~0x00ffffff;
sc->sc_sbicp = (sbic_regmap_p) ((int)rp + 0x91); sc->sc_sbicp = (sbic_regmap_p) ((int)rp + 0x91);
sc->sc_clkfreq = sbic_clock_override ? sbic_clock_override : 77; sc->sc_clkfreq = sbic_clock_override ? sbic_clock_override : 77;
printf(" dmamask 0x%x\n", ~sc->sc_dmamask);
sbicreset(sc); sbicreset(sc);
sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_softc = sc;

8
sys/arch/amiga/dev/grf.c
View File

@ -38,7 +38,7 @@
* from: Utah $Hdr: grf.c 1.31 91/01/21$ * from: Utah $Hdr: grf.c 1.31 91/01/21$
* *
* @(#)grf.c 7.8 (Berkeley) 5/7/91 * @(#)grf.c 7.8 (Berkeley) 5/7/91
* $Id: grf.c,v 1.11 1994/05/08 05:53:03 chopps Exp $ * $Id: grf.c,v 1.12 1994/05/11 19:06:42 chopps Exp $
*/ */
/* /*
@ -152,12 +152,12 @@ grfattach(pdp, dp, auxp)
gp->g_grfdev = makedev(maj, gp->g_unit); gp->g_grfdev = makedev(maj, gp->g_unit);
if (dp != NULL) { if (dp != NULL) {
printf(" %d x %d", gp->g_display.gd_dwidth, printf(" width %d height %d", gp->g_display.gd_dwidth,
gp->g_display.gd_dheight); gp->g_display.gd_dheight);
if (gp->g_display.gd_colors == 2) if (gp->g_display.gd_colors == 2)
printf(", monochrome\n"); printf(" monochrome\n");
else else
printf(", %d colors\n", gp->g_display.gd_colors); printf(" colors %d\n", gp->g_display.gd_colors);
} }
/* /*

10
sys/arch/amiga/dev/gtsc.c
View File

@ -32,7 +32,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)dma.c * @(#)dma.c
* $Id: gtsc.c,v 1.1 1994/05/08 05:53:12 chopps Exp $ * $Id: gtsc.c,v 1.2 1994/05/11 19:06:44 chopps Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -152,7 +152,7 @@ gtscattach(pdp, dp, auxp)
sc->sc_dmamask = ~0x01ffffff; sc->sc_dmamask = ~0x01ffffff;
else else
sc->sc_dmamask = ~0x07ffffff; sc->sc_dmamask = ~0x07ffffff;
printf(" dmamask: 0x%x", ~sc->sc_dmamask); printf(" dmamask 0x%x", ~sc->sc_dmamask);
sc->gtsc_bankmask = (~sc->sc_dmamask >> 18) & 0x01c0; sc->gtsc_bankmask = (~sc->sc_dmamask >> 18) & 0x01c0;
@ -171,17 +171,17 @@ gtscattach(pdp, dp, auxp)
if (gtsc_dmabounce || kvtop(sc) & sc->sc_dmamask) { if (gtsc_dmabounce || kvtop(sc) & sc->sc_dmamask) {
sc->sc_dmabuffer = (char *) alloc_z2mem(MAXPHYS); sc->sc_dmabuffer = (char *) alloc_z2mem(MAXPHYS);
if (isztwomem(sc->sc_dmabuffer)) if (isztwomem(sc->sc_dmabuffer))
printf(" bounce PA: 0x%x", ztwopa(sc->sc_dmabuffer)); printf(" bounce pa 0x%x", ztwopa(sc->sc_dmabuffer));
else if (gtsc_maxdma == 0) { else if (gtsc_maxdma == 0) {
gtsc_maxdma = 1024; gtsc_maxdma = 1024;
printf(" bounce PA: 0x%x", printf(" bounce pa 0x%x",
PREP_DMA_MEM(sc->sc_dmabuffer)); PREP_DMA_MEM(sc->sc_dmabuffer));
} }
} }
if (gtsc_maxdma == 0) if (gtsc_maxdma == 0)
gtsc_maxdma = MAXPHYS; gtsc_maxdma = MAXPHYS;
printf(" max dma: %d\n", gtsc_maxdma); printf(" maxdma %d\n", gtsc_maxdma);
sc->sc_sbicp = (sbic_regmap_p) ((int)rp + 0x61); sc->sc_sbicp = (sbic_regmap_p) ((int)rp + 0x61);
sc->sc_clkfreq = sbic_clock_override ? sbic_clock_override : 77; sc->sc_clkfreq = sbic_clock_override ? sbic_clock_override : 77;

53
sys/arch/amiga/dev/ite.c
View File

@ -37,7 +37,7 @@
* *
* from: Utah Hdr: ite.c 1.1 90/07/09 * from: Utah Hdr: ite.c 1.1 90/07/09
* from: @(#)ite.c 7.6 (Berkeley) 5/16/91 * from: @(#)ite.c 7.6 (Berkeley) 5/16/91
* $Id: ite.c,v 1.16 1994/05/09 06:38:40 chopps Exp $ * $Id: ite.c,v 1.17 1994/05/11 19:06:45 chopps Exp $
*/ */
/* /*
@ -47,6 +47,7 @@
*/ */
#include <sys/param.h> #include <sys/param.h>
#include <sys/kernel.h>
#include <sys/conf.h> #include <sys/conf.h>
#include <sys/device.h> #include <sys/device.h>
#include <sys/malloc.h> #include <sys/malloc.h>
@ -84,8 +85,8 @@ struct tty *ite_tty[NGRF];
int nunits; /* number of units */ int nunits; /* number of units */
int start_repeat_timeo = 20; /* first repeat after. */ int start_repeat_timeo = 30; /* first repeat after x s/100 */
int next_repeat_timeo = 5; /* next repeat after. */ int next_repeat_timeo = 10; /* next repeat after x s/100 */
int ite_default_wrap = 1; /* you want vtxxx-nam, binpatch */ int ite_default_wrap = 1; /* you want vtxxx-nam, binpatch */
@ -157,9 +158,9 @@ iteattach(pdp, dp, auxp)
splx(s); splx(s);
iteinit(gp->g_itedev); iteinit(gp->g_itedev);
printf(" rows: %d cols: %d", ip->rows, ip->cols); printf(" rows %d cols %d", ip->rows, ip->cols);
printf(" first key repeat: (%d/%d)s next: (%d/%d)s\n", printf(" repeat at (%d/100)s next at (%d/100)s\n",
start_repeat_timeo, hz, next_repeat_timeo, hz); start_repeat_timeo, next_repeat_timeo);
if (kbd_ite == NULL) if (kbd_ite == NULL)
kbd_ite = ip; kbd_ite = ip;
@ -424,6 +425,7 @@ iteioctl(dev, cmd, addr, flag, p)
caddr_t addr; caddr_t addr;
struct proc *p; struct proc *p;
{ {
struct iterepeat *irp;
struct ite_softc *ip; struct ite_softc *ip;
struct tty *tp; struct tty *tp;
int error; int error;
@ -441,20 +443,27 @@ iteioctl(dev, cmd, addr, flag, p)
return (error); return (error);
switch (cmd) { switch (cmd) {
case ITELOADKMAP: case ITEIOCSKMAP:
if (addr) { if (addr == 0)
bcopy(addr, &kbdmap, sizeof(struct kbdmap)); return(EFAULT);
bcopy(addr, &kbdmap, sizeof(struct kbdmap));
return 0; return(0);
} else case ITEIOCGKMAP:
return EFAULT; if (addr == NULL)
case ITEGETKMAP: return(EFAULT);
if (addr) { bcopy(&kbdmap, addr, sizeof(struct kbdmap));
bcopy(&kbdmap, addr, sizeof(struct kbdmap)); return(0);
case ITEIOCGREPT:
return 0; irp = (struct iterepeat *)addr;
} else irp->start = start_repeat_timeo;
return EFAULT; irp->next = next_repeat_timeo;
case ITEIOCSREPT:
irp = (struct iterepeat *)addr;
if (irp->start < ITEMINREPEAT && irp->next < ITEMINREPEAT)
return(EINVAL);
start_repeat_timeo = irp->start;
next_repeat_timeo = irp->next;
return(0);
} }
/* XXX */ /* XXX */
if (minor(dev) == 0) { if (minor(dev) == 0) {
@ -814,12 +823,12 @@ ite_filter(c, caller)
if (!tout_pending && caller == ITEFILT_TTY && kbd_ite->key_repeat) { if (!tout_pending && caller == ITEFILT_TTY && kbd_ite->key_repeat) {
tout_pending = 1; tout_pending = 1;
last_char = c; last_char = c;
timeout(repeat_handler, 0, start_repeat_timeo); timeout(repeat_handler, 0, start_repeat_timeo * hz / 100);
} else if (!tout_pending && caller == ITEFILT_REPEATER && } else if (!tout_pending && caller == ITEFILT_REPEATER &&
kbd_ite->key_repeat) { kbd_ite->key_repeat) {
tout_pending = 1; tout_pending = 1;
last_char = c; last_char = c;
timeout(repeat_handler, 0, next_repeat_timeo); timeout(repeat_handler, 0, next_repeat_timeo * hz / 100);
} }
/* handle dead keys */ /* handle dead keys */
if (key.mode & KBD_MODE_DEAD) { if (key.mode & KBD_MODE_DEAD) {

31
sys/arch/amiga/dev/iteioctl.h
View File

@ -38,37 +38,44 @@
* from: Utah $Hdr: iteioctl.h 1.1 90/07/09$ * from: Utah $Hdr: iteioctl.h 1.1 90/07/09$
* *
* @(#)iteioctl.h 7.2 (Berkeley) 11/4/90 * @(#)iteioctl.h 7.2 (Berkeley) 11/4/90
* $Id: iteioctl.h,v 1.7 1994/04/10 00:43:36 chopps Exp $ * $Id: iteioctl.h,v 1.8 1994/05/11 19:06:47 chopps Exp $
*/ */
struct itewinsize { struct itewinsize {
int x; /* leftedge offset to the right */ int x; /* leftedge offset to the right */
int y; /* topedge offset down */ int y; /* topedge offset down */
u_int width; /* width of ite display */ u_int width; /* width of ite display */
u_int height; /* height of ite display */ u_int height; /* height of ite display */
u_int depth; /* depth of ite display */ u_int depth; /* depth of ite display */
}; };
struct itebell { struct itebell {
u_int volume; /* volume of bell (0-64) */ u_int volume; /* volume of bell (0-64) */
u_int pitch; /* pitch of bell (10-2000) */ u_int pitch; /* pitch of bell (10-2000) */
u_int msec; /* duration of bell */ u_int msec; /* duration of bell */
}; };
#define MAXBVOLUME (63) #define MAXBVOLUME (63)
#define MAXBPITCH (2000) #define MAXBPITCH (2000)
#define MINBPITCH (10) #define MINBPITCH (10)
#define MAXBTIME (5000) /* 5 seconds */ #define MAXBTIME (5000) /* 5 seconds */
struct iterepeat {
int start; /* number of 100/s before repeat start */
int next; /* number of 100/s before next repeat */
};
#define ITEMINREPEAT 5 /* mininum number of 100/s for key repeat */
#define ITEIOCSKMAP _IOW('Z',0x70, struct kbdmap)
#define ITEIOCGKMAP _IOR('Z',0x71, struct kbdmap)
#define ITEIOCGWINSZ _IOR('Z',0x72, struct itewinsize) #define ITEIOCGWINSZ _IOR('Z',0x72, struct itewinsize)
#define ITEIOCSWINSZ _IOW('Z',0x73, struct itewinsize) #define ITEIOCSWINSZ _IOW('Z',0x73, struct itewinsize)
#define ITEIOCDSPWIN _IO('Z', 0x74) #define ITEIOCDSPWIN _IO('Z', 0x74)
#define ITEIOCREMWIN _IO('Z', 0x75) #define ITEIOCREMWIN _IO('Z', 0x75)
#define ITEIOCGBELL _IOR('Z', 0x76, struct itebell) #define ITEIOCGBELL _IOR('Z', 0x76, struct itebell)
#define ITEIOCSBELL _IOW('Z', 0x77, struct itebell) #define ITEIOCSBELL _IOW('Z', 0x77, struct itebell)
#define ITEIOCGREPT _IOR('Z', 0x78, struct iterepeat)
#define ITEIOCSREPT _IOW('Z', 0x79, struct iterepeat)
#define ITESWITCH _IOW('Z',0x69, int) /* XXX */ #define ITESWITCH _IOW('Z',0x69, int) /* XXX */
#define ITELOADKMAP _IOW('Z',0x70, struct kbdmap)
#define ITEGETKMAP _IOR('Z',0x71, struct kbdmap)

4
sys/arch/amiga/dev/ser.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)ser.c 7.12 (Berkeley) 6/27/91 * @(#)ser.c 7.12 (Berkeley) 6/27/91
* $Id: ser.c,v 1.15 1994/05/08 05:53:45 chopps Exp $ * $Id: ser.c,v 1.16 1994/05/11 19:06:49 chopps Exp $
*/ */
/* /*
* XXX This file needs major cleanup it will never ervice more than one * XXX This file needs major cleanup it will never ervice more than one
@ -214,7 +214,7 @@ serattach(pdp, dp, auxp)
if (0 == serconsole) if (0 == serconsole)
serconsinit = 0; serconsinit = 0;
if (dp) if (dp)
printf(" input fifo: %d output fifo: %d\n", SERIBUF_SIZE, printf(" input fifo %d output fifo %d\n", SERIBUF_SIZE,
SEROBUF_SIZE); SEROBUF_SIZE);
} }

11
sys/arch/amiga/dev/ztwobus.c
View File

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: ztwobus.c,v 1.1 1994/05/08 05:53:52 chopps Exp $ * $Id: ztwobus.c,v 1.2 1994/05/11 19:06:50 chopps Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
#include <sys/device.h> #include <sys/device.h>
@ -138,8 +138,9 @@ ztwoattach(pdp, dp, auxp)
int i, zcnt; int i, zcnt;
if (ZTWOMEMADDR) if (ZTWOMEMADDR)
printf (" mem %08x-%08x\n", printf(" mem %08x-%08x",
ZTWOMEMADDR, ZTWOMEMADDR + ZTWOMEMSIZE - 1); ZTWOMEMADDR, ZTWOMEMADDR + ZTWOMEMSIZE - 1);
printf("\n");
for (i = 0; i < ncfdev; i++) { for (i = 0; i < ncfdev; i++) {
za.pa = cfdev[i].addr; za.pa = cfdev[i].addr;
@ -173,11 +174,11 @@ ztwoprint(auxp, pnp)
zap = auxp; zap = auxp;
if (pnp) { if (pnp) {
printf("%s at %s", aconflookup(zap->manid, zap->prodid), printf("%s at %s:", aconflookup(zap->manid, zap->prodid),
pnp); pnp);
if (zap->manid == -1) if (zap->manid == -1)
rv = UNSUPP; rv = UNSUPP;
} }
printf(" rom: 0x%x man/pro: %d/%d", zap->pa, zap->manid, zap->prodid); printf(" rom 0x%x man/pro %d/%d", zap->pa, zap->manid, zap->prodid);
return(rv); return(rv);
} }