From owner-p4-projects@FreeBSD.ORG Sun Apr 20 15:21:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D68E11065672; Sun, 20 Apr 2008 15:21:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98DA5106566B for ; Sun, 20 Apr 2008 15:21:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 879848FC13 for ; Sun, 20 Apr 2008 15:21:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3KFLQpD046029 for ; Sun, 20 Apr 2008 15:21:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3KFLQ9p046027 for perforce@freebsd.org; Sun, 20 Apr 2008 15:21:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 20 Apr 2008 15:21:26 GMT Message-Id: <200804201521.m3KFLQ9p046027@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 140298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Apr 2008 15:21:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=140298 Change 140298 by hselasky@hselasky_laptop001 on 2008/04/20 15:20:31 Style: Function prototypes should be on a single line. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/umass.c#47 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/umass.c#47 (text+ko) ==== @@ -979,94 +979,36 @@ static usbd_callback_t umass_t_cbi_status_callback; static void umass_cancel_ccb(struct umass_softc *sc); +static void umass_init_shuttle(struct umass_softc *sc); +static void umass_reset(struct umass_softc *sc); +static void umass_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer, uint8_t next_xfer, uint8_t stall_xfer); +static void umass_command_start(struct umass_softc *sc, uint8_t dir, void *data_ptr, uint32_t data_len, uint32_t data_timeout, umass_callback_t *callback, union ccb *ccb); +static uint8_t umass_bbb_get_max_lun(struct umass_softc *sc); +static void umass_cbi_start_status(struct umass_softc *sc); +static void umass_t_cbi_data_clear_stall_callback(struct usbd_xfer *xfer, uint8_t next_xfer, uint8_t stall_xfer); +static int umass_cam_attach_sim(struct umass_softc *sc); +static void umass_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb); +static void umass_cam_rescan(struct umass_softc *sc); +static void umass_cam_attach(struct umass_softc *sc); +static void umass_cam_detach_sim(struct umass_softc *sc); +static void umass_cam_action(struct cam_sim *sim, union ccb *ccb); +static void umass_cam_poll(struct cam_sim *sim); +static void umass_cam_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue, uint8_t status); +static void umass_cam_sense_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue, uint8_t status); +static void umass_cam_quirk_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue, uint8_t status); +static uint8_t umass_scsi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len); +static uint8_t umass_rbc_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len); -static void - umass_init_shuttle(struct umass_softc *sc); - -static void - umass_reset(struct umass_softc *sc); - -static void -umass_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer, - uint8_t next_xfer, - uint8_t stall_xfer); -static void -umass_command_start(struct umass_softc *sc, uint8_t dir, - void *data_ptr, uint32_t data_len, - uint32_t data_timeout, umass_callback_t *callback, - union ccb *ccb); -static uint8_t - umass_bbb_get_max_lun(struct umass_softc *sc); - -static void - umass_cbi_start_status(struct umass_softc *sc); - -static void -umass_t_cbi_data_clear_stall_callback(struct usbd_xfer *xfer, - uint8_t next_xfer, - uint8_t stall_xfer); -static int - umass_cam_attach_sim(struct umass_softc *sc); - -static void - umass_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb); - -static void - umass_cam_rescan(struct umass_softc *sc); +static uint8_t umass_ufi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len); +static uint8_t umass_atapi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len); +static uint8_t umass_no_transform(struct umass_softc *sc, uint8_t *cmd, uint8_t cmdlen); +static uint8_t umass_std_transform(struct umass_softc *sc, union ccb *ccb, uint8_t *cmd, uint8_t cmdlen); -static void - umass_cam_attach(struct umass_softc *sc); - -static void - umass_cam_detach_sim(struct umass_softc *sc); - -static void - umass_cam_action(struct cam_sim *sim, union ccb *ccb); - -static void - umass_cam_poll(struct cam_sim *sim); - -static void -umass_cam_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue, - uint8_t status); -static void -umass_cam_sense_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue, - uint8_t status); -static void -umass_cam_quirk_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue, - uint8_t status); -static uint8_t -umass_scsi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, - uint8_t cmd_len); -static uint8_t - umass_rbc_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len); - -static uint8_t -umass_ufi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, - uint8_t cmd_len); -static uint8_t -umass_atapi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, - uint8_t cmd_len); -static uint8_t -umass_no_transform(struct umass_softc *sc, uint8_t *cmd, - uint8_t cmdlen); -static uint8_t -umass_std_transform(struct umass_softc *sc, union ccb *ccb, - uint8_t *cmd, uint8_t cmdlen); - #ifdef USB_DEBUG -static void - umass_bbb_dump_cbw(struct umass_softc *sc, umass_bbb_cbw_t *cbw); - -static void - umass_bbb_dump_csw(struct umass_softc *sc, umass_bbb_csw_t *csw); - -static void - umass_cbi_dump_cmd(struct umass_softc *sc, void *cmd, uint8_t cmdlen); - -static void -umass_dump_buffer(struct umass_softc *sc, uint8_t *buffer, uint32_t buflen, - uint32_t printlen); +static void umass_bbb_dump_cbw(struct umass_softc *sc, umass_bbb_cbw_t *cbw); +static void umass_bbb_dump_csw(struct umass_softc *sc, umass_bbb_csw_t *csw); +static void umass_cbi_dump_cmd(struct umass_softc *sc, void *cmd, uint8_t cmdlen); +static void umass_dump_buffer(struct umass_softc *sc, uint8_t *buffer, uint32_t buflen, uint32_t printlen); #endif