diff options
Diffstat (limited to 'sys/dev/usb/umass.c')
| -rw-r--r-- | sys/dev/usb/umass.c | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index a7a9418..74f6905 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -430,90 +430,90 @@ struct cam_sim *umass_sim; /* SCSI Interface Module */ /* USB device probe/attach/detach functions */ USB_DECLARE_DRIVER(umass); -static int umass_match_proto __P((struct umass_softc *sc, +Static int umass_match_proto __P((struct umass_softc *sc, usbd_interface_handle iface)); /* generic transfer functions */ -static usbd_status umass_setup_transfer __P((struct umass_softc *sc, +Static usbd_status umass_setup_transfer __P((struct umass_softc *sc, usbd_pipe_handle pipe, void *buffer, int buflen, int flags, usbd_xfer_handle xfer)); -static usbd_status umass_setup_ctrl_transfer __P((struct umass_softc *sc, +Static usbd_status umass_setup_ctrl_transfer __P((struct umass_softc *sc, usbd_device_handle dev, usb_device_request_t *req, void *buffer, int buflen, int flags, usbd_xfer_handle xfer)); -static void umass_clear_endpoint_stall __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)); -static void umass_reset __P((struct umass_softc *sc, +Static void umass_reset __P((struct umass_softc *sc, transfer_cb_f cb, void *priv)); /* Bulk-Only related functions */ -static void umass_bbb_reset __P((struct umass_softc *sc, int status)); -static void umass_bbb_transfer __P((struct umass_softc *sc, int lun, +Static void umass_bbb_reset __P((struct umass_softc *sc, int status)); +Static void umass_bbb_transfer __P((struct umass_softc *sc, int lun, void *cmd, int cmdlen, void *data, int datalen, int dir, transfer_cb_f cb, void *priv)); -static void umass_bbb_state __P((usbd_xfer_handle xfer, +Static void umass_bbb_state __P((usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status err)); /* CBI related functions */ -static int umass_cbi_adsc __P((struct umass_softc *sc, char *buffer,int buflen, +Static int umass_cbi_adsc __P((struct umass_softc *sc, char *buffer,int buflen, usbd_xfer_handle xfer)); -static void umass_cbi_reset __P((struct umass_softc *sc, int status)); -static void umass_cbi_transfer __P((struct umass_softc *sc, int lun, +Static void umass_cbi_reset __P((struct umass_softc *sc, int status)); +Static void umass_cbi_transfer __P((struct umass_softc *sc, int lun, void *cmd, int cmdlen, void *data, int datalen, int dir, transfer_cb_f cb, void *priv)); -static void umass_cbi_state __P((usbd_xfer_handle xfer, +Static void umass_cbi_state __P((usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status err)); /* CAM related functions */ -static void umass_cam_action __P((struct cam_sim *sim, union ccb *ccb)); -static void umass_cam_poll __P((struct cam_sim *sim)); +Static void umass_cam_action __P((struct cam_sim *sim, union ccb *ccb)); +Static void umass_cam_poll __P((struct cam_sim *sim)); -static void umass_cam_cb __P((struct umass_softc *sc, void *priv, +Static void umass_cam_cb __P((struct umass_softc *sc, void *priv, int residue, int status)); -static void umass_cam_sense_cb __P((struct umass_softc *sc, void *priv, +Static void umass_cam_sense_cb __P((struct umass_softc *sc, void *priv, int residue, int status)); -static void umass_cam_rescan_callback +Static void umass_cam_rescan_callback __P((struct cam_periph *periph,union ccb *ccb)); -static void umass_cam_rescan __P((struct umass_softc *sc)); +Static void umass_cam_rescan __P((struct umass_softc *sc)); -static int umass_cam_attach_sim __P((void)); -static int umass_cam_attach __P((struct umass_softc *sc)); -static int umass_cam_detach_sim __P((void)); -static int umass_cam_detach __P((struct umass_softc *sc)); +Static int umass_cam_attach_sim __P((void)); +Static int umass_cam_attach __P((struct umass_softc *sc)); +Static int umass_cam_detach_sim __P((void)); +Static int umass_cam_detach __P((struct umass_softc *sc)); /* SCSI specific functions */ -static int umass_scsi_transform __P((struct umass_softc *sc, +Static int umass_scsi_transform __P((struct umass_softc *sc, unsigned char *cmd, int cmdlen, unsigned char **rcmd, int *rcmdlen)); /* UFI specific functions */ #define UFI_COMMAND_LENGTH 12 /* UFI commands are always 12b */ -static int umass_ufi_transform __P((struct umass_softc *sc, +Static int umass_ufi_transform __P((struct umass_softc *sc, unsigned char *cmd, int cmdlen, unsigned char **rcmd, int *rcmdlen)); /* ATAPI (8070i) specific functions */ #define ATAPI_COMMAND_LENGTH 12 /* ATAPI commands are always 12b */ -static int umass_atapi_transform __P((struct umass_softc *sc, +Static int umass_atapi_transform __P((struct umass_softc *sc, unsigned char *cmd, int cmdlen, unsigned char **rcmd, int *rcmdlen)); #ifdef UMASS_DEBUG /* General debugging functions */ -static void umass_bbb_dump_cbw __P((struct umass_softc *sc, +Static void umass_bbb_dump_cbw __P((struct umass_softc *sc, umass_bbb_cbw_t *cbw)); -static void umass_bbb_dump_csw __P((struct umass_softc *sc, +Static void umass_bbb_dump_csw __P((struct umass_softc *sc, umass_bbb_csw_t *csw)); -static void umass_dump_buffer __P((struct umass_softc *sc, u_int8_t *buffer, +Static void umass_dump_buffer __P((struct umass_softc *sc, u_int8_t *buffer, int buflen, int printlen)); #endif @@ -528,7 +528,7 @@ static void umass_dump_buffer __P((struct umass_softc *sc, u_int8_t *buffer, * This function is called from both probe and attach. */ -static int +Static int umass_match_proto(struct umass_softc *sc, usbd_interface_handle iface) { usbd_device_handle dev; @@ -904,7 +904,7 @@ USB_DETACH(umass) * Generic functions to handle transfers */ -static usbd_status +Static usbd_status umass_setup_transfer(struct umass_softc *sc, usbd_pipe_handle pipe, void *buffer, int buflen, int flags, usbd_xfer_handle xfer) @@ -927,7 +927,7 @@ umass_setup_transfer(struct umass_softc *sc, usbd_pipe_handle pipe, } -static usbd_status +Static usbd_status umass_setup_ctrl_transfer(struct umass_softc *sc, usbd_device_handle dev, usb_device_request_t *req, void *buffer, int buflen, int flags, @@ -952,7 +952,7 @@ umass_setup_ctrl_transfer(struct umass_softc *sc, usbd_device_handle dev, return (USBD_NORMAL_COMPLETION); } -static void +Static void umass_clear_endpoint_stall(struct umass_softc *sc, u_int8_t endpt, usbd_pipe_handle pipe, int state, usbd_xfer_handle xfer) @@ -976,7 +976,7 @@ umass_clear_endpoint_stall(struct umass_softc *sc, umass_setup_ctrl_transfer(sc, dev, &sc->request, NULL, 0, 0, xfer); } -static void +Static void umass_reset(struct umass_softc *sc, transfer_cb_f cb, void *priv) { sc->transfer_cb = cb; @@ -990,7 +990,7 @@ umass_reset(struct umass_softc *sc, transfer_cb_f cb, void *priv) * Bulk protocol specific functions */ -static void +Static void umass_bbb_reset(struct umass_softc *sc, int status) { usbd_device_handle dev; @@ -1032,7 +1032,7 @@ umass_bbb_reset(struct umass_softc *sc, int status) sc->transfer_xfer[XFER_BBB_RESET1]); } -static void +Static void umass_bbb_transfer(struct umass_softc *sc, int lun, void *cmd, int cmdlen, void *data, int datalen, int dir, transfer_cb_f cb, void *priv) @@ -1138,7 +1138,7 @@ umass_bbb_transfer(struct umass_softc *sc, int lun, void *cmd, int cmdlen, } -static void +Static void umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status err) { @@ -1435,7 +1435,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv, * Command/Bulk/Interrupt (CBI) specific functions */ -static int +Static int umass_cbi_adsc(struct umass_softc *sc, char *buffer, int buflen, usbd_xfer_handle xfer) { @@ -1456,7 +1456,7 @@ umass_cbi_adsc(struct umass_softc *sc, char *buffer, int buflen, } -static void +Static void umass_cbi_reset(struct umass_softc *sc, int status) { int i; @@ -1504,7 +1504,7 @@ umass_cbi_reset(struct umass_softc *sc, int status) /* XXX if the command fails we should reset the port on the bub */ } -static void +Static void umass_cbi_transfer(struct umass_softc *sc, int lun, void *cmd, int cmdlen, void *data, int datalen, int dir, transfer_cb_f cb, void *priv) @@ -1554,7 +1554,7 @@ umass_cbi_transfer(struct umass_softc *sc, int lun, umass_cbi_reset(sc, STATUS_WIRE_FAILED); } -static void +Static void umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status err) { @@ -1826,7 +1826,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv, * CAM specific functions (used by SCSI, UFI, 8070 (ATAPI)) */ -static int +Static int umass_cam_attach_sim() { struct cam_devq *devq; /* Per device Queue */ @@ -1857,7 +1857,7 @@ umass_cam_attach_sim() return(0); } -static void +Static void umass_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb) { #ifdef UMASS_DEBUG @@ -1875,7 +1875,7 @@ umass_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb) free(ccb, M_USBDEV); } -static void +Static void umass_cam_rescan(struct umass_softc *sc) { struct cam_path *path; @@ -1902,7 +1902,7 @@ umass_cam_rescan(struct umass_softc *sc) /* The scan is in progress now. */ } -static int +Static int umass_cam_attach(struct umass_softc *sc) { /* SIM already attached at module load. The device is a target on the @@ -1944,7 +1944,7 @@ umass_cam_attach(struct umass_softc *sc) * detach from the CAM layer */ -static int +Static int umass_cam_detach_sim() { if (umass_sim) @@ -1962,7 +1962,7 @@ umass_cam_detach_sim() return(0); } -static int +Static int umass_cam_detach(struct umass_softc *sc) { struct cam_path *path; @@ -1988,7 +1988,7 @@ umass_cam_detach(struct umass_softc *sc) * CAM requests for action come through here */ -static void +Static void umass_cam_action(struct cam_sim *sim, union ccb *ccb) { struct umass_softc *sc = devclass_get_softc(umass_devclass, @@ -2268,7 +2268,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb) * all requests are handled through umass_cam_action, requests * are never pending. So, nothing to do here. */ -static void +Static void umass_cam_poll(struct cam_sim *sim) { #ifdef UMASS_DEBUG @@ -2286,7 +2286,7 @@ umass_cam_poll(struct cam_sim *sim) * finalise a completed CAM command */ -static void +Static void umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status) { union ccb *ccb = (union ccb *) priv; @@ -2358,7 +2358,7 @@ umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status) /* Finalise a completed autosense operation */ -static void +Static void umass_cam_sense_cb(struct umass_softc *sc, void *priv, int residue, int status) { union ccb *ccb = (union ccb *) priv; @@ -2404,7 +2404,7 @@ umass_cam_sense_cb(struct umass_softc *sc, void *priv, int residue, int status) } -static int +Static int umass_driver_load(module_t mod, int what, void *arg) { int err; @@ -2430,7 +2430,7 @@ umass_driver_load(module_t mod, int what, void *arg) * SCSI specific functions */ -static int +Static int umass_scsi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen, unsigned char **rcmd, int *rcmdlen) { @@ -2444,7 +2444,7 @@ umass_scsi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen, * UFI specific functions */ -static int +Static int umass_ufi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen, unsigned char **rcmd, int *rcmdlen) { @@ -2516,7 +2516,7 @@ umass_ufi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen, /* * 8070 (ATAPI) specific functions */ -static int +Static int umass_atapi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen, unsigned char **rcmd, int *rcmdlen) { @@ -2575,7 +2575,7 @@ DRIVER_MODULE(umass, uhub, umass_driver, umass_devclass, umass_driver_load, 0); #ifdef UMASS_DEBUG -static void +Static void umass_bbb_dump_cbw(struct umass_softc *sc, umass_bbb_cbw_t *cbw) { int clen = cbw->bCDBLength; @@ -2593,7 +2593,7 @@ umass_bbb_dump_cbw(struct umass_softc *sc, umass_bbb_cbw_t *cbw) (flags == CBWFLAGS_OUT? "out":"<invalid>")))); } -static void +Static void umass_bbb_dump_csw(struct umass_softc *sc, umass_bbb_csw_t *csw) { int sig = UGETDW(csw->dCSWSignature); @@ -2610,7 +2610,7 @@ umass_bbb_dump_csw(struct umass_softc *sc, umass_bbb_csw_t *csw) (status == CSWSTATUS_PHASE? "phase":"<invalid>"))))); } -static void +Static void umass_dump_buffer(struct umass_softc *sc, u_int8_t *buffer, int buflen, int printlen) { |
