Found by grepping for pointer casts.
Some additional cast can be removed if hexify/unhexify arguments are
changed to a more suitable type.
Change-Id: I13796b056f00976979bf0e754de3aa7648f7f321
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1778
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
static int icdi_send_packet(void *handle, int len)
{
unsigned char cksum = 0;
static int icdi_send_packet(void *handle, int len)
{
unsigned char cksum = 0;
- struct icdi_usb_handle_s *h;
+ struct icdi_usb_handle_s *h = handle;
int result, retry = 0;
int transferred = 0;
assert(handle != NULL);
int result, retry = 0;
int transferred = 0;
assert(handle != NULL);
- h = (struct icdi_usb_handle_s *)handle;
/* check we have a large enough buffer for checksum "#00" */
if (len + 3 > h->max_packet) {
/* check we have a large enough buffer for checksum "#00" */
if (len + 3 > h->max_packet) {
static int icdi_send_cmd(void *handle, const char *cmd)
{
static int icdi_send_cmd(void *handle, const char *cmd)
{
- struct icdi_usb_handle_s *h;
- h = (struct icdi_usb_handle_s *)handle;
+ struct icdi_usb_handle_s *h = handle;
int cmd_len = snprintf(h->write_buffer, h->max_packet, PACKET_START "%s", cmd);
return icdi_send_packet(handle, cmd_len);
int cmd_len = snprintf(h->write_buffer, h->max_packet, PACKET_START "%s", cmd);
return icdi_send_packet(handle, cmd_len);
static int icdi_send_remote_cmd(void *handle, const char *data)
{
static int icdi_send_remote_cmd(void *handle, const char *data)
{
- struct icdi_usb_handle_s *h;
- h = (struct icdi_usb_handle_s *)handle;
+ struct icdi_usb_handle_s *h = handle;
size_t cmd_len = sprintf(h->write_buffer, PACKET_START "qRcmd,");
cmd_len += hexify(h->write_buffer + cmd_len, data, 0, h->max_packet - cmd_len);
size_t cmd_len = sprintf(h->write_buffer, PACKET_START "qRcmd,");
cmd_len += hexify(h->write_buffer + cmd_len, data, 0, h->max_packet - cmd_len);
static int icdi_get_cmd_result(void *handle)
{
static int icdi_get_cmd_result(void *handle)
{
- struct icdi_usb_handle_s *h;
+ struct icdi_usb_handle_s *h = handle;
int offset = 0;
char ch;
assert(handle != NULL);
int offset = 0;
char ch;
assert(handle != NULL);
- h = (struct icdi_usb_handle_s *)handle;
do {
ch = h->read_buffer[offset++];
do {
ch = h->read_buffer[offset++];
static int icdi_usb_write_debug_reg(void *handle, uint32_t addr, uint32_t val)
{
static int icdi_usb_write_debug_reg(void *handle, uint32_t addr, uint32_t val)
{
- return icdi_usb_write_mem(handle, addr, 4, 1, (uint8_t *)&val);
+ uint8_t buf[4];
+ /* REVISIT: There's no target pointer here so there's no way to use target_buffer_set_u32().
+ * I guess all supported chips are little-endian anyway. */
+ h_u32_to_le(buf, val);
+ return icdi_usb_write_mem(handle, addr, 4, 1, buf);
}
static enum target_state icdi_usb_state(void *handle)
{
int result;
}
static enum target_state icdi_usb_state(void *handle)
{
int result;
- struct icdi_usb_handle_s *h;
+ struct icdi_usb_handle_s *h = handle;
- h = (struct icdi_usb_handle_s *)handle;
-
- result = icdi_usb_read_mem(h, DCB_DHCSR, 4, 1, (uint8_t *)&dhcsr);
+ result = icdi_usb_read_mem(h, DCB_DHCSR, 4, 1, buf);
if (result != ERROR_OK)
return TARGET_UNKNOWN;
if (result != ERROR_OK)
return TARGET_UNKNOWN;
+ /* REVISIT: There's no target pointer here so there's no way to use target_buffer_get_u32().
+ * I guess all supported chips are little-endian anyway. */
+ dhcsr = le_to_h_u32(buf);
if (dhcsr & S_HALT)
return TARGET_HALTED;
if (dhcsr & S_HALT)
return TARGET_HALTED;
static int icdi_usb_version(void *handle)
{
static int icdi_usb_version(void *handle)
{
- struct icdi_usb_handle_s *h;
- h = (struct icdi_usb_handle_s *)handle;
+ struct icdi_usb_handle_s *h = handle;
- struct icdi_usb_handle_s *h;
- h = (struct icdi_usb_handle_s *)handle;
+ struct icdi_usb_handle_s *h = handle;
result = icdi_send_cmd(handle, "qSupported");
if (result != ERROR_OK)
result = icdi_send_cmd(handle, "qSupported");
if (result != ERROR_OK)
static int icdi_usb_read_reg(void *handle, int num, uint32_t *val)
{
int result;
static int icdi_usb_read_reg(void *handle, int num, uint32_t *val)
{
int result;
- struct icdi_usb_handle_s *h;
+ struct icdi_usb_handle_s *h = handle;
- h = (struct icdi_usb_handle_s *)handle;
-
snprintf(cmd, sizeof(cmd), "p%x", num);
result = icdi_send_cmd(handle, cmd);
if (result != ERROR_OK)
snprintf(cmd, sizeof(cmd), "p%x", num);
result = icdi_send_cmd(handle, cmd);
if (result != ERROR_OK)
- if (unhexify((char *)val, h->read_buffer + 2, 4) != 4) {
+ uint8_t buf[4];
+ if (unhexify((char *)buf, h->read_buffer + 2, 4) != 4) {
LOG_ERROR("failed to convert result");
return ERROR_FAIL;
}
LOG_ERROR("failed to convert result");
return ERROR_FAIL;
}
+ *val = le_to_h_u32(buf);
{
int result;
char cmd[20];
{
int result;
char cmd[20];
+ uint8_t buf[4];
+ h_u32_to_le(buf, val);
int cmd_len = snprintf(cmd, sizeof(cmd), "P%x=", num);
int cmd_len = snprintf(cmd, sizeof(cmd), "P%x=", num);
- hexify(cmd + cmd_len, (char *)&val, 4, sizeof(cmd));
+ hexify(cmd + cmd_len, (const char *)buf, 4, sizeof(cmd));
result = icdi_send_cmd(handle, cmd);
if (result != ERROR_OK)
result = icdi_send_cmd(handle, cmd);
if (result != ERROR_OK)
static int icdi_usb_read_mem_int(void *handle, uint32_t addr, uint32_t len, uint8_t *buffer)
{
int result;
static int icdi_usb_read_mem_int(void *handle, uint32_t addr, uint32_t len, uint8_t *buffer)
{
int result;
- struct icdi_usb_handle_s *h;
+ struct icdi_usb_handle_s *h = handle;
- h = (struct icdi_usb_handle_s *)handle;
-
snprintf(cmd, sizeof(cmd), "x%x,%x", addr, len);
result = icdi_send_cmd(handle, cmd);
if (result != ERROR_OK)
snprintf(cmd, sizeof(cmd), "x%x,%x", addr, len);
result = icdi_send_cmd(handle, cmd);
if (result != ERROR_OK)
static int icdi_usb_write_mem_int(void *handle, uint32_t addr, uint32_t len, const uint8_t *buffer)
{
int result;
static int icdi_usb_write_mem_int(void *handle, uint32_t addr, uint32_t len, const uint8_t *buffer)
{
int result;
- struct icdi_usb_handle_s *h;
-
- h = (struct icdi_usb_handle_s *)handle;
+ struct icdi_usb_handle_s *h = handle;
size_t cmd_len = snprintf(h->write_buffer, h->max_packet, PACKET_START "X%x,%x:", addr, len);
int out_len;
size_t cmd_len = snprintf(h->write_buffer, h->max_packet, PACKET_START "X%x,%x:", addr, len);
int out_len;
- cmd_len += remote_escape_output((char *)buffer, len, h->write_buffer + cmd_len,
+ cmd_len += remote_escape_output((const char *)buffer, len, h->write_buffer + cmd_len,
&out_len, h->max_packet - cmd_len);
if (out_len < (int)len) {
&out_len, h->max_packet - cmd_len);
if (out_len < (int)len) {
uint32_t count, uint8_t *buffer)
{
int retval = ERROR_OK;
uint32_t count, uint8_t *buffer)
{
int retval = ERROR_OK;
- struct icdi_usb_handle_s *h = (struct icdi_usb_handle_s *)handle;
+ struct icdi_usb_handle_s *h = handle;
uint32_t bytes_remaining;
/* calculate byte count */
uint32_t bytes_remaining;
/* calculate byte count */
uint32_t count, const uint8_t *buffer)
{
int retval = ERROR_OK;
uint32_t count, const uint8_t *buffer)
{
int retval = ERROR_OK;
- struct icdi_usb_handle_s *h = (struct icdi_usb_handle_s *)handle;
+ struct icdi_usb_handle_s *h = handle;
uint32_t bytes_remaining;
/* calculate byte count */
uint32_t bytes_remaining;
/* calculate byte count */
static int icdi_usb_close(void *handle)
{
static int icdi_usb_close(void *handle)
{
- struct icdi_usb_handle_s *h;
-
- h = (struct icdi_usb_handle_s *)handle;
+ struct icdi_usb_handle_s *h = handle;
if (h->usb_dev)
libusb_close(h->usb_dev);
if (h->usb_dev)
libusb_close(h->usb_dev);
Linking to existing account procedure
If you already have an account and want to add another login method
you
MUST first sign in with your existing account and
then change URL to read
https://review.openocd.org/login/?link
to get to this page again but this time it'll work for linking. Thank you.
SSH host keys fingerprints
1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=.. |
|+o.. . |
|*.o . . |
|+B . . . |
|Bo. = o S |
|Oo.+ + = |
|oB=.* = . o |
| =+=.+ + E |
|. .=o . o |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)