diff options
Diffstat (limited to 'sys/dev/ppbus/vpoio.c')
| -rw-r--r-- | sys/dev/ppbus/vpoio.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c index 54791ee44dcc7..a416efefb8ef9 100644 --- a/sys/dev/ppbus/vpoio.c +++ b/sys/dev/ppbus/vpoio.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: vpoio.c,v 1.4 1998/12/07 21:58:16 archie Exp $ + * $Id: vpoio.c,v 1.2 1998/09/13 18:26:26 nsouch Exp $ * */ @@ -41,8 +41,6 @@ #include <sys/kernel.h> #endif /*KERNEL */ -#include "opt_vpo.h" - #include <dev/ppbus/ppbconf.h> #include <dev/ppbus/ppb_msq.h> #include <dev/ppbus/vpoio.h> @@ -286,13 +284,8 @@ vpoio_connect(struct vpoio_data *vpo, int how) int error; int ret; - if ((error = ppb_request_bus(&vpo->vpo_dev, how))) { - -#ifdef VP0_DEBUG - printf("%s: can't request bus!\n", __FUNCTION__); -#endif + if ((error = ppb_request_bus(&vpo->vpo_dev, how))) return error; - } if (PPB_IN_EPP_MODE(&vpo->vpo_dev)) ppb_MS_microseq(&vpo->vpo_dev, connect_epp_microseq, &ret); @@ -444,8 +437,8 @@ vpoio_outstr(struct vpoio_data *vpo, char *buffer, int size) ppb_wctr(&vpo->vpo_dev, H_AUTO | H_nSELIN | H_INIT | H_STROBE); } + /* ppb_ecp_sync(&vpo->vpo_dev); */ #endif - ppb_ecp_sync(&vpo->vpo_dev); return (error); } @@ -456,7 +449,10 @@ vpoio_outstr(struct vpoio_data *vpo, char *buffer, int size) static int vpoio_instr(struct vpoio_data *vpo, char *buffer, int size) { + + register int k; int error = 0; + int r, mode, epp; ppb_MS_exec(&vpo->vpo_dev, MS_OP_GET, buffer, size, MS_UNKNOWN, &error); @@ -483,8 +479,8 @@ vpoio_instr(struct vpoio_data *vpo, char *buffer, int size) ppb_wctr(&vpo->vpo_dev, PCD | H_AUTO | H_nSELIN | H_INIT | H_STROBE); } + /* ppb_ecp_sync(&vpo->vpo_dev); */ #endif - ppb_ecp_sync(&vpo->vpo_dev); return (error); } @@ -492,6 +488,7 @@ vpoio_instr(struct vpoio_data *vpo, char *buffer, int size) static char vpoio_select(struct vpoio_data *vpo, int initiator, int target) { + register int k; int ret; struct ppb_microseq select_microseq[] = { @@ -708,10 +705,6 @@ vpoio_reset_bus(struct vpoio_data *vpo) { /* first, connect to the drive */ if (vpoio_connect(vpo, PPB_WAIT|PPB_INTR) || !vpoio_in_disk_mode(vpo)) { - -#ifdef VP0_DEBUG - printf("%s: not in disk mode!\n", __FUNCTION__); -#endif /* release ppbus */ vpoio_disconnect(vpo); return (1); |