[Commit-gnuradio] git://gnuradio.org/gnuradio branch, master, updated. 3.3git-638-g48850cc

[git repository hosting]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/gnuradio".

The branch, master has been updated
       via  48850cce5609941289c00fea9cd3493624bf7376 (commit)
       via  5c4b47526413c6793463fc3bd1f408e21f65b132 (commit)
       via  ab207bece948af27e4772cb482ba9a7973b9565e (commit)
      from  b2117ee60e60a7e7cf27c6b88d45195e70185175 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 48850cce5609941289c00fea9cd3493624bf7376
Merge: b2117ee60e60a7e7cf27c6b88d45195e70185175 
ab207bece948af27e4772cb482ba9a7973b9565e 
5c4b47526413c6793463fc3bd1f408e21f65b132
Author: Johnathan Corgan <address@hidden>
Date:   Sun Feb 21 10:32:22 2010 -0800

    Merge branches 'wbx_usrp2' and 'wbx_usrp1' of git://gnuradio.org/jabele

commit 5c4b47526413c6793463fc3bd1f408e21f65b132
Author: Jason Abele <address@hidden>
Date:   Fri Feb 19 15:24:56 2010 -0800

    Clarified copyright and licensing

commit ab207bece948af27e4772cb482ba9a7973b9565e
Author: Jason Abele <address@hidden>
Date:   Wed Jan 20 18:53:17 2010 -0800

    First pass WBX USRP2 driver

-----------------------------------------------------------------------

Summary of changes:
 usrp/host/lib/db_wbxng_adf4350_regs.cc             |   22 ++-
 usrp/host/lib/db_wbxng_adf4350_regs.h              |   22 ++-
 usrp2/firmware/apps/.gitignore                     |    1 +
 usrp2/firmware/apps/Makefile.am                    |    4 +
 usrp2/firmware/lib/Makefile.am                     |   46 ++++-
 usrp2/firmware/lib/adf4350.c                       |  209 +++++++++++++++++++
 usrp2/firmware/lib/adf4350.h                       |   40 ++++
 usrp2/firmware/lib/adf4350_regs.c                  |  103 ++++++++++
 .../usrp2_mac_addr.h => lib/adf4350_regs.h}        |   17 +-
 usrp2/firmware/lib/db_init.c                       |    2 +
 usrp2/firmware/lib/{db_init.c => db_init_wbx.c}    |   39 +----
 usrp2/firmware/lib/db_wbxng.c                      |  214 ++++++++++++++++++++
 usrp2/firmware/lib/db_wbxng.h                      |   74 +++++++
 13 files changed, 742 insertions(+), 51 deletions(-)
 create mode 100644 usrp2/firmware/lib/adf4350.c
 create mode 100644 usrp2/firmware/lib/adf4350.h
 create mode 100644 usrp2/firmware/lib/adf4350_regs.c
 copy usrp2/firmware/{include/usrp2_mac_addr.h => lib/adf4350_regs.h} (73%)
 copy usrp2/firmware/lib/{db_init.c => db_init_wbx.c} (91%)
 create mode 100644 usrp2/firmware/lib/db_wbxng.c
 create mode 100644 usrp2/firmware/lib/db_wbxng.h


hooks/post-receive
-- 
git://gnuradio.org/gnuradio