qi-hardware/iris
1
0
Fork 0
mirror of git://projects.qi-hardware.com/iris.git synced 2025-04-21 12:27:27 +03:00
Code Activity

update things to work with new compiler and sdram chip

Browse Source
This commit is contained in:
Bas Wijnen
2012-01-14 18:17:23 +01:00
parent f4cac9b3a5
commit 538b9b9361
9 changed files with 54 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mips/nanonote/server/Makefile.am
View File

@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = usb-server
usb_server_SOURCES = usb-server.cc
usb_server_CPPFLAGS = $(SHEVEK_CFLAGS) -DSTAGE1_FILE=\"mips/nanonote/sdram-setup.raw\" -DSTAGE2_FILE=\"mips/start.raw\" -I../../..
usb_server_CPPFLAGS = $(SHEVEK_CFLAGS) -DSTAGE1_FILE=\"mips/nanonote/sdram-setup.raw\" -I../../.. -DCOPYRIGHT_YEARS=\"2009-2012\" -DCOPYRIGHT_AUTHOR=\"Bas\ Wijnen\" -DCOPYRIGHT_EMAIL=\"wijnen@debian.org\"
usb_server_LDFLAGS = $(SHEVEK_LIBS) -lusb
PYPP = /usr/bin/pypp

6
mips/nanonote/server/usb-server.ccp
View File

@@ -210,10 +210,10 @@ struct client : public shevek::server <client, data *>::connection:
void pickup (bool is_stdio):
keep = is_stdio
void read (std::string const &line):
shevek::istring l (line)
shevek::ristring l (line)
unsigned load, entry
std::string filename
if l ("reboot %x %x %r%", load, entry, filename):
if l ("reboot %x %x %a%", load, entry, filename):
get_server ()->data ()->boot (filename, load, entry)
else if l ("shutdown%"):
std::cerr << "shutting down\n"
@@ -332,7 +332,7 @@ int main (int argc, char **argv):
shevek::args::option opts[] = {
shevek::args::option ('p', "port", "port to listen for commands", true, port)
}
shevek::args args (argc, argv, opts, 0, 0, "device server for testing Iris on NanoNote", "2009")
shevek::args args (argc, argv, opts, 0, 0, "device server for testing Iris on NanoNote")
data d (port)
dump_devices ()
shevek::loop ()