sg_pt_linux.h (sdparm-1.11.tgz) | : | sg_pt_linux.h (sdparm-1.12.tgz) | ||
---|---|---|---|---|
skipping to change at line 119 | skipping to change at line 119 | |||
#include <linux/bsg.h> | #include <linux/bsg.h> | |||
#endif | #endif | |||
struct sg_pt_linux_scsi { | struct sg_pt_linux_scsi { | |||
struct sg_io_v4 io_hdr; /* use v4 header as it is more general */ | struct sg_io_v4 io_hdr; /* use v4 header as it is more general */ | |||
/* Leave io_hdr in first place of this structure */ | /* Leave io_hdr in first place of this structure */ | |||
bool is_sg; | bool is_sg; | |||
bool is_bsg; | bool is_bsg; | |||
bool is_nvme; /* OS device type, if false ignore nvme_direct */ | bool is_nvme; /* OS device type, if false ignore nvme_our_sntl */ | |||
bool nvme_direct; /* false: our SNTL; true: received NVMe command */ | bool nvme_our_sntl; /* true: our SNTL; false: received NVMe command */ | |||
bool nvme_stat_dnr; /* Do No Retry, part of completion status field */ | bool nvme_stat_dnr; /* Do No Retry, part of completion status field */ | |||
bool nvme_stat_more; /* More, part of completion status field */ | bool nvme_stat_more; /* More, part of completion status field */ | |||
bool mdxfer_out; /* direction of metadata xfer, true->data-out */ | bool mdxfer_out; /* direction of metadata xfer, true->data-out */ | |||
int dev_fd; /* -1 if not given (yet) */ | int dev_fd; /* -1 if not given (yet) */ | |||
int in_err; | int in_err; | |||
int os_err; | int os_err; | |||
int sg_version; /* for deciding whether to use v3 or v4 interface */ | int sg_version; /* for deciding whether to use v3 or v4 interface */ | |||
uint32_t nvme_nsid; /* 1 to 0xfffffffe are possibly valid, 0 | uint32_t nvme_nsid; /* 1 to 0xfffffffe are possibly valid, 0 | |||
* implies dev_fd is not a NVMe device | * implies dev_fd is not a NVMe device | |||
* (is_nvme=false) or it is a NVMe char | * (is_nvme=false) or it is a NVMe char | |||
skipping to change at line 172 | skipping to change at line 172 | |||
#endif | #endif | |||
#ifndef NVME_IOCTL_IO_CMD | #ifndef NVME_IOCTL_IO_CMD | |||
#define NVME_IOCTL_IO_CMD _IOWR('N', 0x43, struct sg_nvme_passthru_cmd) | #define NVME_IOCTL_IO_CMD _IOWR('N', 0x43, struct sg_nvme_passthru_cmd) | |||
#endif | #endif | |||
#ifndef NVME_IOCTL_RESET | #ifndef NVME_IOCTL_RESET | |||
#define NVME_IOCTL_RESET _IO('N', 0x44) | #define NVME_IOCTL_RESET _IO('N', 0x44) | |||
#endif | #endif | |||
#ifndef NVME_IOCTL_SUBSYS_RESET | #ifndef NVME_IOCTL_SUBSYS_RESET | |||
#define NVME_IOCTL_SUBSYS_RESET _IO('N', 0x45) | #define NVME_IOCTL_SUBSYS_RESET _IO('N', 0x45) | |||
#endif | #endif | |||
#ifndef NVME_IOCTL_RESCAN | ||||
#define NVME_IOCTL_RESCAN _IO('N', 0x46) | ||||
#endif | ||||
#if 0 | ||||
#define NVME_IOCTL_ADMIN64_CMD _IOWR('N', 0x47, struct nvme_passthru_cmd64) | ||||
#define NVME_IOCTL_IO64_CMD _IOWR('N', 0x48, struct nvme_passthru_cmd64) | ||||
#endif | ||||
extern bool sg_bsg_nvme_char_major_checked; | extern bool sg_bsg_nvme_char_major_checked; | |||
extern int sg_bsg_major; | extern int sg_bsg_major; | |||
extern volatile int sg_nvme_char_major; | extern volatile int sg_nvme_char_major; | |||
extern long sg_lin_page_size; | extern long sg_lin_page_size; | |||
void sg_find_bsg_nvme_char_major(int verbose); | void sg_find_bsg_nvme_char_major(int verbose); | |||
int sg_do_nvme_pt(struct sg_pt_base * vp, int fd, int time_secs, int vb); | int sg_do_nvme_pt(struct sg_pt_base * vp, int fd, int time_secs, int vb); | |||
int sg_linux_get_sg_version(const struct sg_pt_base * vp); | int sg_linux_get_sg_version(const struct sg_pt_base * vp); | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 9 lines changed or added |