X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=blobmsg.h;h=a63fcadd992e8f0b3f1d940dd9a60c88f29d3190;hb=8cada85b610b40a8c25477985ff5c1d26ef452d0;hp=e9782355918041a49a1eb2cee06e1ee1e3d6637b;hpb=7a0571a9ff9a9adfe7563db3067f7faf81c815a9;p=project%2Flibubox.git diff --git a/blobmsg.h b/blobmsg.h index e978235..a63fcad 100644 --- a/blobmsg.h +++ b/blobmsg.h @@ -31,7 +31,8 @@ enum blobmsg_type { 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 { @@ -55,6 +56,11 @@ static inline const char *blobmsg_name(const struct blob_attr *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); @@ -139,7 +145,35 @@ static inline int blobmsg_buf_init(struct blob_buf *buf) return blob_buf_init(buf, BLOBMSG_TYPE_TABLE); } -char *blobmsg_format_json(struct blob_attr *attr, bool list); +static inline uint8_t blobmsg_get_u8(struct blob_attr *attr) +{ + 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); +} + +static inline uint32_t blobmsg_get_u32(struct blob_attr *attr) +{ + return *(uint32_t *) blobmsg_data(attr); +} + +static inline uint64_t blobmsg_get_u64(struct blob_attr *attr) +{ + return *(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); + +/* blobmsg to json formatting */ #define blobmsg_for_each_attr(pos, attr, rem) \ for (rem = blobmsg_data_len(attr), pos = blobmsg_data(attr); \