From owner-p4-projects@FreeBSD.ORG Wed Sep 13 16:53:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 673E216A618; Wed, 13 Sep 2006 16:53:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 24E2C16A558 for ; Wed, 13 Sep 2006 16:53:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7292443D70 for ; Wed, 13 Sep 2006 16:53:10 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8DGrABd027365 for ; Wed, 13 Sep 2006 16:53:10 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8DGrAXg027362 for perforce@freebsd.org; Wed, 13 Sep 2006 16:53:10 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 13 Sep 2006 16:53:10 GMT Message-Id: <200609131653.k8DGrAXg027362@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 106069 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: Wed, 13 Sep 2006 16:53:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=106069 Change 106069 by hselasky@hselasky_mini_itx on 2006/09/13 16:52:14 Factorize the clear stall code. Add missing "_callout" to two function names. Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#6 (text) ==== @@ -148,25 +148,23 @@ atausb_t_bbb_reset3_callback(struct usbd_xfer *xfer); static void -atausb_t_bbb_data_read_clear_stall_callback(struct usbd_xfer *xfer, - u_int8_t next_xfer); +atausb_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer, + u_int8_t next_xfer, + u_int8_t stall_xfer); static void -atausb_t_bbb_data_write_clear_stall_callback(struct usbd_xfer *xfer, - u_int8_t next_xfer); -static void atausb_t_bbb_command_callback(struct usbd_xfer *xfer); static void atausb_t_bbb_data_read_callback(struct usbd_xfer *xfer); static void -atausb_t_bbb_data_rd_cs(struct usbd_xfer *xfer); +atausb_t_bbb_data_rd_cs_callback(struct usbd_xfer *xfer); static void atausb_t_bbb_data_write_callback(struct usbd_xfer *xfer); static void -atausb_t_bbb_data_wr_cs(struct usbd_xfer *xfer); +atausb_t_bbb_data_wr_cs_callback(struct usbd_xfer *xfer); static void atausb_t_bbb_status_callback(struct usbd_xfer *xfer); @@ -249,7 +247,7 @@ .direction = -1, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, - .callback = &atausb_t_bbb_data_rd_cs, + .callback = &atausb_t_bbb_data_rd_cs_callback, .timeout = 5000, /* 5 seconds */ }, @@ -269,7 +267,7 @@ .direction = -1, .bufsize = sizeof(usb_device_request_t), .flags = USBD_USE_DMA, - .callback = &atausb_t_bbb_data_wr_cs, + .callback = &atausb_t_bbb_data_wr_cs_callback, .timeout = 5000, /* 5 seconds */ }, @@ -573,20 +571,23 @@ static void atausb_t_bbb_reset2_callback(struct usbd_xfer *xfer) { - atausb_t_bbb_data_read_clear_stall_callback(xfer, ATAUSB_T_BBB_RESET3); + atausb_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_RESET3, + ATAUSB_T_BBB_DATA_READ); return; } static void atausb_t_bbb_reset3_callback(struct usbd_xfer *xfer) { - atausb_t_bbb_data_write_clear_stall_callback(xfer, ATAUSB_T_BBB_COMMAND); + atausb_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_COMMAND, + ATAUSB_T_BBB_DATA_WRITE); return; } static void -atausb_t_bbb_data_read_clear_stall_callback(struct usbd_xfer *xfer, - u_int8_t next_xfer) +atausb_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer, + u_int8_t next_xfer, + u_int8_t stall_xfer) { struct atausb_softc *sc = xfer->priv_sc; @@ -601,34 +602,12 @@ return; tr_setup: - usbd_clear_stall_tr_setup(xfer, sc->xfer[ATAUSB_T_BBB_DATA_READ]); - usbd_clear_stall_tr_transferred(xfer, sc->xfer[ATAUSB_T_BBB_DATA_READ]); + usbd_clear_stall_tr_setup(xfer, sc->xfer[stall_xfer]); + usbd_clear_stall_tr_transferred(xfer, sc->xfer[stall_xfer]); return; } static void -atausb_t_bbb_data_write_clear_stall_callback(struct usbd_xfer *xfer, - u_int8_t next_xfer) -{ - struct atausb_softc *sc = xfer->priv_sc; - - USBD_CHECK_STATUS(xfer); - - tr_error: - atausb_tr_error(xfer); - return; - - tr_transferred: - atausb_transfer_start(sc, next_xfer); - return; - - tr_setup: - usbd_clear_stall_tr_setup(xfer, sc->xfer[ATAUSB_T_BBB_DATA_WRITE]); - usbd_clear_stall_tr_transferred(xfer, sc->xfer[ATAUSB_T_BBB_DATA_WRITE]); - return; -} - -static void atausb_t_bbb_command_callback(struct usbd_xfer *xfer) { struct atausb_softc *sc = xfer->priv_sc; @@ -731,9 +710,10 @@ } static void -atausb_t_bbb_data_rd_cs(struct usbd_xfer *xfer) +atausb_t_bbb_data_rd_cs_callback(struct usbd_xfer *xfer) { - atausb_t_bbb_data_read_clear_stall_callback(xfer, ATAUSB_T_BBB_STATUS); + atausb_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_STATUS, + ATAUSB_T_BBB_DATA_READ); return; } @@ -786,10 +766,11 @@ } static void -atausb_t_bbb_data_wr_cs(struct usbd_xfer *xfer) +atausb_t_bbb_data_wr_cs_callback(struct usbd_xfer *xfer) { - atausb_t_bbb_data_write_clear_stall_callback(xfer, ATAUSB_T_BBB_STATUS); - return; + atausb_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_STATUS, + ATAUSB_T_BBB_DATA_WRITE); + return; } static void