ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme_spec: fix feature struct definitions

Browse Source 
Several of the 'bits' members were accidentally declared as unions
instead of structs.

Change-Id: Iaaacf79438899794581e3f69c8afb606a244eb1c
Fixes: 8d8f4ac304 ("nvme_spec: define Get/Set Feature structs")
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/404409
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Daniel Verkamp 2018-03-19 11:26:10 -07:00
parent 29e8013d05
commit 0bc4207ece
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/spdk/nvme_spec.h
View File

@ -1890,7 +1890,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_async_event_completion) == 4, "Incorre
*/ */
union spdk_nvme_feat_arbitration { union spdk_nvme_feat_arbitration {
uint32_t raw; uint32_t raw;
union { struct {
/** Arbitration Burst */ /** Arbitration Burst */
uint32_t ab : 3; uint32_t ab : 3;
@ -1913,7 +1913,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_feat_arbitration) == 4, "Incorrect siz
*/ */
union spdk_nvme_feat_power_management { union spdk_nvme_feat_power_management {
uint32_t raw; uint32_t raw;
union { struct {
/** Power State */ /** Power State */
uint32_t ps : 5; uint32_t ps : 5;
@ -1930,7 +1930,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_feat_power_management) == 4, "Incorrec
*/ */
union spdk_nvme_feat_lba_range_type { union spdk_nvme_feat_lba_range_type {
uint32_t raw; uint32_t raw;
union { struct {
/** Number of LBA Ranges */ /** Number of LBA Ranges */
uint32_t num : 6; uint32_t num : 6;
@ -1944,7 +1944,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_feat_lba_range_type) == 4, "Incorrect
*/ */
union spdk_nvme_feat_temperature_threshold { union spdk_nvme_feat_temperature_threshold {
uint32_t raw; uint32_t raw;
union { struct {
/** Temperature Threshold */ /** Temperature Threshold */
uint32_t tmpth : 16; uint32_t tmpth : 16;
@ -1964,7 +1964,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_feat_temperature_threshold) == 4, "Inc
*/ */
union spdk_nvme_feat_error_recovery { union spdk_nvme_feat_error_recovery {
uint32_t raw; uint32_t raw;
union { struct {
/** Time Limited Error Recovery */ /** Time Limited Error Recovery */
uint32_t tler : 16; uint32_t tler : 16;
@ -1981,7 +1981,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_feat_error_recovery) == 4, "Incorrect
*/ */
union spdk_nvme_feat_volatile_write_cache { union spdk_nvme_feat_volatile_write_cache {
uint32_t raw; uint32_t raw;
union { struct {
/** Volatile Write Cache Enable */ /** Volatile Write Cache Enable */
uint32_t wce : 1; uint32_t wce : 1;
@ -1995,7 +1995,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_feat_volatile_write_cache) == 4, "Inco
*/ */
union spdk_nvme_feat_number_of_queues { union spdk_nvme_feat_number_of_queues {
uint32_t raw; uint32_t raw;
union { struct {
/** Number of I/O Submission Queues Requested */ /** Number of I/O Submission Queues Requested */
uint32_t nsqr : 16; uint32_t nsqr : 16;
@ -2010,7 +2010,7 @@ SPDK_STATIC_ASSERT(sizeof(union spdk_nvme_feat_number_of_queues) == 4, "Incorrec
*/ */
union spdk_nvme_feat_interrupt_vector_configuration { union spdk_nvme_feat_interrupt_vector_configuration {
uint32_t raw; uint32_t raw;
union { struct {
/** Interrupt Vector */ /** Interrupt Vector */
uint32_t iv : 16; uint32_t iv : 16;