Merge remote-tracking branch 'origin/master' into bas24
This commit is contained in:
commit
a47ed29c57
@ -64,7 +64,7 @@ static const char s[] = "abcdefghijklmnopqrstuvwxyz";
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* serloop_main
|
||||
* serialblaster_main
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef CONFIG_BUILD_KERNEL
|
||||
|
@ -66,7 +66,7 @@ static int count = 0;
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* serloop_main
|
||||
* serialrx_main
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef CONFIG_BUILD_KERNEL
|
||||
|
@ -79,6 +79,7 @@ int serloop_main(int argc, char *argv[])
|
||||
{
|
||||
ch = '.';
|
||||
}
|
||||
|
||||
putchar(ch);
|
||||
}
|
||||
#else
|
||||
@ -96,6 +97,7 @@ int serloop_main(int argc, char *argv[])
|
||||
{
|
||||
ch = '.';
|
||||
}
|
||||
|
||||
ret = write(1, &ch, 1);
|
||||
}
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user