tests: pass [get|put]char directly in shell_init
This commit is contained in:
parent
8cbfaa8da2
commit
1bd7111a7b
@ -38,22 +38,6 @@
|
|||||||
*/
|
*/
|
||||||
#define SHELL_BUFSIZE (64U)
|
#define SHELL_BUFSIZE (64U)
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Read chars from STDIO
|
|
||||||
*/
|
|
||||||
int shell_read(void)
|
|
||||||
{
|
|
||||||
return (int)getchar();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Write chars to STDIO
|
|
||||||
*/
|
|
||||||
void shell_put(int c)
|
|
||||||
{
|
|
||||||
putchar((char)c);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Maybe you are a golfer?!
|
* @brief Maybe you are a golfer?!
|
||||||
*/
|
*/
|
||||||
@ -76,7 +60,7 @@ int main(void)
|
|||||||
ng_netreg_register(NG_NETTYPE_UNDEF, &dump);
|
ng_netreg_register(NG_NETTYPE_UNDEF, &dump);
|
||||||
|
|
||||||
/* start the shell */
|
/* start the shell */
|
||||||
shell_init(&shell, NULL, SHELL_BUFSIZE, shell_read, shell_put);
|
shell_init(&shell, NULL, SHELL_BUFSIZE, getchar, putchar);
|
||||||
shell_run(&shell);
|
shell_run(&shell);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@ -327,23 +327,6 @@ int cmd_print_regs(int argc, char **argv)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief proxy for reading a char from std-in and passing it to the shell
|
|
||||||
*/
|
|
||||||
int shell_read(void)
|
|
||||||
{
|
|
||||||
return (int) getchar();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief proxy for taking a character from the shell and writing it to std-out
|
|
||||||
*/
|
|
||||||
void shell_write(int c)
|
|
||||||
{
|
|
||||||
putchar((char)c);
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
shell_t shell;
|
shell_t shell;
|
||||||
@ -351,8 +334,7 @@ int main(void)
|
|||||||
puts("Welcome to RIOT!");
|
puts("Welcome to RIOT!");
|
||||||
|
|
||||||
puts("Initializing shell...");
|
puts("Initializing shell...");
|
||||||
shell_init(&shell, shell_commands, SHELL_BUFFER_SIZE, shell_read,
|
shell_init(&shell, shell_commands, SHELL_BUFFER_SIZE, getchar, putchar);
|
||||||
shell_write);
|
|
||||||
|
|
||||||
puts("Starting shell...");
|
puts("Starting shell...");
|
||||||
shell_run(&shell);
|
shell_run(&shell);
|
||||||
|
|||||||
@ -30,22 +30,6 @@
|
|||||||
*/
|
*/
|
||||||
#define SHELL_BUFSIZE (64U)
|
#define SHELL_BUFSIZE (64U)
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Read chars from STDIO
|
|
||||||
*/
|
|
||||||
int shell_read(void)
|
|
||||||
{
|
|
||||||
return (int)getchar();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Write chars to STDIO
|
|
||||||
*/
|
|
||||||
void shell_put(int c)
|
|
||||||
{
|
|
||||||
putchar((char)c);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Maybe you are a golfer?!
|
* @brief Maybe you are a golfer?!
|
||||||
*/
|
*/
|
||||||
@ -67,7 +51,7 @@ int main(void)
|
|||||||
|
|
||||||
/* start the shell */
|
/* start the shell */
|
||||||
puts("Initialization OK, starting shell now");
|
puts("Initialization OK, starting shell now");
|
||||||
shell_init(&shell, NULL, SHELL_BUFSIZE, shell_read, shell_put);
|
shell_init(&shell, NULL, SHELL_BUFSIZE, getchar, putchar);
|
||||||
shell_run(&shell);
|
shell_run(&shell);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@ -274,16 +274,6 @@ int cmd_print(int argc, char **argv)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int shell_getchar(void)
|
|
||||||
{
|
|
||||||
return (int)getchar();
|
|
||||||
}
|
|
||||||
|
|
||||||
void shell_putchar(int c)
|
|
||||||
{
|
|
||||||
putchar((char)c);
|
|
||||||
}
|
|
||||||
|
|
||||||
static const shell_command_t shell_commands[] = {
|
static const shell_command_t shell_commands[] = {
|
||||||
{ "init_master", "Initialize node as SPI master", cmd_init_master },
|
{ "init_master", "Initialize node as SPI master", cmd_init_master },
|
||||||
{ "init_slave", "Initialize node as SPI slave", cmd_init_slave },
|
{ "init_slave", "Initialize node as SPI slave", cmd_init_slave },
|
||||||
@ -301,7 +291,7 @@ int main(void)
|
|||||||
puts("Enter 'help' to get started\n");
|
puts("Enter 'help' to get started\n");
|
||||||
|
|
||||||
/* run the shell */
|
/* run the shell */
|
||||||
shell_init(&shell, shell_commands, SHELL_BUFSIZE, shell_getchar, shell_putchar);
|
shell_init(&shell, shell_commands, SHELL_BUFSIZE, getchar, putchar);
|
||||||
shell_run(&shell);
|
shell_run(&shell);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user