From nobody Wed Apr 02 18:43:29 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 4ZSYfV2KsSz5rQZJ; Wed, 02 Apr 2025 18:43:30 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZSYfV0s8sz3CB9; Wed, 02 Apr 2025 18:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743619410; 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=xpB6nCOUTGHg2IgCJP0yaVOGeSo1ZCFGRA4MkHde044=; b=Vp7DGL1hkqlIk5tZUm1SYnkk8G9jtSMvZMugkXjR4JELNbh03vKh/o2F7H2zAbFSrHG1Di R2KHHoKnDYzjwMellvKC6aqnYAiTjkM2M8FFSDGwG65A3Bt5W/rPvfO/i0k23wh3Yu0CoN OQqS1zqpb3GxZfgMcm9GZPptuW/V+UN80ztOk22crmZEL+me2g2w0tGTSez96pTAEWvQZM l25iU/rkd2Bp1O3uA7rU5RubINmP7KTGKFJzcYgtcyCnpEO+n6/KSqoBd0CLJWHBUlmDQg YSkcZyWzsEgJsMSS0ZvFs8rotGMMxD2n3hGG1i7RHBAZhOv1PDilFhWRK17ETw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743619410; a=rsa-sha256; cv=none; b=XYoNY1lcRx/l9PdLbPqakZSHnASb/g006DJG+PneZiTwSzUqticFRBVt4JgjjBZNSF1o0/ LLbyx5exHz9aNu10jyvvR3NwRPzB43J2m8UrbvFpp6C8PVgvxPtkOqcq0SuPA7zp2mj85L Vrfjz4+cP5Unm8X3oASjcnczJf6rVC8rt43LBUjjNk1RHfx3yClq7bwaKuL+49zWVeeRZC xi91yFEampQMz17DueJJdASHSryYbKp2RMEAZVKZcrgASOwPggViHidW9iMe44yFQaX0lY XUmaBYMWgsrk/+lCleQ1XW0i2IpLAiRkEupWcOcDio2aEIlDQQ6qmG5nwFZ4hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743619410; 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=xpB6nCOUTGHg2IgCJP0yaVOGeSo1ZCFGRA4MkHde044=; b=eymuUJ2nSZxICpuZKJbi3G6zvj9avqMRKHL0HijD5WK+WAnaaqC6jBGFwh4CF4aZUBgEP0 gR7n1CcIOWChEQw2IzDfcGwQPJ3fb1/AWDmcXs6RdpJllAzrXlkGNXJMP6GHZs8swZkP/U KJipyzCNUNwyYXI+jnfbR2/jO0YUzQ4wylMbPuIHxuS171yp0pTfJAl3epZGcG2x2+YtZX imIlF/+SOI1TzQJVuDaAmIlw2nVbFm77E/PaP5fzbi4u9z8oYwQjYCZF+MvICs6otToI3x cpQxsGpy/6UDCwELBm7BCq6FelwbWfzW/p5SeG2KjtMi9i7sscC+TryjNqFscQ== 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 4ZSYfV0QCHzCgy; Wed, 02 Apr 2025 18:43:30 +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 532IhTTn053820; Wed, 2 Apr 2025 18:43:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 532IhTxj053817; Wed, 2 Apr 2025 18:43:29 GMT (envelope-from git) Date: Wed, 2 Apr 2025 18:43:29 GMT Message-Id: <202504021843.532IhTxj053817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 480009522604 - main - ctl_ioctl.h: Do not use enums for bit fields of flags 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48000952260469477346c8a89e927af69ebc00e2 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=48000952260469477346c8a89e927af69ebc00e2 commit 48000952260469477346c8a89e927af69ebc00e2 Author: John Baldwin AuthorDate: 2025-04-02 18:40:54 +0000 Commit: John Baldwin CommitDate: 2025-04-02 18:41:22 +0000 ctl_ioctl.h: Do not use enums for bit fields of flags C++ does not permit treating enum values as individual bits used with the bitwise operators. For types that are a mask of flags, switch the typedef to an unsigned int and use preprocessor macros for flag constants. Reviewed by: imp, asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D49138 --- sys/cam/ctl/ctl_ioctl.h | 104 ++++++++++++++++++++++++------------------------ 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/sys/cam/ctl/ctl_ioctl.h b/sys/cam/ctl/ctl_ioctl.h index c7070b63eb09..ae48951f8acd 100644 --- a/sys/cam/ctl/ctl_ioctl.h +++ b/sys/cam/ctl/ctl_ioctl.h @@ -112,10 +112,10 @@ typedef enum { CTL_SS_ERROR } ctl_stats_status; -typedef enum { - CTL_STATS_FLAG_NONE = 0x00, - CTL_STATS_FLAG_TIME_VALID = 0x01 -} ctl_stats_flags; +typedef u_int ctl_stats_flags; + +#define CTL_STATS_FLAG_NONE 0x00 +#define CTL_STATS_FLAG_TIME_VALID 0x01 struct ctl_io_stats { uint32_t item; @@ -151,16 +151,16 @@ struct ctl_get_io_stats { * CONTINUOUS: This error will stay around until explicitly cleared. * DESCRIPTOR: Use descriptor sense instead of fixed sense. */ -typedef enum { - CTL_LUN_INJ_NONE = 0x000, - CTL_LUN_INJ_ABORTED = 0x001, - CTL_LUN_INJ_MEDIUM_ERR = 0x002, - CTL_LUN_INJ_UA = 0x003, - CTL_LUN_INJ_CUSTOM = 0x004, - CTL_LUN_INJ_TYPE = 0x0ff, - CTL_LUN_INJ_CONTINUOUS = 0x100, - CTL_LUN_INJ_DESCRIPTOR = 0x200 -} ctl_lun_error; +typedef u_int ctl_lun_error; + +#define CTL_LUN_INJ_NONE 0x000 +#define CTL_LUN_INJ_ABORTED 0x001 +#define CTL_LUN_INJ_MEDIUM_ERR 0x002 +#define CTL_LUN_INJ_UA 0x003 +#define CTL_LUN_INJ_CUSTOM 0x004 +#define CTL_LUN_INJ_TYPE 0x0ff +#define CTL_LUN_INJ_CONTINUOUS 0x100 +#define CTL_LUN_INJ_DESCRIPTOR 0x200 /* * Flags to specify what type of command the given error pattern will @@ -180,18 +180,18 @@ typedef enum { * RANGE: For read/write commands, act when the LBA is in the * specified range. */ -typedef enum { - CTL_LUN_PAT_NONE = 0x000, - CTL_LUN_PAT_READ = 0x001, - CTL_LUN_PAT_WRITE = 0x002, - CTL_LUN_PAT_READWRITE = CTL_LUN_PAT_READ | CTL_LUN_PAT_WRITE, - CTL_LUN_PAT_READCAP = 0x004, - CTL_LUN_PAT_TUR = 0x008, - CTL_LUN_PAT_ANY = 0x0ff, - CTL_LUN_PAT_MASK = 0x0ff, - CTL_LUN_PAT_CMD = 0x100, - CTL_LUN_PAT_RANGE = 0x200 -} ctl_lun_error_pattern; +typedef u_int ctl_lun_error_pattern; + +#define CTL_LUN_PAT_NONE 0x000 +#define CTL_LUN_PAT_READ 0x001 +#define CTL_LUN_PAT_WRITE 0x002 +#define CTL_LUN_PAT_READWRITE CTL_LUN_PAT_READ | CTL_LUN_PAT_WRITE +#define CTL_LUN_PAT_READCAP 0x004 +#define CTL_LUN_PAT_TUR 0x008 +#define CTL_LUN_PAT_ANY 0x0ff +#define CTL_LUN_PAT_MASK 0x0ff +#define CTL_LUN_PAT_CMD 0x100 +#define CTL_LUN_PAT_RANGE 0x200 /* * This structure allows the user to specify a particular CDB pattern to @@ -231,10 +231,10 @@ struct ctl_error_desc { STAILQ_ENTRY(ctl_error_desc) links; /* Kernel use only */ }; -typedef enum { - CTL_OOA_FLAG_NONE = 0x00, - CTL_OOA_FLAG_ALL_LUNS = 0x01 -} ctl_ooa_flags; +typedef u_int ctl_ooa_flags; + +#define CTL_OOA_FLAG_NONE 0x00 +#define CTL_OOA_FLAG_ALL_LUNS 0x01 typedef enum { CTL_OOA_OK, @@ -242,16 +242,16 @@ typedef enum { CTL_OOA_ERROR } ctl_get_ooa_status; -typedef enum { - CTL_OOACMD_FLAG_NONE = 0x00, - CTL_OOACMD_FLAG_DMA = 0x01, - CTL_OOACMD_FLAG_BLOCKED = 0x02, - CTL_OOACMD_FLAG_ABORT = 0x04, - CTL_OOACMD_FLAG_RTR = 0x08, - CTL_OOACMD_FLAG_DMA_QUEUED = 0x10, - CTL_OOACMD_FLAG_STATUS_QUEUED = 0x20, - CTL_OOACMD_FLAG_STATUS_SENT = 0x40 -} ctl_ooa_cmd_flags; +typedef u_int ctl_ooa_cmd_flags; + +#define CTL_OOACMD_FLAG_NONE 0x00 +#define CTL_OOACMD_FLAG_DMA 0x01 +#define CTL_OOACMD_FLAG_BLOCKED 0x02 +#define CTL_OOACMD_FLAG_ABORT 0x04 +#define CTL_OOACMD_FLAG_RTR 0x08 +#define CTL_OOACMD_FLAG_DMA_QUEUED 0x10 +#define CTL_OOACMD_FLAG_STATUS_QUEUED 0x20 +#define CTL_OOACMD_FLAG_STATUS_SENT 0x40 struct ctl_ooa_entry { ctl_ooa_cmd_flags cmd_flags; @@ -322,18 +322,18 @@ typedef enum { * * The OFFLINE flag tells us that this LUN can not access backing store. */ -typedef enum { - CTL_LUN_FLAG_ID_REQ = 0x01, - CTL_LUN_FLAG_STOPPED = 0x02, - CTL_LUN_FLAG_NO_MEDIA = 0x04, - CTL_LUN_FLAG_PRIMARY = 0x08, - CTL_LUN_FLAG_SERIAL_NUM = 0x10, - CTL_LUN_FLAG_DEVID = 0x20, - CTL_LUN_FLAG_DEV_TYPE = 0x40, - CTL_LUN_FLAG_UNMAP = 0x80, - CTL_LUN_FLAG_EJECTED = 0x100, - CTL_LUN_FLAG_READONLY = 0x200 -} ctl_backend_lun_flags; +typedef u_int ctl_backend_lun_flags; + +#define CTL_LUN_FLAG_ID_REQ 0x01 +#define CTL_LUN_FLAG_STOPPED 0x02 +#define CTL_LUN_FLAG_NO_MEDIA 0x04 +#define CTL_LUN_FLAG_PRIMARY 0x08 +#define CTL_LUN_FLAG_SERIAL_NUM 0x10 +#define CTL_LUN_FLAG_DEVID 0x20 +#define CTL_LUN_FLAG_DEV_TYPE 0x40 +#define CTL_LUN_FLAG_UNMAP 0x80 +#define CTL_LUN_FLAG_EJECTED 0x100 +#define CTL_LUN_FLAG_READONLY 0x200 /* * LUN creation parameters: