* Initial support for n810

- Fix set_altinterface workaround which seems to be checked by nolo 1.7
- n810 has the same USBID than n770
* Define some nolo commands used in query.c in nolo.h
* Get SW version with -i too

Makefile

@@ -1,3 +1,4 @@
+include config.mk
 PREFIX?=/usr/local
 
 all: logot

config.mk

@@ -0,0 +1,8 @@
+VERSION=0.3.2
+PREFIX=/usr
+
+# NetBSD stuff
+CFLAGS+=-I/usr/pkg/include
+LDFLAGS+=-L/usr/pkg/lib -Wl,-R/usr/pkg/lib
+
+HAVE_USB=1

gui/Makefile

@@ -1,8 +1,11 @@
 OBJ=main.o
 BIN=goxf
 
-CFLAGS=`pkg-config gladeui-1.0 libglade-2.0 --cflags`
+CFLAGS=`pkg-config gladeui-1.0 libglade-2.0 gmodule-2.0 --cflags`
-LDFLAGS=`pkg-config gladeui-1.0 libglade-2.0 --libs`
+LDFLAGS=`pkg-config gladeui-1.0 libglade-2.0 gmodule-2.0 --libs`
 
 all: ${OBJ}
 	${CC} ${LDFLAGS} ${OBJ} -o ${BIN}
+
+clean:
+	-rm -f ${BIN} ${OBJ}

gui/g0xFFFF.glade

@@ -21,7 +21,7 @@
               <widget class="GtkComboBox" id="combobox2">
                 <property name="visible">True</property>
                 <property name="active">0</property>
-                <property name="items" translatable="yes" context="yes">n770/n800
+                <property name="items" translatable="yes" context="yes">n770/n800/n810
 HERMflasher</property>
               </widget>
               <packing>
@@ -30,17 +30,7 @@ HERMflasher</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="gochange">
+              <placeholder/>
-                <property name="width_request">32</property>
-                <property name="visible">True</property>
-                <property name="has_default">True</property>
-                <property name="label" translatable="yes" context="yes">&gt;</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
             </child>
           </widget>
           <packing>
@@ -55,10 +45,11 @@ HERMflasher</property>
             <child>
               <widget class="GtkScrolledWindow" id="scrolledwindow1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                 <child>
-                  <widget class="GtkTreeView" id="treeview1">
+                  <widget class="GtkTreeView" id="tree">
                     <property name="visible">True</property>
                   </widget>
                 </child>
@@ -70,14 +61,14 @@ HERMflasher</property>
                 <property name="border_width">3</property>
                 <property name="spacing">2</property>
                 <child>
-                  <widget class="GtkFileChooserButton" id="filechooserbutton2">
+                  <widget class="GtkFileChooserButton" id="file">
                   </widget>
                   <packing>
                     <property name="expand">False</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkComboBox" id="combo1">
+                  <widget class="GtkComboBox" id="piece">
                     <property name="row_span_column">0</property>
                     <property name="column_span_column">0</property>
                     <property name="active">0</property>
@@ -100,12 +91,18 @@ xloader</property>
                       <widget class="GtkButton" id="button2">
                         <property name="visible">True</property>
                         <property name="label" context="yes">Remove</property>
+                        <property name="response_id">0</property>
+                        <signal name="clicked" handler="gui_remove"/>
+                        <signal name="activate" handler="gui_remove"/>
                       </widget>
                     </child>
                     <child>
                       <widget class="GtkButton" id="add">
                         <property name="visible">True</property>
                         <property name="label" context="yes">Add</property>
+                        <property name="response_id">0</property>
+                        <signal name="clicked" handler="gui_add"/>
+                        <signal name="activate" handler="gui_add"/>
                       </widget>
                       <packing>
                         <property name="position">1</property>
@@ -118,9 +115,10 @@ xloader</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="checkbutton2">
+                  <widget class="GtkCheckButton" id="usbhost">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes" context="yes">USB host mode</property>
+                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -130,9 +128,10 @@ xloader</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="checkbutton3">
+                  <widget class="GtkCheckButton" id="rdmode">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes" context="yes">R&amp;D mode</property>
+                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -145,6 +144,7 @@ xloader</property>
                   <widget class="GtkCheckButton" id="reboot">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes" context="yes">Reboot</property>
+                    <property name="response_id">0</property>
                     <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
@@ -171,7 +171,7 @@ xloader</property>
             <property name="visible">True</property>
             <property name="spacing">6</property>
             <child>
-              <widget class="GtkProgressBar" id="progressbar1">
+              <widget class="GtkProgressBar" id="pbar">
                 <property name="visible">True</property>
                 <property name="show_text">True</property>
               </widget>
@@ -184,6 +184,9 @@ xloader</property>
                     <property name="visible">True</property>
                     <property name="label" translatable="yes" context="yes">gtk-dialog-info</property>
                     <property name="use_stock">True</property>
+                    <property name="response_id">0</property>
+                    <signal name="clicked" handler="gui_information" object="main_window"/>
+                    <signal name="activate" handler="gui_information" object="main_window"/>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -195,6 +198,9 @@ xloader</property>
                     <property name="visible">True</property>
                     <property name="label" translatable="yes" context="yes">gtk-execute</property>
                     <property name="use_stock">True</property>
+                    <property name="response_id">0</property>
+                    <signal name="clicked" handler="gui_run"/>
+                    <signal name="activate" handler="gui_run"/>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -220,4 +226,54 @@ xloader</property>
       </widget>
     </child>
   </widget>
+  <widget class="GtkAboutDialog" id="information">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes" context="yes">About Glade</property>
+    <property name="resizable">False</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="has_separator">False</property>
+    <property name="program_name">Glade</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox3">
+        <property name="visible">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkScrolledWindow" id="scrolledwindow2">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <child>
+              <widget class="GtkTextView" id="textview1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="pixels_below_lines">2</property>
+                <property name="editable">False</property>
+                <property name="cursor_visible">False</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area3">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>

gui/main.c

@@ -21,10 +21,10 @@
 
 #define U(x) printf("%d\n",x); fflush(stdout);
 
+	GladeXML *xml;
 int main(int argc, char **argv)
 {
 	GtkWidget *w;
-	GladeXML *xml;
 
 	gtk_init(&argc, &argv);
 
@@ -40,6 +40,11 @@ int main(int argc, char **argv)
 	w = glade_xml_get_widget(xml, "main_window");
 	gtk_signal_connect(GTK_OBJECT(w), "destroy",
 		GTK_SIGNAL_FUNC(gtk_main_quit),NULL);
+{
+	GtkComboBox *piece = GTK_COMBO_BOX(glade_xml_get_widget(xml, "piece"));
+	gtk_combo_box_set_active(piece, 0);
+}
+
 	gtk_widget_show_all(w);
 
 	gtk_object_unref(GTK_OBJECT(xml));
@@ -47,3 +52,26 @@ int main(int argc, char **argv)
 	gtk_main();
 	return 0;	
 }
+extern void gui_run();
+extern void gui_run()
+{
+	printf("run\n");
+}
+
+extern void gui_add();
+extern void gui_add()
+{
+	GtkTreeView *tree = glade_xml_get_widget(xml, "tree");
+	GtkFileChooser *file = GTK_FILE_CHOOSER(glade_xml_get_widget(xml, "file"));
+	GtkComboBox *piece = GTK_COMBO_BOX(glade_xml_get_widget(xml, "piece"));
+
+	printf("ADD %s\n", gtk_file_chooser_get_filename(file));
+	printf("ADD %d\n", gtk_combo_box_get_active(piece));
+}
+
+extern void gui_information();
+void gui_information()
+{
+	printf("FUCKMENOT!\n");
+	fflush(stdout);
+}

src/Makefile

@@ -1,14 +1,16 @@
-VERSION=0.3
+include ../config.mk
 OBJ=main.o fiasco.o hexdump.o dump.o flash.o serial.o
 OBJ+=hash.o fpid.o query.o pieces.o utils.o devices.o console.o
 BIN=0xFFFF
+#LIBS=`${HAVE_USB} && echo -- '-lusb'`
+LIBS=`if [ "${HAVE_USB}" = 1 ]; then echo '-lusb'; fi`
 CFLAGS+=-DVERSION=\"${VERSION}\" -Wall -g -I .
-CFLAGS+=-pedantic -std=c99
+CFLAGS+=-pedantic -std=c99 -DHAVE_USB=${HAVE_USB}
 USBOBJ=../libusb/error.o ../libusb/usb.o ../libusb/descriptors.o
 USBOBJ+=../libusb/linux.o ## XXX not portable
 
 all: ${OBJ}
-	${CC} ${LDFLAGS} -o ${BIN} ${OBJ} -lusb
+	${CC} ${LDFLAGS} -o ${BIN} ${OBJ} ${LIBS}
 
 allusb: ${OBJ}
 	${CC} ${LDFLAGS} -o ${BIN} ${OBJ} ${USBOBJ}

src/console.c

@@ -1,6 +1,6 @@
 /*
  *  0xFFFF - Open Free Fiasco Firmware Flasher
- *  Copyright (C) 2007  pancake <pancake@youterm.com>
+ *  Copyright (C) 2007, 2008  pancake <pancake@youterm.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
@@ -16,6 +16,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if HAVE_USB
 #include "main.h"
 #include "query.h"
 #include <stdio.h>
@@ -45,6 +46,7 @@ void cmd_help(char *line)
 
 void cmd_info(char *line)
 {
+	get_sw_version();
 	get_hw_revision(); // get hardware revision:
 	get_root_device(); // only for flashing
 	get_usb_mode();
@@ -164,3 +166,4 @@ int console_prompt()
 
 	return 0;
 }
+#endif

src/devices.c

@@ -16,6 +16,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if HAVE_USB
 #include "main.h"
 #include <stdio.h>
 #include <string.h>
@@ -36,7 +37,7 @@
 struct devices supported_devices[SUPPORTED_DEVICES] = {
   { "FFFF", 0x000, 0x0000, 0x0000 },  // dummy
   { "unkn", 0x421, 0x3f00, 0x0000 },  // probably a development board
-  { "n770", 0x421, 0x0105, 0x0001 },  // my n770 
+  { "n770/n810", 0x421, 0x0105, 0x0001 },  // my n770 
   { "n800", 0x421, 0x04c3, 0x0001 },  // a n800 
   { 0 },
   { 0 }
@@ -116,3 +117,4 @@ int usb_device_found(struct usb_device_descriptor *udd, struct devices *it_devic
 
 	return 0;
 }
+#endif

src/dump.c

@@ -18,7 +18,6 @@
 
 #include "main.h"
 #include "hexdump.h"
-#include <usb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -81,8 +80,11 @@ __rf_extract_exit:
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <asm/types.h>
+//#include <asm/types.h>
 #include <mtd/mtd-user.h>
+#ifndef loff_t
+#define loff_t off_t
+#endif
 
 #define M_RDONLY   0x00000001
 #define M_RDRW     0x00000002
@@ -380,6 +382,7 @@ int nanddump(char *mtddev, unsigned long start_addr, unsigned long length, char
 
 		/* Write out page data */
 		//if (pretty_print) dump_bytes(readbuf, bs);
+		write(ofd, readbuf, bs);
 		progressbar(ofs, end_addr);
 
 		// OOB STUFF //

src/flash.c

@@ -16,10 +16,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if HAVE_USB
 #include "main.h"
 #include "hash.h"
 #include "hexdump.h"
-#include <usb.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -195,3 +195,4 @@ void flash_image(char *filename, char *piece, char *version)
 	}
 	printf("Flash done succesfully.\n");
 }
+#endif

src/main.c

@@ -24,8 +24,11 @@
 #include <getopt.h>
 
 /* global pr0n */
+#if HAVE_USB
+#include <usb.h>
 struct usb_device *device  = NULL;
 struct usb_dev_handle *dev = NULL;
+#endif
 char  *fiasco_image        = NULL;
 char  *boot_cmdline        = NULL;
 char  *reverseto           = NULL;
@@ -35,7 +38,7 @@ int    usb_mode            = -1;
 int    root_device         = -1;
 int    verbose             = 0;
 int    identify            = 0;
-int    reboot              = 0;
+int    moboreboot          = 0;
 int    unpack              = 0;
 int    info                = 0;
 
@@ -74,26 +77,30 @@ void show_usage()
 {
 	int i;
 	show_title();
+#if HAVE_USB
+	printf("Over USB:\n");
 	printf(" -b [arg]        boots the kernel with arguments\n");
 	printf(" -c              console prompt mode\n");
-	printf(" -C [/dev/mtd]   check bad blocks on mtd\n");
 	printf(" -d [vid:pid]    injects a usb device into the supported list\n");
 	printf(" -D [0|1|2]      sets the root device to flash (0), mmc (1) or usb (2)\n");
-	printf(" -e [path]       dump and extract pieces to path\n");
 	printf(" -f <flags>      set the given RD flags (see '-f help')\n");
-	printf(" -F [fiasco]     flash a fiasco firmware image\n");
-	printf(" -h              show this help message\n");
-	printf(" -H [file]       calculate hash for file\n");
 	printf(" -i              show device information (let standby mode)\n");
-	printf(" -I [piece]      identify a firmware piece\n");
+	printf(" -l              list supported usb device ids\n");
-	printf(" -l, -L          list supported usb device ids\n");
 	printf(" -p [[p%%]file]  piece-of-firmware %% file-where-this-piece-is\n");
-	printf(" -P [new-fiasco] creates a new fiasco package, pieces as arguments\n");
 	printf(" -r [0|1]        disable/enable R&D mode\n");
 	printf(" -R              reboot the omap board\n");
-	printf(" -s [serial]     serial port console (minicom like terminal)\n");
-	printf(" -u [fiasco]     unpack target fiasco image\n");
 	printf(" -U [0|1]        disable/enable the usb host mode\n");
+#endif
+	printf("Local stuff:\n");
+	printf(" -s [serial]     serial port console (minicom like terminal)\n");
+	printf(" -h              show this help message\n");
+	printf(" -C [/dev/mtd]   check bad blocks on mtd\n");
+	printf(" -e [path]       dump and extract pieces to path\n");
+	printf(" -F [fiasco]     flash a fiasco firmware image\n");
+	printf(" -H [file]       calculate hash for file\n");
+	printf(" -I [piece]      identify a firmware piece\n");
+	printf(" -P [new-fiasco] creates a new fiasco package, pieces as arguments\n");
+	printf(" -u [fiasco]     unpack target fiasco image\n");
 	printf(" -v              be verbose and noisy\n");
 	printf(" -V              show 0xFFFF version information\n");
 	printf(" -x              extract configuration entries from /dev/mtd1\n");
@@ -135,6 +142,7 @@ int fiasco_flash(char *file)
 	return -1;
 }
 
+#if HAVE_USB
 int connect_via_usb()
 {
         struct usb_device_descriptor udd;
@@ -167,7 +175,8 @@ int connect_via_usb()
                         return 1;
 	        }
 
-        	if ( usb_claim_interface(dev, 2) < 0) { // 2 or 0
+        	if ( usb_claim_interface(dev, 2) < 0) {
+		//device->config->interface->altsetting->bInterfaceNumber) < 0) { // 2 or 0
 	        	D perror("usb_claim_interface");
 
                         // Something is broken if closing fails.
@@ -182,7 +191,7 @@ int connect_via_usb()
                         continue;
         	}
 
-        	if (usb_set_altinterface(dev, 1) < 0) {
+        	if (usb_set_altinterface(dev, 1) <0) { //device->config->interface->altsetting->bAlternateSetting) < 0) {
 	        	D perror("usb_set_altinterface");
 
                         // Something is broken if closing fails.
@@ -207,20 +216,28 @@ int connect_via_usb()
 
 	return 0;
 }
+#endif
 
 int main(int argc, char **argv)
 {
 	int c;
 
-	while((c = getopt(argc, argv, "C:cp:PvVhRu:ib:U:r:e:Lld:I:D:f:F:s:xH:")) != -1) {
+	while((c = getopt(argc, argv, "C:cp:PvVhRu:ib:U:r:e:ld:I:D:f:F:s:xH:")) != -1) {
 		switch(c) {
 		case 'H':
 			printf("xorpair: %04x\n", do_hash_file(optarg));
 			return 0;
 		case 'x':
 			return dump_config();
+#if HAVE_USB
 		case 'c':
 			return console_prompt();
+		case 'b':
+			boot_cmdline = optarg;
+			break;
+		case 'U':
+			usb_mode = atoi(optarg);
+			break;
 		case 'F':
 			return fiasco_flash(optarg);
 		case 'd':
@@ -232,11 +249,6 @@ int main(int argc, char **argv)
 		case 'D':
 			root_device = atoi(optarg);
 			break;
-		case 'e':
-			reverseto = optarg;
-			break;
-		case 's':
-			return console(optarg);
 		case 'f':
 			if (!strcmp(optarg,"help")) {
 			printf("* Flags are composed of:\n");
@@ -248,37 +260,40 @@ int main(int argc, char **argv)
 			exit(1);
  			}
 			rd_flags = (unsigned short) strtoul(optarg, NULL, 16);
-		case 'U':
-			usb_mode = atoi(optarg);
 			break;
 		case 'r':
 			rd_mode = atoi(optarg);
 			break;
-		case 'b':
+		case 'l':
-			boot_cmdline = optarg;
+			list_valid_devices();
+			return 0;
+		case 'p':
+			add_piece(optarg);
 			break;
+		case 'i':
+			info = 1;
+			break;
+		case 'R':
+			moboreboot = 1;
+			break;
+#endif
+		case 'e':
+			reverseto = optarg;
+			break;
+		case 's':
+			return console(optarg);
 		case 'u':
 			fiasco_image = optarg;
 			unpack = 1;
 			break;
-		case 'p':
-			add_piece(optarg);
-			break;
 		case 'P':
 			return fiasco_pack(optind, argv);
-		case 'L':
-		case 'l':
-			list_valid_devices();
-			return 0;
 		case 'I':
 			printf("%s: %s\n", fpid_file(optarg), optarg);
 			identify = 1;
 			break;
 		case 'C':
 			return check_badblocks(optarg);
-		case 'i':
-			info = 1;
-			break;
 		case 'v':
 			verbose = 1;
 			break;
@@ -288,9 +303,6 @@ int main(int argc, char **argv)
 		case 'V':
 			printf("%s\n", VERSION);
 			return 0;
-		case 'R':
-			reboot = 1;
-			break;
 		}
 	}
 
@@ -305,11 +317,11 @@ int main(int argc, char **argv)
 	&&	(rd_flags     == -1)
 	&&	(rd_mode      == -1)
 	&&	(info         == 0)
-	&&	(reboot       == 0)
+	&&	(moboreboot       == 0)
 	&&	(usb_mode     == -1)
 	&& 	(root_device  == -1))
 	{
-		printf("0xFFFF [-chiLRvVx] [-C mtd-dev] [-d vid:pid] [-D 0|1|2] [-e path] [-f flags]\n");
+		printf("0xFFFF [-chilRvVx] [-C mtd-dev] [-d vid:pid] [-D 0|1|2] [-e path] [-f flags]\n");
 		printf("       [-F fiasco] [-H hash-file] [-I piece] [-p [piece%%]file]] [-r 0|1]\n");
 		printf("       [-s serial-dev] [-u fiasco-image] [-U 0|1] | [-P new-fiasco] [piece1] [2] ..\n");
 		return 1;
@@ -325,6 +337,7 @@ int main(int argc, char **argv)
 		return 0;
 	}
 
+#if HAVE_USB
         if (connect_via_usb()) {
                 fprintf(stderr, "Cannot connect to device. It is possibly not in boot stage.\n");
                 return 0;
@@ -361,8 +374,9 @@ int main(int argc, char **argv)
 	if (boot_cmdline)
 		boot_board(boot_cmdline);
 
-	if (reboot)
+	if (moboreboot)
 		reboot_board();
+#endif
 
 	return 0;
 }

src/main.h

@@ -3,6 +3,7 @@
 #define _INCLUDE_MAIN_H_
 
 #include "hash.h"
+#include "nolo.h"
 
 #define _FILE_OFFSET_BITS 64
 #define _GNU_SOURCE
@@ -25,6 +26,8 @@ void eprintf(const char *format, ...);
 #ifndef PATH_MAX
 #define PATH_MAX 4096
 #endif
+
+#if HAVE_USB
 #include <usb.h>
 
 extern struct usb_device *device;
@@ -34,6 +37,8 @@ void list_valid_devices();
 int usb_device_found(struct usb_device_descriptor *udd, struct devices *it_device);
 int console(const char *device);
 int connect_via_usb();
+#endif
+
 int console_prompt();
 
 //
@@ -47,9 +52,6 @@ extern int verbose;
 #define CMD_WRITE 64
 #define CMD_QUERY 192
 
-#define NOLO_GET_STATUS   1
-#define NOLO_GET_BOARD_ID 2
-#define NOLO_GET_VERSION  3
 
 struct piece_t {
 	char *name;

src/nolo.h

@@ -0,0 +1,7 @@
+
+#define NOLO_GET_STATUS   1
+#define NOLO_GET_BOARD_ID 2
+#define NOLO_GET_VERSION  3
+#define NOLO_GET_HWVERSION 4
+#define NOLO_SET_RDFLAGS   16
+#define NOLO_GET_RDFLAGS  17

src/query.c

@@ -1,6 +1,6 @@
 /*
  *  0xFFFF - Open Free Fiasco Firmware Flasher
- *  Copyright (C) 2007  pancake <pancake@youterm.com>
+ *  Copyright (C) 2007,2008  pancake <@youterm.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
@@ -16,6 +16,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if HAVE_USB
+
 #include "main.h"
 #include <stdio.h>
 #include <string.h>
@@ -116,7 +118,7 @@ int set_rd_mode(unsigned short mode)
 	if (((short)mode)==-1)
 		return 1;
 
-	if (usb_control_msg(dev, CMD_WRITE, 16, mode, 0, 0, 0, 2000) == -1) {
+	if (usb_control_msg(dev, CMD_WRITE, NOLO_SET_RDFLAGS, mode, 0, 0, 0, 2000) == -1) {
 		fprintf(stderr, "Cannot set R&D flags.\n");
 		return 1;
 	}
@@ -134,7 +136,8 @@ int get_hw_revision()
 	unsigned char string[512];
 	int i = 0;
 
-	if (usb_control_msg(dev, CMD_QUERY, 4, 0, 0, (char *)string, 512, 2000) == -1) {
+	memset(string,'\0',512);
+	if (usb_control_msg(dev, CMD_QUERY, NOLO_GET_HWVERSION, 0, 0, (char *)string, 512, 2000) == -1) {
 		fprintf(stderr, "Cannot query hw revision.\n");
 		return -1;
 	}
@@ -157,7 +160,7 @@ int get_rd_mode()
 {
 	char isrd = 1;
 
-	if (usb_control_msg(dev, CMD_QUERY, 17, 0, 0, (char *)&isrd, 1, 2000) == -1) {
+	if (usb_control_msg(dev, CMD_QUERY, NOLO_GET_RDFLAGS, 0, 0, (char *)&isrd, 1, 2000) == -1) {
 		fprintf(stderr, "Cannot query rd mode.\n");
 		return -1;
 	}
@@ -170,7 +173,7 @@ int get_root_device()
 {
 	unsigned char opcode;
 
-	if (usb_control_msg(dev, CMD_QUERY, 17, 0, 1, (char *)&opcode, 1, 2000) < 0) {
+	if (usb_control_msg(dev, CMD_QUERY, NOLO_GET_RDFLAGS, 0, 1, (char *)&opcode, 1, 2000) < 0) {
 		fprintf(stderr, "Cannot query root device\n");
 		return -1;
 	}
@@ -197,7 +200,7 @@ int set_root_device(unsigned short root_device)
 		return -1;
 	}
 
-	if (usb_control_msg(dev, CMD_WRITE, 16, root_device, 1, 0, 0, 2000) == -1) {
+	if (usb_control_msg(dev, CMD_WRITE, NOLO_SET_RDFLAGS, root_device, 1, 0, 0, 2000) == -1) {
 		fprintf(stderr, "Cannot set root device\n");
 		return -1;
 	}
@@ -281,7 +284,7 @@ int get_rd_flags()
 {
 	unsigned short flags = 0;
 	
-	if (usb_control_msg(dev, CMD_QUERY, 17, 0, 3, (void *) &flags, sizeof(flags), 2000) == -1) {
+	if (usb_control_msg(dev, CMD_QUERY, NOLO_GET_RDFLAGS, 0, 3, (void *) &flags, sizeof(flags), 2000) == -1) {
 		fprintf(stderr, "Cannot get rd flags\n");
 		return -1;
 	}
@@ -301,7 +304,7 @@ int get_nolo_version()
 	unsigned int version; // ensure uint is at least 32 bits
 
 	//if (usb_control_msg(dev, CMD_QUERY, 3, 0, 1, (char *)&version, 4 , 2000) < 0) {
-	if (usb_control_msg(dev, CMD_QUERY, 3, 0, 0, (char *)&version, 4 , 2000) < 0) {
+	if (usb_control_msg(dev, CMD_QUERY, NOLO_GET_VERSION, 0, 0, (char *)&version, 4 , 2000) < 0) {
 		fprintf(stderr, "Cannot query nolo version. Old bootloader version?\n");
 		exit(1);
 	}
@@ -328,6 +331,7 @@ int get_sw_version()
 		fprintf(stderr, "error: cannot write query 18\n");
 		return 0;
 	}
+	bytes[0]='\0';
 	ret = usb_control_msg(dev, CMD_QUERY, 20, 0, 0, (char *)&bytes, 512, 2000);
 	if (ret<0) {
 		fprintf(stderr, "error: b0rken swversion read!\n");
@@ -337,3 +341,4 @@ int get_sw_version()
 	return 1;
 }
 
+#endif

src/utils.c

@@ -17,7 +17,6 @@
  */
 
 #include "main.h"
-#include <usb.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>