mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-12-22 10:30:13 +00:00
Now it is putchar that has to be redefined (instead of __io_putchar), like other platforms.
This commit is contained in:
parent
8f283b3989
commit
5fcae86be3
@ -18,19 +18,19 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
void __io_putchar(char c)
|
||||
{
|
||||
uart1_writeb(c);
|
||||
}
|
||||
|
||||
#undef putchar
|
||||
|
||||
int putchar(int c)
|
||||
int __attribute__(( weak )) putchar(int c)
|
||||
{
|
||||
__io_putchar((char) c);
|
||||
uart1_writeb(c);
|
||||
return c;
|
||||
}
|
||||
|
||||
void __io_putchar(char c)
|
||||
{
|
||||
putchar(c);
|
||||
}
|
||||
|
||||
size_t _write(int handle, const unsigned char * buffer, size_t size)
|
||||
{
|
||||
size_t nChars = 0;
|
||||
|
@ -26,7 +26,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* 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)
|
||||
#else
|
||||
void __io_putchar(char c)
|
||||
#endif
|
||||
{
|
||||
#define SLIP_END 0300
|
||||
static char debug_frame = 0;
|
||||
@ -166,8 +164,6 @@ void __io_putchar(char c)
|
||||
debug_frame = 0;
|
||||
}
|
||||
|
||||
#ifdef __ICCARM__
|
||||
return c;
|
||||
#endif
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
Loading…
Reference in New Issue
Block a user