diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1998-11-30 21:16:33 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1998-11-30 21:16:33 +0000 |
| commit | a93d4bb1446c7c2880dae68480810b7726093ae7 (patch) | |
| tree | 966abd5053ce6e93762425d9f6ea35e5e9ef8b5c | |
| parent | 38364a0792fc67a54a07f9d5f9ed76ad1dde3db4 (diff) | |
s/iot/ca->ca_iot/
| -rw-r--r-- | sys/arch/hppa/gsc/lpt_gsc.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sys/arch/hppa/gsc/lpt_gsc.c b/sys/arch/hppa/gsc/lpt_gsc.c index 962cad4f667..6fd242cba7b 100644 --- a/sys/arch/hppa/gsc/lpt_gsc.c +++ b/sys/arch/hppa/gsc/lpt_gsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpt_gsc.c,v 1.1 1998/09/30 04:45:46 mickey Exp $ */ +/* $OpenBSD: lpt_gsc.c,v 1.2 1998/11/30 21:16:32 mickey Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -98,7 +98,6 @@ lpt_gsc_probe(parent, match, aux) void *match, *aux; { register struct confargs *ca = aux; - bus_space_tag_t iot; bus_space_handle_t ioh; bus_addr_t base; u_int8_t mask, data; @@ -119,9 +118,8 @@ lpt_gsc_probe(parent, match, aux) #define ABORT goto out #endif - iot = ca->ca_iot; base = ca->ca_hpa; - if (bus_space_map(iot, base, IOMOD_HPASIZE, 0, &ioh)) + if (bus_space_map(ca->ca_iot, base, IOMOD_HPASIZE, 0, &ioh)) return 0; ioh |= IOMOD_DEVOFFSET; @@ -129,33 +127,33 @@ lpt_gsc_probe(parent, match, aux) mask = 0xff; data = 0x55; /* Alternating zeros */ - if (!lpt_port_test(iot, ioh, base, lpt_data, data, mask)) + if (!lpt_port_test(ca->ca_iot, ioh, base, lpt_data, data, mask)) ABORT; data = 0xaa; /* Alternating ones */ - if (!lpt_port_test(iot, ioh, base, lpt_data, data, mask)) + if (!lpt_port_test(ca->ca_iot, ioh, base, lpt_data, data, mask)) ABORT; for (i = 0; i < CHAR_BIT; i++) { /* Walking zero */ data = ~(1 << i); - if (!lpt_port_test(iot, ioh, base, lpt_data, data, mask)) + if (!lpt_port_test(ca->ca_iot, ioh, base, lpt_data, data, mask)) ABORT; } for (i = 0; i < CHAR_BIT; i++) { /* Walking one */ data = (1 << i); - if (!lpt_port_test(iot, ioh, base, lpt_data, data, mask)) + if (!lpt_port_test(ca->ca_iot, ioh, base, lpt_data, data, mask)) ABORT; } - bus_space_write_1(iot, ioh, lpt_data, 0); - bus_space_write_1(iot, ioh, lpt_control, 0); + bus_space_write_1(ca->ca_iot, ioh, lpt_data, 0); + bus_space_write_1(ca->ca_iot, ioh, lpt_control, 0); rv = 1; out: ioh &= ~IOMOD_DEVOFFSET; - bus_space_unmap(iot, ioh, IOMOD_HPASIZE); + bus_space_unmap(ca->ca_iot, ioh, IOMOD_HPASIZE); return rv; } |