Re: [Discuss-gnuradio] start_rx_streaming_at patch

[Bruce McGuffin]

Doug

I tried a bunch of different p levels. At -p0 it finds the files right 
away, but
still fails to update them.

Redoing patch with -p0 I get:
 
    address@hidden gnuradio-3.2]$ patch -p0 < 
usrp2-rx_at-sync_rx_at.patch
    patching file usrp2/firmware/apps/serdes_txrx.c
    Hunk #1 FAILED at 183.
    1 out of 1 hunk FAILED -- saving rejects to file 
usrp2/firmware/apps/serdes_txrx.c.rej
    patching file usrp2/firmware/apps/app_common_v2.c
    Hunk #1 FAILED at 477.
    1 out of 1 hunk FAILED -- saving rejects to file 
usrp2/firmware/apps/app_common_v2.c.rej
    patching file usrp2/firmware/apps/app_common_v2.h
    Hunk #1 FAILED at 55.
    1 out of 1 hunk FAILED -- saving rejects to file 
usrp2/firmware/apps/app_common_v2.h.rej
    patching file usrp2/firmware/apps/txrx.c
    Hunk #1 FAILED at 158.
    Hunk #2 FAILED at 211.
    2 out of 2 hunks FAILED -- saving rejects to file 
usrp2/firmware/apps/txrx.c.rej
    patching file usrp2/firmware/apps/factory_test.c
    patching file usrp2/firmware/apps/mimo_tx_slave.c
    Hunk #1 FAILED at 191.
    1 out of 1 hunk FAILED -- saving rejects to file 
usrp2/firmware/apps/mimo_tx_slave.c.rej
    patching file usrp2/host/include/usrp2/usrp2.h
    Hunk #1 succeeded at 172 (offset -5 lines).
    patching file usrp2/host/lib/usrp2_impl.cc
    patching file usrp2/host/lib/usrp2_impl.h
    patching file usrp2/host/lib/usrp2.cc
    patching file usrp2/host/lib/control.h

So I guess it worked on more than just the last file, as I originally 
said, but still
didn't manage to update what look like essential files. e.g. serdes_txrx.

Are these patches still useful? That is, if I went through the files by 
hand and made
the changes, would I wind up with usable code?

Thanks
Bruce


> Bruce,
>  I haven't maintained the patch, so I'm not sure if it still applies
> cleanly to the latest release of gnuradio - but from the error message
> it may just be you're using the wrong '-p' level. I'm usually applying
> patches in the top-level directory of the gnuradio tree, so I use -p0.
>  The email to to me bounced as you swapped an underscore for the period.
>  Doug
>
> On Thu, Sep 17, 2009 at 11:28 AM, Bruce McGuffin <address@hidden> wrote:
>   
> > Hi
> >
> > A while ago, Doug Geiger wrote on this group that he had written a
> > patch to create a function start_rx_streaming_at, which is like
> > start_rx_streaming but begins at a specified time synchronized with
> > the PPS, and that the patch could be found at http://drop.io/9eljrue
> >
> > Yesterday I downloaded the patch and tried applying it to gnuradio-3.2
> > without success. Of the half dozen or so changes in the patch only the last
> > one succeeded. Here is a typical exchange from that attempt:
> >
> >    patch -p2 < usrp2-rx_at-sync_rx_at.patch
> >    can't find file to patch at input line 5
> >    Perhaps you used the wrong -p or --strip option?
> >    The text leading up to this was:
> >    --------------------------
> >    |Index: usrp2/firmware/apps/serdes_txrx.c
> >    |===================================================================
> >    |--- usrp2/firmware/apps/serdes_txrx.c  (revision 11171)
> >    |+++ usrp2/firmware/apps/serdes_txrx.c  (working copy)
> >    --------------------------
> >    File to patch:
> >
> > at this point, I type in:  usrp2/firmware/apps/serdes_txrx.c
> > and it continues:
> >
> >    patching file usrp2/firmware/apps/serdes_txrx.c
> >    Hunk #1 FAILED at 183.
> >    1 out of 1 hunk FAILED -- saving rejects to file
> > usrp2/firmware/apps/serdes_txrx.c.rej
> >
> > the reject file contains:
> >
> >    ***************
> >    *** 183,188 ****
> >        restart_streaming();
> >      }
> >
> >
> >      void
> >      stop_rx_cmd(void)
> >    --- 183,192 ----
> >        restart_streaming();
> >      }
> >
> >    + void start_rx_streaming_at_cmd(const u2_mac_addr_t *host,
> > op_start_rx_streaming_t *p, uint32_t time)
> >    + {}
> >    + void restart_streaming_at(uint32_t time)
> >    + {}
> >
> >      void
> >      stop_rx_cmd(void)
> >
> > and as far as I can tell by looking, the 6 lines of context exactly match
> > lines 183-188 in the file
> > usrp2/firmware/apps/serdes_txrx.c
> >
> > So then just to see if it made a difference, I downloaded gnuradio-3.2.2
> > but patch didn't work there either.
> >
> > Then I emailed Doug at address@hidden
> > <mailto:address@hidden>
> > and it bounced. Does anybody know what I'm doing wrong here?
> >
> > Thanks
> > Bruce
> >
> >
> >
> > _______________________________________________
> > Discuss-gnuradio mailing list
> > address@hidden
> > http://lists.gnu.org/mailman/listinfo/discuss-gnuradio
> >
> >     
>
>
>
>