From: asterix Date: Wed, 28 Apr 2010 13:13:22 +0000 (+0000) Subject: Use log module, implement recv function. Some little refactor and update the cfg... X-Git-Tag: 2.5.0~346 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=1f39f34d8ed6d5641ee9c2bca0bfce7de283d73e;p=bertos.git Use log module, implement recv function. Some little refactor and update the cfg file. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3562 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/bertos/cfg/cfg_pocketbus.h b/bertos/cfg/cfg_pocketbus.h index 687e535d..aa0b090b 100644 --- a/bertos/cfg/cfg_pocketbus.h +++ b/bertos/cfg/cfg_pocketbus.h @@ -32,14 +32,29 @@ * * \brief Configuration file for pocketbus module. * - * \version $Id$ - * * \author Daniele Basile */ #ifndef CFG_POCKETBUS_H #define CFG_POCKETBUS_H +/** + * Module logging level. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_level" + */ +#define POCKETBUS_LOG_LEVEL LOG_LVL_ERR + +/** + * Module logging format. + * + * $WIZ$ type = "enum" + * $WIZ$ value_list = "log_format" + */ +#define POCKETBUS_LOG_FORMAT LOG_FMT_TERSE + + /** *Buffer len for pockebus protocol. * $WIZ$ type = "int" @@ -47,4 +62,10 @@ */ #define CONFIG_POCKETBUS_BUFLEN 128 +/** + * Command replay timeout in milliseconds. + * $WIZ$ type = "int" + */ +#define CONFIG_POCKETBUS_CMD_REPLY_TIMEOUT 50 + #endif /* CFG_POCKETBUS_H */ diff --git a/bertos/net/pocketbus.c b/bertos/net/pocketbus.c index 61d4d2b4..117e40d0 100644 --- a/bertos/net/pocketbus.c +++ b/bertos/net/pocketbus.c @@ -78,8 +78,14 @@ #include "pocketbus.h" -#include +#include "cfg/cfg_pocketbus.h" + +// Define logging setting (for cfg/log.h module). +#define LOG_LEVEL POCKETBUS_LOG_LEVEL +#define LOG_VERBOSITY POCKETBUS_LOG_FORMAT +#include #include +#include #include @@ -264,7 +270,7 @@ bool pocketbus_recv(struct PocketBusCtx *ctx, struct PocketMsg *msg) */ if (kfile_error(ctx->fd)) { - TRACEMSG("fd status[%04X]", kfile_error(ctx->fd)); + LOG_ERR("fd status[%04X]\n", kfile_error(ctx->fd)); kfile_clearerr(ctx->fd); } diff --git a/bertos/net/pocketcmd.c b/bertos/net/pocketcmd.c index 3c92a2fa..14bdc020 100644 --- a/bertos/net/pocketcmd.c +++ b/bertos/net/pocketcmd.c @@ -50,16 +50,20 @@ * The CMD ID used is the same supplied by the master when * the command was sent. * - * \version $Id$ - * * \author Francesco Sacchi */ #include "pocketcmd.h" #include "pocketbus.h" -#include +#include "cfg/cfg_pocketbus.h" + +// Define logging setting (for cfg/log.h module). +#define LOG_LEVEL POCKETBUS_LOG_LEVEL +#define LOG_VERBOSITY POCKETBUS_LOG_FORMAT +#include #include +#include #include #include @@ -74,6 +78,26 @@ * Call it to read and process pocketBus commands. */ void pocketcmd_poll(struct PocketCmdCtx *ctx) +{ + PocketCmdMsg msg; + while (pocketcmd_recv(ctx, &msg)) + { + /* Check for command callback */ + pocketcmd_hook_t callback = ctx->search(msg.cmd); + + /* Call it if exists */ + if (callback) + callback(&msg); + } +} + + + +/** + * pocketBus Command recv function. + * Call it to read and process pocketBus commands. + */ +bool pocketcmd_recv(struct PocketCmdCtx *ctx, PocketCmdMsg *recv_msg) { PocketMsg msg; @@ -108,25 +132,19 @@ void pocketcmd_poll(struct PocketCmdCtx *ctx) if (cmd == ctx->waiting) ctx->waiting = PKTCMD_NULL; - /* Check for command callback */ - pocketcmd_hook_t callback = ctx->search(cmd); + recv_msg->cmd_ctx = ctx; + recv_msg->cmd = cmd; + recv_msg->len = msg.len - sizeof(PocketCmdHdr); + recv_msg->buf = msg.payload + sizeof(PocketCmdHdr); - /* Call it if exists */ - if (callback) - { - PocketCmdMsg cmd_msg; - - cmd_msg.cmd_ctx = ctx; - cmd_msg.cmd = cmd; - cmd_msg.len = msg.len - sizeof(PocketCmdHdr); - cmd_msg.buf = msg.payload + sizeof(PocketCmdHdr); - - callback(&cmd_msg); - } + return true; } } + + return false; } + /** * Send command \a cmd to/from slave adding \a len arguments in \a buf. * Address used is contained in \a ctx->addr . @@ -139,14 +157,14 @@ bool pocketcmd_send(struct PocketCmdCtx *ctx, pocketcmd_t cmd, const void *buf, if (ctx->waiting != PKTCMD_NULL) { /* Check is reply timeout is elapsed */ - if (timer_clock() - ctx->reply_timer < ms_to_ticks(PKTCMD_REPLY_TIMEOUT)) + if (timer_clock() - ctx->reply_timer < ms_to_ticks(CONFIG_POCKETBUS_CMD_REPLY_TIMEOUT)) { - TRACEMSG("Pkt discard! waiting cmd[%04X]\n", ctx->waiting); + LOG_ERR("Pkt discard! waiting cmd[%04X]\n", ctx->waiting); return false; } else { - TRACEMSG("Timeout waiting cmd[%04X]\n", ctx->waiting); + LOG_INFO("Timeout waiting cmd[%04X]\n", ctx->waiting); ctx->waiting = PKTCMD_NULL; } } @@ -162,9 +180,10 @@ bool pocketcmd_send(struct PocketCmdCtx *ctx, pocketcmd_t cmd, const void *buf, if (wait_reply) { - ctx->waiting = cmd; + ctx->waiting = be16_to_cpu(cmd); ctx->reply_timer = timer_clock(); } + return true; } diff --git a/bertos/net/pocketcmd.h b/bertos/net/pocketcmd.h index 1cdc40df..8bfd5e09 100644 --- a/bertos/net/pocketcmd.h +++ b/bertos/net/pocketcmd.h @@ -31,8 +31,6 @@ * * \brief PocketBus command abstraction layer. * - * \version $Id$ - * * \author Francesco Sacchi * * $WIZ$ module_name = "pocketcmd" @@ -47,8 +45,6 @@ #define PKTCMD_NULL 0 ///< pocketBus Null command -#define PKTCMD_REPLY_TIMEOUT 50 ///< Command replay timeout in milliseconds - typedef uint16_t pocketcmd_t; ///< Type for Command IDs /** @@ -116,6 +112,7 @@ INLINE void pocketcmd_setAddr(struct PocketCmdCtx *ctx, pocketbus_addr_t addr) void pocketcmd_init(struct PocketCmdCtx *ctx, struct PocketBusCtx *bus_ctx, pocketbus_addr_t addr, pocketcmd_lookup_t search); void pocketcmd_poll(struct PocketCmdCtx *ctx); bool pocketcmd_send(struct PocketCmdCtx *ctx, pocketcmd_t cmd, const void *buf, size_t len, bool has_replay); +bool pocketcmd_recv(struct PocketCmdCtx *ctx, PocketCmdMsg *recv_msg); void pocketcmd_replyNak(struct PocketCmdMsg *msg); void pocketcmd_replyAck(struct PocketCmdMsg *msg); @@ -136,5 +133,17 @@ INLINE bool pocketcmd_slaveReply(struct PocketCmdCtx *ctx, pocketcmd_t cmd, cons return pocketcmd_send(ctx, cmd, buf, len, false); } +/** + * Return true if message contain NAK. + */ +INLINE bool pocketcmd_checkNak(struct PocketCmdMsg *msg) +{ + if (msg->buf[0] == POCKETBUS_NAK) + return true; + + return false; +} + + #endif /* NET_POCKETCMD_H */