diff options
Diffstat (limited to 'sys/dev/microcode')
| -rw-r--r-- | sys/dev/microcode/siop/ncr53cxxx.c | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/sys/dev/microcode/siop/ncr53cxxx.c b/sys/dev/microcode/siop/ncr53cxxx.c index 12b6c0aa06f..ea445bedf24 100644 --- a/sys/dev/microcode/siop/ncr53cxxx.c +++ b/sys/dev/microcode/siop/ncr53cxxx.c @@ -1,5 +1,5 @@ -/* $OpenBSD: ncr53cxxx.c,v 1.6 2004/03/12 00:04:57 miod Exp $ */ -/* $NetBSD: ncr53cxxx.c,v 1.10 2002/04/21 22:40:10 bouyer Exp $ */ +/* $OpenBSD: ncr53cxxx.c,v 1.7 2005/10/08 15:54:49 krw Exp $ */ +/* $NetBSD: ncr53cxxx.c,v 1.14 2005/02/11 06:21:22 simonb Exp $ */ /* * Copyright (c) 1995,1999 Michael L. Hitch @@ -189,8 +189,9 @@ struct ncrregs regs[] = { {"temp3", {0x1f, 0x1f, 0x1f, 0x1f, 0x1f}}, {"dfifo", {0x20, 0x20, 0x20, 0x20, 0x20}}, {"istat", {0x21, 0x21, 0x14, 0x14, 0x14}}, - {"ctest8", { -1, 0x22, -1, -1, -1}}, + {"ctest8", {0x22, 0x22, -1, -1, -1}}, {"lcrc", { -1, 0x23, -1, -1, -1}}, + {"ctest9", {0x23, -1, -1, -1, -1}}, {"dbc0", {0x24, 0x24, 0x24, 0x24, 0x24}}, {"dbc1", {0x25, 0x25, 0x25, 0x25, 0x25}}, {"dbc2", {0x26, 0x26, 0x26, 0x26, 0x26}}, @@ -211,10 +212,10 @@ struct ncrregs regs[] = { {"scratch1", { -1, 0x35, -1, -1, -1}}, {"scratch2", { -1, 0x36, -1, -1, -1}}, {"scratch3", { -1, 0x37, -1, -1, -1}}, - {"scratcha0", { -1, -1, 0x34, 0x34, 0x34}}, - {"scratcha1", { -1, -1, 0x35, 0x35, 0x35}}, - {"scratcha2", { -1, -1, 0x36, 0x36, 0x36}}, - {"scratcha3", { -1, -1, 0x37, 0x37, 0x37}}, + {"scratcha0", {0x10, -1, 0x34, 0x34, 0x34}}, + {"scratcha1", {0x11, -1, 0x35, 0x35, 0x35}}, + {"scratcha2", {0x12, -1, 0x36, 0x36, 0x36}}, + {"scratcha3", {0x13, -1, 0x37, 0x37, 0x37}}, {"dmode", {0x34, 0x38, 0x38, 0x38, 0x38}}, {"dien", {0x39, 0x39, 0x39, 0x39, 0x39}}, {"dwt", {0x3a, 0x3a, 0x3a, -1, -1}}, @@ -246,10 +247,10 @@ struct ncrregs regs[] = { {"sodl1", { -1, -1, 0x55, -1, 0x55}}, {"sbdl0", { -1, -1, 0x58, 0x58, 0x58}}, {"sbdl1", { -1, -1, 0x59, -1, 0x59}}, - {"scratchb0", { -1, -1, 0x5c, 0x5c, 0x5c}}, - {"scratchb1", { -1, -1, 0x5d, 0x5d, 0x5d}}, - {"scratchb2", { -1, -1, 0x5e, 0x5e, 0x5e}}, - {"scratchb3", { -1, -1, 0x5f, 0x5f, 0x5f}}, + {"scratchb0", {0x3c, -1, 0x5c, 0x5c, 0x5c}}, + {"scratchb1", {0x3d, -1, 0x5d, 0x5d, 0x5d}}, + {"scratchb2", {0x3e, -1, 0x5e, 0x5e, 0x5e}}, + {"scratchb3", {0x3f, -1, 0x5f, 0x5f, 0x5f}}, {"scratchc0", { -1, -1, -1, -1, 0x60}}, {"scratchc1", { -1, -1, -1, -1, 0x61}}, {"scratchc2", { -1, -1, -1, -1, 0x62}}, @@ -415,7 +416,7 @@ main (int argc, char *argv[]) if (outfp) { time_t cur_time; - fprintf(outfp, "/*\t$OpenBSD: ncr53cxxx.c,v 1.6 2004/03/12 00:04:57 miod Exp $\t*/\n"); + fprintf(outfp, "/*\t$OpenBSD: ncr53cxxx.c,v 1.7 2005/10/08 15:54:49 krw Exp $\t*/\n"); fprintf(outfp, "/*\n"); fprintf(outfp, " *\tDO NOT EDIT - this file is automatically generated.\n"); time(&cur_time); @@ -1046,10 +1047,9 @@ void f_wait (void) errout ("Expected SELECT or RESELECT"); ++i; if (reserved ("rel", i)) { -#if 0 /* XXX driver will fix relative dsps to absolute */ +#if 0 /* driver will fix relative dsps to absolute */ if (arch < ARCH710) { errout ("Wrong arch for relative dsps"); - return; } #endif i += 2; @@ -1159,10 +1159,9 @@ void transfer (int word0, int type) i = tokenix; inst0 = word0; if (type == 0 && reserved ("rel", i)) { -#if 0 /* XXX driver will fix relative dsps to absolute */ +#if 0 /* driver will fix relative dsps to absolute */ if (arch < ARCH710) { errout ("Wrong arch for relative dsps"); - return; } #endif inst1 = evaluate (i + 2) - dsps - 8; @@ -1248,10 +1247,9 @@ void select_reselect (int t) inst0 |= (evaluate (t++) & 0xff) << 16; if (tokens[t++].type == ',') { if (reserved ("rel", t)) { -#if 0 /* XXX driver will fix relative dsps to absolute */ +#if 0 /* driver will fix relative dsps to absolute */ if (arch < ARCH710) { errout ("Wrong arch for relative dsps"); - return; } #endif inst0 |= 0x04000000; @@ -1318,7 +1316,7 @@ void block_move () inst0 |= evaluate (tokenix++); /* count */ tokenix++; /* skip ',' */ if (reserved ("ptr", tokenix)) { - ++ tokenix; + ++tokenix; inst0 |= 0x20000000; } inst1 = evaluate (tokenix++); /* address */ @@ -1373,7 +1371,6 @@ void register_write () case 8: if (reserved ("to", tokenix+3) == 0) errout ("Register command expected TO"); - default: } reg = CheckRegister (tokenix); if (reg < 0) { /* Not register, must be data */ |