#include "pocketbus.h"
-#include <cfg/macros.h>
+#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 <cfg/log.h>
#include <cfg/debug.h>
+#include <cfg/macros.h>
-#include <kern/kfile.h>
+#include <io/kfile.h>
-#include <mware/byteorder.h>
+#include <cpu/byteorder.h>
#include <string.h>
/* Escape characters with special meaning */
if (c == POCKETBUS_ESC || c == POCKETBUS_STX || c == POCKETBUS_ETX)
kfile_putc(POCKETBUS_ESC, ctx->fd);
-
+
kfile_putc(c, ctx->fd);
}
/* Send STX */
kfile_putc(POCKETBUS_STX, ctx->fd);
-
+
/* Send header */
pocketbus_write(ctx, &hdr, sizeof(hdr));
}
/* Compute checksum */
rotating_update(ctx->buf, ctx->len, &ctx->in_cks);
- rotating_t recv_cks = be16_to_cpu(*((rotating_t *)(ctx->buf + ctx->len)));
+ uint8_t cks_h = *(ctx->buf + ctx->len);
+ uint8_t cks_l = *(ctx->buf + ctx->len + 1);
+
+ rotating_t recv_cks = (cks_h << 8) | cks_l;
/* Checksum check */
if (recv_cks == ctx->in_cks)
{
- PocketBusHdr *hdr = (PocketBusHdr *)(ctx->buf);
+ PocketBusHdr *hdr = (PocketBusHdr *)ctx;
+
/* Check packet version */
if (hdr->ver == POCKETBUS_VER)
{
*/
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);
}