From 93ea941dff98b31ff6498a9b222c5bb1d40fe8a1 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Fri, 7 Oct 2011 02:17:36 +0000 Subject: [PATCH] Remove duplicate endianness --- src/stlink-common.c | 2 +- src/stlink-common.h | 1 + src/stlink-usb.c | 15 +++++---------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/stlink-common.c b/src/stlink-common.c index 53a9d29..7f51a56 100644 --- a/src/stlink-common.c +++ b/src/stlink-common.c @@ -108,7 +108,7 @@ void stlink_write_mem8(stlink_t *sl, uint32_t addr, uint16_t len) { // const int i = 1; // #define is_bigendian() ( (*(char*)&i) == 0 ) -static inline unsigned int is_bigendian(void) { +inline unsigned int is_bigendian(void) { static volatile const unsigned int i = 1; return *(volatile const char*) &i == 0; } diff --git a/src/stlink-common.h b/src/stlink-common.h index 7fbc0ab..32ea444 100644 --- a/src/stlink-common.h +++ b/src/stlink-common.h @@ -175,6 +175,7 @@ extern "C" { uint16_t read_uint16(const unsigned char *c, const int pt); void stlink_core_stat(stlink_t *sl); void stlink_print_data(stlink_t *sl); + unsigned int is_bigendian(void); #include "stlink-sg.h" diff --git a/src/stlink-usb.c b/src/stlink-usb.c index d989633..4a2fe16 100644 --- a/src/stlink-usb.c +++ b/src/stlink-usb.c @@ -8,12 +8,6 @@ #include "stlink-common.h" #include "stlink-usb.h" -/* endianess related */ -static inline unsigned int is_bigendian(void) { - static volatile const unsigned int i = 1; - return *(volatile const char*) &i == 0; -} - void _stlink_usb_close(stlink_t* sl) { struct stlink_libusb * const handle = sl->backend_data; // maybe we couldn't even get the usb device? @@ -206,7 +200,7 @@ void _stlink_usb_version(stlink_t * sl) { if (size == -1) { printf("[!] send_recv\n"); return; - }mkdir g + } #if 1 /* DEBUG */ { @@ -218,15 +212,16 @@ void _stlink_usb_version(stlink_t * sl) { } void _stlink_usb_write_mem32(stlink_t *sl, uint32_t addr, uint16_t len) { - D(sl, "oops! no write32 support yet ;)\n"); + DD(sl, "oops! no write32 support yet, wanted to write %d bytes to %#x\n", + len, addr); } void _stlink_usb_write_mem8(stlink_t *sl, uint32_t addr, uint16_t len) { - D(sl, "oops! no write8 support yet ;)\n"); + DD(sl, "oops! no write8 support yet, wanted to write %d bytes to %#x\n", + len, addr); } - int stlink_current_mode(stlink_t * sl) { int mode = -1; -- 2.30.2