mirror of
https://github.com/RfidResearchGroup/ChameleonUltra.git
synced 2026-05-12 11:22:59 -07:00
Move to PP_HTONS
This commit is contained in:
Foxushka
@@ -14,6 +14,7 @@
|
||||
#include "nrf_pwr_mgmt.h"
|
||||
#include "settings.h"
|
||||
#include "delayed_reset.h"
|
||||
#include "lwip_def.h"
|
||||
|
||||
|
||||
#define NRF_LOG_MODULE_NAME app_cmd
|
||||
@@ -921,8 +922,7 @@ data_frame_tx_t *cmd_processor_get_capabilities(uint16_t cmd, uint16_t status, u
|
||||
memset(commands, 0, count * sizeof(uint16_t));
|
||||
|
||||
for (size_t i = 0; i < count; i++) {
|
||||
// beware: wrong endianness
|
||||
commands[i] = m_data_cmd_map[i].cmd;
|
||||
commands[i] = PP_HTONS(m_data_cmd_map[i].cmd);
|
||||
}
|
||||
|
||||
return data_frame_make(cmd, status, count * sizeof(uint16_t), (uint8_t *)commands);
|
||||
|
||||
@@ -0,0 +1,142 @@
|
||||
/**
|
||||
* @file
|
||||
* various utility macros
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001-2004 Swedish Institute of Computer Science.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without modification,
|
||||
* are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice,
|
||||
* this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
|
||||
* SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
|
||||
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
|
||||
* OF SUCH DAMAGE.
|
||||
*
|
||||
* This file is part of the lwIP TCP/IP stack.
|
||||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup perf Performance measurement
|
||||
* @ingroup sys_layer
|
||||
* All defines related to this section must not be placed in lwipopts.h,
|
||||
* but in arch/perf.h!
|
||||
* Measurement calls made throughout lwip, these can be defined to nothing.
|
||||
* - PERF_START: start measuring something.
|
||||
* - PERF_STOP(x): stop measuring something, and record the result.
|
||||
*/
|
||||
|
||||
#ifndef LWIP_HDR_DEF_H
|
||||
#define LWIP_HDR_DEF_H
|
||||
|
||||
/* arch.h might define NULL already */
|
||||
#define PERF_START /* null definition */
|
||||
#define PERF_STOP(x) /* null definition */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define LWIP_MAX(x , y) (((x) > (y)) ? (x) : (y))
|
||||
#define LWIP_MIN(x , y) (((x) < (y)) ? (x) : (y))
|
||||
|
||||
/* Get the number of entries in an array ('x' must NOT be a pointer!) */
|
||||
#define LWIP_ARRAYSIZE(x) (sizeof(x)/sizeof((x)[0]))
|
||||
|
||||
/** Create uint32_t value from bytes */
|
||||
#define LWIP_MAKEU32(a,b,c,d) (((uint32_t)((a) & 0xff) << 24) | \
|
||||
((uint32_t)((b) & 0xff) << 16) | \
|
||||
((uint32_t)((c) & 0xff) << 8) | \
|
||||
(uint32_t)((d) & 0xff))
|
||||
|
||||
#ifndef NULL
|
||||
#ifdef __cplusplus
|
||||
#define NULL 0
|
||||
#else
|
||||
#define NULL ((void *)0)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if BYTE_ORDER == BIG_ENDIAN
|
||||
#define lwip_htons(x) ((uint16_t)(x))
|
||||
#define lwip_ntohs(x) ((uint16_t)(x))
|
||||
#define lwip_htonl(x) ((uint32_t)(x))
|
||||
#define lwip_ntohl(x) ((uint32_t)(x))
|
||||
#define PP_HTONS(x) ((uint16_t)(x))
|
||||
#define PP_NTOHS(x) ((uint16_t)(x))
|
||||
#define PP_HTONL(x) ((uint32_t)(x))
|
||||
#define PP_NTOHL(x) ((uint32_t)(x))
|
||||
#else /* BYTE_ORDER != BIG_ENDIAN */
|
||||
#ifndef lwip_htons
|
||||
uint16_t lwip_htons(uint16_t x);
|
||||
#endif
|
||||
#define lwip_ntohs(x) lwip_htons(x)
|
||||
|
||||
#ifndef lwip_htonl
|
||||
uint32_t lwip_htonl(uint32_t x);
|
||||
#endif
|
||||
#define lwip_ntohl(x) lwip_htonl(x)
|
||||
|
||||
/* These macros should be calculated by the preprocessor and are used
|
||||
with compile-time constants only (so that there is no little-endian
|
||||
overhead at runtime). */
|
||||
#define PP_HTONS(x) ((uint16_t)((((x) & (uint16_t)0x00ffU) << 8) | (((x) & (uint16_t)0xff00U) >> 8)))
|
||||
#define PP_NTOHS(x) PP_HTONS(x)
|
||||
#define PP_HTONL(x) ((((x) & (uint32_t)0x000000ffUL) << 24) | \
|
||||
(((x) & (uint32_t)0x0000ff00UL) << 8) | \
|
||||
(((x) & (uint32_t)0x00ff0000UL) >> 8) | \
|
||||
(((x) & (uint32_t)0xff000000UL) >> 24))
|
||||
#define PP_NTOHL(x) PP_HTONL(x)
|
||||
#endif /* BYTE_ORDER == BIG_ENDIAN */
|
||||
|
||||
/* Functions that are not available as standard implementations.
|
||||
* In cc.h, you can #define these to implementations available on
|
||||
* your platform to save some code bytes if you use these functions
|
||||
* in your application, too.
|
||||
*/
|
||||
|
||||
#ifndef lwip_itoa
|
||||
/* This can be #defined to itoa() or snprintf(result, bufsize, "%d", number) depending on your platform */
|
||||
void lwip_itoa(char* result, size_t bufsize, int number);
|
||||
#endif
|
||||
#ifndef lwip_strnicmp
|
||||
/* This can be #defined to strnicmp() or strncasecmp() depending on your platform */
|
||||
int lwip_strnicmp(const char* str1, const char* str2, size_t len);
|
||||
#endif
|
||||
#ifndef lwip_stricmp
|
||||
/* This can be #defined to stricmp() or strcasecmp() depending on your platform */
|
||||
int lwip_stricmp(const char* str1, const char* str2);
|
||||
#endif
|
||||
#ifndef lwip_strnstr
|
||||
/* This can be #defined to strnstr() depending on your platform */
|
||||
char* lwip_strnstr(const char* buffer, const char* token, size_t n);
|
||||
#endif
|
||||
#ifndef lwip_strnistr
|
||||
/* This can be #defined to strnistr() depending on your platform */
|
||||
char* lwip_strnistr(const char* buffer, const char* token, size_t n);
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* LWIP_HDR_DEF_H */
|
||||
@@ -846,12 +846,7 @@ class ChameleonCMD:
|
||||
|
||||
try:
|
||||
ret = self.device.send_cmd_sync(DATA_CMD_GET_DEVICE_CAPABILITIES, 0x00)
|
||||
|
||||
for i in range(0, len(ret.data), 2):
|
||||
if i + 1 < len(ret.data):
|
||||
commands.append((ret.data[i + 1] << 8) | ret.data[i])
|
||||
|
||||
self.device.commands = commands
|
||||
self.device.commands = struct.unpack(f"{len(ret.data) // 2}H", ret.data)
|
||||
except:
|
||||
print("Chameleon doesn't understand get capabilities command. Please update firmware")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user