diff options
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/console.c | 166 | ||||
| -rw-r--r-- | src/console.h | 25 |
3 files changed, 1 insertions, 192 deletions
diff --git a/src/Makefile b/src/Makefile index fdb4fdd..601568a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,7 @@ CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_GNU_SOURCE -I. CFLAGS += -W -Wall -O2 -pedantic -std=c99 LIBS += -lm -lusb -OBJS = main.o nolo.o printf-utils.o image.o fiasco.o device.o usb-device.o cold-flash.o console.o operations.o local.o mkii.o disk.o cal.o +OBJS = main.o nolo.o printf-utils.o image.o fiasco.o device.o usb-device.o cold-flash.o operations.o local.o mkii.o disk.o cal.o BIN = 0xFFFF all: $(BIN) diff --git a/src/console.c b/src/console.c deleted file mode 100644 index 4e51c67..0000000 --- a/src/console.c +++ /dev/null @@ -1,166 +0,0 @@ -/* - * 0xFFFF - Open Free Fiasco Firmware Flasher - * Copyright (C) 2007, 2008 pancake <pancake@youterm.com> - * Copyright (C) 2012 Pali Rohár <pali.rohar@gmail.com> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <getopt.h> -#include <unistd.h> - -#include "global.h" -#include "console.h" - -static void cmd_exit(char *line) { - exit(0); - (void)line; -} - -static void cmd_help(char *line) { - printf("connect connects via usb to nolo\n"); - printf("reboot reboots remote host\n"); - printf("info shows info of the remote system\n"); - printf("linfo shows info of the local system\n"); - printf("shell opens a shell (/bin/sh)\n"); - printf("badblocks [dev] checks bad blocks on mtd (/dev/mtd1)\n"); - printf("dump [dir] dumps the contents of /dev/mtd to dir\n"); - printf("nanddump [dev] [start] [len] [out] [ignore-badblocks] [ignore-oob]\n"); - printf(" f.ex: nanddump /dev/mtd0 0x0 0x4000 xloader.bin 1 1\n"); - printf("exit exits the shell\n"); - fflush(stdout); - (void)line; -} - -static void cmd_info(char *line) { - /* TODO */ - (void)line; -} - -static void cmd_nanddump(char *line) { - - char dev[128]; - int from; - int length; - char out[128]; - int ignbb; - int ignoob = -1; - - sscanf(line, "%127s 0x%x 0x%x %127s %d %d", - (char *)&dev, (unsigned int*)&from, (unsigned int *)&length, - (char *)&out, (int*)&ignbb, (int *)&ignoob); - - /* TODO */ -} - -static void cmd_dump(char *line) { - - if ( ! line[0] ) { - printf("Usage: dump [path]\n"); - return; - } - - while ( line[0] == ' ' ) - ++line; - - /* TODO */ -} - -static void cmd_badblocks(char *line) { - - if ( ! line[0] ) { - printf("Usage: badblocks [path]\n"); - return; - } - - while ( line[0] == ' ' ) - ++line; - - /* TODO */ -} - -static void cmd_connect(char *line) { - /* TODO */ - (void)line; -} - -static void cmd_reboot(char *line) { - /* TODO */ - (void)line; -} - -static void cmd_shell(char *line) { - system("/bin/sh"); - (void)line; -} - -static struct cmd_t { - char *name; - void (*callback)(char *); -} console_commands[] = { - { .name = "exit", .callback = &cmd_exit }, - { .name = "q", .callback = &cmd_exit }, - { .name = "connect", .callback = &cmd_connect }, - { .name = "reboot", .callback = &cmd_reboot }, - { .name = "badblocks", .callback = &cmd_badblocks}, - { .name = "help", .callback = &cmd_help }, - { .name = "?", .callback = &cmd_help }, - { .name = "info", .callback = &cmd_info }, - { .name = "dump", .callback = &cmd_dump }, - { .name = "nanddump", .callback = &cmd_nanddump }, - { .name = "shell", .callback = &cmd_shell } -}; - -static int console_command(char *line) { - - size_t i; - char command[11]; - - command[0] = '\0'; - sscanf(line, "%10s", command); - line = line + strlen(command); - - for ( i = 0; i < (sizeof(console_commands)/sizeof(console_commands[0])); ++i ) - if ( strcmp(console_commands[i].name, command) == 0 ) - console_commands[i].callback(line); - - return 1; - -} - -int console_prompt(void) { - - char line[1024]; - - do { - write(1, "0xFFFF> ", 8); - line[0] = '\0'; - fgets(line, 1024, stdin); - - if ( feof(stdin) ) { - write(1, "\n", 1); - break; - } - - if ( line[0] ) - line[strlen(line)-1] = '\0'; - line[1023] = '\0'; - } while ( console_command(line) ); - - return 0; - -} diff --git a/src/console.h b/src/console.h deleted file mode 100644 index 456febd..0000000 --- a/src/console.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 0xFFFF - Open Free Fiasco Firmware Flasher - * Copyright (C) 2007, 2008 pancake <pancake@youterm.com> - * Copyright (C) 2012 Pali Rohár <pali.rohar@gmail.com> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef CONSOLE_H -#define CONSOLE_H - -int console_prompt(void); - -#endif |