Update siop.c, siopreg.h, siopvar from upstream

This commit is contained in:
Stefan Reinauer 2022-09-05 16:58:19 +08:00
parent 6ce6dfa063
commit b5f142087f
3 changed files with 8 additions and 8 deletions

6
siop.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: siop.c,v 1.70 2019/11/10 21:16:22 chs Exp $ */
/* $NetBSD: siop.c,v 1.71 2022/04/07 19:33:37 andvar Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@ -75,7 +75,7 @@
// #include "opt_ddb.h"
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.70 2019/11/10 21:16:22 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.71 2022/04/07 19:33:37 andvar Exp $");
#include <sys/param.h>
#if 0
@ -860,7 +860,7 @@ siop_start(struct siop_softc *sc, int target, int lun, u_char *cbuf, int clen,
/*
* Negotiate wide is the initial negotiation state; since the 53c710
* doesn't do wide transfers, just begin the synchronous transfer
* negotation here.
* negotiation here.
*/
if (sc->sc_sync[target].state == NEG_WIDE) {
if (siop_inhibit_sync[target]) {

View File

@ -1,4 +1,4 @@
/* $NetBSD: siopreg.h,v 1.15 2012/08/24 09:01:22 msaitoh Exp $ */
/* $NetBSD: siopreg.h,v 1.16 2022/06/27 20:28:31 andvar Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@ -470,7 +470,7 @@ typedef volatile siop_regmap_t *siop_regmap_p;
#define SIOP_CTEST4_ZMOD 0x40 /* High-impedance outputs */
#define SIOP_CTEST4_SZM 0x20 /* ditto, SCSI "outputs" */
#ifndef ARCH_720
#define SIOP_CTEST4_SLBE 0x10 /* SCSI loobpack enable */
#define SIOP_CTEST4_SLBE 0x10 /* SCSI loopback enable */
#define SIOP_CTEST4_SFWR 0x08 /* SCSI FIFO write enable (from sodl) */
#else
#define SIOP_CTEST4_SRTM 0x10 /* Shadow Register Test Mode */

View File

@ -1,4 +1,4 @@
/* $NetBSD: siopvar.h,v 1.28 2022/01/01 21:07:13 andvar Exp $ */
/* $NetBSD: siopvar.h,v 1.29 2022/04/07 19:33:37 andvar Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@ -191,10 +191,10 @@ struct siop_softc {
/* negotiation states */
#define NEG_WIDE 0 /* Negotiate wide transfers */
#define NEG_WAITW 1 /* Waiting for wide negotation response */
#define NEG_WAITW 1 /* Waiting for wide negotiation response */
#define NEG_SYNC 2 /* Negotiate synch transfers */
#define NEG_WAITS 3 /* Waiting for synch negoation response */
#define NEG_DONE 4 /* Wide and/or sync negotation done */
#define NEG_DONE 4 /* Wide and/or sync negotiation done */
#define MSG_CMD_COMPLETE 0x00
#define MSG_EXT_MESSAGE 0x01