X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fnet%2Fpocketcmd.c;h=3c92a2faf5883fe2c326334d5c818a29867faf7c;hb=7d7882d05d70560c3aa9e6c6fad48bd323ff2a82;hp=d59cbf41057de9a2bce8e175f23b5fa6f9b5e456;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/net/pocketcmd.c b/bertos/net/pocketcmd.c
index d59cbf41..3c92a2fa 100644
--- a/bertos/net/pocketcmd.c
+++ b/bertos/net/pocketcmd.c
@@ -1,12 +1,33 @@
 /**
  * \file
  * <!--
- * Copyright 2007 Develer S.r.l. (http://www.develer.com/)
- * -->
+ * 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 <batt@develer.com>
+ * 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,6 +49,10 @@
  *
  * The CMD ID used is the same supplied by the master when
  * the command was sent.
+ *
+ * \version $Id$
+ *
+ * \author Francesco Sacchi <batt@develer.com>
  */
 
 #include "pocketcmd.h"
@@ -39,7 +64,8 @@
 
 #include <drv/timer.h>
 
-#include <mware/byteorder.h>
+#include <cpu/byteorder.h>
+#include <cpu/detect.h>
 
 #include <string.h>
 
@@ -58,7 +84,24 @@ 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) */