The branch main has been updated by imp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=8259fc46ac37e56eb819760b611be9564793dc00

commit 8259fc46ac37e56eb819760b611be9564793dc00
Author:     Warner Losh <i...@freebsd.org>
AuthorDate: 2023-06-19 20:42:48 +0000
Commit:     Warner Losh <i...@freebsd.org>
CommitDate: 2023-06-19 20:45:43 +0000

    camcontrol: Label the unused command args
    
    Remove CAM_ARG_FORMAT_{BLOCK,BLI,PHYS} since they are not used.  Label
    all the unused CAM_ARG_ bits as unused in comments to make them stand
    out.
    
    Sponsored by:           Netflix
    Reviewed by:            mav
    Differential Revision:  https://reviews.freebsd.org/D40520
---
 sbin/camcontrol/camcontrol.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index 55a6ba93c99b..49786dae9ffe 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -123,18 +123,21 @@ typedef enum {
        CAM_ARG_LUN             = 0x00000010,
        CAM_ARG_EJECT           = 0x00000020,
        CAM_ARG_UNIT            = 0x00000040,
-       CAM_ARG_FORMAT_BLOCK    = 0x00000080,
-       CAM_ARG_FORMAT_BFI      = 0x00000100,
-       CAM_ARG_FORMAT_PHYS     = 0x00000200,
+                       /* unused 0x00000080 */
+                       /* unused 0x00000100 */
+                       /* unused 0x00000200 */
        CAM_ARG_PLIST           = 0x00000400,
        CAM_ARG_GLIST           = 0x00000800,
        CAM_ARG_GET_SERIAL      = 0x00001000,
        CAM_ARG_GET_STDINQ      = 0x00002000,
        CAM_ARG_GET_XFERRATE    = 0x00004000,
        CAM_ARG_INQ_MASK        = 0x00007000,
+                       /* unused 0x00008000 */
+                       /* unused 0x00010000 */
        CAM_ARG_TIMEOUT         = 0x00020000,
        CAM_ARG_CMD_IN          = 0x00040000,
        CAM_ARG_CMD_OUT         = 0x00080000,
+                       /* unused 0x00100000 */
        CAM_ARG_ERR_RECOVER     = 0x00200000,
        CAM_ARG_RETRIES         = 0x00400000,
        CAM_ARG_START_UNIT      = 0x00800000,
@@ -145,6 +148,7 @@ typedef enum {
        CAM_ARG_DEBUG_XPT       = 0x10000000,
        CAM_ARG_DEBUG_PERIPH    = 0x20000000,
        CAM_ARG_DEBUG_PROBE     = 0x40000000,
+                       /* unused 0x80000000 */
 } cam_argmask;
 
 struct camcontrol_opts {

Reply via email to