Fix memmove size

Correct the byte count for several memmove calls.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

PS3 platform routines

Add new files ui/common/ps3.h and ui/common/ps3.c with
platform specific routines to access the PS3 flash
memory and to get and set the PS3 video mode.

The flash routines use the ps3-utils library.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Rename client add remove ops

For consistency, rename the symbols add_device and remove_device
to device_add and device_remove.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Kboot parser URL test

Add a kboot parser test for network URLs.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Add more yaboot parser tests

Add yaboot.conf files from fedora, OpenSUSE, and a yaboot whitespace
and comment test.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Fixup parser test program

Fixup the parser test program and helper script to work
with the new multi-ui design.

The expected-output files have not been updated.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Remove yaboot-cfg files

Remove the now unused yaboot-cnf.h and yaboot-cnf.c files.
These files are no longer needed with the parser-conf routines.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Hookup yaboot parser

Hookup the yaboot parser to the new parser-conf routines.
This update eliminates the dependency on yaboot-cnf.h
and yaboot-cnf.c.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Split common routines from kboot parser

Pull out the common .conf file parsing logic from kboot-parser.c and
into two new files parser-conf.h and parser-conf.c, and rework
the kboot parser to use those common routines.

The new common routines are based on a .conf file parser context
struct conf_context.  The specific parsers setup the context then
call the main parsing entry routine conf_parse().  conf_parse()
uses the context info to open and read .conf files and call
parser specific callbacks to process name:value pairs and to
add boot_option instances to the discover server.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Log new boot options

Add calls to log new devices in device_add_boot_option().

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

log discover mount failure

Add the status value to the discover mount failure log.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Makefile set udev rule permissions

Set the proper install file permissions on the udev rules.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Fix udev rule

Change 'RUN=' to 'RUN+=' to let other block rules run.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Get log stream

Add a new convenience routine pb_log_get_stream() that returns the
current PB_log stream.  Used to setup the ps3-utils library to log
to the pb_log.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Increase protocol payload size

Fixes the problem of big conf files not showing up in the UI.

Increases the protocol payload from 4 KiB to 8 KiB.

Also, adds some log messages when I/O errors occur, or the payload
is too large for the protocol.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Add hotplug test script

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Log server messages to file

Log discover server messages to a file.  Helps in debugging
the server when is has problems at system startup.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

Add CFLAGS to LDFLAGS

Add the CFLAGS options to LDFLAGS so that the machine option
from CFLAGS is used when linking.  This duplicates the
behavior of automake.

Fixes errors like these:
  ppu-ld: skipping incompatible libc.so when searching for -lc

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

Fix out of source make dist

The dist makefile target needs to work on files in the
source directory. Add the missing $(top_srcdir).

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

Add makefile deps to makefile

Add a dependency on the makefiles so a rebuild is done
when they change.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

Makefile cleanups

General cleanup of the makefile.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

Add maintainer-clean makefile target

Add a maintainer-clean makefile target that cleans all the
generated files.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

Install udev rules

Add 99-petitboot.rules to the install make target.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

Add SHELL to Makefile.in

Add SHELL to the list of variables in Makefile.in to make
it available to the Makefile.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

Hookup the --with-twin configure option

Add some missing makefile parts to make the --with-twin configure
option work properly.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

Include types header in talloc

Include sys/types.h in talloc.h.
talloc.h uses off_t, which is defined in sys/types.h.

Fixes this OpenWRT build error:

  ./lib/talloc/talloc.h:114: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'talloc_total_size'

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

Loop through valid kboot conf names

The PS3 bootloader spec allows several kboot.conf file names.
Add a loop in the parser to check for all of them.

Also, print some diagnostic messages to the log file and change
the parser routine name from 'parser' to 'kboot_parser'
to give a better log file output.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

Rename symbol new

Change the symbol 'new' to an alternative.  The symbol new is
reserved for C++ compilers.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

Add list_for_each_entry_continue routine

Add a new list iteration routine list_for_each_entry_continue().  Continues
iteration from a user specified list item.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

Pass cb_arg to discover_client_init

Pass the client cb_arg to discover_client_init() and have it
initialize the structure member.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

petitboot: Add --with-twin config option

Make the build of the GUI components conditional on the installation
of libtwin.  Also, add options --with-twin and --without-twin to allow the
user to override the default.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Remove boot_option_copy routine

Remove the now uneeded boot_option_copy() routine.

The addition of persistant client device and boot option info
make this routine uneeded.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Add list insert routines

Add new list insertion routines list_insert_before(), list_insert_after(),
and list_add_tail().  Also, change list_add() to use list_insert_after().

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Add protocol object compare routines

Add routines pb_protocol_device_cmp() and pb_protocol_boot_option_cmp()
to hide the implemention details of the device.  The implementation
of the id can be changed without effecting the users of it.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Fix log move commit

Fix missed log.h path change in log move commit
(dae4540e417e2bf72dd83b2713a670bde0056ba9).

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

[discover client] Remove device from discover array before notifying UI

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

[discover client] Add device accessors

Allow the UIs to query the current device set.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

[pb-protocol] Add ui_info member to devices and boot options

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

[discover client] Make devices persistent

Change discover client to keep devices around after they've been
added, and freed after removal.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Make device instance constant

Make the instance of devices read-only.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Make client ops constant

Make the discover_client_ops args read-only.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Add client ops instance arg

Add a user supplied agument to the struct discover_client_ops
callback routines that is suitable for managing client instance
data.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Add boot_option_copy routine

Add the convenience routine boot_option_copy().  Does a deep copy.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Flush log stream on write

Flush the pb_log stream when the stream is changed, and add an
option to flush the pb_log stream on every write.  Useful while
debugging.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Change client to use pb_log

Change any use of the standard io streams in the client
routines to use pb_log().

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Move log to library

Move the log routines to the petitboot library.  The log
routines are generic enough to be used for both server and
client.  Does not change the log source.

jk: move to lib/log/ instead of lib/

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Fix waiter alloc

Add the missing assignment of the global n_pollfds variable.
Fix a minor memory leak in waiter_poll().

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Move waiter to library

Move the waiter routines into the petitboot library.  The waiter
routines are generic enough to be used for both server and
client.  Does not change the waiter source.

jk: move to lib/waiter/ instead of lib/

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Fix unused parameter warnings

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Fix build warnings

Fix various minor build warnings:

  lib/pb-protocol/pb-protocol.c:72: warning: comparison between signed and unsigned
  lib/pb-protocol/pb-protocol.c:78: warning: comparison between signed and unsigned
  lib/pb-protocol/pb-protocol.c:141: warning: unused parameter 'buf_len'
  lib/pb-protocol/pb-protocol.c:241: warning: comparison between signed and unsigned
  discover/pb-discover.c:14: warning: no previous prototype for 'sigint_handler'
  discover/pb-discover.c:13: warning: unused parameter 'signum'
  discover/log.c:22: warning: no previous prototype for 'pb_log_set_stream'
  discover/discover-server.c:159: warning: no previous prototype for 'discover_server_notify_add'
  discover/discover-server.c:169: warning: no previous prototype for 'discover_server_notify_remove'
  discover/discover-server.c:179: warning: no previous prototype for 'discover_server_set_device_source'
  discover/discover-server.c:184: warning: no previous prototype for 'discover_server_init'
  discover/discover-server.c:229: warning: no previous prototype for 'discover_server_destroy'
  discover/device-handler.c:395: warning: comparison between signed and unsigned
  discover/paths.c:44: warning: comparison between signed and unsigned

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Fix make install

Fix the make target install.

Fixes errors like these:
  /usr/bin/install: cannot stat `petitboot': No such file or directory

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Use enum type in pb_protocol_create_message

To better illustrate the usage of pb_protocol_create_message(),
change the type of the arg action from int to enum pb_protocol_action.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Update udev rule for socket

Update the udev petitboot rule to use the petitboot discover socket

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Add more -W flags to CFLAGS

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Report error is no message is read

Allow the client to detect read() failures.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Use separate section for parsers array

Instead of hardcoding the array of parsers, use the linker to do the
work for us.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Hook up parsers to device discovery

Iterate the parsers from the device handler on an add event.

Initial change to just the kboot parser.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Use a list for device->boot_options

Makes adding and removing options easier for parsers.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Use CPPFLAGS for -I arguments

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Remove reference to device.h

It isn't needed anymore.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Use talloc for device handler destruction

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Add device handler cleanup

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Initial device handler code

Mount discovered devices, and set up symlinks for UUID and LABELs

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Fix invocation of udev_init

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Hook up udev events to device handler

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Remove const from print_device_remove

..we can add consts where suitable later.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Don't print pid on ui test startup

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Create device-handler for managing registered devices

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Initial support for multiple UIs

Move the device discovery code from separate udev helpers to a single
process to listen on two sockets: one SOCK_DGRAM for incoming udev
events, and one SOCK_STREAM for UIs to connect.

Initial support for client/server infrastructure, still need to wire-up
the udev messages.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

autoconfiscate

Add autoconf, but keep non-recursive Makefile structure.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

tests: add tests for assorted ydl and ubuntu configs

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

kboot parser: Add UUID and LABEL tests

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

yaboot parser: fix cfg_getc inline

Current build fails with:

petitboot/devices/yaboot-cfg.c:151: undefined reference to `cfg_getc'

As it it maked inline. This change un-inlines this function.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Include limits.h

Fixes these build errors:

  petitboot-udev-helper.c:415: error: 'PATH_MAX' undeclared
  petitboot-udev-helper.c:496: error: 'INT_MAX' undeclared

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Remove unneded kboot patch

Remove the unneeded Ubuntu ps3-kboot support patch.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Version 0.2

We don't need a major.minor.patch version string, jsut major.minor
is fine.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Unify boot messages

Both linux and gameos boots have elipses.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Give boot messages time to display.

Currently we don't see booting messages, as petitboot has quit before
the fbdev has updated. By using twin_window_draw() in pboot_message,
we force the refresh before petitboot exits.

Also, don't exit in the gameOS path - may as well leave the GUI active
while rebooting.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Print ststus message when booting

Add a couple of calls to pboot_message() to give some feedback when
an option (or gameos) is selected.

Also, convert pboot_message to varargs, to allow more flexible message
formats.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Add define for boot-game-os binary

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Use git-ls-files for make dist target

To make sure we won't miss any files.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Rename udev-helper to petitboot-udev-helper

.. so that the installed binary looks more like a component of
petitboot, not udev.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Fix check for null initrd and boot args

Because the strings are read from the pb socket, we need to check
for an empty string, not a NULL string.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Make kboot_parser global options array static

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Add kexec argument logging

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Ignore /dev/loop* devices

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Don't log in removable device poll loops

This creates large log files.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Create uuid and label symlinks when mounting devices

When we discover a device with ID_FS_UUID or ID_FS_LABEL properties,
create a symlink in the mount tree. This will end up with a mount
tree structure mirroring /dev, and allow devices to be referenced
by uuid when booting is attempted.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Rework device-path handling

Pass full device paths around, rather than shortened device names and
mountpoints.

The parse() function has been updated to only take a device path; the
mountpoint can be derived with mountpoint_for_device. Also, add
initial handling for uuid= and label= syntaxes.

This allows us to remap ps3 devices where necessary.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Don't reset dev->id in yaboot parser

- this may end up giving duplicate IDs for different partitions. It's
fine to keep the device where we discovered the config file.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Move path maniuplation functions to devices/paths.c

This allows us to include the real functions in the parser testsuite,
instead of using fakes.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Don't #include <libio.h>

It isn't present on uClibc, and we don't seem to need anything from
this header.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Fix path in udev rule example

The default prefix is /usr, so the correct path to the udev-helper
script is /usr/sbin.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Log udev-helper output to /var/log/, not /var/tmp/

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Remove completed items from TODO

We've got controller support, and the kboot parser can handle device
prefixes.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Update ps3-kboot patch

Ubuntu's ps3-kboot has been updated, so update our patch to match,
and fix the missing -.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Add 'make check' and 'make distcheck' targets

Provides an easy way to test the working dir and tarball.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Add parser tests, clean up test system

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Add ps3 controller support

Using the new twin joystick API, map some of the sixaxis controller
events to key events.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

Add utils dir to tarball

make dist left it out.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>