Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 pancake
|
a215967e38 |
No files matched your search
@@ -1,9 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Encoding=UTF-8
|
|
||||||
Name=0xFFFF
|
|
||||||
Comment=Free flasher for the Nokia internet tablets
|
|
||||||
Exec=gnome-terminal -e goxf
|
|
||||||
Icon=gnome-terminal.png
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
Categories=GTK;Application;Utility;
|
|
||||||
@@ -1,17 +1,11 @@
|
|||||||
include config.mk
|
|
||||||
PREFIX?=/usr/local
|
PREFIX?=/usr/local
|
||||||
DESTDIR?=
|
|
||||||
|
|
||||||
all: logot frontend
|
all: logot
|
||||||
cd src && ${MAKE} all
|
cd src && ${MAKE} all
|
||||||
|
|
||||||
frontend:
|
|
||||||
-cd src/gui && ${MAKE} all
|
|
||||||
|
|
||||||
static: logot
|
static: logot
|
||||||
cd libusb && ${MAKE} all
|
cd libusb && ${MAKE} all
|
||||||
cd src && ${MAKE} static
|
cd src && ${MAKE} static
|
||||||
cd logotool && ${MAKE} static
|
|
||||||
|
|
||||||
allusb: logot
|
allusb: logot
|
||||||
cd libusb && ${MAKE} all
|
cd libusb && ${MAKE} all
|
||||||
@@ -25,15 +19,9 @@ clean:
|
|||||||
cd logotool && ${MAKE} clean
|
cd logotool && ${MAKE} clean
|
||||||
|
|
||||||
install:
|
install:
|
||||||
mkdir -p ${DESTDIR}${PREFIX}/bin
|
cp src/0xFFFF ${PREFIX}/bin
|
||||||
mkdir -p ${DESTDIR}${PREFIX}/share/applications/
|
cp logotool/logotool ${PREFIX}/bin
|
||||||
cp src/0xFFFF ${DESTDIR}${PREFIX}/bin
|
|
||||||
-cp src/gui/goxf ${DESTDIR}${PREFIX}/bin
|
|
||||||
cp logotool/logotool ${DESTDIR}${PREFIX}/bin
|
|
||||||
cp 0xFFFF.desktop ${DESTDIR}${PREFIX}/share/applications/
|
|
||||||
|
|
||||||
deinstall:
|
deinstall:
|
||||||
rm -f ${DESTDIR}${PREFIX}/bin/0xFFFF
|
rm -f ${PREFIX}/bin/0xFFFF
|
||||||
rm -f ${DESTDIR}${PREFIX}/bin/logotool
|
rm -f ${PREFIX}/bin/logotool
|
||||||
rm -f ${DESTDIR}${PREFIX}/bin/goxf
|
|
||||||
rm ${DESTDIR}${PREFIX}/share/applications/0xFFFF.desktop
|
|
||||||
@@ -27,15 +27,8 @@ Feel free to join to the mailing list and visit the homepage for more info:
|
|||||||
0xffff@lists.nopcode.org
|
0xffff@lists.nopcode.org
|
||||||
http://www.nopcode.org/0xFFFF
|
http://www.nopcode.org/0xFFFF
|
||||||
|
|
||||||
-----------8<---------------------------------------------------------------
|
|
||||||
|
|
||||||
Build:
|
|
||||||
$ make
|
|
||||||
|
|
||||||
To install: (by default is /usr/local)
|
|
||||||
$ make install PREFIX=/usr DESTDIR=/
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Have phun!
|
Have phun!
|
||||||
|
|
||||||
|
|
||||||
--pancake
|
--pancake
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
VERSION=0.4.0
|
|
||||||
PREFIX=/usr
|
|
||||||
|
|
||||||
|
|
||||||
# NetBSD stuff
|
|
||||||
CFLAGS+=-I/usr/pkg/include -O2
|
|
||||||
LDFLAGS+=-L/usr/pkg/lib -Wl,-R/usr/pkg/lib
|
|
||||||
|
|
||||||
HAVE_USB=1
|
|
||||||
HAVE_GUI=1
|
|
||||||
@@ -1,49 +1,79 @@
|
|||||||
<h2>FAQ</h2>
|
<b>FAQ</b>
|
||||||
|
|
||||||
<b>*) How can I set my Internet Tablet into RD mode with 0xFFFF?</b>
|
This file tries to collect a bunch of common questions/answers about flashing
|
||||||
|
|
||||||
Just type '0xFFFF -r 1' as root
|
<b>*) Why implement a free software flasher?</b>
|
||||||
|
|
||||||
|
The Nokia Internet Tablets are based on Free Software (software libre), but
|
||||||
|
not everything included *is* free software, for instance, the firmware flasher
|
||||||
|
tool.
|
||||||
|
|
||||||
|
The 0xFFFF project aims to feed the minds of those who really want to
|
||||||
|
understand how these gadgets work internally, free the knowledge to
|
||||||
|
avoid the restrictions and fill the lack of information on the most
|
||||||
|
important part of the system.
|
||||||
|
|
||||||
|
That's it, now you can build and run this flasher on *BSD, w32, MacOSX on ARM,
|
||||||
|
powerpc, x86, mips, etc...
|
||||||
|
|
||||||
|
|
||||||
<b>*) How can I unpack a FIASCO firmware?
|
<b>*) Can I brick my device?</b>
|
||||||
|
|
||||||
Just type '0xFFFF -r 1' as root
|
Of course! You're free to do what you want with your device :)
|
||||||
|
|
||||||
|
Seriously. Flashing a device is not a safe thing, so I give no warranty
|
||||||
|
of what will happen to your device when using this tool.
|
||||||
|
|
||||||
|
BTW, after a huge number of tests I can say that these devices are hard
|
||||||
|
to brick, but if you are scared about bricking your device you should
|
||||||
|
use the flasher provided by Nokia, it's better for your heart's health.
|
||||||
|
|
||||||
|
|
||||||
<b>*) How can I unpack a FIASCO firmware?</b>
|
<b>*) What can I do with 0xFFFF?</b>
|
||||||
|
|
||||||
Just type '0xFFFF -u FiascoFirmware.bin -e /tmp' as root
|
Actually 0xFFFF allows you to:
|
||||||
|
|
||||||
|
- flash separated pieces of the firmware.
|
||||||
|
- retrieve information about the device
|
||||||
|
- reboot de mother board
|
||||||
|
- extract the current firmware pieces from the device (reverse flash)
|
||||||
|
- set the USB host/slave mode
|
||||||
|
- set the R&R mode
|
||||||
|
- identify firmware pieces
|
||||||
|
|
||||||
|
|
||||||
<b>*) How can I flash a new rootfs?
|
<b>*) What is NOLO?</b>
|
||||||
|
|
||||||
Unpack the pieces from the fiasco firmware (the one distributed by Nokia for example) and then type:
|
NOLO is the 'server-side' part of the flasher from Nokia. NOLO means
|
||||||
|
NOkia LOader and it's composed by two pieces of the firmware that are
|
||||||
|
flashed together.
|
||||||
|
|
||||||
# 0xFFFF -R -p rootfs.jffs
|
On the n800 firmwares, these two pieces are distributed in a single
|
||||||
|
file, but when flashing a n770, NOLO requires to provide the xloader
|
||||||
|
(without commiting) and then the secondary piece.
|
||||||
|
|
||||||
|
This piece of software is closed source and is the responsable of
|
||||||
|
handling the requests from the client-side flasher. It provides a
|
||||||
|
query-like interface via usb control messages for doing different
|
||||||
|
actions on the device.
|
||||||
|
|
||||||
|
|
||||||
<b>*) How can I flash a full FIASCO image?</b>
|
<b>*) How can I identify my device?</b>
|
||||||
|
|
||||||
It is not recommended to use, it needs more testing, and is more secure to unpack them first manually
|
Theorically n770 and n800 have different USB device ID, but this is not
|
||||||
and flash the pieces manually with multiple '-p' flags. If you are brave try:
|
true at all. The first series of the n800 comes with the same usb-id
|
||||||
|
than n770. That's weird!
|
||||||
|
|
||||||
# 0xFFFF -F FiascoFirmware.fiasco
|
So, the only way to identify the device is by asking nolo for the version
|
||||||
|
information of different pieces of the firmware. This can be faked, because
|
||||||
|
you can flash n770 stuff on n800 and viceversa, but it's not recommended
|
||||||
|
because it wouldn't work :)
|
||||||
|
|
||||||
|
|
||||||
<h2>Advanced commands</h2>
|
<b>*) Can I unpack fiasco blobs?</b>
|
||||||
|
|
||||||
<b>*) How to extract the firmware pieces from a running device?</b>
|
Actually the fiasco format is not yet supported and not planned in
|
||||||
|
short term. There is no real need for supporting a proprietary
|
||||||
|
format image containing a proprietary system.
|
||||||
|
|
||||||
It is possible to dump the firmware pieces from the internal MTD to reconstruct a FIASCO image.
|
We can just use tarballs containing the desired pieces.
|
||||||
To do this recompile the flasher for ARM and run this command in the device:
|
|
||||||
|
|
||||||
# mkdir /media/mmc1/backup
|
|
||||||
# 0xFFFF -e /media/mmc1/backup
|
|
||||||
|
|
||||||
|
|
||||||
<b>*) Dumping configuration region</b>
|
|
||||||
|
|
||||||
There's a hidden mtd partition containing undocumented configuration information. This one can be
|
|
||||||
dumped from the device using the following command:
|
|
||||||
|
|
||||||
# 0xFFFF -x
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
<b>FAQ</b>
|
|
||||||
|
|
||||||
This file tries to collect a bunch of common questions/answers about flashing
|
|
||||||
|
|
||||||
|
|
||||||
<b>*) Why implement a free software flasher?</b>
|
|
||||||
|
|
||||||
The Nokia Internet Tablets are based on Free Software (software libre), but
|
|
||||||
not everything included *is* free software, for instance, the firmware flasher
|
|
||||||
tool.
|
|
||||||
|
|
||||||
The 0xFFFF project aims to feed the minds of those who really want to
|
|
||||||
understand how these gadgets work internally, free the knowledge to
|
|
||||||
avoid the restrictions and fill the lack of information on the most
|
|
||||||
important part of the system.
|
|
||||||
|
|
||||||
That's it, now you can build and run this flasher on *BSD, w32, MacOSX on ARM,
|
|
||||||
powerpc, x86, mips, etc...
|
|
||||||
|
|
||||||
|
|
||||||
<b>*) Can I brick my device?</b>
|
|
||||||
|
|
||||||
Of course! You're free to do what you want with your device :)
|
|
||||||
|
|
||||||
Seriously. Flashing a device is not a safe thing, so I give no warranty
|
|
||||||
of what will happen to your device when using this tool.
|
|
||||||
|
|
||||||
BTW, after a huge number of tests I can say that these devices are hard
|
|
||||||
to brick, but if you are scared about bricking your device you should
|
|
||||||
use the flasher provided by Nokia, it's better for your heart's health.
|
|
||||||
|
|
||||||
|
|
||||||
<b>*) What can I do with 0xFFFF?</b>
|
|
||||||
|
|
||||||
Actually 0xFFFF allows you to:
|
|
||||||
|
|
||||||
- flash separated pieces of the firmware.
|
|
||||||
- retrieve information about the device
|
|
||||||
- reboot de mother board
|
|
||||||
- extract the current firmware pieces from the device (reverse flash)
|
|
||||||
- set the USB host/slave mode
|
|
||||||
- set the R&R mode
|
|
||||||
- identify firmware pieces
|
|
||||||
|
|
||||||
|
|
||||||
<b>*) What is NOLO?</b>
|
|
||||||
|
|
||||||
NOLO is the 'server-side' part of the flasher from Nokia. NOLO means
|
|
||||||
NOkia LOader and it's composed by two pieces of the firmware that are
|
|
||||||
flashed together.
|
|
||||||
|
|
||||||
On the n800 firmwares, these two pieces are distributed in a single
|
|
||||||
file, but when flashing a n770, NOLO requires to provide the xloader
|
|
||||||
(without commiting) and then the secondary piece.
|
|
||||||
|
|
||||||
This piece of software is closed source and is the responsable of
|
|
||||||
handling the requests from the client-side flasher. It provides a
|
|
||||||
query-like interface via usb control messages for doing different
|
|
||||||
actions on the device.
|
|
||||||
|
|
||||||
|
|
||||||
<b>*) How can I identify my device?</b>
|
|
||||||
|
|
||||||
Theorically n770 and n800 have different USB device ID, but this is not
|
|
||||||
true at all. The first series of the n800 comes with the same usb-id
|
|
||||||
than n770. That's weird!
|
|
||||||
|
|
||||||
So, the only way to identify the device is by asking nolo for the version
|
|
||||||
information of different pieces of the firmware. This can be faked, because
|
|
||||||
you can flash n770 stuff on n800 and viceversa, but it's not recommended
|
|
||||||
because it wouldn't work :)
|
|
||||||
|
|
||||||
|
|
||||||
<b>*) Can I unpack fiasco blobs?</b>
|
|
||||||
|
|
||||||
Actually the fiasco format is not yet supported and not planned in
|
|
||||||
short term. There is no real need for supporting a proprietary
|
|
||||||
format image containing a proprietary system.
|
|
||||||
|
|
||||||
We can just use tarballs containing the desired pieces.
|
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
- preferences
|
||||||
|
|
||||||
|
* choose flasher type.
|
||||||
|
|
||||||
|
by default 0xFFFF is used
|
||||||
|
|
||||||
|
*
|
||||||
|
|
||||||
|
piece [file]
|
||||||
|
|
|
||||||
|
+-- radio
|
||||||
|
|
|
||||||
|
+-- nbh
|
||||||
|
|
||||||
|
info
|
||||||
|
|
|
||||||
|
+-- -i
|
||||||
|
|
||||||
|
reboot
|
||||||
|
|
|
||||||
|
+-- ???
|
||||||
|
|
||||||
|
----------
|
||||||
|
|
||||||
|
piece [file]
|
||||||
|
|
|
||||||
|
+-- xloader
|
||||||
|
|
|
||||||
|
+-- secondary
|
||||||
|
|
|
||||||
|
+-- kernel
|
||||||
|
|
|
||||||
|
+-- initfs
|
||||||
|
|
|
||||||
|
+-- rootfs
|
||||||
|
|
|
||||||
|
+-- autodetected
|
||||||
|
|
||||||
|
info
|
||||||
|
|
|
||||||
|
+-- -i
|
||||||
|
|
||||||
|
usb-host-mode
|
||||||
|
|
|
||||||
|
+-- -U [0|1]
|
||||||
|
|
||||||
|
rd-mode
|
||||||
|
|
|
||||||
|
+-- -r 0|1
|
||||||
|
|
||||||
|
reboot
|
||||||
|
|
|
||||||
|
+-- -R
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
OBJ=main.o
|
||||||
|
BIN=goxf
|
||||||
|
|
||||||
|
CFLAGS=`pkg-config libgladeui-1.0 libglade-2.0 --cflags`
|
||||||
|
LDFLAGS=`pkg-config libgladeui-1.0 libglade-2.0 --libs`
|
||||||
|
|
||||||
|
all: ${OBJ}
|
||||||
|
${CC} ${LDFLAGS} ${OBJ} -o ${BIN}
|
||||||
@@ -0,0 +1,223 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
|
||||||
|
<!--*- mode: xml -*-->
|
||||||
|
<glade-interface>
|
||||||
|
<widget class="GtkWindow" id="main_window">
|
||||||
|
<property name="border_width">5</property>
|
||||||
|
<property name="title" translatable="yes" context="yes">g0xFFFF</property>
|
||||||
|
<property name="default_width">501</property>
|
||||||
|
<property name="default_height">329</property>
|
||||||
|
<property name="icon_name">gtk-connect</property>
|
||||||
|
<signal name="destroy_event" handler="gtk_main_quit" object="0"/>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkVBox" id="vbox1">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="spacing">3</property>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkHButtonBox" id="hbuttonbox2">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="layout_style">GTK_BUTTONBOX_START</property>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkComboBox" id="combobox2">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="active">0</property>
|
||||||
|
<property name="items" translatable="yes" context="yes">n770/n800
|
||||||
|
HERMflasher</property>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">False</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkButton" id="gochange">
|
||||||
|
<property name="width_request">32</property>
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="has_default">True</property>
|
||||||
|
<property name="label" translatable="yes" context="yes">></property>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">False</property>
|
||||||
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">False</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkHBox" id="hbox1">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="spacing">6</property>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkScrolledWindow" id="scrolledwindow1">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
|
||||||
|
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkTreeView" id="treeview1">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkVBox" id="vbox2">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="border_width">3</property>
|
||||||
|
<property name="spacing">2</property>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkFileChooserButton" id="filechooserbutton2">
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkComboBox" id="combo1">
|
||||||
|
<property name="row_span_column">0</property>
|
||||||
|
<property name="column_span_column">0</property>
|
||||||
|
<property name="active">0</property>
|
||||||
|
<property name="tearoff_title">patata</property>
|
||||||
|
<property name="items" translatable="yes" context="yes">rootfs
|
||||||
|
initfs
|
||||||
|
kernel
|
||||||
|
secondary
|
||||||
|
xloader</property>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkHBox" id="hbox4">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkButton" id="button2">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="label" context="yes">Remove</property>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkButton" id="add">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="label" context="yes">Add</property>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="position">2</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkCheckButton" id="checkbutton2">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="label" translatable="yes" context="yes">USB host mode</property>
|
||||||
|
<property name="draw_indicator">True</property>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">False</property>
|
||||||
|
<property name="position">3</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkCheckButton" id="checkbutton3">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="label" translatable="yes" context="yes">R&D mode</property>
|
||||||
|
<property name="draw_indicator">True</property>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">False</property>
|
||||||
|
<property name="position">4</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkCheckButton" id="reboot">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="label" translatable="yes" context="yes">Reboot</property>
|
||||||
|
<property name="draw_indicator">True</property>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">False</property>
|
||||||
|
<property name="position">5</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="pack_type">GTK_PACK_END</property>
|
||||||
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="padding">3</property>
|
||||||
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkHBox" id="hbox3">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="spacing">6</property>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkProgressBar" id="progressbar1">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="show_text">True</property>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkHBox" id="hbox5">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkButton" id="info">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="label" translatable="yes" context="yes">gtk-dialog-info</property>
|
||||||
|
<property name="use_stock">True</property>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">False</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<widget class="GtkButton" id="but_commit">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="label" translatable="yes" context="yes">gtk-execute</property>
|
||||||
|
<property name="use_stock">True</property>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">False</property>
|
||||||
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">False</property>
|
||||||
|
<property name="pack_type">GTK_PACK_END</property>
|
||||||
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">False</property>
|
||||||
|
<property name="position">2</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
</child>
|
||||||
|
</widget>
|
||||||
|
</glade-interface>
|
||||||
+49
@@ -0,0 +1,49 @@
|
|||||||
|
/*
|
||||||
|
* 0xFFFF - Open Free Fiasco Firmware Flasher
|
||||||
|
* Copyright (C) 2007 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
|
||||||
|
* 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 <glade/glade.h>
|
||||||
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
|
#define U(x) printf("%d\n",x); fflush(stdout);
|
||||||
|
|
||||||
|
int main(int argc, char **argv)
|
||||||
|
{
|
||||||
|
GtkWidget *w;
|
||||||
|
GladeXML *xml;
|
||||||
|
|
||||||
|
gtk_init(&argc, &argv);
|
||||||
|
|
||||||
|
xml = glade_xml_new("g0xFFFF.glade", "main_window", "");
|
||||||
|
//xml = glade_xml_new("test.glade", "window1", NULL);
|
||||||
|
if(!xml) {
|
||||||
|
g_warning("We could not load the interface!");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
glade_xml_signal_autoconnect(xml);
|
||||||
|
|
||||||
|
w = glade_xml_get_widget(xml, "main_window");
|
||||||
|
gtk_signal_connect(GTK_OBJECT(w), "destroy",
|
||||||
|
GTK_SIGNAL_FUNC(gtk_main_quit),NULL);
|
||||||
|
gtk_widget_show_all(w);
|
||||||
|
|
||||||
|
gtk_object_unref(GTK_OBJECT(xml));
|
||||||
|
|
||||||
|
gtk_main();
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
+2
-8
@@ -1,14 +1,8 @@
|
|||||||
OBJ=logotool.o compress.o uncompress.o rgb2yuv.o
|
OBJ=logotool.o compress.o uncompress.o rgb2yuv.o
|
||||||
#CFLAGS=-Wall -g
|
CFLAGS=-Wall -g
|
||||||
BIN=logotool
|
|
||||||
|
|
||||||
all: ${BIN}
|
all: ${OBJ}
|
||||||
|
|
||||||
${BIN}: ${OBJ}
|
|
||||||
${CC} ${OBJ} -o logotool
|
${CC} ${OBJ} -o logotool
|
||||||
|
|
||||||
static: ${BIN}
|
|
||||||
${CC} -static ${OBJ} -o logotool
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f ${OBJ} logotool
|
rm -f ${OBJ} logotool
|
||||||
+5
-11
@@ -1,19 +1,13 @@
|
|||||||
include ../config.mk
|
VERSION=0.3
|
||||||
OBJ=main.o fiasco.o hexdump.o dump.o flash.o serial.o qmode.o
|
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
|
OBJ+=hash.o fpid.o query.o pieces.o utils.o devices.o console.o
|
||||||
OBJ+=squeue/squeue.o
|
|
||||||
BIN=0xFFFF
|
BIN=0xFFFF
|
||||||
#LIBS=`${HAVE_USB} && echo -- '-lusb'`
|
CFLAGS+=-DVERSION=\"${VERSION}\" -Wall -g -I .
|
||||||
LIBS=`if [ "${HAVE_USB}" = 1 ]; then echo '-lusb'; fi`
|
|
||||||
CFLAGS+=-DVERSION=\"${VERSION}\" -Wall -I .
|
|
||||||
CFLAGS+=-pedantic -std=c99 -DHAVE_USB=${HAVE_USB}
|
|
||||||
USBOBJ=../libusb/error.o ../libusb/usb.o ../libusb/descriptors.o
|
USBOBJ=../libusb/error.o ../libusb/usb.o ../libusb/descriptors.o
|
||||||
USBOBJ+=../libusb/linux.o ## XXX not portable
|
USBOBJ+=../libusb/linux.o ## XXX not portable
|
||||||
|
|
||||||
all: ${BIN}
|
all: ${OBJ}
|
||||||
|
${CC} ${LDFLAGS} -o ${BIN} ${OBJ} -lusb
|
||||||
${BIN}: ${OBJ}
|
|
||||||
${CC} ${LDFLAGS} -o ${BIN} ${OBJ} ${LIBS}
|
|
||||||
|
|
||||||
allusb: ${OBJ}
|
allusb: ${OBJ}
|
||||||
${CC} ${LDFLAGS} -o ${BIN} ${OBJ} ${USBOBJ}
|
${CC} ${LDFLAGS} -o ${BIN} ${OBJ} ${USBOBJ}
|
||||||
|
|||||||
+8
-19
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* 0xFFFF - Open Free Fiasco Firmware Flasher
|
* 0xFFFF - Open Free Fiasco Firmware Flasher
|
||||||
* Copyright (C) 2007, 2008 pancake <pancake@youterm.com>
|
* Copyright (C) 2007 pancake <pancake@youterm.com>
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -16,7 +16,6 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if HAVE_USB
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "query.h"
|
#include "query.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
@@ -46,13 +45,7 @@ void cmd_help(char *line)
|
|||||||
|
|
||||||
void cmd_info(char *line)
|
void cmd_info(char *line)
|
||||||
{
|
{
|
||||||
char *p, str[128];
|
get_hw_revision(); // get hardware revision:
|
||||||
get_sw_version();
|
|
||||||
get_hw_revision(str, 128); // get hardware revision:
|
|
||||||
p = strstr(str, "hw_rev:");
|
|
||||||
if (p) // TODO: delimit string by comma
|
|
||||||
printf("SubVersionString autodetected: '%s'\n", p+7);
|
|
||||||
else printf("SubVersionString autodetected: (error)\n");
|
|
||||||
get_root_device(); // only for flashing
|
get_root_device(); // only for flashing
|
||||||
get_usb_mode();
|
get_usb_mode();
|
||||||
get_rd_mode();
|
get_rd_mode();
|
||||||
@@ -67,17 +60,14 @@ void cmd_nanddump(char *line)
|
|||||||
char out[128];
|
char out[128];
|
||||||
int ignbb;
|
int ignbb;
|
||||||
int ignoob = -1;
|
int ignoob = -1;
|
||||||
|
sscanf(line, "%127s 0x%x 0x%x %127s %d %d", &dev, &from, &length, &out, &ignbb, &ignoob);
|
||||||
sscanf(line, "%127s 0x%x 0x%x %127s %d %d",
|
|
||||||
(char *)&dev, (unsigned int*)&from, (unsigned int *)&length,
|
|
||||||
(char *)&out, (int*)&ignbb, (int *)&ignoob);
|
|
||||||
|
|
||||||
if (ignoob == -1) {
|
if (ignoob == -1) {
|
||||||
eprintf("Invalid arguments.\n");
|
printf("Invalid arguments.\n");
|
||||||
eprintf("nanddump [dev] [start] [len] [out] [ignore-badblocks] [ignore-oob]\n");
|
printf("nanddump [dev] [start] [len] [out] [ignore-badblocks] [ignore-oob]\n");
|
||||||
eprintf(" f.ex: nanddump /dev/mtd0 0x0 0x4000 xloader.bin 1 1\n");
|
printf(" f.ex: nanddump /dev/mtd0 0x0 0x4000 xloader.bin 1 1\n");
|
||||||
} else
|
} else {
|
||||||
nanddump(dev, from, length, out, ignbb, ignoob);
|
nanddump(dev, from, length, out, ignbb, ignoob);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmd_dump(char *line)
|
void cmd_dump(char *line)
|
||||||
@@ -171,4 +161,3 @@ int console_prompt()
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
+2
-4
@@ -16,7 +16,6 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if HAVE_USB
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@@ -37,7 +36,7 @@
|
|||||||
struct devices supported_devices[SUPPORTED_DEVICES] = {
|
struct devices supported_devices[SUPPORTED_DEVICES] = {
|
||||||
{ "FFFF", 0x000, 0x0000, 0x0000 }, // dummy
|
{ "FFFF", 0x000, 0x0000, 0x0000 }, // dummy
|
||||||
{ "unkn", 0x421, 0x3f00, 0x0000 }, // probably a development board
|
{ "unkn", 0x421, 0x3f00, 0x0000 }, // probably a development board
|
||||||
{ "n770/n810", 0x421, 0x0105, 0x0001 }, // my n770
|
{ "n770", 0x421, 0x0105, 0x0001 }, // my n770
|
||||||
{ "n800", 0x421, 0x04c3, 0x0001 }, // a n800
|
{ "n800", 0x421, 0x04c3, 0x0001 }, // a n800
|
||||||
{ 0 },
|
{ 0 },
|
||||||
{ 0 }
|
{ 0 }
|
||||||
@@ -57,7 +56,7 @@ int is_valid_device(struct usb_device_descriptor *udd)
|
|||||||
for(i=1 ; ptr.vendor_id; ptr = supported_devices[++i])
|
for(i=1 ; ptr.vendor_id; ptr = supported_devices[++i])
|
||||||
if ((udd->idVendor == ptr.vendor_id)
|
if ((udd->idVendor == ptr.vendor_id)
|
||||||
&& (udd->idProduct == ptr.product_id)) {
|
&& (udd->idProduct == ptr.product_id)) {
|
||||||
D printf("found %s\n", supported_devices[i].name);
|
D printf("found %s\n", supported_devices[i]);
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -117,4 +116,3 @@ int usb_device_found(struct usb_device_descriptor *udd, struct devices *it_devic
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
+9
-13
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "hexdump.h"
|
#include "hexdump.h"
|
||||||
|
#include <usb.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@@ -80,11 +81,8 @@ __rf_extract_exit:
|
|||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
//#include <asm/types.h>
|
#include <asm/types.h>
|
||||||
#include <mtd/mtd-user.h>
|
#include <mtd/mtd-user.h>
|
||||||
#ifndef loff_t
|
|
||||||
#define loff_t off_t
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define M_RDONLY 0x00000001
|
#define M_RDONLY 0x00000001
|
||||||
#define M_RDRW 0x00000002
|
#define M_RDRW 0x00000002
|
||||||
@@ -244,8 +242,7 @@ closeall:
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// XXX warning ioob is not used
|
int nanddump(char *mtddev, unsigned long start_addr, unsigned long length, char *dumpfile, int isbl)
|
||||||
int nanddump(char *mtddev, unsigned long start_addr, unsigned long length, char *dumpfile, int isbl, int ioob)
|
|
||||||
{
|
{
|
||||||
unsigned char readbuf[2048];
|
unsigned char readbuf[2048];
|
||||||
int oobinfochanged = 0 ;
|
int oobinfochanged = 0 ;
|
||||||
@@ -382,7 +379,6 @@ int nanddump(char *mtddev, unsigned long start_addr, unsigned long length, char
|
|||||||
|
|
||||||
/* Write out page data */
|
/* Write out page data */
|
||||||
//if (pretty_print) dump_bytes(readbuf, bs);
|
//if (pretty_print) dump_bytes(readbuf, bs);
|
||||||
write(ofd, readbuf, bs);
|
|
||||||
progressbar(ofs, end_addr);
|
progressbar(ofs, end_addr);
|
||||||
|
|
||||||
// OOB STUFF //
|
// OOB STUFF //
|
||||||
@@ -547,20 +543,20 @@ int reverse_extract_pieces(char *dir)
|
|||||||
// TODO: get values from /proc/mtd ???
|
// TODO: get values from /proc/mtd ???
|
||||||
|
|
||||||
//rf_extract("/dev/mtd0", is_n800()?0x200:0, 0x003600, "xloader.bin");
|
//rf_extract("/dev/mtd0", is_n800()?0x200:0, 0x003600, "xloader.bin");
|
||||||
nanddump("/dev/mtd0", is_n800()?0x200:0, 0x4000, "xloader.bin", 1,0); // 0x3600 size?
|
nanddump("/dev/mtd0", is_n800()?0x200:0, 0x4000, "xloader.bin", 1); // 0x3600 size?
|
||||||
//rf_extract("/dev/mtd0", 0x004000, 0x01ffff, "secondary.bin");
|
//rf_extract("/dev/mtd0", 0x004000, 0x01ffff, "secondary.bin");
|
||||||
nanddump("/dev/mtd0", 0x004000, 0, "secondary.bin", 1,0);
|
nanddump("/dev/mtd0", 0x004000, 0, "secondary.bin", 1);
|
||||||
nanddump("/dev/mtd1", 0, 0, "config.bin", 0,0);
|
nanddump("/dev/mtd1", 0, 0, "config.bin", 0);
|
||||||
//rf_extract("/dev/mtd2", 0x000800, 0x200000, "zImage");
|
//rf_extract("/dev/mtd2", 0x000800, 0x200000, "zImage");
|
||||||
nanddump("/dev/mtd2", 0x000800, 0, "zImage", 0,0);
|
nanddump("/dev/mtd2", 0x000800, 0, "zImage", 0);
|
||||||
//rf_extract("/dev/mtd3", 0x000000, 0x1D00000, "initfs.jffs2");
|
//rf_extract("/dev/mtd3", 0x000000, 0x1D00000, "initfs.jffs2");
|
||||||
nanddump("/dev/mtd3", 0x000000, 0, "initfs.jffs2", 0,0);
|
nanddump("/dev/mtd3", 0x000000, 0, "initfs.jffs2", 0);
|
||||||
|
|
||||||
printf("\n\nExtract rootfs? (y/N): "); fflush(stdout);
|
printf("\n\nExtract rootfs? (y/N): "); fflush(stdout);
|
||||||
read(0, &reply, 1);
|
read(0, &reply, 1);
|
||||||
if (reply=='y'||reply=='Y') {
|
if (reply=='y'||reply=='Y') {
|
||||||
//rf_extract("/dev/mtd4", 0x000000, 0x6000000, "rootfs.jffs2");
|
//rf_extract("/dev/mtd4", 0x000000, 0x6000000, "rootfs.jffs2");
|
||||||
nanddump("/dev/mtd4", 0x000000, 0, "rootfs.jffs2", 0,0);
|
nanddump("/dev/mtd4", 0x000000, 0, "rootfs.jffs2", 0);
|
||||||
} else printf("*** Ignoring rootfs\n");
|
} else printf("*** Ignoring rootfs\n");
|
||||||
|
|
||||||
printf("\n\nStrip dumped files? (y/N): "); fflush(stdout);
|
printf("\n\nStrip dumped files? (y/N): "); fflush(stdout);
|
||||||
|
|||||||
+19
-53
@@ -27,18 +27,16 @@
|
|||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "hash.h"
|
#include "hash.h"
|
||||||
|
|
||||||
int (*fiasco_callback)(struct header_t *header) = NULL;
|
void (*fiasco_callback)(struct header_t *header) = NULL;
|
||||||
|
|
||||||
int openfiasco(char *name, char *piece_grep, int v)
|
int openfiasco(char *name)
|
||||||
{
|
{
|
||||||
struct header_t header;
|
struct header_t header;
|
||||||
unsigned char buf[128];
|
unsigned char buf[128];
|
||||||
unsigned char data[128];
|
unsigned char data[128];
|
||||||
unsigned char *pdata;
|
|
||||||
unsigned int namelen;
|
unsigned int namelen;
|
||||||
off_t off, here;
|
off_t off;
|
||||||
int i,j;
|
int i;
|
||||||
|
|
||||||
header.fd = open(name, O_RDONLY);
|
header.fd = open(name, O_RDONLY);
|
||||||
|
|
||||||
if (header.fd == -1) {
|
if (header.fd == -1) {
|
||||||
@@ -61,30 +59,21 @@ int openfiasco(char *name, char *piece_grep, int v)
|
|||||||
memset(buf,'\0', 128);
|
memset(buf,'\0', 128);
|
||||||
read(header.fd, buf, namelen);
|
read(header.fd, buf, namelen);
|
||||||
|
|
||||||
if (v) printf("Fiasco version: %2d\n", buf[3]);
|
printf("Fiasco version: %2d\n", buf[3]);
|
||||||
strcpy(header.fwname, (char *)buf+6);
|
strcpy(header.fwname, buf+6);
|
||||||
if (v)
|
for(i=6;i<namelen;i+=strlen(buf+i)+1)
|
||||||
for(i=6;i<namelen;i+=strlen((char *)(buf+i))+1)
|
|
||||||
printf("Name: %s\n", buf+i);
|
printf("Name: %s\n", buf+i);
|
||||||
|
|
||||||
/* walk the tree */
|
/* walk the tree */
|
||||||
while(1) {
|
while(1) {
|
||||||
here = lseek(header.fd, 0, SEEK_CUR);
|
|
||||||
if (read(header.fd, buf, 9)<9)
|
if (read(header.fd, buf, 9)<9)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (buf[0] != 0x54) { // 'T'
|
if (buf[0] != 0x54) { // 'T'
|
||||||
/* skipping some bytes */
|
printf("unexpected header at 0x%x, found %02x %02x %02x\n",
|
||||||
lseek(header.fd, -9, SEEK_CUR);
|
((int)lseek(header.fd, 0, SEEK_CUR))-9,
|
||||||
for(i=0;buf[0]!=0x54;i++) {
|
buf[0], buf[1], buf[2]);
|
||||||
j = read(header.fd, buf, 1);
|
break;
|
||||||
if (j == -1) {
|
|
||||||
printf("Cannot find next FIASCO header\n");
|
|
||||||
return close(header.fd);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (v) printf("Skipping %d padding bytes\n", i);
|
|
||||||
lseek(header.fd, -1, SEEK_CUR);
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
header.hash = buf[7]<<8|buf[8];
|
header.hash = buf[7]<<8|buf[8];
|
||||||
|
|
||||||
@@ -96,18 +85,15 @@ int openfiasco(char *name, char *piece_grep, int v)
|
|||||||
if (data[0] == 0xff) {
|
if (data[0] == 0xff) {
|
||||||
printf(" [eof]\n");
|
printf(" [eof]\n");
|
||||||
break;
|
break;
|
||||||
} else if (v) printf(" %s\n", data);
|
} else printf(" %s\n", data);
|
||||||
strcpy(header.name, (char *)data);
|
strcpy(header.name, data);
|
||||||
|
|
||||||
if (read(header.fd, buf, 9)<9)
|
if (read(header.fd, buf, 9)<9)
|
||||||
break;
|
break;
|
||||||
memcpy(&header.size, buf,4);
|
memcpy(&header.size, buf,4);
|
||||||
header.size = ntohl(header.size);
|
header.size = ntohl(header.size);
|
||||||
if (v) {
|
|
||||||
printf(" offset: 0x%08x\n", (unsigned int)here);
|
|
||||||
printf(" size: %d bytes\n", header.size);
|
printf(" size: %d bytes\n", header.size);
|
||||||
printf(" hash: %04x\n", header.hash);
|
printf(" hash: %04x\n", header.hash);
|
||||||
}
|
|
||||||
//printf("BYTE: %02x %02x %02x %02x %02x\n",
|
//printf("BYTE: %02x %02x %02x %02x %02x\n",
|
||||||
// buf[4], buf[5], buf[6], buf[7], buf[8]);
|
// buf[4], buf[5], buf[6], buf[7], buf[8]);
|
||||||
/* XXX this is not ok */
|
/* XXX this is not ok */
|
||||||
@@ -118,50 +104,29 @@ int openfiasco(char *name, char *piece_grep, int v)
|
|||||||
i = data[0];
|
i = data[0];
|
||||||
if (read(header.fd, data, i)<i)
|
if (read(header.fd, data, i)<i)
|
||||||
break;
|
break;
|
||||||
if (data[0]) {
|
if (data[0])
|
||||||
if (v) {
|
|
||||||
printf(" version-length: %d\n", i);
|
|
||||||
printf(" version: %s\n", data);
|
printf(" version: %s\n", data);
|
||||||
}
|
strcpy(header.version, data);
|
||||||
pdata = data;
|
|
||||||
while(pdata<data+i) {
|
|
||||||
strcat(header.name,pdata==data?"-":",");
|
|
||||||
strcat(header.name, (char*)pdata);
|
|
||||||
if (v) printf(" sub-version: %s\n", pdata);
|
|
||||||
pdata = pdata+strlen((char*)pdata)+1;
|
|
||||||
for(;*pdata=='\0'&&pdata<data+i;pdata=pdata+1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
strcpy(header.version, (char *)data);
|
|
||||||
if (read(header.fd, buf+8, 1)<1)
|
if (read(header.fd, buf+8, 1)<1)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* callback */
|
/* callback */
|
||||||
off = lseek(header.fd, 0, SEEK_CUR);
|
off = lseek(header.fd, 0, SEEK_CUR);
|
||||||
if (v) {
|
|
||||||
printf(" name: %s\n", header.name);
|
|
||||||
printf(" body-at: 0x%08x\n", (unsigned int)off);
|
|
||||||
}
|
|
||||||
if (piece_grep==NULL || (strstr(header.name, piece_grep))) {
|
|
||||||
printf("==> (%s) %s\n", piece_grep, header.name);
|
|
||||||
if (fiasco_callback != NULL) {
|
if (fiasco_callback != NULL) {
|
||||||
fiasco_callback(&header);
|
fiasco_callback(&header);
|
||||||
free(header.data);
|
free(header.data);
|
||||||
continue;
|
continue;
|
||||||
} else {
|
|
||||||
// ??huh
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// XXX dup
|
// XXX dup
|
||||||
lseek(header.fd, off, SEEK_SET);
|
lseek(header.fd, off, SEEK_SET);
|
||||||
lseek(header.fd, header.size, SEEK_CUR);
|
lseek(header.fd, header.size, SEEK_CUR);
|
||||||
}
|
}
|
||||||
return close(header.fd);
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void fiasco_data_read(struct header_t *header)
|
void fiasco_data_read(struct header_t *header)
|
||||||
{
|
{
|
||||||
header->data = (unsigned char *)malloc(header->size);
|
header->data = (char *)malloc(header->size);
|
||||||
if (header->data == NULL) {
|
if (header->data == NULL) {
|
||||||
printf("Cannot alloc %d bytes\n", header->size);
|
printf("Cannot alloc %d bytes\n", header->size);
|
||||||
return;
|
return;
|
||||||
@@ -208,6 +173,7 @@ int fiasco_add_eof(int fd)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int fiasco_add(int fd, const char *name, const char *file, const char *version)
|
int fiasco_add(int fd, const char *name, const char *file, const char *version)
|
||||||
{
|
{
|
||||||
int gd,ret;
|
int gd,ret;
|
||||||
|
|||||||
+2
-20
@@ -16,10 +16,10 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if HAVE_USB
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "hash.h"
|
#include "hash.h"
|
||||||
#include "hexdump.h"
|
#include "hexdump.h"
|
||||||
|
#include <usb.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
@@ -74,7 +74,7 @@ void check_nolo_order()
|
|||||||
check_nolo_order_failed();
|
check_nolo_order_failed();
|
||||||
}
|
}
|
||||||
|
|
||||||
void flash_image(const char *filename, const char *piece, const char *version)
|
void flash_image(char *filename, char *piece, char *version)
|
||||||
{
|
{
|
||||||
FILE *fd;
|
FILE *fd;
|
||||||
int vlen = 0;
|
int vlen = 0;
|
||||||
@@ -86,23 +86,6 @@ void flash_image(const char *filename, const char *piece, const char *version)
|
|||||||
unsigned char nolofiller[128];
|
unsigned char nolofiller[128];
|
||||||
ushort hash = do_hash_file(filename);
|
ushort hash = do_hash_file(filename);
|
||||||
|
|
||||||
if (piece == NULL) {
|
|
||||||
//exit(1);
|
|
||||||
piece = fpid_file(filename);
|
|
||||||
if (piece == NULL) {
|
|
||||||
printf("Unknown piece type\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
printf("Piece type: %s\n", piece);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (piece != NULL) {
|
|
||||||
if (!strcmp(piece, "fiasco")) {
|
|
||||||
fiasco_flash(filename);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (version)
|
if (version)
|
||||||
vlen = strlen(version)+1;
|
vlen = strlen(version)+1;
|
||||||
|
|
||||||
@@ -212,4 +195,3 @@ void flash_image(const char *filename, const char *piece, const char *version)
|
|||||||
}
|
}
|
||||||
printf("Flash done succesfully.\n");
|
printf("Flash done succesfully.\n");
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
+4
-34
@@ -20,34 +20,12 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
/* global structs */
|
|
||||||
char *pieces[] = {
|
|
||||||
"xloader", // xloader.bin
|
|
||||||
"2nd", // 2nd
|
|
||||||
"secondary", // secondary.bin
|
|
||||||
"kernel", // zImage
|
|
||||||
"initfs", // jffs'd initfs
|
|
||||||
"rootfs", // 80mB of blob
|
|
||||||
"omap-nand", // 8kB of food for the nand
|
|
||||||
"fiasco", // FIASCO IMAGE
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
long fpid_size(const char *filename)
|
|
||||||
{
|
|
||||||
long sz;
|
|
||||||
FILE *fd = fopen(filename, "r");
|
|
||||||
fseek(fd, 0, SEEK_END);
|
|
||||||
sz = ftell(fd);
|
|
||||||
fclose(fd);
|
|
||||||
return sz;
|
|
||||||
}
|
|
||||||
|
|
||||||
const char *fpid_file(const char *filename)
|
const char *fpid_file(const char *filename)
|
||||||
{
|
{
|
||||||
FILE *fd;
|
FILE *fd;
|
||||||
char buf[512];
|
char buf[512];
|
||||||
unsigned char *b = (unsigned char *)&buf;
|
unsigned char *b = (unsigned char *)&buf;
|
||||||
|
char *piece = NULL;
|
||||||
long size;
|
long size;
|
||||||
|
|
||||||
// 2nd : +0x34 = 2NDAPE
|
// 2nd : +0x34 = 2NDAPE
|
||||||
@@ -67,9 +45,6 @@ const char *fpid_file(const char *filename)
|
|||||||
size = ftell(fd);
|
size = ftell(fd);
|
||||||
fclose(fd);
|
fclose(fd);
|
||||||
|
|
||||||
if (!memcmp(b, "\xb4", 1))
|
|
||||||
return pieces[PIECE_FIASCO];
|
|
||||||
else
|
|
||||||
if (!memcmp(b+0x34, "2NDAPE", 6))
|
if (!memcmp(b+0x34, "2NDAPE", 6))
|
||||||
return pieces[PIECE_2ND];
|
return pieces[PIECE_2ND];
|
||||||
else
|
else
|
||||||
@@ -79,15 +54,10 @@ const char *fpid_file(const char *filename)
|
|||||||
if (!memcmp(b+0x14, "X-LOADER", 8))
|
if (!memcmp(b+0x14, "X-LOADER", 8))
|
||||||
return pieces[PIECE_XLOADER];
|
return pieces[PIECE_XLOADER];
|
||||||
else
|
else
|
||||||
if (!memcmp(b+0x0c, "NOLOXldr", 8))
|
if (!memcmp(b+0x0c, "NOLOXldr", 8)) // TODO: this is xloader800, not valid on 770?
|
||||||
return pieces[PIECE_XLOADER];
|
return pieces[PIECE_XLOADER];
|
||||||
else
|
else
|
||||||
if (!memcmp(b+4,"NOLOXldr",8))
|
if (!memcmp(b+0x00, "\x00\x00\xa0\xe1\x00\x00\xa0\xe1", 8))
|
||||||
// TODO: this is xloader800, not valid on 770?
|
|
||||||
return pieces[PIECE_2ND];
|
|
||||||
else
|
|
||||||
if (!memcmp(b+0x00, "\x00\x00\xa0\xe1\x00\x00\xa0\xe1", 8)
|
|
||||||
|| (!memcmp(b, "\x21\x01\x01", 3)))
|
|
||||||
return pieces[PIECE_KERNEL];
|
return pieces[PIECE_KERNEL];
|
||||||
else
|
else
|
||||||
// JFFS2 MAGIC
|
// JFFS2 MAGIC
|
||||||
@@ -98,5 +68,5 @@ const char *fpid_file(const char *filename)
|
|||||||
return pieces[PIECE_ROOTFS];
|
return pieces[PIECE_ROOTFS];
|
||||||
}
|
}
|
||||||
|
|
||||||
return NULL;
|
return piece;
|
||||||
}
|
}
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
include ../../config.mk
|
|
||||||
|
|
||||||
ifeq (${HAVE_GUI},1)
|
|
||||||
all:
|
|
||||||
gtkamlc --save-temps --Xcc=-I../squeue ../squeue/squeue.c ../fpid.c ../squeue/squeue.vapi gui.gtkaml extras.vapi --pkg gtk+-2.0 -o goxf
|
|
||||||
|
|
||||||
test:
|
|
||||||
valac --save-temps --Xcc=-I.. squeue.vapi test.vala ../squeue.c -o v
|
|
||||||
valac --save-temps --Xcc=-I.. squeue.vapi client.vala ../squeue.c -o c
|
|
||||||
else
|
|
||||||
all:
|
|
||||||
@true
|
|
||||||
endif
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
namespace Extras {
|
|
||||||
public class External {
|
|
||||||
[CCode (cname = "system")]
|
|
||||||
public static int system(string cmd);
|
|
||||||
[CCode (cname = "fpid_file")]
|
|
||||||
public static string fpid_file(string file);
|
|
||||||
[CCode (cname = "fpid_size")]
|
|
||||||
public static long fpid_size(string file);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,356 +0,0 @@
|
|||||||
<!--
|
|
||||||
|
|
||||||
Frontend for the 0xFFFF flasher in gtkaml
|
|
||||||
|
|
||||||
author: pancake <youterm.com>
|
|
||||||
|
|
||||||
-->
|
|
||||||
|
|
||||||
<Window xmlns="Gtk"
|
|
||||||
xmlns:GLib="GLib"
|
|
||||||
xmlns:Extras="Extras"
|
|
||||||
xmlns:SQueues="SQueues"
|
|
||||||
xmlns:class="http://gtkaml.org/0.2"
|
|
||||||
class:name="MainWindow"
|
|
||||||
title="0xFFFF GUI">
|
|
||||||
<!-- delete-event="{OnWindow1DeleteEvent}" -->
|
|
||||||
<VBox>
|
|
||||||
<MenuBar expand="false">
|
|
||||||
<MenuItem label="_File" with-mnemonic="true">
|
|
||||||
<submenu>
|
|
||||||
<Menu>
|
|
||||||
<ImageMenuItem stock-id="gtk-new" activate="{OnFileNewEvent}"/>
|
|
||||||
<ImageMenuItem stock-id="gtk-open" activate="{OnFileOpenEvent}"/>
|
|
||||||
<SeparatorMenuItem />
|
|
||||||
<ImageMenuItem stock-id="gtk-quit" activate="{OnQuitEvent}"/>
|
|
||||||
</Menu>
|
|
||||||
</submenu>
|
|
||||||
</MenuItem>
|
|
||||||
|
|
||||||
<!-- Help menu -->
|
|
||||||
<MenuItem label="_Target" with-mnemonic="true">
|
|
||||||
<submenu>
|
|
||||||
<Menu>
|
|
||||||
<ImageMenuItem stock-id="gtk-connect" activate="{OnConnect}"/>
|
|
||||||
<ImageMenuItem stock-id="gtk-stop" activate="{OnStop}"/>
|
|
||||||
<ImageMenuItem stock-id="gtk-info" activate="{OnGetInformation}"/>
|
|
||||||
<ImageMenuItem label="Reset" activate="{OnReset}"/>
|
|
||||||
</Menu>
|
|
||||||
</submenu>
|
|
||||||
</MenuItem>
|
|
||||||
|
|
||||||
<!-- Help menu -->
|
|
||||||
<MenuItem label="_Help" with-mnemonic="true">
|
|
||||||
<submenu>
|
|
||||||
<Menu>
|
|
||||||
<ImageMenuItem stock-id="gtk-about" activate="{OnMenuHelpAboutActivatedEvent}"/>
|
|
||||||
</Menu>
|
|
||||||
</submenu>
|
|
||||||
</MenuItem>
|
|
||||||
</MenuBar>
|
|
||||||
|
|
||||||
<HBox border-width="5">
|
|
||||||
<VBox border-width="3" spacing="3">
|
|
||||||
<ScrolledWindow can-focus="true" hscrollbar-policy="{PolicyType.AUTOMATIC}" vscrollbar-policy="{PolicyType.AUTOMATIC}">
|
|
||||||
<TreeView class:private="tv">
|
|
||||||
</TreeView>
|
|
||||||
</ScrolledWindow>
|
|
||||||
|
|
||||||
</VBox>
|
|
||||||
<VBox expand="false" border-width="3" spacing="3">
|
|
||||||
<Button label="gtk-connect" use-stock="true" expand="false" clicked="{OnConnect}"/>
|
|
||||||
<Button label="gtk-stop" use-stock="true" expand="false" clicked="{OnStop}"/>
|
|
||||||
<Button label="gtk-info" use-stock="true" expand="false" clicked="{OnGetInformation}"/>
|
|
||||||
<Label label="" />
|
|
||||||
<!-- <Button label="Options" use-stock="false" expand="false"/>
|
|
||||||
<Button label="Fiasco!" use-stock="false" expand="false"/>
|
|
||||||
<Button label="Unpack!" use-stock="false" expand="false"/> -->
|
|
||||||
<Button label="gtk-add" use-stock="true" expand="false" clicked="{OnFileOpenEvent}" />
|
|
||||||
<Button label="gtk-remove" use-stock="true" expand="false" clicked="{list_del}"/>
|
|
||||||
<Label label="" />
|
|
||||||
<Button label="gtk-media-record" use-stock="true" expand="false" clicked="{OnFileFlashEvent}"/>
|
|
||||||
</VBox>
|
|
||||||
</HBox>
|
|
||||||
<ProgressBar class:private="pb" expand="false" />
|
|
||||||
|
|
||||||
<!-- <Statusbar expand="false"/> -->
|
|
||||||
</VBox>
|
|
||||||
<AboutDialog class:standalone="true" class:private="aboutdialog1" delete-event="{aboutdialog1.hide_on_delete}"
|
|
||||||
border-width="5" title="About 0xFFFF gui" resizable="false" modal="true"
|
|
||||||
window-position="{WindowPosition.CENTER_ON_PARENT}" has-separator="false"
|
|
||||||
program-name="0xFFFF" version="0.3.9" copyright="Copyright (c) 2008 pancake"
|
|
||||||
comments="The Free Nokia Internet Tablet flasher"
|
|
||||||
website="http://www.nopcode.org/0xFFFF/"
|
|
||||||
authors='{new string[] {"pancake (pancake@youterm.com)", null}}'>
|
|
||||||
</AboutDialog>
|
|
||||||
|
|
||||||
<![CDATA[
|
|
||||||
|
|
||||||
|
|
||||||
private void doCloseApplication ()
|
|
||||||
{
|
|
||||||
Gtk.main_quit ();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnReset()
|
|
||||||
{
|
|
||||||
q->push("reset:device", 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnFileFlashEvent()
|
|
||||||
{
|
|
||||||
ListStore ls = (ListStore)tv.get_model();
|
|
||||||
weak string str;
|
|
||||||
TreeIter iter;
|
|
||||||
|
|
||||||
int n = ls.iter_n_children(null);
|
|
||||||
if (n >0) {
|
|
||||||
if (showYesNo("Do you want to flash these files?")) {
|
|
||||||
ls.get_iter_first(out iter);
|
|
||||||
do {
|
|
||||||
ls.get(iter, 2, out str, -1);
|
|
||||||
//stdout.printf("polla:%s\n", str);
|
|
||||||
q->push2("flash", str, 1);
|
|
||||||
} while(ls.iter_next(ref iter));
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
showMessage("No files selected", MessageType.ERROR);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnFileOpenEvent ()
|
|
||||||
{
|
|
||||||
FileChooserDialog fc = new FileChooserDialog("Select file to open",
|
|
||||||
this, FileChooserAction.OPEN,
|
|
||||||
"gtk-cancel", ResponseType.CANCEL,
|
|
||||||
"gtk-open", ResponseType.ACCEPT);
|
|
||||||
int resp = fc.run ();
|
|
||||||
fc.hide ();
|
|
||||||
if (resp == ResponseType.ACCEPT) {
|
|
||||||
string file = fc.get_filename();
|
|
||||||
string *type = External.fpid_file(file);
|
|
||||||
string size = "%ld".printf(External.fpid_size(file));
|
|
||||||
if (type == null) {
|
|
||||||
showMessage("Invalid file type", MessageType.ERROR);
|
|
||||||
} else {
|
|
||||||
add_file(type, size, file);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fc.destroy ();
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool loadFile( string filename )
|
|
||||||
{
|
|
||||||
int err = 0;
|
|
||||||
try {
|
|
||||||
string contents; int length;
|
|
||||||
FileUtils.get_contents (filename, out contents, out length);
|
|
||||||
//textview1.buffer.set_text (contents, length);
|
|
||||||
} catch(Error e) {
|
|
||||||
showError ("Unexpected error while loading the file, please contact the author with the following information:\n\n" + e.message);
|
|
||||||
err++;
|
|
||||||
}
|
|
||||||
return err == 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool showYesNo(string s)
|
|
||||||
{
|
|
||||||
MessageDialog md = new MessageDialog (this,
|
|
||||||
DialogFlags.DESTROY_WITH_PARENT,
|
|
||||||
MessageType.QUESTION, ButtonsType.YES_NO, s);
|
|
||||||
int ret = md.run ();
|
|
||||||
md.destroy ();
|
|
||||||
|
|
||||||
return ret==ResponseType.YES;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void showMessage(string s, MessageType mt)
|
|
||||||
{
|
|
||||||
MessageDialog md = new MessageDialog (this,
|
|
||||||
DialogFlags.DESTROY_WITH_PARENT,
|
|
||||||
mt, ButtonsType.CLOSE, s);
|
|
||||||
md.run ();
|
|
||||||
md.destroy ();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnMenuHelpAboutActivatedEvent ()
|
|
||||||
{
|
|
||||||
aboutdialog1.transient_for = this;
|
|
||||||
aboutdialog1.run ();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void showError (string s)
|
|
||||||
{
|
|
||||||
MessageDialog md = new MessageDialog (this,
|
|
||||||
DialogFlags.DESTROY_WITH_PARENT,
|
|
||||||
MessageType.ERROR,
|
|
||||||
ButtonsType.CLOSE,
|
|
||||||
s);
|
|
||||||
md.run ();
|
|
||||||
md.destroy ();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnFileNewEvent ()
|
|
||||||
{
|
|
||||||
list_clear();
|
|
||||||
// TODO: clear file list
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnQuitEvent ()
|
|
||||||
{
|
|
||||||
doCloseApplication();
|
|
||||||
// TODO: send message to gracefully kill 0xFFFF
|
|
||||||
// TODO: handle ^C when flashing
|
|
||||||
}
|
|
||||||
|
|
||||||
public void list_clear()
|
|
||||||
{
|
|
||||||
((ListStore)tv.model).clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void list_del()
|
|
||||||
{
|
|
||||||
TreeIter iter;
|
|
||||||
TreeModel model;
|
|
||||||
|
|
||||||
TreeSelection sel = tv.get_selection();
|
|
||||||
|
|
||||||
if (sel.count_selected_rows() == 1) {
|
|
||||||
sel.get_selected(out model, out iter);
|
|
||||||
((ListStore)tv.model).remove(iter);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void add_file(string type, string size, string file)
|
|
||||||
{
|
|
||||||
ListStore listmodel = (ListStore)tv.get_model();
|
|
||||||
Gtk.TreeIter iter;
|
|
||||||
listmodel.append (out iter);
|
|
||||||
listmodel.set (iter, 0, type, 1, size, 2, file, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setup_treeview (Gtk.TreeView view)
|
|
||||||
{
|
|
||||||
/* use liststore to hold accountname, accounttype, balance and color attribute */
|
|
||||||
/* for more info how gtkTreeview works take a look in the GTK API */
|
|
||||||
|
|
||||||
var listmodel = new Gtk.ListStore(4, typeof(string), typeof(string), typeof(string), typeof(string));
|
|
||||||
view.set_model(listmodel);
|
|
||||||
|
|
||||||
view.insert_column_with_attributes (-1, "Type", new Gtk.CellRendererText(), "text", 0, null);
|
|
||||||
view.insert_column_with_attributes (-1, "Size", new Gtk.CellRendererText(), "text", 1, null);
|
|
||||||
|
|
||||||
var cell = new Gtk.CellRendererText ();
|
|
||||||
cell.set ("foreground_set", true, null);
|
|
||||||
view.insert_column_with_attributes (-1, "Name", cell, "text", 2, "foreground", 3, null);
|
|
||||||
|
|
||||||
// Gtk.TreeIter iter;
|
|
||||||
// listmodel.append (out iter);
|
|
||||||
// listmodel.set (iter, 0, "initfs", 1, "3M", 2, "initfs.jffs", -1);
|
|
||||||
//listmodel.set (iter, 0, "initfs", 1, "3M", 2, "initfs.jffs", 3, "green", -1);
|
|
||||||
|
|
||||||
// listmodel.append (out iter);
|
|
||||||
// listmodel.set (iter, 0, "rootfs", 1, "52M", 2, "rootfs.jffs", -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static bool readFunc()
|
|
||||||
{
|
|
||||||
weak string msg = p->get(0);
|
|
||||||
|
|
||||||
if (msg != null && msg[0]!='\0') {
|
|
||||||
stdout.printf("[<] msg received: %s\n", msg);
|
|
||||||
string[] foo = msg.split(":",2);
|
|
||||||
if (foo[1] != null) {
|
|
||||||
switch(foo[0]) {
|
|
||||||
case "bar":
|
|
||||||
viewer.pb.fraction = foo[1].to_int() / 100;
|
|
||||||
viewer.pb.text = foo[1]+"%";
|
|
||||||
break;
|
|
||||||
case "error":
|
|
||||||
viewer.showMessage(foo[1], MessageType.ERROR);
|
|
||||||
break;
|
|
||||||
case "info":
|
|
||||||
viewer.showMessage(foo[1], MessageType.INFO);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
stderr.printf("[E] Unknown message type\n");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
//viewer.showMessage(msg, MessageType.INFO);
|
|
||||||
}
|
|
||||||
p->pop();
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static SQueue *q = null;
|
|
||||||
static SQueue *p = null;
|
|
||||||
|
|
||||||
private void OnGetInformation()
|
|
||||||
{
|
|
||||||
msg("info:device");
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnConnect()
|
|
||||||
{
|
|
||||||
//msg("connect:device");
|
|
||||||
OnStop();
|
|
||||||
External.system("sudo 0xFFFF -Q &");
|
|
||||||
p->close();
|
|
||||||
q->close();
|
|
||||||
p = q = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnStop()
|
|
||||||
{
|
|
||||||
External.system("sudo pkill 0xFFFF");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private bool chk_queues()
|
|
||||||
{
|
|
||||||
if (p == null)
|
|
||||||
p = SQueue.open("/tmp/0xFFFF.1", SQueueMode.OPEN);
|
|
||||||
if (q == null)
|
|
||||||
q = SQueue.open("/tmp/0xFFFF.2", SQueueMode.OPEN);
|
|
||||||
if (p == null || q == null) {
|
|
||||||
showMessage("Cannot connect to queues", MessageType.ERROR);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void msg(string str)
|
|
||||||
{
|
|
||||||
if (!chk_queues())
|
|
||||||
return;
|
|
||||||
if (q->push(str, 0)<1) {
|
|
||||||
stderr.printf("Oops on push\n");
|
|
||||||
q->free();
|
|
||||||
q = null;
|
|
||||||
p->free();
|
|
||||||
p = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static MainWindow viewer;
|
|
||||||
|
|
||||||
static int main (string[] args)
|
|
||||||
{
|
|
||||||
Gtk.init (ref args);
|
|
||||||
viewer = new MainWindow();
|
|
||||||
if (args.length > 1)
|
|
||||||
viewer.loadFile (args[1]);
|
|
||||||
viewer.resize(600,400);
|
|
||||||
viewer.set_position(WindowPosition.CENTER);
|
|
||||||
viewer.delete_event += (x,y) => { Gtk.main_quit(); };
|
|
||||||
setup_treeview(viewer.tv);
|
|
||||||
viewer.show_all ();
|
|
||||||
// viewer.showMessage("This software is beta and does not guaranties correct functionality", MessageType.WARNING);
|
|
||||||
Timeout.add(200, (SourceFunc)(readFunc));
|
|
||||||
Gtk.main ();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
]]>
|
|
||||||
</Window>
|
|
||||||
+1
-1
@@ -27,7 +27,7 @@ usho do_hash(usho *b, int len)
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
usho do_hash_file(const char *filename)
|
usho do_hash_file(char *filename)
|
||||||
{
|
{
|
||||||
unsigned char buf[BSIZE];
|
unsigned char buf[BSIZE];
|
||||||
FILE *fd = fopen(filename, "r");
|
FILE *fd = fopen(filename, "r");
|
||||||
|
|||||||
+1
-1
@@ -5,6 +5,6 @@
|
|||||||
#define BSIZE 0x20000
|
#define BSIZE 0x20000
|
||||||
|
|
||||||
usho do_hash(usho *b, int len);
|
usho do_hash(usho *b, int len);
|
||||||
usho do_hash_file(const char *filename);
|
usho do_hash_file(char *filename);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+67
-167
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* 0xFFFF - Open Free Fiasco Firmware Flasher
|
* 0xFFFF - Open Free Fiasco Firmware Flasher
|
||||||
* Copyright (C) 2007, 2008 pancake <pancake@youterm.com>
|
* Copyright (C) 2007 pancake <pancake@youterm.com>
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -24,26 +24,32 @@
|
|||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
|
|
||||||
/* global pr0n */
|
/* global pr0n */
|
||||||
#if HAVE_USB
|
|
||||||
#include <usb.h>
|
|
||||||
struct usb_device *device = NULL;
|
struct usb_device *device = NULL;
|
||||||
struct usb_dev_handle *dev = NULL;
|
struct usb_dev_handle *dev = NULL;
|
||||||
#endif
|
|
||||||
char *fiasco_image = NULL;
|
char *fiasco_image = NULL;
|
||||||
char *boot_cmdline = NULL;
|
char *boot_cmdline = NULL;
|
||||||
char *reverseto = NULL;
|
char *reverseto = NULL;
|
||||||
char *subverstr = NULL;
|
|
||||||
int rd_mode = -1;
|
int rd_mode = -1;
|
||||||
int rd_flags = -1;
|
int rd_flags = -1;
|
||||||
int usb_mode = -1;
|
int usb_mode = -1;
|
||||||
int root_device = -1;
|
int root_device = -1;
|
||||||
int verbose = 0;
|
int verbose = 0;
|
||||||
int identify = 0;
|
int identify = 0;
|
||||||
int moboreboot = 0;
|
int reboot = 0;
|
||||||
int unpack = 0;
|
int unpack = 0;
|
||||||
int qmode = 0;
|
|
||||||
int info = 0;
|
int info = 0;
|
||||||
int nomode = 0;
|
|
||||||
|
/* global structs */
|
||||||
|
char *pieces[] = {
|
||||||
|
"xloader", // xloader.bin
|
||||||
|
"2nd", // 2nd
|
||||||
|
"secondary", // secondary.bin
|
||||||
|
"kernel", // zImage
|
||||||
|
"initfs", // jffs'd initfs
|
||||||
|
"rootfs", // 80mB of blob
|
||||||
|
"omap-nand", // 8kB of food for the nand
|
||||||
|
NULL
|
||||||
|
};
|
||||||
|
|
||||||
char *modes[]={
|
char *modes[]={
|
||||||
"host",
|
"host",
|
||||||
@@ -68,35 +74,26 @@ void show_usage()
|
|||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
show_title();
|
show_title();
|
||||||
#if HAVE_USB
|
|
||||||
printf("Over USB:\n");
|
|
||||||
printf(" -b [arg] boots the kernel with arguments\n");
|
printf(" -b [arg] boots the kernel with arguments\n");
|
||||||
printf(" -c console prompt mode\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 [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(" -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 <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 show device information (let standby mode)\n");
|
||||||
printf(" -l list supported usb device ids\n");
|
printf(" -I [piece] identify a firmware piece\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 [[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 [0|1] disable/enable R&D mode\n");
|
||||||
printf(" -R reboot the omap board\n");
|
printf(" -R reboot the omap board\n");
|
||||||
printf(" -U [0|1] disable/enable the usb host mode\n");
|
|
||||||
#endif
|
|
||||||
#if HAVE_SQUEUE
|
|
||||||
printf(" -Q enter shared queues server mode (for gui or remote)\n");
|
|
||||||
#endif
|
|
||||||
printf("Local stuff:\n");
|
|
||||||
printf(" -s [serial] serial port console (minicom like terminal)\n");
|
printf(" -s [serial] serial port console (minicom like terminal)\n");
|
||||||
printf(" -h show this help message\n");
|
|
||||||
printf(" -S [subversion] unpacks/flash pieces matching this sub-version information\n");
|
|
||||||
printf(" -n do not flash or write to disk (simulation)\n");
|
|
||||||
printf(" -C [/dev/mtd] check bad blocks on mtd\n");
|
|
||||||
printf(" -e [path] dump/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(" -u [fiasco] unpack target fiasco image\n");
|
||||||
|
printf(" -U [0|1] disable/enable the usb host mode\n");
|
||||||
printf(" -v be verbose and noisy\n");
|
printf(" -v be verbose and noisy\n");
|
||||||
printf(" -V show 0xFFFF version information\n");
|
printf(" -V show 0xFFFF version information\n");
|
||||||
printf(" -x extract configuration entries from /dev/mtd1\n");
|
printf(" -x extract configuration entries from /dev/mtd1\n");
|
||||||
@@ -108,104 +105,41 @@ void show_usage()
|
|||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
int unpack_callback(struct header_t *header)
|
|
||||||
|
void unpack_callback(struct header_t *header)
|
||||||
{
|
{
|
||||||
FILE *fd;
|
FILE *fd = fopen(header->name, "wb");
|
||||||
|
|
||||||
fiasco_data_read(header);
|
|
||||||
if (subverstr) {
|
|
||||||
if (strchr(header->name, ',') != NULL) {
|
|
||||||
if (!strstr(header->name, subverstr)) {
|
|
||||||
printf("Skipping '%s' does not matches -S subversion\n",
|
|
||||||
header->name);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (nomode)
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
fd = fopen(header->name, "wb");
|
|
||||||
if (fd == NULL) {
|
if (fd == NULL) {
|
||||||
printf("Cannot open file.\n");
|
printf("Cannot open file.\n");
|
||||||
return 1;
|
return;
|
||||||
}
|
}
|
||||||
|
fiasco_data_read(header);
|
||||||
fwrite(header->data, header->size, 1, fd);
|
fwrite(header->data, header->size, 1, fd);
|
||||||
fclose(fd);
|
fclose(fd);
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int flash_callback(struct header_t *header)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
char *type;
|
|
||||||
|
|
||||||
ret = unpack_callback(header);
|
|
||||||
if (ret) {
|
|
||||||
printf("ignored\n");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
type = (char *)fpid_file(header->name);
|
|
||||||
printf("\nFlashing %s (%s)\n", header->name, type);
|
|
||||||
flash_image(header->name, type, NULL);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void unpack_fiasco_image(char *file)
|
void unpack_fiasco_image(char *file)
|
||||||
{
|
{
|
||||||
printf("Dumping firmware pieces to disk.\n");
|
printf("Dumping firmware pieces to disk.\n");
|
||||||
fiasco_callback = &unpack_callback;
|
fiasco_callback = &unpack_callback;
|
||||||
openfiasco(file, NULL ,1);
|
openfiasco( file );
|
||||||
}
|
}
|
||||||
|
|
||||||
int fiasco_flash(const char *file)
|
int fiasco_flash(char *file)
|
||||||
{
|
{
|
||||||
char *p;
|
/* TODO */
|
||||||
char version[64];
|
fiasco_callback = NULL;
|
||||||
|
openfiasco( file );
|
||||||
|
|
||||||
if (connect_via_usb()) {
|
printf("\nTODO: Implement the fiasco flashing here.\n");
|
||||||
fprintf(stderr, "Cannot connect to device. It is possibly not in boot stage.\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// if (info)
|
|
||||||
cmd_info("");
|
|
||||||
|
|
||||||
check_nolo_order();
|
|
||||||
get_nolo_version();
|
|
||||||
get_sw_version();
|
|
||||||
get_hw_revision(version, 44);
|
|
||||||
|
|
||||||
if (subverstr == NULL) {
|
|
||||||
p = strstr(version, "hw_rev:");
|
|
||||||
if (p) {
|
|
||||||
subverstr = strdup(p+7);
|
|
||||||
// TODO: delimit string by comma
|
|
||||||
printf("SubVersionString autodetected: '%s'\n", subverstr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
printf("\n");
|
|
||||||
|
|
||||||
fiasco_callback = &flash_callback;
|
|
||||||
openfiasco(file, "xloader", 0);
|
|
||||||
openfiasco(file, "secondary", 0);
|
|
||||||
openfiasco(file, "kernel", 0);
|
|
||||||
openfiasco(file, "initfs", 0);
|
|
||||||
openfiasco(file, "rootfs", 0);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if HAVE_USB
|
|
||||||
int connect_via_usb()
|
int connect_via_usb()
|
||||||
{
|
{
|
||||||
static char pbc[]={'/','-','\\', '|'};
|
|
||||||
struct usb_device_descriptor udd;
|
struct usb_device_descriptor udd;
|
||||||
struct devices it_device;
|
struct devices it_device;
|
||||||
int c = 0;
|
int c = 0;
|
||||||
|
static char pbc[]={'/','-','\\', '|'};
|
||||||
|
|
||||||
// usb_set_debug(5);
|
// usb_set_debug(5);
|
||||||
usb_init();
|
usb_init();
|
||||||
@@ -232,8 +166,7 @@ int connect_via_usb()
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( usb_claim_interface(dev, 2) < 0) {
|
if ( usb_claim_interface(dev, 2) < 0) { // 2 or 0
|
||||||
//device->config->interface->altsetting->bInterfaceNumber) < 0) { // 2 or 0
|
|
||||||
D perror("usb_claim_interface");
|
D perror("usb_claim_interface");
|
||||||
|
|
||||||
// Something is broken if closing fails.
|
// Something is broken if closing fails.
|
||||||
@@ -248,7 +181,7 @@ int connect_via_usb()
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (usb_set_altinterface(dev, 1) <0) { //device->config->interface->altsetting->bAlternateSetting) < 0) {
|
if (usb_set_altinterface(dev, 1) < 0) {
|
||||||
D perror("usb_set_altinterface");
|
D perror("usb_set_altinterface");
|
||||||
|
|
||||||
// Something is broken if closing fails.
|
// Something is broken if closing fails.
|
||||||
@@ -273,37 +206,22 @@ int connect_via_usb()
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int c;
|
int c;
|
||||||
|
|
||||||
while((c = getopt(argc, argv, "QC:cp:PvVhRu:ib:U:r:e:ld:I:D:f:F:s:xH:S:n")) != -1) {
|
while((c = getopt(argc, argv, "C:cp:PvVhRu:ib:U:r:e:Lld:I:D:f:F:s:xH:")) != -1) {
|
||||||
switch(c) {
|
switch(c) {
|
||||||
case 'H':
|
case 'H':
|
||||||
printf("xorpair: %04x\n", do_hash_file(optarg));
|
printf("xorpair: %04x\n", do_hash_file(optarg));
|
||||||
return 0;
|
return 0;
|
||||||
case 'x':
|
case 'x':
|
||||||
return dump_config();
|
return dump_config();
|
||||||
#if HAVE_USB
|
|
||||||
case 'c':
|
case 'c':
|
||||||
return console_prompt();
|
return console_prompt();
|
||||||
case 'b':
|
|
||||||
boot_cmdline = optarg;
|
|
||||||
break;
|
|
||||||
case 'S':
|
|
||||||
subverstr = optarg;
|
|
||||||
break;
|
|
||||||
case 'n':
|
|
||||||
nomode = 1;
|
|
||||||
break;
|
|
||||||
case 'U':
|
|
||||||
usb_mode = atoi(optarg);
|
|
||||||
break;
|
|
||||||
case 'F':
|
case 'F':
|
||||||
fiasco_image = optarg;
|
return fiasco_flash(optarg);
|
||||||
break;
|
|
||||||
case 'd':
|
case 'd':
|
||||||
sscanf(optarg, "%04hx:%04hx",
|
sscanf(optarg, "%04hx:%04hx",
|
||||||
&supported_devices[SUPPORTED_DEVICES-2].vendor_id,
|
&supported_devices[SUPPORTED_DEVICES-2].vendor_id,
|
||||||
@@ -313,6 +231,11 @@ int main(int argc, char **argv)
|
|||||||
case 'D':
|
case 'D':
|
||||||
root_device = atoi(optarg);
|
root_device = atoi(optarg);
|
||||||
break;
|
break;
|
||||||
|
case 'e':
|
||||||
|
reverseto = optarg;
|
||||||
|
break;
|
||||||
|
case 's':
|
||||||
|
return console(optarg);
|
||||||
case 'f':
|
case 'f':
|
||||||
if (!strcmp(optarg,"help")) {
|
if (!strcmp(optarg,"help")) {
|
||||||
printf("* Flags are composed of:\n");
|
printf("* Flags are composed of:\n");
|
||||||
@@ -324,43 +247,37 @@ int main(int argc, char **argv)
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
rd_flags = (unsigned short) strtoul(optarg, NULL, 16);
|
rd_flags = (unsigned short) strtoul(optarg, NULL, 16);
|
||||||
|
case 'U':
|
||||||
|
usb_mode = atoi(optarg);
|
||||||
break;
|
break;
|
||||||
case 'r':
|
case 'r':
|
||||||
rd_mode = atoi(optarg);
|
rd_mode = atoi(optarg);
|
||||||
break;
|
break;
|
||||||
case 'l':
|
case 'b':
|
||||||
list_valid_devices();
|
boot_cmdline = optarg;
|
||||||
return 0;
|
|
||||||
case 'p':
|
|
||||||
add_piece(optarg);
|
|
||||||
break;
|
break;
|
||||||
case 'i':
|
|
||||||
info = 1;
|
|
||||||
break;
|
|
||||||
case 'R':
|
|
||||||
moboreboot = 1;
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
case 'e':
|
|
||||||
reverseto = optarg;
|
|
||||||
break;
|
|
||||||
case 's':
|
|
||||||
return console(optarg);
|
|
||||||
case 'u':
|
case 'u':
|
||||||
fiasco_image = optarg;
|
fiasco_image = optarg;
|
||||||
unpack = 1;
|
unpack = 1;
|
||||||
break;
|
break;
|
||||||
case 'Q':
|
case 'p':
|
||||||
qmode = 1;
|
add_piece(optarg);
|
||||||
break;
|
break;
|
||||||
case 'P':
|
case 'P':
|
||||||
return fiasco_pack(optind, argv);
|
return fiasco_pack(optind, argv);
|
||||||
|
case 'L':
|
||||||
|
case 'l':
|
||||||
|
list_valid_devices();
|
||||||
|
return 0;
|
||||||
case 'I':
|
case 'I':
|
||||||
printf("%s: %s\n", fpid_file(optarg), optarg);
|
printf("%s: %s\n", fpid_file(optarg), optarg);
|
||||||
identify = 1;
|
identify = 1;
|
||||||
break;
|
break;
|
||||||
case 'C':
|
case 'C':
|
||||||
return check_badblocks(optarg);
|
return check_badblocks(optarg);
|
||||||
|
case 'i':
|
||||||
|
info = 1;
|
||||||
|
break;
|
||||||
case 'v':
|
case 'v':
|
||||||
verbose = 1;
|
verbose = 1;
|
||||||
break;
|
break;
|
||||||
@@ -370,15 +287,12 @@ int main(int argc, char **argv)
|
|||||||
case 'V':
|
case 'V':
|
||||||
printf("%s\n", VERSION);
|
printf("%s\n", VERSION);
|
||||||
return 0;
|
return 0;
|
||||||
|
case 'R':
|
||||||
|
reboot = 1;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qmode)
|
|
||||||
return queue_mode();
|
|
||||||
|
|
||||||
if (!unpack && fiasco_image)
|
|
||||||
return fiasco_flash(fiasco_image);
|
|
||||||
|
|
||||||
if (identify)
|
if (identify)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
@@ -390,21 +304,17 @@ int main(int argc, char **argv)
|
|||||||
&& (rd_flags == -1)
|
&& (rd_flags == -1)
|
||||||
&& (rd_mode == -1)
|
&& (rd_mode == -1)
|
||||||
&& (info == 0)
|
&& (info == 0)
|
||||||
&& (moboreboot == 0)
|
&& (reboot == 0)
|
||||||
&& (usb_mode == -1)
|
&& (usb_mode == -1)
|
||||||
&& (root_device == -1))
|
&& (root_device == -1))
|
||||||
{
|
{
|
||||||
|
printf("0xFFFF [-chiLRvVx] [-C mtd-dev] [-d vid:pid] [-D 0|1|2] [-e path] [-f flags]\n");
|
||||||
printf("# The Free Fiasco Firmware Flasher v"VERSION"\n"
|
printf(" [-F fiasco] [-H hash-file] [-I piece] [-p [piece%%]file]] [-r 0|1]\n");
|
||||||
"0xFFFF [-chinlQRvVx] [-C mtd-dev] [-d vid:pid] [-D 0|1|2] [-e path] [-f flags]\n"
|
printf(" [-s serial-dev] [-u fiasco-image] [-U 0|1] | [-P new-fiasco] [piece1] [2] ..\n");
|
||||||
" [-F fiasco] [-H hash-file] [-I piece] [-p [piece%%]file]] [-r 0|1] [-S subver]\n"
|
|
||||||
" [-s serial-dev] [-u fiasco-image] [-U 0|1] | [-P new-fiasco] [piece1] [2] ..\n");
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (unpack) {
|
if (unpack) {
|
||||||
if (reverseto)
|
|
||||||
chdir(reverseto);
|
|
||||||
unpack_fiasco_image(fiasco_image);
|
unpack_fiasco_image(fiasco_image);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -414,7 +324,6 @@ int main(int argc, char **argv)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#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");
|
fprintf(stderr, "Cannot connect to device. It is possibly not in boot stage.\n");
|
||||||
return 0;
|
return 0;
|
||||||
@@ -424,18 +333,10 @@ int main(int argc, char **argv)
|
|||||||
cmd_info("");
|
cmd_info("");
|
||||||
|
|
||||||
if (pcs_n) {
|
if (pcs_n) {
|
||||||
char version[64];
|
int c;
|
||||||
|
|
||||||
check_nolo_order();
|
check_nolo_order();
|
||||||
get_sw_version();
|
get_sw_version();
|
||||||
get_hw_revision(version, 44);
|
|
||||||
if (subverstr == NULL) {
|
|
||||||
char *p = strstr(version, "hw_rev:");
|
|
||||||
if (p) {
|
|
||||||
subverstr = strdup(p+7);
|
|
||||||
// TODO: delimit string by comma
|
|
||||||
printf("SubVersionString autodetected: '%s'\n", subverstr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
get_nolo_version();
|
get_nolo_version();
|
||||||
|
|
||||||
for(c=0;c<pcs_n;c++) {
|
for(c=0;c<pcs_n;c++) {
|
||||||
@@ -459,9 +360,8 @@ int main(int argc, char **argv)
|
|||||||
if (boot_cmdline)
|
if (boot_cmdline)
|
||||||
boot_board(boot_cmdline);
|
boot_board(boot_cmdline);
|
||||||
|
|
||||||
if (moboreboot)
|
if (reboot)
|
||||||
reboot_board();
|
reboot_board();
|
||||||
#endif
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
+17
-38
@@ -2,38 +2,24 @@
|
|||||||
#ifndef _INCLUDE_MAIN_H_
|
#ifndef _INCLUDE_MAIN_H_
|
||||||
#define _INCLUDE_MAIN_H_
|
#define _INCLUDE_MAIN_H_
|
||||||
|
|
||||||
#include "hash.h"
|
|
||||||
#include "nolo.h"
|
|
||||||
#include "os.h"
|
|
||||||
extern char strbuf[1024];
|
|
||||||
|
|
||||||
#define _FILE_OFFSET_BITS 64
|
#define _FILE_OFFSET_BITS 64
|
||||||
#define _GNU_SOURCE
|
#define _GNU_SOURCE
|
||||||
|
|
||||||
// Forward declaration for use in function arguments.
|
// Forward declaration for use in function arguments.
|
||||||
struct devices;
|
struct devices;
|
||||||
|
|
||||||
int queue_mode();
|
|
||||||
int reverse_extract_pieces(char *dir);
|
int reverse_extract_pieces(char *dir);
|
||||||
void flash_image(const char *filename, const char *piece, const char *version);
|
void flash_image(char *filename, char *piece, char *version);
|
||||||
int fiasco_read_image(char *file);
|
int fiasco_read_image(char *file);
|
||||||
void check_nolo_order();
|
void check_nolo_order();
|
||||||
extern struct usb_dev_handle *dev;
|
extern struct usb_dev_handle *dev;
|
||||||
unsigned long get_file_size(const char *file);
|
unsigned long get_file_size(char *file);
|
||||||
void progressbar(unsigned long long part, unsigned long long total);
|
void progressbar(unsigned long long part, unsigned long long total);
|
||||||
const char *fpid_file(const char *filename);
|
const char *fpid_file(const char *filename);
|
||||||
int add_piece(char *piece);
|
int add_piece(char *piece);
|
||||||
void eprintf(const char *format, ...);
|
|
||||||
|
|
||||||
#include <limits.h>
|
|
||||||
#ifndef PATH_MAX
|
|
||||||
#define PATH_MAX 4096
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if HAVE_USB
|
|
||||||
#include <usb.h>
|
#include <usb.h>
|
||||||
|
|
||||||
int fiasco_flash(const char *file);
|
|
||||||
extern struct usb_device *device;
|
extern struct usb_device *device;
|
||||||
extern struct usb_dev_handle *dev;
|
extern struct usb_dev_handle *dev;
|
||||||
int is_valid_device(struct usb_device_descriptor *udd);
|
int is_valid_device(struct usb_device_descriptor *udd);
|
||||||
@@ -41,8 +27,6 @@ void list_valid_devices();
|
|||||||
int usb_device_found(struct usb_device_descriptor *udd, struct devices *it_device);
|
int usb_device_found(struct usb_device_descriptor *udd, struct devices *it_device);
|
||||||
int console(const char *device);
|
int console(const char *device);
|
||||||
int connect_via_usb();
|
int connect_via_usb();
|
||||||
#endif
|
|
||||||
|
|
||||||
int console_prompt();
|
int console_prompt();
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -56,6 +40,9 @@ extern int verbose;
|
|||||||
#define CMD_WRITE 64
|
#define CMD_WRITE 64
|
||||||
#define CMD_QUERY 192
|
#define CMD_QUERY 192
|
||||||
|
|
||||||
|
#define NOLO_GET_STATUS 1
|
||||||
|
#define NOLO_GET_BOARD_ID 2
|
||||||
|
#define NOLO_GET_VERSION 3
|
||||||
|
|
||||||
struct piece_t {
|
struct piece_t {
|
||||||
char *name;
|
char *name;
|
||||||
@@ -84,10 +71,21 @@ enum {
|
|||||||
PIECE_INITFS,
|
PIECE_INITFS,
|
||||||
PIECE_ROOTFS,
|
PIECE_ROOTFS,
|
||||||
PIECE_OMAPNAND,
|
PIECE_OMAPNAND,
|
||||||
PIECE_FIASCO,
|
|
||||||
PIECE_LAST
|
PIECE_LAST
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extern char *pieces[];
|
||||||
|
extern char *modes[];
|
||||||
|
extern char *root_devices[];
|
||||||
|
|
||||||
|
// fiasco
|
||||||
|
int openfiasco(char *name);
|
||||||
|
int fiasco_new(const char *filename, const char *name);
|
||||||
|
void fiasco_data_read(struct header_t *header);
|
||||||
|
int fiasco_add_eof(int fd);
|
||||||
|
extern void (*fiasco_callback)(struct header_t *header);
|
||||||
|
int fiasco_add(int fd, const char *name, const char *file, const char *version);
|
||||||
|
int fiasco_pack(int optind, char *argv[]);
|
||||||
struct header_t {
|
struct header_t {
|
||||||
int fd;
|
int fd;
|
||||||
char fwname[128];
|
char fwname[128];
|
||||||
@@ -98,24 +96,5 @@ struct header_t {
|
|||||||
unsigned char *data;
|
unsigned char *data;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern char *pieces[];
|
|
||||||
extern char *modes[];
|
|
||||||
extern char *root_devices[];
|
|
||||||
|
|
||||||
// fiasco
|
|
||||||
int openfiasco(char *name, char *grep, int v);
|
|
||||||
int fiasco_new(const char *filename, const char *name);
|
|
||||||
void fiasco_data_read(struct header_t *header);
|
|
||||||
int fiasco_add_eof(int fd);
|
|
||||||
extern int (*fiasco_callback)(struct header_t *header);
|
|
||||||
int fiasco_add(int fd, const char *name, const char *file, const char *version);
|
|
||||||
int fiasco_pack(int optind, char *argv[]);
|
|
||||||
int nanddump(char *mtddev, unsigned long start_addr, unsigned long length, char *dumpfile, int isbl, int ioob);
|
|
||||||
|
|
||||||
//
|
|
||||||
int reboot_board();
|
|
||||||
int get_rd_flags();
|
|
||||||
int get_usb_mode();
|
|
||||||
int get_nolo_version();
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
|
|
||||||
#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
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
#ifndef _OS_H_
|
|
||||||
#define _OS_H_
|
|
||||||
|
|
||||||
#if __linux__ || __NetBSD__ || __FreBSD__ || __OpenBSD__ || __Darwin__ || __MacOSX__
|
|
||||||
#define HAVE_SQUEUE 1
|
|
||||||
#else
|
|
||||||
#define HAVE_SQUEUE 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if HAVE_SQUEUE
|
|
||||||
|
|
||||||
#include "squeue/squeue.h"
|
|
||||||
extern int qmode;
|
|
||||||
extern struct squeue_t *p;
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+1
-1
@@ -55,7 +55,7 @@ int add_piece(char *piece)
|
|||||||
pcs[pcs_n].vers = NULL; // TODO version string not yet supported
|
pcs[pcs_n].vers = NULL; // TODO version string not yet supported
|
||||||
} else {
|
} else {
|
||||||
/*/ autodetect piece type */
|
/*/ autodetect piece type */
|
||||||
pcs[pcs_n].type = (char *)fpid_file(piece);
|
pcs[pcs_n].type = fpid_file(piece);
|
||||||
if (pcs[pcs_n].type == NULL) {
|
if (pcs[pcs_n].type == NULL) {
|
||||||
printf("Use -p [piece]:[file]\n");
|
printf("Use -p [piece]:[file]\n");
|
||||||
printf("Pieces: ");
|
printf("Pieces: ");
|
||||||
|
|||||||
-146
@@ -1,146 +0,0 @@
|
|||||||
/*
|
|
||||||
* 0xFFFF - Open Free Fiasco Firmware Flasher
|
|
||||||
* Copyright (C) 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
|
|
||||||
* 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 "main.h"
|
|
||||||
#include "os.h"
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <signal.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/wait.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
|
|
||||||
#if HAVE_SQUEUE
|
|
||||||
|
|
||||||
struct squeue_t *q;
|
|
||||||
struct squeue_t *p;
|
|
||||||
|
|
||||||
int fork_enabled = 0;
|
|
||||||
int dofork()
|
|
||||||
{
|
|
||||||
if (fork_enabled)
|
|
||||||
return fork();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void process_message(char *msg)
|
|
||||||
{
|
|
||||||
char *str;
|
|
||||||
char *arg;
|
|
||||||
int c=1;
|
|
||||||
if (msg == NULL)
|
|
||||||
return;
|
|
||||||
printf("[x] (%s)\n", msg);
|
|
||||||
str = strdup(msg);
|
|
||||||
arg = strchr(str, ':');
|
|
||||||
if (c!=0) {
|
|
||||||
arg[0]='\0';
|
|
||||||
arg = arg +1;
|
|
||||||
if (!strcmp(str, "flash")) {
|
|
||||||
const char *type = fpid_file(arg);
|
|
||||||
if (type == NULL) {
|
|
||||||
squeue_push2(p, "error", "Unknown piece format", 1);
|
|
||||||
} else flash_image(arg, type, NULL);
|
|
||||||
} else
|
|
||||||
if (!strcmp(str, "reset")) {
|
|
||||||
if (reboot_board() == 0) {
|
|
||||||
squeue_push2(p,"info", "Device reboots", 1);
|
|
||||||
} else squeue_push2(p,"error", "Cannot reboot device", 1);
|
|
||||||
} else
|
|
||||||
if (!strcmp(str, "info")) {
|
|
||||||
get_rd_flags();
|
|
||||||
squeue_push2(p, "info", strbuf, 1);
|
|
||||||
get_nolo_version();
|
|
||||||
squeue_push2(p, "info", strbuf, 1);
|
|
||||||
get_usb_mode();
|
|
||||||
squeue_push2(p, "info", strbuf, 1);
|
|
||||||
} else
|
|
||||||
squeue_push2(p, "error", "invalid command", 0);
|
|
||||||
} else {
|
|
||||||
squeue_push2(p, "error", "invalid command format", 0);
|
|
||||||
}
|
|
||||||
free(str);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void cc()
|
|
||||||
{
|
|
||||||
squeue_close(p);
|
|
||||||
squeue_close(q);
|
|
||||||
printf("pipes closed\n");
|
|
||||||
squeue_release("/tmp/0xFFFF.1");
|
|
||||||
squeue_release("/tmp/0xFFFF.2");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
int queue_mode()
|
|
||||||
{
|
|
||||||
int pid = 0;
|
|
||||||
char *msg;
|
|
||||||
|
|
||||||
signal(SIGINT, cc);
|
|
||||||
|
|
||||||
pid = dofork();
|
|
||||||
if (pid) {
|
|
||||||
wait(&pid);
|
|
||||||
return 0;
|
|
||||||
} else {
|
|
||||||
p = squeue_open("/tmp/0xFFFF.1", Q_CREAT);
|
|
||||||
q = squeue_open("/tmp/0xFFFF.2", Q_CREAT);
|
|
||||||
if (p == NULL || q == NULL) {
|
|
||||||
fprintf(stderr, "Cannot open queue files\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
chmod("/tmp/0xFFFF.1", 0666);
|
|
||||||
chmod("/tmp/0xFFFF.2", 0666);
|
|
||||||
pid = dofork();
|
|
||||||
if (pid) {
|
|
||||||
printf( "Entering into shared queue server mode.\n"
|
|
||||||
"Type $ kill -9 %d # to stop\n"
|
|
||||||
"NOTE: Manually remove the /tmp/.0xFFFF.* files to solve perm problems\n", pid);
|
|
||||||
} else {
|
|
||||||
do {
|
|
||||||
#if HAVE_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();
|
|
||||||
while(1) {
|
|
||||||
msg = squeue_get(q, 1);
|
|
||||||
if (msg) {
|
|
||||||
process_message(msg);
|
|
||||||
squeue_pop(q);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
printf("Connection restarted\n");
|
|
||||||
} while (1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
int queue_mode()
|
|
||||||
{
|
|
||||||
/* dummy */
|
|
||||||
fprintf(stderr, "No HAVE_SQUEUE support\n");
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
+31
-59
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* 0xFFFF - Open Free Fiasco Firmware Flasher
|
* 0xFFFF - Open Free Fiasco Firmware Flasher
|
||||||
* Copyright (C) 2007,2008 pancake <@youterm.com>
|
* Copyright (C) 2007 pancake <pancake@youterm.com>
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -16,16 +16,12 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if HAVE_USB
|
|
||||||
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <usb.h>
|
#include <usb.h>
|
||||||
|
|
||||||
char strbuf[1024];
|
|
||||||
|
|
||||||
/* wait for status = 0 */
|
/* wait for status = 0 */
|
||||||
int get_status()
|
int get_status()
|
||||||
{
|
{
|
||||||
@@ -78,8 +74,7 @@ int get_usb_mode()
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(strbuf, "Device's USB mode is '%s'\n", (mode) ? "host" : "client");
|
printf("Device's USB mode is '%s'\n", (mode) ? "host" : "client");
|
||||||
printf(strbuf);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -121,7 +116,7 @@ int set_rd_mode(unsigned short mode)
|
|||||||
if (((short)mode)==-1)
|
if (((short)mode)==-1)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
if (usb_control_msg(dev, CMD_WRITE, NOLO_SET_RDFLAGS, mode, 0, 0, 0, 2000) == -1) {
|
if (usb_control_msg(dev, CMD_WRITE, 16, mode, 0, 0, 0, 2000) == -1) {
|
||||||
fprintf(stderr, "Cannot set R&D flags.\n");
|
fprintf(stderr, "Cannot set R&D flags.\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -134,28 +129,26 @@ int set_rd_mode(unsigned short mode)
|
|||||||
/*
|
/*
|
||||||
* query root device
|
* query root device
|
||||||
*/
|
*/
|
||||||
int get_hw_revision(char *str, int len)
|
int get_hw_revision()
|
||||||
{
|
{
|
||||||
unsigned char string[512];
|
unsigned char string[512];
|
||||||
char tmpstr[64];
|
int i = 0;
|
||||||
int i = 0, j=0, mod=0;
|
|
||||||
|
|
||||||
if (str == NULL)
|
if (usb_control_msg(dev, CMD_QUERY, 4, 0, 0, (char *)string, 512, 2000) == -1) {
|
||||||
str = tmpstr;
|
|
||||||
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");
|
fprintf(stderr, "Cannot query hw revision.\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(i=0;i<44&&i<len;i++) { // XXX ??
|
printf("HW revision string: '");
|
||||||
if (string[i]>19) {
|
for(i=0;i<44;i++) { // XXX ??
|
||||||
if (i>0 && string[i-1]<19)
|
if (string[i]==0) {
|
||||||
str[j++] = (++mod%2)?':':',';
|
printf(" ");
|
||||||
str[j++] = string[i];
|
} else {
|
||||||
|
if (string[i]>19)
|
||||||
|
printf("%c", string[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
printf("HW revision string: '%s'\n", str);
|
printf("'\n");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -164,12 +157,11 @@ int get_rd_mode()
|
|||||||
{
|
{
|
||||||
char isrd = 1;
|
char isrd = 1;
|
||||||
|
|
||||||
strbuf[0]='\0';
|
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");
|
fprintf(stderr, "Cannot query rd mode.\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
sprintf(strbuf, "RD mode is: %s\n", isrd?"on":"off");
|
printf("RD mode is: %s\n", isrd?"on":"off");
|
||||||
|
|
||||||
return isrd;
|
return isrd;
|
||||||
}
|
}
|
||||||
@@ -178,19 +170,16 @@ int get_root_device()
|
|||||||
{
|
{
|
||||||
unsigned char opcode;
|
unsigned char opcode;
|
||||||
|
|
||||||
strbuf[0] = '\0';
|
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");
|
fprintf(stderr, "Cannot query root device\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (opcode>2) { // use sizeof || enum
|
if (opcode>2) { // use sizeof || enum
|
||||||
fprintf(stderr, "Invalid root device received from the device '%d'.\n", opcode);
|
printf("Invalid root device received from the device '%d'.\n", opcode);
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(strbuf, "Root device is: %s\n", root_devices[opcode]);
|
printf("Root device is: %s\n", root_devices[opcode]);
|
||||||
printf(strbuf);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -208,7 +197,7 @@ int set_root_device(unsigned short root_device)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (usb_control_msg(dev, CMD_WRITE, NOLO_SET_RDFLAGS, root_device, 1, 0, 0, 2000) == -1) {
|
if (usb_control_msg(dev, CMD_WRITE, 16, root_device, 1, 0, 0, 2000) == -1) {
|
||||||
fprintf(stderr, "Cannot set root device\n");
|
fprintf(stderr, "Cannot set root device\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
@@ -292,25 +281,17 @@ int get_rd_flags()
|
|||||||
{
|
{
|
||||||
unsigned short flags = 0;
|
unsigned short flags = 0;
|
||||||
|
|
||||||
if (usb_control_msg(dev, CMD_QUERY, NOLO_GET_RDFLAGS, 0, 3, (void *) &flags, sizeof(flags), 2000) == -1) {
|
if (usb_control_msg(dev, CMD_QUERY, 17, 0, 3, (void *) &flags, sizeof(flags), 2000) == -1) {
|
||||||
fprintf(stderr, "Cannot get rd flags\n");
|
fprintf(stderr, "Cannot get rd flags\n");
|
||||||
sprintf(strbuf, "error: Cannot read rd flags\n");
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(strbuf,
|
printf("Current rd flag setting:\n");
|
||||||
"Current rd flag setting:\n"
|
printf("disable OMAP watchdog : %s\n", (flags & 0x02) ? "set" : "not set");
|
||||||
"disable OMAP watchdog : %s\n"
|
printf("disable RETU watchdog : %s\n", (flags & 0x04) ? "set" : "not set");
|
||||||
"disable RETU watchdog : %s\n"
|
printf("disable lifeguard reset: %s\n", (flags & 0x08) ? "set" : "not set");
|
||||||
"disable lifeguard reset: %s\n"
|
printf("enable serial console : %s\n", (flags & 0x10) ? "set" : "not set");
|
||||||
"enable serial console : %s\n"
|
printf("disable USB timeout : %s\n", (flags & 0x20) ? "set" : "not set");
|
||||||
"disable USB timeout : %s\n"
|
|
||||||
, (flags & 0x02) ? "set" : "not set"
|
|
||||||
, (flags & 0x04) ? "set" : "not set"
|
|
||||||
, (flags & 0x08) ? "set" : "not set"
|
|
||||||
, (flags & 0x10) ? "set" : "not set"
|
|
||||||
, (flags & 0x20) ? "set" : "not set");
|
|
||||||
printf(strbuf);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -320,14 +301,12 @@ int get_nolo_version()
|
|||||||
unsigned int version; // ensure uint is at least 32 bits
|
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, 1, (char *)&version, 4 , 2000) < 0) {
|
||||||
if (usb_control_msg(dev, CMD_QUERY, NOLO_GET_VERSION, 0, 0, (char *)&version, 4 , 2000) < 0) {
|
if (usb_control_msg(dev, CMD_QUERY, 3, 0, 0, (char *)&version, 4 , 2000) < 0) {
|
||||||
fprintf(stderr, "Cannot query nolo version. Old bootloader version?\n");
|
fprintf(stderr, "Cannot query nolo version. Old bootloader version?\n");
|
||||||
sprintf(strbuf, "error: Cannot query nolo version. Old bootloader?");
|
exit(1);
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(strbuf,
|
printf("NOLO Version %d.%d.%d\n",
|
||||||
"NOLO Version %d.%d.%d\n",
|
|
||||||
version >> 20 & 15,
|
version >> 20 & 15,
|
||||||
version >> 16 & 15,
|
version >> 16 & 15,
|
||||||
version >> 8 & 255);
|
version >> 8 & 255);
|
||||||
@@ -338,7 +317,6 @@ int get_nolo_version()
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int get_sw_version()
|
int get_sw_version()
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
@@ -350,18 +328,12 @@ int get_sw_version()
|
|||||||
fprintf(stderr, "error: cannot write query 18\n");
|
fprintf(stderr, "error: cannot write query 18\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
bytes[0]='\0';
|
|
||||||
ret = usb_control_msg(dev, CMD_QUERY, 20, 0, 0, (char *)&bytes, 512, 2000);
|
ret = usb_control_msg(dev, CMD_QUERY, 20, 0, 0, (char *)&bytes, 512, 2000);
|
||||||
if (ret<0) {
|
if (ret<0) {
|
||||||
fprintf(stderr, "error: b0rken swversion read!\n");
|
fprintf(stderr, "error: b0rken swversion read!\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (bytes[0]) {
|
printf("SWVERSION GOT: %s\n", bytes); //???+strlen(bytes)+1));
|
||||||
sprintf(strbuf, "Software Version: %s\n", bytes);
|
|
||||||
printf("Software Version: %s\n", bytes); //???+strlen(bytes)+1));
|
|
||||||
} else
|
|
||||||
printf("No software version detected\n");
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
+1
-1
@@ -16,7 +16,7 @@ int set_rd_mode(unsigned short mode);
|
|||||||
int get_rd_flags();
|
int get_rd_flags();
|
||||||
int set_rd_flags(unsigned short flags);
|
int set_rd_flags(unsigned short flags);
|
||||||
|
|
||||||
int get_hw_revision(char *str, int len);
|
int get_hw_revision();
|
||||||
|
|
||||||
int get_root_device();
|
int get_root_device();
|
||||||
int set_root_device(unsigned short);
|
int set_root_device(unsigned short);
|
||||||
|
|||||||
@@ -1,294 +0,0 @@
|
|||||||
#include "squeue.h"
|
|
||||||
#define _XOPEN_SOURCE 500 /* Or: #define _BSD_SOURCE */
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <sys/ipc.h>
|
|
||||||
#include <signal.h>
|
|
||||||
#include <sys/shm.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <sys/mman.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#define POOL_SIZE ITEM_MAX*ITEM_SIZE
|
|
||||||
#define ITEM_SIZE 512
|
|
||||||
#define ITEM_MAX 10
|
|
||||||
|
|
||||||
int squeue_release(const char *file)
|
|
||||||
{
|
|
||||||
int shmid;
|
|
||||||
key_t k = ftok(file, 0xa3);
|
|
||||||
|
|
||||||
if (k == -1) {
|
|
||||||
perror("ftok");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
shmid = shmget(k, POOL_SIZE, 0666);
|
|
||||||
if (shmid == -1)
|
|
||||||
return -1; // not released
|
|
||||||
return shmctl(shmid, IPC_RMID,NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
extern int errno;
|
|
||||||
struct squeue_t *squeue_open(const char *file, int mode)
|
|
||||||
{
|
|
||||||
struct squeue_t *q;
|
|
||||||
char *pool;
|
|
||||||
int shmid;
|
|
||||||
key_t k;
|
|
||||||
|
|
||||||
k = ftok(file, 0x34);
|
|
||||||
if (k == -1) {
|
|
||||||
perror("ftok");
|
|
||||||
squeue_release(file);
|
|
||||||
close(creat(file, 0666));
|
|
||||||
chmod(file, 0666);
|
|
||||||
k = ftok(file, 0xa3);
|
|
||||||
if (k == -1) {
|
|
||||||
perror("ftok");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_retry:
|
|
||||||
shmid = shmget(k, POOL_SIZE, 0666|(mode==Q_CREAT)?IPC_CREAT:0);
|
|
||||||
if (shmid == -1) {
|
|
||||||
perror("shmget1");
|
|
||||||
shmid = shmget(k, POOL_SIZE, 0666|((mode==Q_CREAT)?IPC_CREAT:0));
|
|
||||||
if (shmid == -1) {
|
|
||||||
perror("shmget2");
|
|
||||||
if (errno == EEXIST)
|
|
||||||
shmid = shmget(k, POOL_SIZE, 0666 |IPC_CREAT);
|
|
||||||
|
|
||||||
if (shmid == -1) {
|
|
||||||
if (mode == Q_WAIT) {
|
|
||||||
usleep(100);
|
|
||||||
goto _retry;
|
|
||||||
}
|
|
||||||
perror("shmget");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mode == Q_WAIT)
|
|
||||||
mode = Q_OPEN;
|
|
||||||
|
|
||||||
/* fix perms */
|
|
||||||
if (mode == Q_CREAT) {
|
|
||||||
struct shmid_ds sd;
|
|
||||||
shmctl(shmid, IPC_STAT, &sd);
|
|
||||||
sd.shm_perm.uid = 1000;
|
|
||||||
sd.shm_perm.gid = 1000;
|
|
||||||
sd.shm_perm.mode = sd.shm_perm.mode|0666;
|
|
||||||
shmctl(shmid, IPC_SET, &sd);
|
|
||||||
}
|
|
||||||
|
|
||||||
pool = shmat(shmid, NULL, 0);
|
|
||||||
if (((int)pool) == -1) {
|
|
||||||
perror("shmat");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mode == Q_CREAT)
|
|
||||||
memset(pool, '\0', POOL_SIZE);
|
|
||||||
|
|
||||||
q = (struct squeue_t *)malloc(sizeof(struct squeue_t));
|
|
||||||
memset(q, '\0', sizeof(struct squeue_t));
|
|
||||||
q->shmid = shmid;
|
|
||||||
q->pool = pool;
|
|
||||||
q->mode = mode;
|
|
||||||
|
|
||||||
return q;
|
|
||||||
}
|
|
||||||
|
|
||||||
void squeue_free(struct squeue_t *q)
|
|
||||||
{
|
|
||||||
free(q);
|
|
||||||
}
|
|
||||||
|
|
||||||
int squeue_close(struct squeue_t *q)
|
|
||||||
{
|
|
||||||
char *pool;
|
|
||||||
|
|
||||||
if (q==NULL)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
pool = q->pool;
|
|
||||||
shmctl(q->shmid, IPC_RMID, NULL);
|
|
||||||
free(q);
|
|
||||||
return shmdt(pool);
|
|
||||||
}
|
|
||||||
|
|
||||||
int squeue_push(struct squeue_t *q, const char *str, int lock)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if (q==NULL)
|
|
||||||
return -1;
|
|
||||||
// if (q->mode == Q_CREAT) {
|
|
||||||
// printf("squeue_push: cannot push from the creator\n");
|
|
||||||
// return -1;
|
|
||||||
// }
|
|
||||||
|
|
||||||
if (str==NULL||strlen(str)>ITEM_SIZE)
|
|
||||||
return -1;
|
|
||||||
do {
|
|
||||||
if (q->squeue_idx >= ITEM_MAX) {
|
|
||||||
while (q->pool[0]!='\0') {
|
|
||||||
q->squeue_locks++;
|
|
||||||
if (!lock) {
|
|
||||||
printf("buffer is full\n");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
usleep(100);
|
|
||||||
}
|
|
||||||
q->squeue_idx = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
for(i=q->squeue_idx*ITEM_SIZE;i<POOL_SIZE;i+=ITEM_SIZE) {
|
|
||||||
if (q->pool[i]=='\0') {
|
|
||||||
strcpy(q->pool+i, str);
|
|
||||||
q->squeue_idx++;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
q->squeue_locks++;
|
|
||||||
} while (lock);
|
|
||||||
q->squeue_lost++;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int squeue_push2(struct squeue_t *q, const char *head, const char *str, int lock)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
char *buf = malloc(strlen(head) + strlen(str) + 2);
|
|
||||||
strcpy(buf, head);
|
|
||||||
strcat(buf, ":");
|
|
||||||
strcat(buf, str);
|
|
||||||
ret = squeue_push(q, buf, lock);
|
|
||||||
free(buf);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
int squeue_pop(struct squeue_t *q)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
int two = 1;
|
|
||||||
|
|
||||||
if (q==NULL)
|
|
||||||
return -1;
|
|
||||||
// if (q->mode == Q_OPEN) { // cannot pop when not owner of squeue
|
|
||||||
// fprintf(stderr, "squeue_pop: cannot pop when you are not owner.\n");
|
|
||||||
// return -1;
|
|
||||||
// }
|
|
||||||
for(two=1;two--;q->head_idx = 0)
|
|
||||||
for(i=q->head_idx*ITEM_SIZE;i<POOL_SIZE;i+=ITEM_SIZE) {
|
|
||||||
if (q->pool[i]!='\0') {
|
|
||||||
q->pool[i]='\0';
|
|
||||||
q->head_idx++;
|
|
||||||
q->squeue_pops++;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
q->squeue_oops++;
|
|
||||||
fprintf(stderr, "WARNING: race condition detected in squeue.\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
char *squeue_get(struct squeue_t *q, int lock)
|
|
||||||
{
|
|
||||||
int i=0;
|
|
||||||
int two = 1;
|
|
||||||
|
|
||||||
if(q==NULL)
|
|
||||||
return NULL;
|
|
||||||
// if (q->mode == Q_OPEN) { // cannot pop when not owner of squeue
|
|
||||||
// fprintf(stderr, "squeue_get: cannot pop when you are not owner.\n");
|
|
||||||
// return NULL;
|
|
||||||
// }
|
|
||||||
do {
|
|
||||||
for(two=1;two--;q->head_idx = 0) {
|
|
||||||
for(i=q->head_idx*ITEM_SIZE;i<POOL_SIZE;i+=ITEM_SIZE)
|
|
||||||
if (q->pool[i]!='\0')
|
|
||||||
return q->pool+i;
|
|
||||||
}
|
|
||||||
if (lock)
|
|
||||||
usleep(100);
|
|
||||||
} while (lock);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
void squeue_stats(struct squeue_t *q)
|
|
||||||
{
|
|
||||||
if(q==NULL)
|
|
||||||
return;
|
|
||||||
printf("Queue locks: %d\n", q->squeue_locks);
|
|
||||||
printf("Queue lost: %d\n", q->squeue_lost);
|
|
||||||
printf("Queue oops: %d\n", q->squeue_oops);
|
|
||||||
printf("Queue pops: %d\n", q->squeue_pops);
|
|
||||||
}
|
|
||||||
|
|
||||||
#if _MAIN_
|
|
||||||
struct squeue_t *q;
|
|
||||||
|
|
||||||
int sigc()
|
|
||||||
{
|
|
||||||
squeue_stats(q);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
char buf[102];
|
|
||||||
int i;
|
|
||||||
int pid;
|
|
||||||
|
|
||||||
signal(SIGINT, sigc);
|
|
||||||
|
|
||||||
squeue_release("/dev/null");
|
|
||||||
|
|
||||||
pid = fork();
|
|
||||||
if (pid) {
|
|
||||||
q = squeue_open("/dev/null", Q_CREAT);
|
|
||||||
if (q == NULL) {
|
|
||||||
perror("oops");
|
|
||||||
kill(pid, SIGINT);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
squeue_push(q, "Hello World", 0);
|
|
||||||
squeue_push(q, "jeje msg 2", 0);
|
|
||||||
|
|
||||||
while(1) {
|
|
||||||
char *uh = squeue_get(q,1);
|
|
||||||
if (uh) {
|
|
||||||
printf("get: (%s)\n", uh);
|
|
||||||
squeue_pop(q);
|
|
||||||
}
|
|
||||||
usleep(100);
|
|
||||||
}
|
|
||||||
squeue_close(q);
|
|
||||||
} else {
|
|
||||||
q = squeue_open("/dev/null", Q_WAIT);
|
|
||||||
if (q == NULL) {
|
|
||||||
perror("oops");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
for(i=0;i<128;i++) {
|
|
||||||
sprintf(buf, "puta%d", i);
|
|
||||||
squeue_push(q, buf, 1);
|
|
||||||
usleep(100);
|
|
||||||
}
|
|
||||||
squeue_stats(q);
|
|
||||||
printf("cya\n");
|
|
||||||
squeue_close(q);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
struct squeue_t {
|
|
||||||
int shmid;
|
|
||||||
int mode;
|
|
||||||
char *pool;
|
|
||||||
/* pointers */
|
|
||||||
int head_idx;
|
|
||||||
int squeue_idx;
|
|
||||||
/* counters */
|
|
||||||
int squeue_locks;
|
|
||||||
int squeue_lost;
|
|
||||||
int squeue_oops;
|
|
||||||
int squeue_pops;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
#define Q_OPEN 0
|
|
||||||
#define Q_CREAT 1
|
|
||||||
#define Q_WAIT 2
|
|
||||||
|
|
||||||
int squeue_release(const char *file);
|
|
||||||
struct squeue_t *squeue_open(const char *file, int init);
|
|
||||||
int squeue_close(struct squeue_t *q);
|
|
||||||
void squeue_free(struct squeue_t *q);
|
|
||||||
int squeue_push(struct squeue_t *q, const char *str, int lock);
|
|
||||||
int squeue_push2(struct squeue_t *q, const char *head, const char *str, int lock);
|
|
||||||
int squeue_pop(struct squeue_t *q);
|
|
||||||
char *squeue_get(struct squeue_t *q, int lock);
|
|
||||||
void squeue_stats(struct squeue_t *q);
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
using GLib;
|
|
||||||
|
|
||||||
[CCode (lower_case_cprefix = "squeue_", cheader_filename = "squeue.h")]
|
|
||||||
namespace SQueues {
|
|
||||||
[CCode (cname = "struct squeue_t", free_function = "squeue_free")]
|
|
||||||
public struct SQueue {
|
|
||||||
int shmid;
|
|
||||||
int mode;
|
|
||||||
char *pool;
|
|
||||||
/* pointers */
|
|
||||||
int head_idx;
|
|
||||||
int queue_idx;
|
|
||||||
/* counters */
|
|
||||||
int locks;
|
|
||||||
int lost;
|
|
||||||
int oops;
|
|
||||||
int pops;
|
|
||||||
[CCode (cname = "squeue_open")]
|
|
||||||
public static SQueue* open(string file, int mode);
|
|
||||||
[CCode (cname = "squeue_push")]
|
|
||||||
public int push(string msg, int l);
|
|
||||||
[CCode (cname = "squeue_push2")]
|
|
||||||
public int push2(string cmd, string msg, int l);
|
|
||||||
[CCode (cname = "squeue_get")]
|
|
||||||
public weak string get(int l);
|
|
||||||
[CCode (cname = "squeue_pop")]
|
|
||||||
public int pop();
|
|
||||||
[CCode (cname = "squeue_stats")]
|
|
||||||
public int stats();
|
|
||||||
[CCode (cname = "squeue_close")]
|
|
||||||
public int close();
|
|
||||||
[CCode (cname = "squeue_free")]
|
|
||||||
public int free();
|
|
||||||
[CCode (cname = "squeue_release")]
|
|
||||||
public static int release(string file);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
[CCode (cprefix = "Q_", cheader_fileneme = "squeue.h")]
|
|
||||||
public enum SQueueMode {
|
|
||||||
OPEN = 0,
|
|
||||||
CREAT = 1,
|
|
||||||
WAIT = 2
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+3
-24
@@ -17,12 +17,12 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
#include <usb.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdarg.h>
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
unsigned long get_file_size(const char *file)
|
unsigned long get_file_size(char *file)
|
||||||
{
|
{
|
||||||
FILE *fd = fopen(file, "r");
|
FILE *fd = fopen(file, "r");
|
||||||
unsigned long len = 0;
|
unsigned long len = 0;
|
||||||
@@ -42,18 +42,9 @@ void progressbar(unsigned long long part, unsigned long long total)
|
|||||||
int pc;
|
int pc;
|
||||||
int tmp, cols = 80;
|
int tmp, cols = 80;
|
||||||
|
|
||||||
/* percentage calculation */
|
|
||||||
pc = (int)(part*100/total);
|
pc = (int)(part*100/total);
|
||||||
(pc<0)?pc=0:(pc>100)?pc=100:0;
|
(pc<0)?pc=0:(pc>100)?pc=100:0;
|
||||||
|
printf("\e[K %3d%% [", pc);
|
||||||
#if HAVE_SQUEUE
|
|
||||||
if (qmode) {
|
|
||||||
char msg[128];
|
|
||||||
sprintf(msg, "%d%%", pc);
|
|
||||||
squeue_push2(p, "bar", msg, 0);
|
|
||||||
} else {
|
|
||||||
#endif
|
|
||||||
printf("\x1b[K %3d%% [", pc);
|
|
||||||
if (columns)
|
if (columns)
|
||||||
cols = atoi(columns);
|
cols = atoi(columns);
|
||||||
cols-=15;
|
cols-=15;
|
||||||
@@ -61,16 +52,4 @@ void progressbar(unsigned long long part, unsigned long long total)
|
|||||||
for(tmp=cols-(cols*pc/100);tmp;tmp--) printf("-");
|
for(tmp=cols-(cols*pc/100);tmp;tmp--) printf("-");
|
||||||
printf("]\r");
|
printf("]\r");
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
#if HAVE_SQUEUE
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void eprintf(const char *format, ...)
|
|
||||||
{
|
|
||||||
va_list ap;
|
|
||||||
va_start(ap, format);
|
|
||||||
vfprintf(stderr, format, ap);
|
|
||||||
va_end(ap);
|
|
||||||
//fflush(stderr); // XXX CRASH?!? stdin here?!?!?
|
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user