Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make this file compiles under some condition:

Browse Source 
- #if 0'ed out the umass_reset for now.
- some atapibus specific code is conditionalized by NATAPIBUS.
This commit is contained in:
enami 2000-04-03 03:56:49 +00:00
parent 2a9be1168a
commit 6442efb498
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/usb/umass.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */
/* $NetBSD: umass.c,v 1.29 2000/04/03 03:56:49 enami Exp $ */
/*-
* Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
* Nick Hibma <n_hibma@freebsd.org>
@ -95,6 +95,8 @@
* something similar?
*/
#include "atapibus.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@ -518,8 +520,10 @@ Static usbd_status umass_setup_ctrl_transfer __P((struct umass_softc *sc,
Static void umass_clear_endpoint_stall __P((struct umass_softc *sc,
u_int8_t endpt, usbd_pipe_handle pipe,
int state, usbd_xfer_handle xfer));
#if 0
Static void umass_reset __P((struct umass_softc *sc,
transfer_cb_f cb, void *priv));
#endif
/* Bulk-Only related functions */
Static void umass_bbb_reset __P((struct umass_softc *sc, int status));
@ -589,8 +593,10 @@ Static void umass_scsipi_sense_cb __P((struct umass_softc *sc, void *priv,
int residue, int status));
Static int scsipiprint __P((void *aux, const char *pnp));
#if NATAPIBUS > 0
Static void umass_atapi_probedev __P((struct atapibus_softc *, int));
#endif
#endif
#if defined(__FreeBSD__)
/* SCSI specific functions */
@ -1049,6 +1055,7 @@ USB_ATTACH(umass)
sc->u.sc_link.quirks |= ADEV_NOTUR;
break;
#if NATAPIBUS > 0
case PROTO_8070:
sc->u.aa.sc_aa.aa_type = T_ATAPI;
sc->u.aa.sc_aa.aa_channel = 0;
@ -1058,6 +1065,7 @@ USB_ATTACH(umass)
sc->sc_atapi_adapter.atapi_probedev = umass_atapi_probedev;
sc->sc_atapi_adapter.atapi_kill_pending = scsi_kill_pending;
break;
#endif
default:
printf("%s: proto=0x%x not supported yet\n",
@ -1300,6 +1308,7 @@ umass_clear_endpoint_stall(struct umass_softc *sc,
umass_setup_ctrl_transfer(sc, dev, &sc->request, NULL, 0, 0, xfer);
}
#if 0
Static void
umass_reset(struct umass_softc *sc, transfer_cb_f cb, void *priv)
{
@ -1309,6 +1318,7 @@ umass_reset(struct umass_softc *sc, transfer_cb_f cb, void *priv)
/* The reset is a forced reset, so no error (yet) */
sc->reset(sc, STATUS_CMD_OK);
}
#endif
/*
* Bulk protocol specific functions
@ -3245,6 +3255,7 @@ umass_scsipi_sense_cb(struct umass_softc *sc, void *priv, int residue,
splx(s);
}
#if NATAPIBUS > 0
Static void
umass_atapi_probedev(atapi, target)
struct atapibus_softc *atapi;
@ -3309,3 +3320,4 @@ bad:
return;
}
#endif
#endif