diff options
| author | pjd <pjd@FreeBSD.org> | 2010-10-24 17:22:34 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2010-10-24 17:22:34 +0000 |
| commit | cd45fc19c2ccd171da623767221828ae5508ea64 (patch) | |
| tree | c7533d8010ac0505d49c8a672773e39c9b647807 | |
| parent | ba204fa87ef51371c7252b651a25912e15f77a2c (diff) | |
| download | FreeBSD-src-cd45fc19c2ccd171da623767221828ae5508ea64.zip FreeBSD-src-cd45fc19c2ccd171da623767221828ae5508ea64.tar.gz | |
Move all NV defines into nv.c, they are not used externally thus there is
no need to make then visible from outside.
MFC after: 3 days
| -rw-r--r-- | sbin/hastd/nv.c | 27 | ||||
| -rw-r--r-- | sbin/hastd/nv.h | 27 |
2 files changed, 27 insertions, 27 deletions
diff --git a/sbin/hastd/nv.c b/sbin/hastd/nv.c index 49b0cbb..a0de09a 100644 --- a/sbin/hastd/nv.c +++ b/sbin/hastd/nv.c @@ -46,6 +46,33 @@ __FBSDID("$FreeBSD$"); #include <ebuf.h> #include <nv.h> +#define NV_TYPE_INT8 1 +#define NV_TYPE_UINT8 2 +#define NV_TYPE_INT16 3 +#define NV_TYPE_UINT16 4 +#define NV_TYPE_INT32 5 +#define NV_TYPE_UINT32 6 +#define NV_TYPE_INT64 7 +#define NV_TYPE_UINT64 8 +#define NV_TYPE_INT8_ARRAY 9 +#define NV_TYPE_UINT8_ARRAY 10 +#define NV_TYPE_INT16_ARRAY 11 +#define NV_TYPE_UINT16_ARRAY 12 +#define NV_TYPE_INT32_ARRAY 13 +#define NV_TYPE_UINT32_ARRAY 14 +#define NV_TYPE_INT64_ARRAY 15 +#define NV_TYPE_UINT64_ARRAY 16 +#define NV_TYPE_STRING 17 + +#define NV_TYPE_MASK 0x7f +#define NV_TYPE_FIRST NV_TYPE_INT8 +#define NV_TYPE_LAST NV_TYPE_STRING + +#define NV_ORDER_NETWORK 0x00 +#define NV_ORDER_HOST 0x80 + +#define NV_ORDER_MASK 0x80 + #define NV_MAGIC 0xaea1e struct nv { int nv_magic; diff --git a/sbin/hastd/nv.h b/sbin/hastd/nv.h index 1677548..7aee3c4 100644 --- a/sbin/hastd/nv.h +++ b/sbin/hastd/nv.h @@ -41,33 +41,6 @@ #include <ebuf.h> -#define NV_TYPE_INT8 1 -#define NV_TYPE_UINT8 2 -#define NV_TYPE_INT16 3 -#define NV_TYPE_UINT16 4 -#define NV_TYPE_INT32 5 -#define NV_TYPE_UINT32 6 -#define NV_TYPE_INT64 7 -#define NV_TYPE_UINT64 8 -#define NV_TYPE_INT8_ARRAY 9 -#define NV_TYPE_UINT8_ARRAY 10 -#define NV_TYPE_INT16_ARRAY 11 -#define NV_TYPE_UINT16_ARRAY 12 -#define NV_TYPE_INT32_ARRAY 13 -#define NV_TYPE_UINT32_ARRAY 14 -#define NV_TYPE_INT64_ARRAY 15 -#define NV_TYPE_UINT64_ARRAY 16 -#define NV_TYPE_STRING 17 - -#define NV_TYPE_MASK 0x7f -#define NV_TYPE_FIRST NV_TYPE_INT8 -#define NV_TYPE_LAST NV_TYPE_STRING - -#define NV_ORDER_NETWORK 0x00 -#define NV_ORDER_HOST 0x80 - -#define NV_ORDER_MASK 0x80 - struct nv; struct nv *nv_alloc(void); |
