usrp2: update copyright dates on firmware code

24 files changed, 33 insertions, 28 deletions

diff --git a/firmware/zpu/lib/arp_cache.c b/firmware/zpu/lib/arp_cache.c
index 9c586fa6b..8e14d8f17 100644
--- a/firmware/zpu/lib/arp_cache.c
+++ b/firmware/zpu/lib/arp_cache.c
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/lib/arp_cache.h b/firmware/zpu/lib/arp_cache.h
index 8e84a1f94..e0e125d89 100644
--- a/firmware/zpu/lib/arp_cache.h
+++ b/firmware/zpu/lib/arp_cache.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/lib/banal.c b/firmware/zpu/lib/banal.c
index 42937957f..dfb8df355 100644
--- a/firmware/zpu/lib/banal.c
+++ b/firmware/zpu/lib/banal.c
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/lib/banal.h b/firmware/zpu/lib/banal.h
index eb7ed509a..e9e55bca5 100644
--- a/firmware/zpu/lib/banal.h
+++ b/firmware/zpu/lib/banal.h
@@ -1,6 +1,6 @@
 /* -*- c -*- */
 /*
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/lib/eth_addrs.c b/firmware/zpu/lib/eth_addrs.c
index fc35a3c9b..c45ce7559 100644
--- a/firmware/zpu/lib/eth_addrs.c
+++ b/firmware/zpu/lib/eth_addrs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Ettus Research LLC
+ * Copyright 2010-2011 Ettus Research LLC
  * Copyright 2007 Free Software Foundation, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/firmware/zpu/lib/ethertype.h b/firmware/zpu/lib/ethertype.h
index 11f4bafec..235981193 100644
--- a/firmware/zpu/lib/ethertype.h
+++ b/firmware/zpu/lib/ethertype.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/lib/net/eth_mac_addr.h b/firmware/zpu/lib/net/eth_mac_addr.h
index b44fb68f7..01bf91988 100644
--- a/firmware/zpu/lib/net/eth_mac_addr.h
+++ b/firmware/zpu/lib/net/eth_mac_addr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/lib/nonstdio.h b/firmware/zpu/lib/nonstdio.h
index 2c4aeb961..a47a6df6e 100644
--- a/firmware/zpu/lib/nonstdio.h
+++ b/firmware/zpu/lib/nonstdio.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Ettus Research LLC
+// Copyright 2010-2011 Ettus Research LLC
 //
 /*
  * Copyright 2007 Free Software Foundation, Inc.
diff --git a/firmware/zpu/usrp2/sd.c b/firmware/zpu/usrp2/sd.c
index d000b28ae..d634baea8 100644
--- a/firmware/zpu/usrp2/sd.c
+++ b/firmware/zpu/usrp2/sd.c
@@ -1,6 +1,6 @@
 /* -*- c -*- */
 /*
- * Copyright 2008 Ettus Research LLC
+ * Copyright 2008-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/usrp2/sd.h b/firmware/zpu/usrp2/sd.h
index e2d0ae38e..e4b4aae8b 100644
--- a/firmware/zpu/usrp2/sd.h
+++ b/firmware/zpu/usrp2/sd.h
@@ -1,6 +1,6 @@
 /* -*- c -*- */
 /*
- * Copyright 2008 Ettus Research LLC
+ * Copyright 2008-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/usrp2p/bootconfig.h b/firmware/zpu/usrp2p/bootconfig.h
index 35c2726ed..b64834d22 100644
--- a/firmware/zpu/usrp2p/bootconfig.h
+++ b/firmware/zpu/usrp2p/bootconfig.h
@@ -1,6 +1,6 @@
 /* -*- c -*- */
 /*
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  * 
  * This file is part of GNU Radio
  * 
diff --git a/firmware/zpu/usrp2p/bootloader/fpga_bootloader.c b/firmware/zpu/usrp2p/bootloader/fpga_bootloader.c
index 9feff6ecd..f5a71a8bb 100644
--- a/firmware/zpu/usrp2p/bootloader/fpga_bootloader.c
+++ b/firmware/zpu/usrp2p/bootloader/fpga_bootloader.c
@@ -1,6 +1,6 @@
 /* -*- c -*- */
 /*
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/usrp2p/bootloader/fw_bootloader.c b/firmware/zpu/usrp2p/bootloader/fw_bootloader.c
index a2c32bf8e..de561cf22 100644
--- a/firmware/zpu/usrp2p/bootloader/fw_bootloader.c
+++ b/firmware/zpu/usrp2p/bootloader/fw_bootloader.c
@@ -1,6 +1,6 @@
 /* -*- c -*- */
 /*
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/usrp2p/bootloader/init_bootloader.c b/firmware/zpu/usrp2p/bootloader/init_bootloader.c
index e960fe474..f8b432c46 100644
--- a/firmware/zpu/usrp2p/bootloader/init_bootloader.c
+++ b/firmware/zpu/usrp2p/bootloader/init_bootloader.c
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2010 Ettus Research LLC
+ * Copyright 2010-2011 Ettus Research LLC
  *
  */
 
diff --git a/firmware/zpu/usrp2p/bootloader/serial_loader_burner.c b/firmware/zpu/usrp2p/bootloader/serial_loader_burner.c
index 4ac4df454..6d5d135ab 100644
--- a/firmware/zpu/usrp2p/bootloader/serial_loader_burner.c
+++ b/firmware/zpu/usrp2p/bootloader/serial_loader_burner.c
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/usrp2p/bootloader/spi_bootloader.c b/firmware/zpu/usrp2p/bootloader/spi_bootloader.c
index 678e66cf7..3e66d41cb 100644
--- a/firmware/zpu/usrp2p/bootloader/spi_bootloader.c
+++ b/firmware/zpu/usrp2p/bootloader/spi_bootloader.c
@@ -1,6 +1,6 @@
 /* -*- c -*- */
 /*
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/usrp2p/spi_flash.c b/firmware/zpu/usrp2p/spi_flash.c
index 09b74a513..25fc239be 100644
--- a/firmware/zpu/usrp2p/spi_flash.c
+++ b/firmware/zpu/usrp2p/spi_flash.c
@@ -1,7 +1,7 @@
 /* -*- c++ -*- */
 /*
  * Copyright 2009 Free Software Foundation, Inc.
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/usrp2p/spi_flash.h b/firmware/zpu/usrp2p/spi_flash.h
index 9a04df86b..a10533e08 100644
--- a/firmware/zpu/usrp2p/spi_flash.h
+++ b/firmware/zpu/usrp2p/spi_flash.h
@@ -1,7 +1,7 @@
 /* -*- c -*- */
 /*
  * Copyright 2009 Free Software Foundation, Inc.
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/usrp2p/spi_flash_private.h b/firmware/zpu/usrp2p/spi_flash_private.h
index 9a1b8d3e3..6bf06fda8 100644
--- a/firmware/zpu/usrp2p/spi_flash_private.h
+++ b/firmware/zpu/usrp2p/spi_flash_private.h
@@ -1,7 +1,7 @@
 /* -*- c++ -*- */
 /*
  * Copyright 2009 Free Software Foundation, Inc.
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/usrp2p/spi_flash_read.c b/firmware/zpu/usrp2p/spi_flash_read.c
index 47a79e7d1..fffc2a671 100644
--- a/firmware/zpu/usrp2p/spi_flash_read.c
+++ b/firmware/zpu/usrp2p/spi_flash_read.c
@@ -1,7 +1,7 @@
 /* -*- c++ -*- */
 /*
  * Copyright 2009 Free Software Foundation, Inc.
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/usrp2p/spif.c b/firmware/zpu/usrp2p/spif.c
index 1c1a348f4..91da73155 100644
--- a/firmware/zpu/usrp2p/spif.c
+++ b/firmware/zpu/usrp2p/spif.c
@@ -1,6 +1,6 @@
 /*
  * Copyright 2007,2008,2009 Free Software Foundation, Inc.
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/usrp2p/xilinx_s3_icap.c b/firmware/zpu/usrp2p/xilinx_s3_icap.c
index 50c85231c..8995aa23d 100644
--- a/firmware/zpu/usrp2p/xilinx_s3_icap.c
+++ b/firmware/zpu/usrp2p/xilinx_s3_icap.c
@@ -1,6 +1,6 @@
 /* -*- c -*- */
 /*
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/firmware/zpu/usrp2p/xilinx_s3_icap.h b/firmware/zpu/usrp2p/xilinx_s3_icap.h
index 7b7e9eccc..d4238eee9 100644
--- a/firmware/zpu/usrp2p/xilinx_s3_icap.h
+++ b/firmware/zpu/usrp2p/xilinx_s3_icap.h
@@ -1,6 +1,6 @@
 /* -*- c -*- */
 /*
- * Copyright 2009 Ettus Research LLC
+ * Copyright 2009-2011 Ettus Research LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/fix-copyright-years b/fix-copyright-years
index c6ee16a21..97630041b 100755
--- a/fix-copyright-years
+++ b/fix-copyright-years
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import re
-import sys
+import optparse
 import datetime
 import subprocess
 import multiprocessing
@@ -15,7 +15,7 @@ def get_co_line(lines):
         if co_line_matcher.match(line): return line, i
     return None, None
 
-def fix_co_years(files):
+def fix_co_years(files, keep_years):
     for file in files:
         print file
         lines = open(file).readlines()
@@ -41,6 +41,9 @@ def fix_co_years(files):
             print '    format error on line %d: "%s"'%(num, line), e
             continue
 
+        #keep years means log years is a superset
+        if keep_years: log_years = min(co_years+log_years), max(co_years+log_years)
+
         if log_years != co_years:
             print '    log years: %s != copyright years: %s'%(log_years, co_years)
             year_now = datetime.datetime.now().year
@@ -51,15 +54,17 @@ def fix_co_years(files):
             open(file, 'w').write(new_text)
 
 if __name__ == "__main__":
-    if len(sys.argv) < 2: print "Usage: %s path/"%sys.argv[0]; exit()
+    parser = optparse.OptionParser(usage="usage: %prog [options] path")
+    parser.add_option("-k", "--keep", action="store_true", help="keep copyright years", default=False)
+    (options, args) = parser.parse_args()
 
     #get recursive list of files in the repo
-    files = command('git', 'ls-tree', '--name-only', 'HEAD', '-r', sys.argv[1]).splitlines()
+    files = command('git', 'ls-tree', '--name-only', 'HEAD', '-r', args[0]).splitlines()
 
     #start n+1 processes to handle the files
     num_procs = multiprocessing.cpu_count()
     procs = [multiprocessing.Process(
-        target=lambda *files: fix_co_years(files),
+        target=lambda *files: fix_co_years(files, keep_years=options.keep),
         args=files[num::num_procs],
     ) for num in range(num_procs)]
     map(multiprocessing.Process.start, procs)