From d41fe609843dfa3be29db962e22daa453530c029 Mon Sep 17 00:00:00 2001 From: David Greenman Date: Fri, 4 Oct 1996 14:17:32 +0000 Subject: [PATCH] Oops, missed a chunk in that last commit. --- sys/dev/cy/cy.c | 6 +++--- sys/dev/cy/cy_isa.c | 6 +++--- sys/i386/isa/cy.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 3319aac15b3e..1346042373fc 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.35 1996/09/06 23:07:17 phk Exp $ + * $Id: cy.c,v 1.36 1996/10/04 10:33:08 davidg Exp $ */ #include "cy.h" @@ -958,8 +958,8 @@ siointr(unit) cy_iobase = com_addr(baseu)->cy_iobase; /* check each CD1400 in turn */ - for (cyu = 0, iobase = cy_iobase; cyu < cy_nr_cd1400s[unit]; - ++cyu, iobase += CY_CD1400_MEMSIZE) { + for (cyu = 0; cyu < cy_nr_cd1400s[unit]; ++cyu) { + iobase = (cy_addr) (cy_iobase + cy_chip_offset[cyu]); /* poll to see if it has any work */ status = cd_inb(iobase, CD1400_SVRR); if (status == 0) diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index 3319aac15b3e..1346042373fc 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.35 1996/09/06 23:07:17 phk Exp $ + * $Id: cy.c,v 1.36 1996/10/04 10:33:08 davidg Exp $ */ #include "cy.h" @@ -958,8 +958,8 @@ siointr(unit) cy_iobase = com_addr(baseu)->cy_iobase; /* check each CD1400 in turn */ - for (cyu = 0, iobase = cy_iobase; cyu < cy_nr_cd1400s[unit]; - ++cyu, iobase += CY_CD1400_MEMSIZE) { + for (cyu = 0; cyu < cy_nr_cd1400s[unit]; ++cyu) { + iobase = (cy_addr) (cy_iobase + cy_chip_offset[cyu]); /* poll to see if it has any work */ status = cd_inb(iobase, CD1400_SVRR); if (status == 0) diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index 3319aac15b3e..1346042373fc 100644 --- a/sys/i386/isa/cy.c +++ b/sys/i386/isa/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.35 1996/09/06 23:07:17 phk Exp $ + * $Id: cy.c,v 1.36 1996/10/04 10:33:08 davidg Exp $ */ #include "cy.h" @@ -958,8 +958,8 @@ siointr(unit) cy_iobase = com_addr(baseu)->cy_iobase; /* check each CD1400 in turn */ - for (cyu = 0, iobase = cy_iobase; cyu < cy_nr_cd1400s[unit]; - ++cyu, iobase += CY_CD1400_MEMSIZE) { + for (cyu = 0; cyu < cy_nr_cd1400s[unit]; ++cyu) { + iobase = (cy_addr) (cy_iobase + cy_chip_offset[cyu]); /* poll to see if it has any work */ status = cd_inb(iobase, CD1400_SVRR); if (status == 0)