X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fnet%2Fpocketcmd.c;h=14bdc020d2a20f00adbb82a49763f61236c7d396;hb=024bf80e5f29e4de00d0813d23a4d3b67245ead7;hp=d59cbf41057de9a2bce8e175f23b5fa6f9b5e456;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git diff --git a/bertos/net/pocketcmd.c b/bertos/net/pocketcmd.c index d59cbf41..14bdc020 100644 --- a/bertos/net/pocketcmd.c +++ b/bertos/net/pocketcmd.c @@ -1,12 +1,33 @@ /** * \file * + * This file is part of BeRTOS. * - * \version $Id: pocketcmd.c 16587 2007-10-02 14:31:02Z batt $ + * Bertos is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * \author Francesco Sacchi + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * As a special exception, you may use this file as part of a free software + * library without restriction. Specifically, if other files instantiate + * templates or use macros or inline functions from this file, or you compile + * this file and link it with other files to produce an executable, this + * file does not by itself cause the resulting executable to be covered by + * the GNU General Public License. This exception does not however + * invalidate any other reasons why the executable file might be covered by + * the GNU General Public License. + * + * Copyright 2007 Develer S.r.l. (http://www.develer.com/) + * --> * * \brief pocketBus protocol Command layer implementation. * @@ -28,18 +49,27 @@ * * The CMD ID used is the same supplied by the master when * the command was sent. + * + * \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 -#include +#include +#include #include @@ -48,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; @@ -58,32 +108,43 @@ void pocketcmd_poll(struct PocketCmdCtx *ctx) if (msg.addr == ctx->addr || msg.addr == POCKETBUS_BROADCAST_ADDR) { - const PocketCmdHdr *hdr = (const PocketCmdHdr *)msg.payload; + + #if CPU_AVR + const PocketCmdHdr *hdr = (const PocketCmdHdr *)msg.payload; + #else + #if !CPU_ARM + #warning Fix alignment problem.. + /* + * The code below make one memcopy, this the only way to + * solve alignment problem on ARM. If you are use other + * architecture you should find other way to optimize + * this code. + */ + #endif + PocketCmdHdr hd; + memcpy(&hd, msg.payload, sizeof(PocketCmdHdr)); + const PocketCmdHdr *hdr = &hd; + #endif + pocketcmd_t cmd = be16_to_cpu(hdr->cmd); /* We're no longer waiting for a reply (in case we were) */ if (cmd == ctx->waiting) ctx->waiting = PKTCMD_NULL; - /* Check for command callback */ - pocketcmd_hook_t callback = ctx->search(cmd); - - /* 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); + recv_msg->cmd_ctx = ctx; + recv_msg->cmd = cmd; + recv_msg->len = msg.len - sizeof(PocketCmdHdr); + recv_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 . @@ -96,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; } } @@ -119,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; }