diff options
-rw-r--r-- | src/console.c | 2 | ||||
-rw-r--r-- | src/main.c | 2 | ||||
-rw-r--r-- | src/main2.c | 6 | ||||
-rw-r--r-- | src/nolo.c | 8 | ||||
-rw-r--r-- | src/qmode.c | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/console.c b/src/console.c index e8eac88..75c1871 100644 --- a/src/console.c +++ b/src/console.c @@ -107,7 +107,7 @@ static void cmd_badblocks(char *line) static void cmd_connect(char *line) { - connect_via_usb(); +// connect_via_usb(); } static void cmd_reboot(char *line) @@ -26,7 +26,7 @@ #if HAVE_USB #include <usb.h> struct usb_device *device = NULL; -struct usb_dev_handle *dev = NULL; +extern struct usb_dev_handle *dev = NULL; #endif //char *fiasco_image = NULL; char *boot_cmdline = NULL; diff --git a/src/main2.c b/src/main2.c index c360e96..bb30ce4 100644 --- a/src/main2.c +++ b/src/main2.c @@ -34,6 +34,8 @@ #include "device.h" #include "usb-device.h" #include "cold-flash.h" +#include "console.h" +#include "qmode.h" #undef VERSION #define VERSION "0.6" @@ -476,14 +478,14 @@ int main(int argc, char **argv) { /* console */ if ( console ) { -// console_prompt(); + console_prompt(); ret = 0; goto clean; } /* share queues */ if ( queue ) { -// queue_mode(); + queue_mode(); ret = 0; goto clean; } @@ -32,9 +32,7 @@ #define CMD_WRITE 64 #define CMD_QUERY 192 -extern char *root_devices[]; - -extern struct usb_dev_handle *dev; +struct usb_dev_handle *dev; /*void check_nolo_order_failed() { @@ -394,7 +392,7 @@ int get_root_device() return -1; } - printf("Root device is: %s\n", root_devices[opcode]); +// printf("Root device is: %s\n", root_devices[opcode]); return 0; } @@ -417,7 +415,7 @@ int set_root_device(unsigned short root_device) return -1; } - printf("Root device set to: %s\n", root_devices[root_device]); +// printf("Root device set to: %s\n", root_devices[root_device]); return 0; } diff --git a/src/qmode.c b/src/qmode.c index 79e4de8..ce722d7 100644 --- a/src/qmode.c +++ b/src/qmode.c @@ -134,11 +134,11 @@ int queue_mode(void) } else { do { #if HAVE_USB - if (connect_via_usb()) { +/* if (connect_via_usb()) { fprintf(stderr, "Cannot connect to device. It is possibly not in boot stage.\n"); squeue_push2(p, "error", "Cannot connect to the device", 1); return 0; - } + }*/ #endif printf("Waiting for a client in shared queues..\n"); setsid(); |