summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2018-01-28 22:30:23 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2018-01-30 07:58:31 +0100
commitf0f40101be54f25c8ed34c6f92d6842d90950ecd (patch)
tree2f4f334035a75d4cc3a14a2c5d36be6a90aa7f5a
parent7dd2ee1248bfd9d86c3f9b4ed3812c83229e7b3d (diff)
downloadbarebox-f0f40101be54f25c8ed34c6f92d6842d90950ecd.tar.gz
barebox-f0f40101be54f25c8ed34c6f92d6842d90950ecd.tar.xz
ratp: move barebox-specific command to ratp_bb.h
The ratp_run_command() is really an implementation detail of the barebox ratp 'command' operation support. Move it to the barebox specific header and rename it with the correct prefix. Signed-off-by: Aleksander Morgado <aleksander@aleksander.es> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--common/ratp.c2
-rw-r--r--include/ratp.h2
-rw-r--r--include/ratp_bb.h7
-rw-r--r--lib/readline.c4
4 files changed, 7 insertions, 8 deletions
diff --git a/common/ratp.c b/common/ratp.c
index c5eae2e2ce..6db4df870f 100644
--- a/common/ratp.c
+++ b/common/ratp.c
@@ -323,7 +323,7 @@ static int ratp_console_register(struct ratp_ctx *ctx)
return 0;
}
-void ratp_run_command(void)
+void barebox_ratp_command_run(void)
{
int ret;
diff --git a/include/ratp.h b/include/ratp.h
index 94fd004f45..6f4cf8a6f5 100644
--- a/include/ratp.h
+++ b/include/ratp.h
@@ -17,6 +17,4 @@ int ratp_poll(struct ratp *ratp);
bool ratp_closed(struct ratp *ratp);
bool ratp_busy(struct ratp *ratp);
-void ratp_run_command(void);
-
#endif /* __RATP_H */ \ No newline at end of file
diff --git a/include/ratp_bb.h b/include/ratp_bb.h
index 52ecaff374..70fd58a678 100644
--- a/include/ratp_bb.h
+++ b/include/ratp_bb.h
@@ -8,8 +8,9 @@ struct ratp_bb_pkt {
uint8_t data[];
};
-int barebox_ratp(struct console_device *cdev);
-int barebox_ratp_fs_call(struct ratp_bb_pkt *tx, struct ratp_bb_pkt **rx);
-int barebox_ratp_fs_mount(const char *path);
+int barebox_ratp(struct console_device *cdev);
+void barebox_ratp_command_run(void);
+int barebox_ratp_fs_call(struct ratp_bb_pkt *tx, struct ratp_bb_pkt **rx);
+int barebox_ratp_fs_mount(const char *path);
#endif /* __RATP_BB_H */
diff --git a/lib/readline.c b/lib/readline.c
index b5d99ca185..1e380abeca 100644
--- a/lib/readline.c
+++ b/lib/readline.c
@@ -3,7 +3,7 @@
#include <init.h>
#include <libbb.h>
#include <poller.h>
-#include <ratp.h>
+#include <ratp_bb.h>
#include <xfuncs.h>
#include <complete.h>
#include <linux/ctype.h>
@@ -203,7 +203,7 @@ int readline(const char *prompt, char *buf, int len)
while (!tstc()) {
poller_call();
if (IS_ENABLED(CONFIG_RATP))
- ratp_run_command();
+ barebox_ratp_command_run();
}
ichar = read_key();