BLOBMSG_TYPE_INT16,
BLOBMSG_TYPE_INT8,
__BLOBMSG_TYPE_LAST,
- BLOBMSG_TYPE_LAST = __BLOBMSG_TYPE_LAST - 1
+ BLOBMSG_TYPE_LAST = __BLOBMSG_TYPE_LAST - 1,
+ BLOBMSG_TYPE_BOOL = BLOBMSG_TYPE_INT8,
};
struct blobmsg_hdr {
static inline const char *blobmsg_name(const struct blob_attr *attr)
{
- struct blobmsg_hdr *hdr = blob_data(attr);
+ struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr);
return (const char *) hdr->name;
}
+static inline int blobmsg_type(const struct blob_attr *attr)
+{
+ return blob_id(attr);
+}
+
static inline void *blobmsg_data(const struct blob_attr *attr)
{
- struct blobmsg_hdr *hdr = blob_data(attr);
- return (char *) hdr + blobmsg_hdrlen(hdr->namelen);
+ struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr);
+ return (char *) hdr + blobmsg_hdrlen(be16_to_cpu(hdr->namelen));
}
static inline int blobmsg_data_len(const struct blob_attr *attr)
{
uint8_t *start, *end;
- start = blob_data(attr);
- end = blobmsg_data(attr);
+ start = (uint8_t *) blob_data(attr);
+ end = (uint8_t *) blobmsg_data(attr);
return blob_len(attr) - (end - start);
}
static inline int
blobmsg_add_u16(struct blob_buf *buf, const char *name, uint16_t val)
{
+ val = cpu_to_be16(val);
return blobmsg_add_field(buf, BLOBMSG_TYPE_INT16, name, &val, 2);
}
static inline int
blobmsg_add_u32(struct blob_buf *buf, const char *name, uint32_t val)
{
+ val = cpu_to_be32(val);
return blobmsg_add_field(buf, BLOBMSG_TYPE_INT32, name, &val, 4);
}
static inline int
blobmsg_add_u64(struct blob_buf *buf, const char *name, uint64_t val)
{
+ val = cpu_to_be64(val);
return blobmsg_add_field(buf, BLOBMSG_TYPE_INT64, name, &val, 8);
}
return *(uint8_t *) blobmsg_data(attr);
}
+static inline bool blobmsg_get_bool(struct blob_attr *attr)
+{
+ return *(uint8_t *) blobmsg_data(attr);
+}
+
static inline uint16_t blobmsg_get_u16(struct blob_attr *attr)
{
- return *(uint16_t *) blobmsg_data(attr);
+ return be16_to_cpu(*(uint16_t *) blobmsg_data(attr));
}
static inline uint32_t blobmsg_get_u32(struct blob_attr *attr)
{
- return *(uint32_t *) blobmsg_data(attr);
+ return be32_to_cpu(*(uint32_t *) blobmsg_data(attr));
}
static inline uint64_t blobmsg_get_u64(struct blob_attr *attr)
{
- return *(uint64_t *) blobmsg_data(attr);
+ return be64_to_cpu(*(uint64_t *) blobmsg_data(attr));
}
void *blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen);
void blobmsg_add_string_buffer(struct blob_buf *buf);
-char *blobmsg_format_json(struct blob_attr *attr, bool list);
+/* blobmsg to json formatting */
#define blobmsg_for_each_attr(pos, attr, rem) \
for (rem = blobmsg_data_len(attr), pos = blobmsg_data(attr); \
- (blob_pad_len(pos) <= rem) && \
+ rem > 0 && (blob_pad_len(pos) <= rem) && \
(blob_pad_len(pos) >= sizeof(struct blob_attr)); \
rem -= blob_pad_len(pos), pos = blob_next(pos))