rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace pb_type_t enum with #defines.

Browse Source 
See issue #57.
This commit is contained in:
Petteri Aimonen
2013-02-11 21:55:55 +02:00
parent c1a355b23e
commit ec4a7a0cce
1 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
pb.h
View File

@@ -6,7 +6,7 @@
* see pb_encode.h or pb_decode.h * see pb_encode.h or pb_decode.h
*/ */
#define NANOPB_VERSION 0.2.0-dev #define NANOPB_VERSION nanopb-0.2.0-dev
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
@@ -53,59 +53,59 @@
* SINT* is different, though, because it is zig-zag coded. * SINT* is different, though, because it is zig-zag coded.
*/ */
typedef enum { typedef uint8_t pb_type_t;
/************************
/************************
* Field contents types * * Field contents types *
************************/ ************************/
/* Numeric types */ /* Numeric types */
PB_LTYPE_VARINT = 0x00, /* int32, uint32, int64, uint64, bool, enum */ #define PB_LTYPE_VARINT 0x00 /* int32, uint32, int64, uint64, bool, enum */
PB_LTYPE_SVARINT = 0x01, /* sint32, sint64 */ #define PB_LTYPE_SVARINT 0x01 /* sint32, sint64 */
PB_LTYPE_FIXED32 = 0x02, /* fixed32, sfixed32, float */ #define PB_LTYPE_FIXED32 0x02 /* fixed32, sfixed32, float */
PB_LTYPE_FIXED64 = 0x03, /* fixed64, sfixed64, double */ #define PB_LTYPE_FIXED64 0x03 /* fixed64, sfixed64, double */
/* Marker for last packable field type. */ /* Marker for last packable field type. */
PB_LTYPE_LAST_PACKABLE = 0x03, #define PB_LTYPE_LAST_PACKABLE 0x03
/* Byte array with pre-allocated buffer. /* Byte array with pre-allocated buffer.
* data_size is the length of the allocated PB_BYTES_ARRAY structure. */ * data_size is the length of the allocated PB_BYTES_ARRAY structure. */
PB_LTYPE_BYTES = 0x04, #define PB_LTYPE_BYTES 0x04
/* String with pre-allocated buffer. /* String with pre-allocated buffer.
* data_size is the maximum length. */ * data_size is the maximum length. */
PB_LTYPE_STRING = 0x05, #define PB_LTYPE_STRING 0x05
/* Submessage /* Submessage
* submsg_fields is pointer to field descriptions */ * submsg_fields is pointer to field descriptions */
PB_LTYPE_SUBMESSAGE = 0x06, #define PB_LTYPE_SUBMESSAGE 0x06
/* Number of declared LTYPES */ /* Number of declared LTYPES */
PB_LTYPES_COUNT = 7, #define PB_LTYPES_COUNT 7
PB_LTYPE_MASK = 0x0F, #define PB_LTYPE_MASK 0x0F
/****************** /******************
* Modifier flags * * Modifier flags *
******************/ ******************/
/* Just the basic, write data at data_offset */ /* Just the basic, write data at data_offset */
PB_HTYPE_REQUIRED = 0x00, #define PB_HTYPE_REQUIRED 0x00
/* Write true at size_offset */ /* Write true at size_offset */
PB_HTYPE_OPTIONAL = 0x10, #define PB_HTYPE_OPTIONAL 0x10
/* Read to pre-allocated array /* Read to pre-allocated array
* Maximum number of entries is array_size, * Maximum number of entries is array_size,
* actual number is stored at size_offset */ * actual number is stored at size_offset */
PB_HTYPE_ARRAY = 0x20, #define PB_HTYPE_ARRAY 0x20
/* Works for all required/optional/repeated fields. /* Works for all required/optional/repeated fields.
* data_offset points to pb_callback_t structure. * data_offset points to pb_callback_t structure.
* LTYPE should be valid or 0 (it is ignored, but * LTYPE should be valid or 0 (it is ignored, but
* sometimes used to speculatively index an array). */ * sometimes used to speculatively index an array). */
PB_HTYPE_CALLBACK = 0x30, #define PB_HTYPE_CALLBACK 0x30
PB_HTYPE_MASK = 0xF0 #define PB_HTYPE_MASK 0xF0
} pb_packed pb_type_t;
#define PB_HTYPE(x) ((x) & PB_HTYPE_MASK) #define PB_HTYPE(x) ((x) & PB_HTYPE_MASK)
#define PB_LTYPE(x) ((x) & PB_LTYPE_MASK) #define PB_LTYPE(x) ((x) & PB_LTYPE_MASK)