1 files changed, 23 insertions, 23 deletions

diff --git a/lib/pbdrv/pb-serial.c b/lib/pbdrv/pb-serial.c
index 95bb8fb..9b20bf9 100644
--- a/lib/pbdrv/pb-serial.c
+++ b/lib/pbdrv/pb-serial.c
@@ -3,68 +3,68 @@
 #include "pb-serial.h"
 #include "pb-types.h"
 
-void pbdrv_serialize(mpack_writer_t * writer, const pb_msg_t * msg) {
-	pbdrv_sr_msg_header(writer, msg);
+void pb_ser_w(mpack_writer_t * writer, const pb_msg_t * msg) {
+	pb_ser_w_msg_header(writer, msg);
 	if (msg->msg == NULL) return;
 	switch (msg->type) {
-		case PB_CMD_REQ_READ: return pbdrv_sr_cmd_req_read(writer, msg);
-		case PB_CMD_RES_READ: return pbdrv_sr_cmd_res_read(writer, msg);
+		case PB_CMD_REQ_READ: return pb_ser_w_cmd_req_read(writer, msg);
+		case PB_CMD_RES_READ: return pb_ser_w_cmd_res_read(writer, msg);
 		default: break;
 	}
 }
-void pbdrv_deserialize(mpack_reader_t * reader, pb_msg_t * msg) {
-	pbdrv_dsr_msg_header(reader, msg);
+void pb_ser_r(mpack_reader_t * reader, pb_msg_t * msg) {
+	pb_ser_r_msg_header(reader, msg);
 	switch (msg->type) {
-		case PB_CMD_REQ_READ: return pbdrv_dsr_cmd_req_read(reader, msg);
-		case PB_CMD_RES_READ: return pbdrv_dsr_cmd_res_read(reader, msg);
+		case PB_CMD_REQ_READ: return pb_ser_r_cmd_req_read(reader, msg);
+		case PB_CMD_RES_READ: return pb_ser_r_cmd_res_read(reader, msg);
 		default: break;
 	}
 }
-void pbdrv_free(pb_msg_t * msg) {
+void pb_ser_free(pb_msg_t * msg) {
 	if (msg == NULL) return;
 
 	switch (msg->type) {
-		case PB_CMD_REQ_READ: return pbdrv_free_cmd_req_read(msg);
-		case PB_CMD_RES_READ: return pbdrv_free_cmd_res_read(msg);
+		case PB_CMD_REQ_READ: return pb_ser_free_cmd_req_read(msg);
+		case PB_CMD_RES_READ: return pb_ser_free_cmd_res_read(msg);
 		default: break;
 	}
-	pbdrv_free_msg_header(msg);
+	pb_ser_free_msg_header(msg);
 }
 
-void pbdrv_sr_msg_header(mpack_writer_t * writer, const pb_msg_t * msg) {
+void pb_ser_w_msg_header(mpack_writer_t * writer, const pb_msg_t * msg) {
 	mpack_write_u8(writer, msg->type);
-	// TODO: if pbdrv is compiled under the pbdrv-mod target, place
-	// PBDRV_MOD_ADDR in this field
+	// TODO: if pb is compiled under the pb-mod target, place
+	// PB_MOD_ADDR in this field
 	mpack_write_u16(writer, msg->sender);
 }
-void pbdrv_dsr_msg_header(mpack_reader_t * reader, pb_msg_t * msg) {
+void pb_ser_r_msg_header(mpack_reader_t * reader, pb_msg_t * msg) {
 	msg->type = mpack_expect_u8(reader);
 	msg->sender = mpack_expect_u16(reader);
 }
-void pbdrv_free_msg_header(pb_msg_t * msg) { }
+void pb_ser_free_msg_header(pb_msg_t * msg) { }
 
-void pbdrv_sr_cmd_req_read(mpack_writer_t * writer, const pb_msg_t * _msg) {
+void pb_ser_w_cmd_req_read(mpack_writer_t * writer, const pb_msg_t * _msg) {
 	pb_cmd_req_read_t * msg = _msg->msg;
 	mpack_write_u8(writer, msg->propid);
 }
-void pbdrv_dsr_cmd_req_read(mpack_reader_t * reader, pb_msg_t * _msg) {
+void pb_ser_r_cmd_req_read(mpack_reader_t * reader, pb_msg_t * _msg) {
 	pb_cmd_req_read_t * msg = _msg->msg = malloc(sizeof(pb_cmd_req_read_t));
 	msg->propid = mpack_expect_u8(reader);
 }
-void pbdrv_free_cmd_req_read(pb_msg_t * _msg) {
+void pb_ser_free_cmd_req_read(pb_msg_t * _msg) {
 	if (_msg->msg != NULL) {
 		free(_msg->msg);
 		_msg->msg = NULL;
 	}
 }
 
-void pbdrv_sr_cmd_res_read(mpack_writer_t * writer, const pb_msg_t * _msg) {
+void pb_ser_w_cmd_res_read(mpack_writer_t * writer, const pb_msg_t * _msg) {
 	pb_cmd_res_read_t * msg = _msg->msg;
 
 	mpack_write_u8(writer, msg->propid);
 	mpack_write_bin(writer, (char *) msg->value, msg->_value_size);
 }
-void pbdrv_dsr_cmd_res_read(mpack_reader_t * reader, pb_msg_t * _msg) {
+void pb_ser_r_cmd_res_read(mpack_reader_t * reader, pb_msg_t * _msg) {
 	pb_cmd_res_read_t * msg = _msg->msg = malloc(sizeof(pb_cmd_res_read_t));
 
 	msg->propid = mpack_expect_u8(reader);
@@ -72,7 +72,7 @@ void pbdrv_dsr_cmd_res_read(mpack_reader_t * reader, pb_msg_t * _msg) {
 	msg->value = (uint8_t *) mpack_read_bytes_alloc(reader, msg->_value_size);
 	mpack_done_bin(reader);
 }
-void pbdrv_free_cmd_res_read(pb_msg_t * _msg) {
+void pb_ser_free_cmd_res_read(pb_msg_t * _msg) {
 	if (_msg->msg != NULL) {
 		pb_cmd_res_read_t * msg = _msg->msg;
 		if (msg->value != NULL) {