From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8D8EFECAAD5 for ; Mon, 29 Aug 2022 14:51:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ACB4A84817; Mon, 29 Aug 2022 16:50:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="aJGwM4D1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D6CFD8493F; Mon, 29 Aug 2022 16:50:58 +0200 (CEST) Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9F32B805DA for ; Mon, 29 Aug 2022 16:50:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1661784652; bh=cLe1rGpom3Ihs9cZ5WXqX3k/3z0lFhGUe3rJc8Jsmr4=; h=X-UI-Sender-Class:Date:Subject:To:Cc:References:From:In-Reply-To; b=aJGwM4D1uqadJ/zinxcktlIsnrfMWTRNDDqME0mxH5X4nYo+OQ0sIyeLpBgL0cxip dTfJ0NaEXqTLtNJvIoA8/z44ir5lHCzKNssGZS5vrS46g4yC4Bs7iOWy66DzVTjCTF 76PBAxlR3/JAynyWEoUvASJVHvHuOfr3fDmwoNlU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [192.168.123.67] ([84.118.157.2]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MlNp7-1p7Ytl0u3J-00llhw; Mon, 29 Aug 2022 16:50:52 +0200 Message-ID: Date: Mon, 29 Aug 2022 16:50:51 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.1.2 Subject: Re: [PATCH 03/15] scsi: Move cmd_phase enum to the header Content-Language: en-US To: Simon Glass Cc: Andrew Scull , Marek Vasut , Rob Herring , Sean Anderson , Stefan Roese , U-Boot Mailing List References: <20220827151513.736395-1-sjg@chromium.org> <20220827151513.736395-4-sjg@chromium.org> From: Heinrich Schuchardt In-Reply-To: <20220827151513.736395-4-sjg@chromium.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:ESnxli2KPfClMOyzAnuSfOlWVFG++wT9UC4zPg6SPtHAzHviJKO zGDGElXh10xwMEa81X6GS9O3euLp4GgfdCs8iMgPd25IzbNPu39Rmje2OmIFS8I+KFrrHB1 EOzyxhGhzxQhWsbqDdnhqvIw9dhaILZc8j+HkH94hFmVhjf8LgfrXreKpvfav5vW5sreaWA zVu5TeDyESZavfMKsnlRw== X-UI-Out-Filterresults: notjunk:1;V03:K0:F1xv1sVB5RM=:0ze2jprMjl1YbgfjC1y3GV S7kUqjd0AzY5V/Pg3rdlfzXBcDbgbMWtzw4FfP2H/j8dbs7YTUSXX0IVc+yLyZ06qDpeL/pWa Z6zX8oMW0ECX7SJJHgw8Fp2J31LhqX+DeUPAaSuaVBr1+bP1xJP5k7fYI65bytnI56S/+ppZ+ TaCa8V0dPS/BvREM2hgCCZN2vAilhjVoNJ2jUpskD/368mZ97LNPHMsGeFj1J5S2B7ujGt90C 5RVdIKSVbnp6Hs55ZjhN06ank74oXdNXHsoEJQODYZoFFyRrJpVhP3omSb4W6jS8kqShgwPrz eLyR+yicvhuupXKZFppLcAYS/TNJXs+XEH1SC1tafBEdVay+PDVG+IkIUi90MdjarYD4fK9Vl LvMyehhm7vCmtt9KUqvYLk9Lgeq5OZM2R/xg+y4llV3Y3mNVer1Vqx1dMpV+0aNPYi3ZWlAXY LMdbZX5aSNdZistyZ+m0G3LbeDuEHUsr6A5mYEkoeAqeh2zymJ7Grjg1BP+qqYzcpqmv5voaH TRJg1qroXMvUviSi5HN2FE+OEIJNQuaKooihmh5uuwPwy268OGyXqnmIcB+WOLgorTZ47nsh9 vBcz/XWsOX2anKh8lKD+3IMrlGJ6/8qp2+xyVXJTK3xBGwOa2ILqVQ3d5UNcz76LEZVXXRy+t hkdtuxcyzkvh6qJ16MhPJTm/jnpZxdFpSBWwZesTVyPxKbHHPu7U8lnbTjACKd1g4s0kEV/Ks 8ivrE8w4bdgqT509IB3XrZyPLt954wINBHqlYG6DiPbkXKnzgVafQobktt0m1eJYdVRbZ37Bx MqsGbTAhx2KHIOAfuIRvKmu2FqHoHh5vTyP3HycVf49bMUNfs1eNPQVVYPGRqlShytSdoruz2 UnglymhlhZPyNuc8FDH9u2G02W2uBGw2Sib7yHwNmORUtS83IM1cyoDRV6gv2uarNcy3uLhsv iIhokutl7tUSk00JlzenBfWKI6hQzccUpItnKMRmEy2IhGudppJq/U/tYQKI+9dz+5eo7QFg5 m+e90pziIU2JH+F9CYyYoU7WAJNjgfWPaOtNjpFoIrbGnkr8shWx3glCyYV8lDgdGhIu1M8co 6ZDgPclbokJ37yOM/BP++VdjnFRPPsxzIyq02WnwjzXa5ZV+Gu67cspWA== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean On 8/27/22 17:15, Simon Glass wrote: > This can be used by common files, so move it to the SCSI header and rena= me > it. > > Signed-off-by: Simon Glass > --- > > drivers/usb/emul/sandbox_flash.c | 24 +++++++++--------------- > include/scsi.h | 6 ++++++ > 2 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox= _flash.c > index 7de752100c8..806aed2ef2e 100644 > --- a/drivers/usb/emul/sandbox_flash.c > +++ b/drivers/usb/emul/sandbox_flash.c > @@ -23,12 +23,6 @@ enum { > SANDBOX_FLASH_BLOCK_LEN =3D 512, > }; > > -enum cmd_phase { > - PHASE_START, > - PHASE_DATA, > - PHASE_STATUS, > -}; > - > enum { > STRINGID_MANUFACTURER =3D 1, > STRINGID_PRODUCT, > @@ -56,7 +50,7 @@ struct sandbox_flash_priv { > int alloc_len; > int transfer_len; > int read_len; > - enum cmd_phase phase; > + enum scsi_cmd_phase phase; > u32 tag; > int fd; > loff_t file_size; > @@ -290,7 +284,7 @@ static int handle_ufi_command(struct sandbox_flash_p= lat *plat, > return -EPROTONOSUPPORT; > } > > - priv->phase =3D priv->transfer_len ? PHASE_DATA : PHASE_STATUS; > + priv->phase =3D priv->transfer_len ? SCSIPH_DATA : SCSIPH_STATUS; > return 0; > } > > @@ -307,7 +301,7 @@ static int sandbox_flash_bulk(struct udevice *dev, s= truct usb_device *udev, > switch (ep) { > case SANDBOX_FLASH_EP_OUT: > switch (priv->phase) { > - case PHASE_START: > + case SCSIPH_START: > priv->alloc_len =3D 0; > priv->read_len =3D 0; > if (priv->error || len !=3D UMASS_BBB_CBW_SIZE || > @@ -322,7 +316,7 @@ static int sandbox_flash_bulk(struct udevice *dev, s= truct usb_device *udev, > priv->tag =3D cbw->dCBWTag; > return handle_ufi_command(plat, priv, cbw->CBWCDB, > cbw->bCDBLength); > - case PHASE_DATA: > + case SCSIPH_DATA: > debug("data out\n"); > break; > default: > @@ -330,7 +324,7 @@ static int sandbox_flash_bulk(struct udevice *dev, s= truct usb_device *udev, > } > case SANDBOX_FLASH_EP_IN: > switch (priv->phase) { > - case PHASE_DATA: > + case SCSIPH_DATA: > debug("data in, len=3D%x, alloc_len=3D%x, priv->read_len=3D%x\n", > len, priv->alloc_len, priv->read_len); > if (priv->read_len) { > @@ -344,22 +338,22 @@ static int sandbox_flash_bulk(struct udevice *dev,= struct usb_device *udev, > return -EIO; > priv->read_len -=3D len / SANDBOX_FLASH_BLOCK_LEN; > if (!priv->read_len) > - priv->phase =3D PHASE_STATUS; > + priv->phase =3D SCSIPH_STATUS; > } else { > if (priv->alloc_len && len > priv->alloc_len) > len =3D priv->alloc_len; > if (len > sizeof(priv->buff)) > len =3D sizeof(priv->buff); > memcpy(buff, priv->buff, len); > - priv->phase =3D PHASE_STATUS; > + priv->phase =3D SCSIPH_STATUS; > } > return len; > - case PHASE_STATUS: > + case SCSIPH_STATUS: > debug("status in, len=3D%x\n", len); > if (len > sizeof(priv->status)) > len =3D sizeof(priv->status); > memcpy(buff, &priv->status, len); > - priv->phase =3D PHASE_START; > + priv->phase =3D SCSIPH_START; > return len; > default: > break; > diff --git a/include/scsi.h b/include/scsi.h > index e5d75b0cdca..5d63963bed0 100644 > --- a/include/scsi.h > +++ b/include/scsi.h > @@ -167,6 +167,12 @@ struct scsi_cmd { > #define SCSI_WRITE_LONG 0x3F /* Write Long (O) */ > #define SCSI_WRITE_SAME 0x41 /* Write Same (O) */ > > +enum scsi_cmd_phase { Please, add Sphinx style description. Best regards Heinrich > + SCSIPH_START, > + SCSIPH_DATA, > + SCSIPH_STATUS, > +}; > + > /** > * struct scsi_plat - stores information about SCSI controller > *