Module Name: src
Committed By: christos
Date: Tue Oct 15 19:29:58 UTC 2019
Modified Files:
src/sys/dev/pci: isp_pci.c
Log Message:
remove conditional portion that was wrong and always false.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/dev/pci/isp_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/isp_pci.c
diff -u src/sys/dev/pci/isp_pci.c:1.120 src/sys/dev/pci/isp_pci.c:1.121
--- src/sys/dev/pci/isp_pci.c:1.120 Sun Dec 9 06:14:02 2018
+++ src/sys/dev/pci/isp_pci.c Tue Oct 15 15:29:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_pci.c,v 1.120 2018/12/09 11:14:02 jdolecek Exp $ */
+/* $NetBSD: isp_pci.c,v 1.121 2019/10/15 19:29:58 christos Exp $ */
/*
* Copyright (C) 1997, 1998, 1999 National Aeronautics & Space Administration
* All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.120 2018/12/09 11:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.121 2019/10/15 19:29:58 christos Exp $");
#include <dev/ic/isp_netbsd.h>
#include <dev/pci/pcireg.h>
@@ -1137,8 +1137,7 @@ isp_pci_rd_reg_1080(struct ispsoftc *isp
uint16_t rv, oc = 0;
struct isp_pcisoftc *pcs = (struct isp_pcisoftc *) isp;
- if ((regoff & _BLK_REG_MASK) == SXP_BLOCK ||
- (regoff & _BLK_REG_MASK) == (SXP_BLOCK|SXP_BANK1_SELECT)) {
+ if ((regoff & _BLK_REG_MASK) == SXP_BLOCK) {
uint16_t tc;
/*
* We will assume that someone has paused the RISC processor.
@@ -1168,8 +1167,7 @@ isp_pci_wr_reg_1080(struct ispsoftc *isp
struct isp_pcisoftc *pcs = (struct isp_pcisoftc *) isp;
int oc = 0;
- if ((regoff & _BLK_REG_MASK) == SXP_BLOCK ||
- (regoff & _BLK_REG_MASK) == (SXP_BLOCK|SXP_BANK1_SELECT)) {
+ if ((regoff & _BLK_REG_MASK) == SXP_BLOCK) {
uint16_t tc;
/*
* We will assume that someone has paused the RISC processor.
