From nobody Wed May 7 21:37:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt7rl26X4z5vKPl; Wed, 07 May 2025 21:37:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt7rk2Gj8z3lsn; Wed, 07 May 2025 21:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HNriYt9XeSQ7Az+9Epd31Mb4MzulC2QA5dWq0/F3wOw=; b=qEplsIPPSUQO6yt8RAvv12NjS5/GYilKc6h11V0xYLM5jhgZl0aFg9W2hTxfkksZVZrpAx WpPf0CElMAaFL9M+w3QG0TeiqqQ3bjcFTDf/65nGjgKvx4cXqANB1gH9W9SESpa+UE0j5+ ZHucLR8TMJ5rADb+KGHugHZd134PdIoEKjh4bCJf+xq3AQ7giep7Mfaq3qTvxVMnBJ4U1g KRUNvtvIGcOXztQVu2pDvkxYnClNDMpt22eH3pFKk+HeXVNM+F9k89d/o3D44NQnG3IjeM TdqG/NkJLK9njKsiE6BVOh4QI0b+ySsiEbIpyKGtWKVEm3AdWp4XRRxlAA0UMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HNriYt9XeSQ7Az+9Epd31Mb4MzulC2QA5dWq0/F3wOw=; b=cCISj4whRBltrobHtTzWs9EX2AozW9sLTyHgd3mtM1j3VxcW/VfIUb+t8ujHPYo9XIGo+d UJtyLPH8gNyhX3IDquByySTqLN2SCT17h9rL+zYNpqyauF2DxFQpPMFVTQddOcD5oXiIuw idD4I9IQjhrtlzBWwz6SEETYuxYEHD8kY9McmQdXs82xLjQYg+tjgUMzx1AyI2bn2U8If3 AyoYmd5faXa60iTZP7j8ud5Y87LmZesVPE+Ms6puT3r8Nhd5kiTjOKn2k09TT0qSOlglb+ TTnlqm2FRDEOs0Nk4W+qfM8DRKxsIgatiyyr6tC9rFEdxri5aBCAd2GwNzD46w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746653830; a=rsa-sha256; cv=none; b=KWpkIpoCyyiwWrQXMu48YxAq6/zsBDGeuW7ckuguOV+fwO4MjrHuZJ/CX8yklr+L2+VPDH CMqXI9hry2YWnQxpkO6w2Qd2IIH3oIR52zf5TcdrbKjyVyjjAzX5+b64oNPTw1fFaOBMT7 JJKiBZjtnBGOXgumWvsAAx+KvDEVY/ZkJ8XxPpw9/QyeBMtvTbmqyILDyXD6aXZJ+MoChg rt503hhbRj7as3FC1MuIDWbsMQlo3HubUV6Fw0+WKQpjli7t8Oey1wS0lkoxeXH3NEi51J ojIdBQqHGQhwK7Bp6iTVfjEY5ZmdcQvyKz8ZEbNEVXp4zvTbyXIfKXWVInyZFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt7rk1pWJzmvL; Wed, 07 May 2025 21:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547LbAp0092089; Wed, 7 May 2025 21:37:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547LbA8a092086; Wed, 7 May 2025 21:37:10 GMT (envelope-from git) Date: Wed, 7 May 2025 21:37:10 GMT Message-Id: <202505072137.547LbA8a092086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: bff8730c24b2 - main - umass: make *_transform() return a bool List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bff8730c24b25af4f1d1dc6fee9240c74f60fab5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bff8730c24b25af4f1d1dc6fee9240c74f60fab5 commit bff8730c24b25af4f1d1dc6fee9240c74f60fab5 Author: Warner Losh AuthorDate: 2025-05-07 16:07:27 +0000 Commit: Warner Losh CommitDate: 2025-05-07 21:36:54 +0000 umass: make *_transform() return a bool These are now boolean, so make them return a boolean. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D49470 --- sys/dev/usb/storage/umass.c | 63 ++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index 9878635f7e59..f7df9f49257e 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -299,7 +299,7 @@ typedef void (umass_callback_t)(struct umass_softc *sc, union ccb *ccb, #define STATUS_CMD_FAILED 2 /* transfer was ok, command failed */ #define STATUS_WIRE_FAILED 3 /* couldn't even get command across */ -typedef uint8_t (umass_transform_t)(struct umass_softc *sc, uint8_t *cmd_ptr, +typedef bool (umass_transform_t)(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len); /* Wire and command protocol */ @@ -490,13 +490,12 @@ static void umass_cam_sense_cb(struct umass_softc *, union ccb *, uint32_t, static void umass_cam_quirk_cb(struct umass_softc *, union ccb *, uint32_t, uint8_t); static void umass_cam_illegal_request(union ccb *ccb); -static uint8_t umass_scsi_transform(struct umass_softc *, uint8_t *, uint8_t); -static uint8_t umass_rbc_transform(struct umass_softc *, uint8_t *, uint8_t); -static uint8_t umass_ufi_transform(struct umass_softc *, uint8_t *, uint8_t); -static uint8_t umass_atapi_transform(struct umass_softc *, uint8_t *, - uint8_t); -static uint8_t umass_no_transform(struct umass_softc *, uint8_t *, uint8_t); -static uint8_t umass_std_transform(struct umass_softc *, union ccb *, uint8_t +static bool umass_scsi_transform(struct umass_softc *, uint8_t *, uint8_t); +static bool umass_rbc_transform(struct umass_softc *, uint8_t *, uint8_t); +static bool umass_ufi_transform(struct umass_softc *, uint8_t *, uint8_t); +static bool umass_atapi_transform(struct umass_softc *, uint8_t *, uint8_t); +static bool umass_no_transform(struct umass_softc *, uint8_t *, uint8_t); +static bool umass_std_transform(struct umass_softc *, union ccb *, uint8_t *, uint8_t); #ifdef USB_DEBUG @@ -2677,7 +2676,7 @@ umass_cam_quirk_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue, * SCSI specific functions */ -static uint8_t +static bool umass_scsi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len) { @@ -2685,7 +2684,7 @@ umass_scsi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, (cmd_len > sizeof(sc->sc_transfer.cmd_data))) { DPRINTF(sc, UDMASS_SCSI, "Invalid command " "length: %d bytes\n", cmd_len); - return (0); /* failure */ + return (false); /* failure */ } sc->sc_transfer.cmd_len = cmd_len; @@ -2697,7 +2696,7 @@ umass_scsi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, memset(sc->sc_transfer.cmd_data, 0, cmd_len); sc->sc_transfer.cmd_data[0] = START_STOP_UNIT; sc->sc_transfer.cmd_data[4] = SSS_START; - return (1); + return (true); } break; @@ -2709,23 +2708,23 @@ umass_scsi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, if (sc->sc_quirks & FORCE_SHORT_INQUIRY) { memcpy(sc->sc_transfer.cmd_data, cmd_ptr, cmd_len); sc->sc_transfer.cmd_data[4] = SHORT_INQUIRY_LENGTH; - return (1); + return (true); } break; } memcpy(sc->sc_transfer.cmd_data, cmd_ptr, cmd_len); - return (1); + return (true); } -static uint8_t +static bool umass_rbc_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len) { if ((cmd_len == 0) || (cmd_len > sizeof(sc->sc_transfer.cmd_data))) { DPRINTF(sc, UDMASS_SCSI, "Invalid command " "length: %d bytes\n", cmd_len); - return (0); /* failure */ + return (false); /* failure */ } switch (cmd_ptr[0]) { /* these commands are defined in RBC: */ @@ -2756,17 +2755,17 @@ umass_rbc_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len) cmd_len = 12; } sc->sc_transfer.cmd_len = cmd_len; - return (1); /* success */ + return (true); /* success */ /* All other commands are not legal in RBC */ default: DPRINTF(sc, UDMASS_SCSI, "Unsupported RBC " "command 0x%02x\n", cmd_ptr[0]); - return (0); /* failure */ + return (false); /* failure */ } } -static uint8_t +static bool umass_ufi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len) { @@ -2774,7 +2773,7 @@ umass_ufi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, (cmd_len > sizeof(sc->sc_transfer.cmd_data))) { DPRINTF(sc, UDMASS_SCSI, "Invalid command " "length: %d bytes\n", cmd_len); - return (0); /* failure */ + return (false); /* failure */ } /* An UFI command is always 12 bytes in length */ sc->sc_transfer.cmd_len = UFI_COMMAND_LENGTH; @@ -2829,21 +2828,21 @@ umass_ufi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, * know what to do. */ case SYNCHRONIZE_CACHE: - return (0); + return (false); default: DPRINTF(sc, UDMASS_SCSI, "Unsupported UFI " "command 0x%02x\n", cmd_ptr[0]); - return (0); /* failure */ + return (false); /* failure */ } memcpy(sc->sc_transfer.cmd_data, cmd_ptr, cmd_len); - return (1); /* success */ + return (true); /* success */ } /* * 8070i (ATAPI) specific functions */ -static uint8_t +static bool umass_atapi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len) { @@ -2851,7 +2850,7 @@ umass_atapi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, (cmd_len > sizeof(sc->sc_transfer.cmd_data))) { DPRINTF(sc, UDMASS_SCSI, "Invalid command " "length: %d bytes\n", cmd_len); - return (0); /* failure */ + return (false); /* failure */ } /* An ATAPI command is always 12 bytes in length. */ sc->sc_transfer.cmd_len = ATAPI_COMMAND_LENGTH; @@ -2874,7 +2873,7 @@ umass_atapi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, memcpy(sc->sc_transfer.cmd_data, cmd_ptr, cmd_len); sc->sc_transfer.cmd_data[4] = SHORT_INQUIRY_LENGTH; - return (1); + return (true); } break; @@ -2884,7 +2883,7 @@ umass_atapi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, "to START_UNIT\n"); sc->sc_transfer.cmd_data[0] = START_STOP_UNIT; sc->sc_transfer.cmd_data[4] = SSS_START; - return (1); + return (true); } break; @@ -2933,29 +2932,29 @@ umass_atapi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, } memcpy(sc->sc_transfer.cmd_data, cmd_ptr, cmd_len); - return (1); /* success */ + return (true); /* success */ } -static uint8_t +static bool umass_no_transform(struct umass_softc *sc, uint8_t *cmd, uint8_t cmdlen) { - return (0); /* failure */ + return (false); /* failure */ } -static uint8_t +static bool umass_std_transform(struct umass_softc *sc, union ccb *ccb, uint8_t *cmd, uint8_t cmdlen) { uint8_t retval; if (sc->sc_transform(sc, cmd, cmdlen)) - return (1); /* Execute command */ + return (true); /* Execute command */ xpt_freeze_devq(ccb->ccb_h.path, 1); ccb->ccb_h.status = CAM_REQ_INVALID | CAM_DEV_QFRZN; xpt_done(ccb); - return (0); /* Already failed */ + return (false); /* Already failed -- don't submit */ } #ifdef USB_DEBUG