This reverts commit 0bcbe429

.

Now that we are able to check for bogus printf calls, don't define the
name any more (ptp-noposix defines it anyways, but let's not do it
when building with ppsi, so the code explicitly calls pp_printf (or
mprintf, which will remain as an alias until we get rid of
ptp-noposix).

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Tomasz Wlostowski authored 11 years ago and Grzegorz Daniluk committed 11 years ago

Signed-off-by: Grzegorz Daniluk <grzegorz.daniluk@cern.ch>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

This reads to stdout, in binary format. With "-v" it prints text and
scans the bus too. The examples here below use the same card (and same
data) as in commit "d44ace7e

 w1: complete eeprom low-level support".

   spusa.root# ./tools/wrpc-w1-read -b 2 0 5 | od -t u1 -Ax -w1
   000000  40
   000001  41
   000002  42
   000003 243
   000004 244

   spusa.root# ./tools/wrpc-w1-read -v -b 2 30 6
   ./ohwr/wrpc-sw/tools/wrpc-w1-read: found device 10dc:018d: 0000:02:00.0
   ./ohwr/wrpc-sw/tools/wrpc-w1-read: found device 10dc:018d: 0000:04:00.0
   device 0: 68000801dce56910
   device 1: 5b0000036c567628
   device 2: f70000001eda8242
   device 3: 5f00000040e50143
   Reading device on bus 2: offset 30 (0x1e), len 6
   offset   30 (0x01e):  11 (0x0b)
   offset   31 (0x01f):  22 (0x16)
   offset   32 (0x020):  33 (0x21)
   offset   33 (0x021):  44 (0x2c)
   offset   34 (0x022):  55 (0x37)
   offset   35 (0x023):  66 (0x42)

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Mainly, this removes the shell commands and the inclusion of <wrc.h>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

The command is not documented, and it looks like is not useful either
(I understand it has been useful when setting up the init area initially)

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Aurelio Colosimo authored 11 years ago and Alessandro Rubini committed 11 years ago

Signed-off-by: Aurelio Colosimo <aurelio@aureliocolosimo.it>
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Aurelio Colosimo <aurelio@aureliocolosimo.it>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Cesar Prados noted that if you boot w1 directly, not passing through
sockitowm, w1 was not working.  I always run sockitowm because I have
it in the lm32 code that starts every time I load the fpga.

This fixes the missing clock divisor.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

This completes w1-eeproom.c with the complete API. The provided test
commands allow to read and write any size at any offset (the low-level
code manages cross-page reads and writes. The following examples
modify a pre-written eeprom, which I host in an external socket of
my SPEC card:

   wrc# w1r 0 4
   read(0x0, 4): result = 4
   offset    0 (0x000): 240 (0xf0)
   offset    1 (0x001): 241 (0xf1)
   offset    2 (0x002): 242 (0xf2)
   offset    3 (0x003): 243 (0xf3)

   wrc# w1w 0 40 41 42
   offset    0 (0x000):  40 (0x28)
   offset    1 (0x001):  41 (0x29)
   offset    2 (0x002):  42 (0x2a)
   write(0x0, 3): result = 3

   wrc# w1r 0 4
   read(0x0, 4): result = 4
   offset    0 (0x000):  40 (0x28)
   offset    1 (0x001):  41 (0x29)
   offset    2 (0x002):  42 (0x2a)
   offset    3 (0x003): 243 (0xf3)

   wrc# w1r 30 4
   read(0x1e, 4): result = 4
   offset   30 (0x01e):  69 (0x45)
   offset   31 (0x01f):  70 (0x46)
   offset   32 (0x020):  71 (0x47)
   offset   33 (0x021):  72 (0x48)

   wrc# w1w 30 11 22 33 44 55 66
   offset   30 (0x01e):  11 (0x0b)
   offset   31 (0x01f):  22 (0x16)
   offset   32 (0x020):  33 (0x21)
   offset   33 (0x021):  44 (0x2c)
   offset   34 (0x022):  55 (0x37)
   offset   35 (0x023):  66 (0x42)
   write(0x1e, 6): result = 6

   wrc# w1r 30 6
   read(0x1e, 6): result = 6
   offset   30 (0x01e):  11 (0x0b)
   offset   31 (0x01f):  22 (0x16)
   offset   32 (0x020):  33 (0x21)
   offset   33 (0x021):  44 (0x2c)
   offset   34 (0x022):  55 (0x37)
   offset   35 (0x023):  66 (0x42)

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Aurelio Colosimo <aurelio@aureliocolosimo.it>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

With this commit, when you select both the hardware and software uart,
ppsi diagnostics (controlled  by the "verbose" command) got to
the software uart, not to the hardware one. In this way you can run
the shell in a clean tty.

Unfortunately, frame dumps still reach the hardware uart, if frame
verbosity is greater than 1.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Actually, I tried to move cmd_verbose.c to ppsi, and avoid
this dependency, but our use of --gc-sections would prevent
the code to be picked into wrc.o.

Hopefully, we won't need to touch this command any more.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

This merges a number of changes related to a major ppsi update,
commits by me and Aurelio Colosimo.  This last wrpc-sw commit builds,
but previous ones do not. Still, I chose to commit separately each
fix for documenting purposes, with the maintainer's approval.

The new ppsi does not sync two spec cards, because I broke it during
my development session of April 2013, but lack of even build-test led
wrpc-sw master to not even build with its ppsi submodule.

This al least brings back build-testing to a sane state, and allows us
to concentrate on making it work and benefit from the new features on
WRPC-based cards.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

We need to link ppsi/proto-standard/libstd.a explicitly, but we also
need a rule to generate it, or parallel compilation fails saying it
has no rule. The makefile depended on build order (my fault), as
building ppsi/ppsi.o, with its rule), also built libstd.a

BTW, this removes ppsi/arch-wrpc/libarch.a from the dependencies,
because it is already linked in making ppsi/ppsi.o (otoh the need for
an explicit mention of libstd.a can't easily be solved in ppsi
itself, so it remains here).

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

In recent ppsi code, proto-ext-whiterabbit is not replicating
proto-standard any more, but rather it offers hooks for the additional
code it needs.  Thus, we need to link the library for standard PTP as
well, to pick some of the states for the WR state machine.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

This source file is now part of ppsi itself, so it is removed from
wrpc-sw. The move helps improving cleaning up and maintaing ppsi
without committing to the supermodule each time something internal changes.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

This commit updates ppsi with the latest development, but does not
build if CONFIG_PPSI is selected. This whole branch is devoted
to a smooth merge of ppsi changes, so every wrpc-sw modification that
depends on ppsi is commited and explained separately.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>