ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #352 from 0xc0170/dev_error_header_inclusion 

Error header inclusion in the error code file - fix.
pull/355/head
Bogdan Marinescu 2014-06-12 10:07:36 +01:00
parent 1b287bb08e d6c10d1cd2
commit 0b5a92fbc5
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/mbed/api/error.h
View File

@ -53,8 +53,6 @@
* #endcode * #endcode
*/ */
#include "toolchain.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

2
libraries/mbed/common/board.c
View File

@ -16,8 +16,8 @@
#include "gpio_api.h" #include "gpio_api.h"
#include "wait_api.h" #include "wait_api.h"
#include "toolchain.h" #include "toolchain.h"
#include "mbed_interface.h"
WEAK void mbed_die(void);
WEAK void mbed_die(void) { WEAK void mbed_die(void) {
#ifndef NRF51_H #ifndef NRF51_H
__disable_irq(); // dont allow interrupts to disturb the flash pattern __disable_irq(); // dont allow interrupts to disturb the flash pattern

2
libraries/mbed/common/error.c
View File

@ -17,11 +17,11 @@
#include <stdarg.h> #include <stdarg.h>
#include "device.h" #include "device.h"
#include "toolchain.h" #include "toolchain.h"
#include "error.h"
#if DEVICE_STDIO_MESSAGES #if DEVICE_STDIO_MESSAGES
#include <stdio.h> #include <stdio.h>
#endif #endif
WEAK void error(const char* format, ...);
WEAK void error(const char* format, ...) { WEAK void error(const char* format, ...) {
#if DEVICE_STDIO_MESSAGES #if DEVICE_STDIO_MESSAGES
va_list arg; va_list arg;

3
libraries/mbed/common/mbed_interface.c
View File

@ -38,7 +38,6 @@ int mbed_interface_reset(void) {
} }
} }
WEAK int mbed_interface_uid(char *uid);
WEAK int mbed_interface_uid(char *uid) { WEAK int mbed_interface_uid(char *uid) {
if (mbed_interface_connected()) { if (mbed_interface_connected()) {
return semihost_uid(uid); // Returns 0 if successful, -1 on failure return semihost_uid(uid); // Returns 0 if successful, -1 on failure
@ -77,13 +76,11 @@ void mbed_reset(void) {
mbed_interface_reset(); mbed_interface_reset();
} }
WEAK int mbed_uid(char *uid);
WEAK int mbed_uid(char *uid) { WEAK int mbed_uid(char *uid) {
return mbed_interface_uid(uid); return mbed_interface_uid(uid);
} }
#endif #endif
WEAK void mbed_mac_address(char *mac);
WEAK void mbed_mac_address(char *mac) { WEAK void mbed_mac_address(char *mac) {
#if DEVICE_SEMIHOST #if DEVICE_SEMIHOST
char uid[DEVICE_ID_LENGTH + 1]; char uid[DEVICE_ID_LENGTH + 1];