card burner: added --list option, added warning, added sync on linux

1 files changed, 19 insertions, 6 deletions

diff --git a/host/utils/usrp2_card_burner.py b/host/utils/usrp2_card_burner.py
index 5f876c7bc..a1d4c5ed1 100755
--- a/host/utils/usrp2_card_burner.py
+++ b/host/utils/usrp2_card_burner.py
@@ -132,7 +132,7 @@ def verify_image(image_file, device_file, offset):
     return 'Verification Passed:\n%s'%verbose
 
 def write_image(image_file, device_file, offset):
-    return command(
+    verbose = command(
         get_dd_path(),
         "if=%s"%image_file,
         "of=%s"%device_file,
@@ -140,6 +140,12 @@ def write_image(image_file, device_file, offset):
         "bs=%d"%SECTOR_SIZE,
     )
 
+    try: #exec the sync command (only works on linux)
+        if platform.system() == 'Linux': command('sync')
+    except: pass
+
+    return verbose
+
 def write_and_verify(image_file, device_file, offset):
     if os.path.getsize(image_file) > MAX_FILE_SIZE:
         raise Exception, 'Image file larger than %d bytes!'%MAX_FILE_SIZE
@@ -211,7 +217,7 @@ class DeviceEntryWidget(Tkinter.Frame):
     def __init__(self, root, text=''):
         Tkinter.Frame.__init__(self, root)
 
-        Tkinter.Button(self, text="Reload Possible Devices", command=self._reload_cb).pack()
+        Tkinter.Button(self, text="Rescan for Devices", command=self._reload_cb).pack()
 
         self._hints = Tkinter.Listbox(self)
         self._hints.bind("<<ListboxSelect>>", self._listbox_cb)
@@ -278,6 +284,7 @@ class USRP2CardBurnerApp(Tkinter.Frame):
 
         #the do it button
         SectionLabel(self, text="").pack(pady=5)
+        Tkinter.Label(self, text="Warning! This tool can overwrite your hard drive. Use with caution.").pack()
         Tkinter.Button(self, text="Burn SD Card", command=self._burn).pack()
 
     def _burn(self):
@@ -314,12 +321,18 @@ import optparse
 
 if __name__=='__main__':
     parser = optparse.OptionParser()
-    parser.add_option("--gui", action="store_true", default=False, help="run in gui mode")
-    parser.add_option("--dev", type="string", help="raw device path", default='')
-    parser.add_option("--fw", type="string", help="firmware image path (optional)", default='')
-    parser.add_option("--fpga", type="string", help="fpga image path (optional)", default='')
+    parser.add_option("--dev",  type="string",       help="raw device path",                default='')
+    parser.add_option("--fw",   type="string",       help="firmware image path (optional)", default='')
+    parser.add_option("--fpga", type="string",       help="fpga image path (optional)",     default='')
+    parser.add_option("--list", action="store_true", help="list possible raw devices",      default=False)
+    parser.add_option("--gui",  action="store_true", help="run in gui mode",                default=False)
     (options, args) = parser.parse_args()
 
+    if options.list:
+        print 'Possible raw devices:'
+        print '  ' + '\n  '.join(get_raw_device_hints())
+        exit()
+
     if options.gui:
         root = Tkinter.Tk()
         root.title('USRP2 SD Card Burner')