deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Now it is putchar that has to be redefined (instead of __io_putchar), like other platforms.

Browse source
This commit is contained in:
salvopitru 2011-01-19 09:13:06 +00:00
parent 8f283b3989
commit 5fcae86be3
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cpu/stm32w108/dev/uart1-putchar.c
View file

@ -18,19 +18,19 @@
# endif # endif
#endif #endif
void __io_putchar(char c)
{
uart1_writeb(c);
}
#undef putchar #undef putchar
int putchar(int c) int __attribute__(( weak )) putchar(int c)
{ {
__io_putchar((char) c); uart1_writeb(c);
return c; return c;
} }
void __io_putchar(char c)
{
putchar(c);
}
size_t _write(int handle, const unsigned char * buffer, size_t size) size_t _write(int handle, const unsigned char * buffer, size_t size)
{ {
size_t nChars = 0; size_t nChars = 0;

12
tools/stm32w/uip6_bridge/uip6-bridge-tap.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: uip6-bridge-tap.c,v 1.1 2010/10/25 10:42:41 salvopitru Exp $ * $Id: uip6-bridge-tap.c,v 1.2 2011/01/19 09:13:06 salvopitru Exp $
* *
*/ */
@ -140,11 +140,9 @@ PROCESS_THREAD(uip6_bridge, ev, data)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#ifdef __ICCARM__
#undef putchar
int putchar(int c) int putchar(int c)
#else
void __io_putchar(char c)
#endif
{ {
#define SLIP_END 0300 #define SLIP_END 0300
static char debug_frame = 0; static char debug_frame = 0;
@ -166,8 +164,6 @@ void __io_putchar(char c)
debug_frame = 0; debug_frame = 0;
} }
#ifdef __ICCARM__ return c;
return c;
#endif
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/