d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move common logpage routines into nvmecontrol.h

Browse Source 
For the upcoming move of vendor specific code into vendor specific
files, make the common logpage routines global and move them to
nvmecontrol.h.

Sponsored by: Netflix
Differential Revision: https://reviews.freebsd.org/D18403
This commit is contained in:
Warner Losh 2018-12-02 23:12:26 +00:00
parent aecd1901a9
commit a773b08b88
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=341409
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sbin/nvmecontrol/logpage.c
View File

@ -53,16 +53,9 @@ SET_DECLARE(logpage, struct logpage_function);
#define LOGPAGE_USAGE \ #define LOGPAGE_USAGE \
" nvmecontrol logpage <-p page_id> [-b] [-v vendor] [-x] <controller id|namespace id>\n" \ " nvmecontrol logpage <-p page_id> [-b] [-v vendor] [-x] <controller id|namespace id>\n" \
#define DEFAULT_SIZE (4096)
#define MAX_FW_SLOTS (7) #define MAX_FW_SLOTS (7)
struct kv_name const char *
{
uint32_t key;
const char *name;
};
static const char *
kv_lookup(const struct kv_name *kv, size_t kv_count, uint32_t key) kv_lookup(const struct kv_name *kv, size_t kv_count, uint32_t key)
{ {
static char bad[32]; static char bad[32];

8
sbin/nvmecontrol/nvmecontrol.h
View File

@ -69,6 +69,14 @@ struct logpage_function {
} ; \ } ; \
NVME_LOGPAGESET(unique ## _lpf) NVME_LOGPAGESET(unique ## _lpf)
#define DEFAULT_SIZE (4096)
struct kv_name {
uint32_t key;
const char *name;
};
const char *kv_lookup(const struct kv_name *kv, size_t kv_count, uint32_t key);
#define NVME_CTRLR_PREFIX "nvme" #define NVME_CTRLR_PREFIX "nvme"
#define NVME_NS_PREFIX "ns" #define NVME_NS_PREFIX "ns"